fixed an embarrasing segfault (head w/ no args

	used to die (but now it lives))

diff --git a/coreutils/head.c b/coreutils/head.c
index 23adce79f2feaa6aa223bcbbb9ea52cc3d05b2dc..a9d024e6216858c4282276c013d57d36bba5c270 100644 (file)
--- 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 23adce79f2feaa6aa223bcbbb9ea52cc3d05b2dc..a9d024e6216858c4282276c013d57d36bba5c270 100644 (file)
--- 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 $ */