handle unlikely case argc < 1 - sfeed - RSS and Atom parser
(HTM) git clone git://git.codemadness.org/sfeed
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit 839a4563e809916ccdd8ebeac1461d8c7ffc62e7
(DIR) parent 67179090976e460a85c14ce701c0c0f0dd8af2fd
(HTM) Author: Hiltjo Posthuma <hiltjo@codemadness.org>
Date: Tue, 11 Nov 2025 20:49:39 +0100
handle unlikely case argc < 1
Diffstat:
M sfeed_atom.c | 4 ++--
M sfeed_curses.c | 6 +++---
M sfeed_frames.c | 6 +++---
M sfeed_html.c | 6 +++---
M sfeed_json.c | 4 ++--
M sfeed_plain.c | 4 ++--
M sfeed_twtxt.c | 4 ++--
7 files changed, 17 insertions(+), 17 deletions(-)
---
(DIR) diff --git a/sfeed_atom.c b/sfeed_atom.c
@@ -122,7 +122,7 @@ main(int argc, char *argv[])
char *name;
int i;
- if (pledge(argc == 1 ? "stdio" : "stdio rpath", NULL) == -1)
+ if (pledge(argc <= 1 ? "stdio" : "stdio rpath", NULL) == -1)
err(1, "pledge");
if ((now = time(NULL)) == (time_t)-1)
@@ -139,7 +139,7 @@ main(int argc, char *argv[])
tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
tm->tm_hour, tm->tm_min, tm->tm_sec);
- if (argc == 1) {
+ if (argc <= 1) {
printfeed(stdin, "");
checkfileerror(stdin, "<stdin>", 'r');
} else {
(DIR) diff --git a/sfeed_curses.c b/sfeed_curses.c
@@ -1974,8 +1974,8 @@ main(int argc, char *argv[])
if (lazyload)
panes[PaneItems].row_get = item_row_get;
- feeds = ecalloc(argc, sizeof(struct feed));
- if (argc == 1) {
+ feeds = ecalloc(argc <= 1 ? 1 : argc, sizeof(struct feed));
+ if (argc <= 1) {
nfeeds = 1;
f = &feeds[0];
f->name = "stdin";
@@ -2002,7 +2002,7 @@ main(int argc, char *argv[])
die("dup2(%d, 0): /dev/tty -> stdin", fd);
close(fd);
}
- if (argc == 1)
+ if (argc <= 1)
feeds[0].fp = NULL;
if ((devnullfd = open("/dev/null", O_WRONLY)) == -1)
(DIR) diff --git a/sfeed_frames.c b/sfeed_frames.c
@@ -82,7 +82,7 @@ main(int argc, char *argv[])
if (pledge("stdio rpath wpath cpath", NULL) == -1)
err(1, "pledge");
- if (!(feeds = calloc(argc, sizeof(struct feed))))
+ if (!(feeds = calloc(argc <= 1 ? 1 : argc, sizeof(struct feed))))
err(1, "calloc");
if ((comparetime = getcomparetime()) == (time_t)-1)
@@ -96,7 +96,7 @@ main(int argc, char *argv[])
if (showsidebar && !(fpmenu = fopen("menu.html", "wb")))
err(1, "fopen: menu.html");
- if (pledge(argc == 1 ? "stdio" : "stdio rpath", NULL) == -1)
+ if (pledge(argc <= 1 ? "stdio" : "stdio rpath", NULL) == -1)
err(1, "pledge");
fputs("<!DOCTYPE HTML>\n"
@@ -108,7 +108,7 @@ main(int argc, char *argv[])
"</head>\n"
"<body class=\"frame\"><div id=\"items\">", fpitems);
- if (argc == 1) {
+ if (argc <= 1) {
feeds[0].name = "";
printfeed(fpitems, stdin, &feeds[0]);
checkfileerror(stdin, "<stdin>", 'r');
(DIR) diff --git a/sfeed_html.c b/sfeed_html.c
@@ -80,10 +80,10 @@ main(int argc, char *argv[])
FILE *fp;
int i;
- if (pledge(argc == 1 ? "stdio" : "stdio rpath", NULL) == -1)
+ if (pledge(argc <= 1 ? "stdio" : "stdio rpath", NULL) == -1)
err(1, "pledge");
- if (!(feeds = calloc(argc, sizeof(struct feed))))
+ if (!(feeds = calloc(argc <= 1 ? 1 : argc, sizeof(struct feed))))
err(1, "calloc");
if ((comparetime = getcomparetime()) == (time_t)-1)
errx(1, "getcomparetime");
@@ -103,7 +103,7 @@ main(int argc, char *argv[])
else
fputs("\t\t<div id=\"items\" class=\"nosidebar\">\n", stdout);
- if (argc == 1) {
+ if (argc <= 1) {
feeds[0].name = "";
printfeed(stdin, &feeds[0]);
checkfileerror(stdin, "<stdin>", 'r');
(DIR) diff --git a/sfeed_json.c b/sfeed_json.c
@@ -142,7 +142,7 @@ main(int argc, char *argv[])
char *name;
int i;
- if (pledge(argc == 1 ? "stdio" : "stdio rpath", NULL) == -1)
+ if (pledge(argc <= 1 ? "stdio" : "stdio rpath", NULL) == -1)
err(1, "pledge");
fputs("{\n"
@@ -150,7 +150,7 @@ main(int argc, char *argv[])
"\"title\": \"Newsfeed\",\n"
"\"items\": [\n", stdout);
- if (argc == 1) {
+ if (argc <= 1) {
printfeed(stdin, "");
checkfileerror(stdin, "<stdin>", 'r');
} else {
(DIR) diff --git a/sfeed_plain.c b/sfeed_plain.c
@@ -58,13 +58,13 @@ main(int argc, char *argv[])
setlocale(LC_CTYPE, "");
- if (pledge(argc == 1 ? "stdio" : "stdio rpath", NULL) == -1)
+ if (pledge(argc <= 1 ? "stdio" : "stdio rpath", NULL) == -1)
err(1, "pledge");
if ((comparetime = getcomparetime()) == (time_t)-1)
errx(1, "getcomparetime");
- if (argc == 1) {
+ if (argc <= 1) {
printfeed(stdin, "");
checkfileerror(stdin, "<stdin>", 'r');
} else {
(DIR) diff --git a/sfeed_twtxt.c b/sfeed_twtxt.c
@@ -48,10 +48,10 @@ main(int argc, char *argv[])
char *name;
int i;
- if (pledge(argc == 1 ? "stdio" : "stdio rpath", NULL) == -1)
+ if (pledge(argc <= 1 ? "stdio" : "stdio rpath", NULL) == -1)
err(1, "pledge");
- if (argc == 1) {
+ if (argc <= 1) {
printfeed(stdin, "");
checkfileerror(stdin, "<stdin>", 'r');
} else {