From b954ed4b9f1ef7e3d4ebb3bc964338726549bfab Mon Sep 17 00:00:00 2001 From: Markus Teich Date: Sun, 6 Mar 2016 20:49:18 +0100 Subject: Fix cmdline argument check There was a segfault when sent was called without arguments. Now we use stdin when there's no argument or - is used. Thanks to izabera for the report. --- sent.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'sent.c') diff --git a/sent.c b/sent.c index 6f5c139..9ad3636 100644 --- a/sent.c +++ b/sent.c @@ -689,7 +689,7 @@ void usage() { die("sent " VERSION " (c) 2014-2015 markus.teich@stusta.mhn.de\n" \ - "usage: sent FILE", argv0); + "usage: sent [FILE]", argv0); } int @@ -703,12 +703,13 @@ main(int argc, char *argv[]) usage(); } ARGEND; - if ((fp = strcmp(argv[0], "-") ? fopen(argv[0], "r") : stdin)) { - load(fp); - fclose(fp); - } else { + if (!argv[0] || !strcmp(argv[0], "-")) + fp = stdin; + else if (!(fp = fopen(argv[0], "r"))) die("Unable to open '%s' for reading:", argv[0]); - } + + load(fp); + fclose(fp); if (!slidecount) usage(); -- cgit v1.2.3