summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Beppu1999-12-15 19:29:09 +0000
committerJohn Beppu1999-12-15 19:29:09 +0000
commit25ab6534576eb0dbb636867ff992ab3a69ae06bc (patch)
treee581f37fa8f12f4e756fed152294f9c3212ab5e6
parente1618e42a8299cc928ba9af78bbea65899e76f4b (diff)
downloadbusybox-25ab6534576eb0dbb636867ff992ab3a69ae06bc.zip
busybox-25ab6534576eb0dbb636867ff992ab3a69ae06bc.tar.gz
fixed an embarrasing segfault (head w/ no args
used to die (but now it lives))
-rw-r--r--coreutils/head.c5
-rw-r--r--head.c5
2 files changed, 6 insertions, 4 deletions
diff --git a/coreutils/head.c b/coreutils/head.c
index 23adce7..a9d024e 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 23adce7..a9d024e 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 $ */