From 25ab6534576eb0dbb636867ff992ab3a69ae06bc Mon Sep 17 00:00:00 2001 From: John Beppu Date: Wed, 15 Dec 1999 19:29:09 +0000 Subject: [PATCH] fixed an embarrasing segfault (head w/ no args used to die (but now it lives)) --- coreutils/head.c | 5 +++-- head.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/coreutils/head.c b/coreutils/head.c index 23adce79f..a9d024e62 100644 --- a/coreutils/head.c +++ b/coreutils/head.c @@ -54,7 +54,7 @@ head_main(int argc, char **argv) int len = 10; /* 1st option is potentially special */ - if ((argv[1][0] == '-') && isDecimal(argv[1][1])) { + if ((argc > 1) && (argv[1][0] == '-') && isDecimal(argv[1][1])) { int tmplen = atoi(&argv[1][1]); if (tmplen) { len = tmplen; } i = 2; @@ -66,6 +66,7 @@ head_main(int argc, char **argv) opt = argv[i][1]; switch (opt) { case '-': + break; case 'h': usage(head_usage); default: @@ -103,4 +104,4 @@ head_main(int argc, char **argv) exit(0); } -/* $Id: head.c,v 1.2 1999/12/10 08:29:20 andersen Exp $ */ +/* $Id: head.c,v 1.3 1999/12/15 19:29:09 beppu Exp $ */ diff --git a/head.c b/head.c index 23adce79f..a9d024e62 100644 --- a/head.c +++ b/head.c @@ -54,7 +54,7 @@ head_main(int argc, char **argv) int len = 10; /* 1st option is potentially special */ - if ((argv[1][0] == '-') && isDecimal(argv[1][1])) { + if ((argc > 1) && (argv[1][0] == '-') && isDecimal(argv[1][1])) { int tmplen = atoi(&argv[1][1]); if (tmplen) { len = tmplen; } i = 2; @@ -66,6 +66,7 @@ head_main(int argc, char **argv) opt = argv[i][1]; switch (opt) { case '-': + break; case 'h': usage(head_usage); default: @@ -103,4 +104,4 @@ head_main(int argc, char **argv) exit(0); } -/* $Id: head.c,v 1.2 1999/12/10 08:29:20 andersen Exp $ */ +/* $Id: head.c,v 1.3 1999/12/15 19:29:09 beppu Exp $ */ -- 2.25.1