fixed an embarrasing segfault (head w/ no args

used to die (but now it lives))
This commit is contained in:
John Beppu 1999-12-15 19:29:09 +00:00
parent e1618e42a8
commit 25ab653457
2 changed files with 6 additions and 4 deletions

View File

@ -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 $ */

5
head.c
View File

@ -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 $ */