Changeset 153 for branches/GNU/src/gmake/main.c

Timestamp:

Sep 8, 2004, 4:43:30 AM (21 years ago)

Author:

bird

Message:

GNU Make 3.81beta1.

File:

• branches/GNU/src/gmake/main.c (modified) (9 diffs)

branches/GNU/src/gmake/main.c

@@ -392 +392 @@
     { CHAR_MAX+4, flag, (char *) &warn_undefined_variables_flag, 1, 1, 0, 0, 0,
         "warn-undefined-variables" },
-    { '\0', }
+    { 0 }
   };
 
@@ -550 +550 @@
 
 static RETSIGTYPE
-debug_signal_handler (int sig)
+debug_signal_handler (int sig UNUSED)
 {
   db_level = db_level ? DB_NONE : DB_BASIC;
@@ -839 +839 @@
 {
   static char *stdin_nm = 0;
-  register struct file *f;
-  register unsigned int i;
+  struct file *f;
+  int i;
   char **p;
   struct dep *read_makefiles;
@@ -1163 +1163 @@
   if (current_directory[0] != '\0'
       && argv[0] != 0
-      && (argv[0][0] != '/' && (argv[0][0] == '\0' || argv[0][1] != ':')))
+      && (argv[0][0] != '/' && (argv[0][0] == '\0' || argv[0][1] != ':'))
+#ifdef __EMX__
+      /* do not prepend cwd if argv[0] contains no '/', e.g. "make" */
+      && (strchr (argv[0], '/') != 0 || strchr (argv[0], '\\') != 0)
+# endif
+      )
     argv[0] = concat (current_directory, "/", argv[0]);
 #else  /* !__MSDOS__ */
@@ -1510 +1515 @@
   {
     char *cp;
-
-    for (i=1; i < jobserver_fds->idx; ++i)
-      if (!streq (jobserver_fds->list[0], jobserver_fds->list[i]))
+    unsigned int ui;
+
+    for (ui=1; ui < jobserver_fds->idx; ++ui)
+      if (!streq (jobserver_fds->list[0], jobserver_fds->list[ui]))
         fatal (NILF, _("internal error: multiple --jobserver-fds options"));
 
@@ -1743 +1749 @@
                in updating or could not be found at all.  */
             int any_failed = 0;
-            register unsigned int i;
+            unsigned int i;
             struct dep *d;
 
@@ -1817 +1823 @@
             {
               /* These names might have changed.  */
-              register unsigned int i, j = 0;
+              int i, j = 0;
               for (i = 1; i < argc; ++i)
                 if (strneq (argv[i], "-f", 2)) /* XXX */
@@ -2022 +2028 @@
 init_switches (void)
 {
-  register char *p;
-  register int c;
-  register unsigned int i;
+  char *p;
+  unsigned int c;
+  unsigned int i;
 
   if (options[0] != '\0')
@@ -2236 +2242 @@
                   if (optarg == 0)
                     optarg = cs->noarg_value;
+                  else if (*optarg == '\0')
+                    {
+                      error (NILF, _("the `-%c' option requires a non-empty string argument"),
+                             cs->c);
+                      bad = 1;
+                    }
 
                   sl = *(struct stringlist **) cs->value_ptr;