don't go into an infinite loop on "make -"

SCCS-vsn: usr.bin/make/main.c 5.26

diff --git a/usr/src/usr.bin/make/main.c b/usr/src/usr.bin/make/main.c
index 58b399b..2465391 100644 (file)
--- a/usr/src/usr.bin/make/main.c
+++ b/usr/src/usr.bin/make/main.c
@@ -17,7 +17,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)main.c     5.25 (Berkeley) %G%";
+static char sccsid[] = "@(#)main.c     5.26 (Berkeley) %G%";

 #endif /* not lint */
 
 /*-
 #endif /* not lint */
 
 /*-


@@ -251,7 +251,7 @@ rearg:      while((c = getopt(argc, argv, "D:I:d:ef:ij:knqrst")) != EOF) {
                if (Parse_IsVar(*argv))
                        Parse_DoVar(*argv, VAR_CMD);
                else {
                if (Parse_IsVar(*argv))
                        Parse_DoVar(*argv, VAR_CMD);
                else {

-                       if (!**argv)
+                       if (!*argv[0] || *argv[0] == '-' && !*argv[1])

                                Punt("illegal (null) argument.");
                        if (**argv == '-') {
                                optind = 0;
                                Punt("illegal (null) argument.");
                        if (**argv == '-') {
                                optind = 0;