Changeset 903 for trunk/src/gmakenew/main.c

Timestamp:

May 23, 2007, 7:31:19 AM (18 years ago)

Author:

bird

Message:

Merged with the 2007-05-23 CVS. Added rsort and fixed a couple of windows build issues.

File:

• trunk/src/gmakenew/main.c (modified) (79 diffs)

trunk/src/gmakenew/main.c

@@ -1 +1 @@
 /* Argument parsing and main program of GNU Make.
 Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
-1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software
+1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software
 Foundation, Inc.
 This file is part of GNU Make.
@@ -57 +57 @@
 #endif
 
-extern void init_dir PARAMS ((void));
-extern void remote_setup PARAMS ((void));
-extern void remote_cleanup PARAMS ((void));
-extern RETSIGTYPE fatal_error_signal PARAMS ((int sig));
-
-extern void print_variable_data_base PARAMS ((void));
-extern void print_dir_data_base PARAMS ((void));
-extern void print_rule_data_base PARAMS ((void));
-extern void print_file_data_base PARAMS ((void));
-extern void print_vpath_data_base PARAMS ((void));
+void init_dir (void);
+void remote_setup (void);
+void remote_cleanup (void);
+RETSIGTYPE fatal_error_signal (int sig);
+
+void print_variable_data_base (void);
+void print_dir_data_base (void);
+void print_rule_data_base (void);
+void print_file_data_base (void);
+void print_vpath_data_base (void);
+
+void verify_file_data_base (void);
 
 #if defined HAVE_WAITPID || defined HAVE_WAIT3
@@ -72 +74 @@
 #endif
 
-#if !defined(HAVE_UNISTD_H) && !defined(_MSC_VER)
-extern int chdir ();
+#if !defined(HAVE_UNISTD_H) && !defined(_MSC_VER) /* bird */
+int chdir ();
 #endif
 #ifndef STDC_HEADERS
 # ifndef sun                    /* Sun has an incorrect decl in a header.  */
-extern void exit PARAMS ((int)) __attribute__ ((noreturn));
+void exit (int) __attribute__ ((noreturn));
 # endif
-extern double atof ();
-#endif
-
-static void clean_jobserver PARAMS ((int status));
-static void print_data_base PARAMS ((void));
-static void print_version PARAMS ((void));
-static void decode_switches PARAMS ((int argc, char **argv, int env));
-static void decode_env_switches PARAMS ((char *envar, unsigned int len));
-static void define_makeflags PARAMS ((int all, int makefile));
-static char *quote_for_env PARAMS ((char *out, char *in));
-static void initialize_global_hash_tables PARAMS ((void));
+double atof ();
+#endif
+
+static void clean_jobserver (int status);
+static void print_data_base (void);
+static void print_version (void);
+static void decode_switches (int argc, char **argv, int env);
+static void decode_env_switches (char *envar, unsigned int len);
+static void define_makeflags (int all, int makefile);
+static char *quote_for_env (char *out, const char *in);
+static void initialize_global_hash_tables (void);
 
 
@@ -104 +106 @@
         flag_off,               /* Turn int flag off.  */
         string,                 /* One string per switch.  */
+        filename,               /* A string containing a file name.  */
         positive_int,           /* A positive integer.  */
         floating,               /* A floating-point number (double).  */
@@ -109 +112 @@
       } type;
 
-    char *value_ptr;    /* Pointer to the value-holding variable.  */
+    void *value_ptr;    /* Pointer to the value-holding variable.  */
 
     unsigned int env:1;         /* Can come from MAKEFLAGS.  */
@@ -115 +118 @@
     unsigned int no_makefile:1; /* Don't propagate when remaking makefiles.  */
 
-    char *noarg_value;  /* Pointer to value used if no argument is given.  */
-    char *default_value;/* Pointer to default value.  */
+    const void *noarg_value;    /* Pointer to value used if no arg given.  */
+    const void *default_value;  /* Pointer to default value.  */
 
     char *long_name;            /* Long option name.  */
@@ -130 +133 @@
 struct stringlist
   {
-    char **list;        /* Nil-terminated list of strings.  */
+    const char **list;  /* Nil-terminated list of strings.  */
     unsigned int idx;   /* Index into above.  */
     unsigned int max;   /* Number of pointers allocated.  */
@@ -164 +167 @@
 
 int db_level = 0;
+
+/* Output level (--verbosity).  */
+
+static struct stringlist *verbosity_flags;
 
 #ifdef WINDOWS32
@@ -288 +295 @@
 
 struct variable shell_var;
+
+/* This character introduces a command: it's the first char on the line.  */
+
+char cmd_prefix = '\t';
 
 #ifdef KMK
@@ -382 +393 @@
   {
     { 'b', ignore, 0, 0, 0, 0, 0, 0, 0 },
-    { 'B', flag, (char *) &always_make_set, 1, 1, 0, 0, 0, "always-make" },
-    { 'C', string, (char *) &directories, 0, 0, 0, 0, 0, "directory" },
-    { 'd', flag, (char *) &debug_flag, 1, 1, 0, 0, 0, 0 },
-    { CHAR_MAX+1, string, (char *) &db_flags, 1, 1, 0, "basic", 0, "debug" },
+    { 'B', flag, &always_make_set, 1, 1, 0, 0, 0, "always-make" },
+    { 'C', filename, &directories, 0, 0, 0, 0, 0, "directory" },
+    { 'd', flag, &debug_flag, 1, 1, 0, 0, 0, 0 },
+    { CHAR_MAX+1, string, &db_flags, 1, 1, 0, "basic", 0, "debug" },
 #ifdef WINDOWS32
-    { 'D', flag, (char *) &suspend_flag, 1, 1, 0, 0, 0, "suspend-for-debug" },
-#endif
-    { 'e', flag, (char *) &env_overrides, 1, 1, 0, 0, 0,
-      "environment-overrides", },
-    { 'f', string, (char *) &makefiles, 0, 0, 0, 0, 0, "file" },
-    { 'h', flag, (char *) &print_usage_flag, 0, 0, 0, 0, 0, "help" },
-    { 'i', flag, (char *) &ignore_errors_flag, 1, 1, 0, 0, 0,
-      "ignore-errors" },
-    { 'I', string, (char *) &include_directories, 1, 1, 0, 0, 0,
+    { 'D', flag, &suspend_flag, 1, 1, 0, 0, 0, "suspend-for-debug" },
+#endif
+    { 'e', flag, &env_overrides, 1, 1, 0, 0, 0, "environment-overrides", },
+    { 'f', filename, &makefiles, 0, 0, 0, 0, 0, "file" },
+    { 'h', flag, &print_usage_flag, 0, 0, 0, 0, 0, "help" },
+    { 'i', flag, &ignore_errors_flag, 1, 1, 0, 0, 0, "ignore-errors" },
+    { 'I', filename, &include_directories, 1, 1, 0, 0, 0,
       "include-dir" },
-    { 'j', positive_int, (char *) &job_slots, 1, 1, 0, (char *) &inf_jobs,
-      (char *) &default_job_slots, "jobs" },
-    { CHAR_MAX+2, string, (char *) &jobserver_fds, 1, 1, 0, 0, 0,
-      "jobserver-fds" },
-    { 'k', flag, (char *) &keep_going_flag, 1, 1, 0, 0,
-      (char *) &default_keep_going_flag, "keep-going" },
+    { 'j', positive_int, &job_slots, 1, 1, 0, &inf_jobs, &default_job_slots,
+      "jobs" },
+    { CHAR_MAX+2, string, &jobserver_fds, 1, 1, 0, 0, 0, "jobserver-fds" },
+    { 'k', flag, &keep_going_flag, 1, 1, 0, 0, &default_keep_going_flag,
+      "keep-going" },
 #ifndef NO_FLOAT
-    { 'l', floating, (char *) &max_load_average, 1, 1, 0,
-      (char *) &default_load_average, (char *) &default_load_average,
-      "load-average" },
+    { 'l', floating, &max_load_average, 1, 1, 0, &default_load_average,
+      &default_load_average, "load-average" },
 #else
-    { 'l', positive_int, (char *) &max_load_average, 1, 1, 0,
-      (char *) &default_load_average, (char *) &default_load_average,
-      "load-average" },
-#endif
-    { 'L', flag, (char *) &check_symlink_flag, 1, 1, 0, 0, 0,
-      "check-symlink-times" },
+    { 'l', positive_int, &max_load_average, 1, 1, 0, &default_load_average,
+      &default_load_average, "load-average" },
+#endif
+    { 'L', flag, &check_symlink_flag, 1, 1, 0, 0, 0, "check-symlink-times" },
     { 'm', ignore, 0, 0, 0, 0, 0, 0, 0 },
-    { 'n', flag, (char *) &just_print_flag, 1, 1, 1, 0, 0, "just-print" },
-    { 'o', string, (char *) &old_files, 0, 0, 0, 0, 0, "old-file" },
-    { 'p', flag, (char *) &print_data_base_flag, 1, 1, 0, 0, 0,
-      "print-data-base" },
+    { 'n', flag, &just_print_flag, 1, 1, 1, 0, 0, "just-print" },
+    { 'o', filename, &old_files, 0, 0, 0, 0, 0, "old-file" },
+    { 'p', flag, &print_data_base_flag, 1, 1, 0, 0, 0, "print-data-base" },
 #ifdef CONFIG_PRETTY_COMMAND_PRINTING
     { CHAR_MAX+6, flag, (char *) &pretty_command_printing, 1, 1, 1, 0, 0,
@@ -427 +431 @@
       (char *) &process_priority, (char *) &process_priority, "priority" },
 #endif
-    { 'q', flag, (char *) &question_flag, 1, 1, 1, 0, 0, "question" },
-    { 'r', flag, (char *) &no_builtin_rules_flag, 1, 1, 0, 0, 0,
-      "no-builtin-rules" },
-    { 'R', flag, (char *) &no_builtin_variables_flag, 1, 1, 0, 0, 0,
+    { 'q', flag, &question_flag, 1, 1, 1, 0, 0, "question" },
+    { 'r', flag, &no_builtin_rules_flag, 1, 1, 0, 0, 0, "no-builtin-rules" },
+    { 'R', flag, &no_builtin_variables_flag, 1, 1, 0, 0, 0,
       "no-builtin-variables" },
-    { 's', flag, (char *) &silent_flag, 1, 1, 0, 0, 0, "silent" },
-    { 'S', flag_off, (char *) &keep_going_flag, 1, 1, 0, 0,
-      (char *) &default_keep_going_flag, "no-keep-going" },
-    { 't', flag, (char *) &touch_flag, 1, 1, 1, 0, 0, "touch" },
-    { 'v', flag, (char *) &print_version_flag, 1, 1, 0, 0, 0, "version" },
-    { 'w', flag, (char *) &print_directory_flag, 1, 1, 0, 0, 0,
-      "print-directory" },
-    { CHAR_MAX+3, flag, (char *) &inhibit_print_directory_flag, 1, 1, 0, 0, 0,
+    { 's', flag, &silent_flag, 1, 1, 0, 0, 0, "silent" },
+    { 'S', flag_off, &keep_going_flag, 1, 1, 0, 0, &default_keep_going_flag,
+      "no-keep-going" },
+    { 't', flag, &touch_flag, 1, 1, 1, 0, 0, "touch" },
+    { 'v', flag, &print_version_flag, 1, 1, 0, 0, 0, "version" },
+    { CHAR_MAX+3, string, &verbosity_flags, 1, 1, 0, 0, 0,
+      "verbosity" },
+    { 'w', flag, &print_directory_flag, 1, 1, 0, 0, 0, "print-directory" },
+    { CHAR_MAX+4, flag, &inhibit_print_directory_flag, 1, 1, 0, 0, 0,
       "no-print-directory" },
-    { 'W', string, (char *) &new_files, 0, 0, 0, 0, 0, "what-if" },
-    { CHAR_MAX+4, flag, (char *) &warn_undefined_variables_flag, 1, 1, 0, 0, 0,
+    { 'W', filename, &new_files, 0, 0, 0, 0, 0, "what-if" },
+    { CHAR_MAX+5, flag, &warn_undefined_variables_flag, 1, 1, 0, 0, 0,
       "warn-undefined-variables" },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0 }
@@ -588 +592 @@
 }
 
-static struct file *
-enter_command_line_file (char *name)
+static const char *
+expand_command_line_file (char *name)
 {
+  const char *cp;
+  char *expanded = 0;
+
   if (name[0] == '\0')
     fatal (NILF, _("empty string invalid as file name"));
@@ -596 +603 @@
   if (name[0] == '~')
     {
-      char *expanded = tilde_expand (name);
+      expanded = tilde_expand (name);
       if (expanded != 0)
-        name = expanded;        /* Memory leak; I don't care.  */
+        name = expanded;
     }
 
@@ -622 +629 @@
     }
 
-  return enter_file (xstrdup (name));
+  cp = strcache_add (name);
+
+  if (expanded)
+    free (expanded);
+
+  return cp;
 }
 
@@ -638 +650 @@
 decode_debug_flags (void)
 {
-  char **pp;
+  const char **pp;
 
   if (debug_flag)
@@ -814 +826 @@
 
 int
-find_and_set_default_shell (char *token)
+find_and_set_default_shell (const char *token)
 {
   int sh_found = 0;
+  char *atoken = 0;
   char *search_token;
   char *tokend;
@@ -825 +838 @@
     search_token = default_shell;
   else
-    search_token = token;
-
+    atoken = search_token = xstrdup (token);
 
   /* If the user explicitly requests the DOS cmd shell, obey that request.
@@ -836 +848 @@
         || (tokend > search_token
             && (tokend[-1] == '/' || tokend[-1] == '\\')))
-       && !strcmpi (tokend, "cmd"))
+       && !strcasecmp (tokend, "cmd"))
       || ((tokend - 4 == search_token
            || (tokend - 4 > search_token
                && (tokend[-5] == '/' || tokend[-5] == '\\')))
-          && !strcmpi (tokend - 4, "cmd.exe"))) {
+          && !strcasecmp (tokend - 4, "cmd.exe"))) {
     batch_mode_shell = 1;
     unixy_shell = 0;
@@ -852 +864 @@
     /* no new information, path already set or known */
     sh_found = 1;
-  } else if (file_exists_p(search_token)) {
+  } else if (file_exists_p (search_token)) {
     /* search token path was found */
-    sprintf(sh_path, "%s", search_token);
-    default_shell = xstrdup(w32ify(sh_path,0));
+    sprintf (sh_path, "%s", search_token);
+    default_shell = xstrdup (w32ify (sh_path, 0));
     DB (DB_VERBOSE,
         (_("find_and_set_shell setting default_shell = %s\n"), default_shell));
@@ -868 +880 @@
 
       p  = v->value;
-      ep = strchr(p, PATH_SEPARATOR_CHAR);
+      ep = strchr (p, PATH_SEPARATOR_CHAR);
 
       while (ep && *ep) {
         *ep = '\0';
 
-        if (dir_file_exists_p(p, search_token)) {
-          sprintf(sh_path, "%s/%s", p, search_token);
-          default_shell = xstrdup(w32ify(sh_path,0));
+        if (dir_file_exists_p (p, search_token)) {
+          sprintf (sh_path, "%s/%s", p, search_token);
+          default_shell = xstrdup (w32ify (sh_path, 0));
           sh_found = 1;
           *ep = PATH_SEPARATOR_CHAR;
 
           /* terminate loop */
-          p += strlen(p);
+          p += strlen (p);
         } else {
           *ep = PATH_SEPARATOR_CHAR;
@@ -886 +898 @@
         }
 
-        ep = strchr(p, PATH_SEPARATOR_CHAR);
+        ep = strchr (p, PATH_SEPARATOR_CHAR);
       }
 
       /* be sure to check last element of Path */
-      if (p && *p && dir_file_exists_p(p, search_token)) {
-          sprintf(sh_path, "%s/%s", p, search_token);
-          default_shell = xstrdup(w32ify(sh_path,0));
+      if (p && *p && dir_file_exists_p (p, search_token)) {
+          sprintf (sh_path, "%s/%s", p, search_token);
+          default_shell = xstrdup (w32ify (sh_path, 0));
           sh_found = 1;
       }
@@ -916 +928 @@
   /* naive test */
   if (!unixy_shell && sh_found &&
-      (strstr(default_shell, "sh") || strstr(default_shell, "SH"))) {
+      (strstr (default_shell, "sh") || strstr (default_shell, "SH"))) {
     unixy_shell = 1;
     batch_mode_shell = 0;
@@ -924 +936 @@
   batch_mode_shell = 1;
 #endif
+
+  if (atoken)
+    free (atoken);
 
   return (sh_found);
@@ -995 +1010 @@
 #endif  /* WINDOWS32 */
 
-#ifdef  __MSDOS__
-
+#ifdef __MSDOS__
 static void
 msdos_return_to_initial_directory (void)
@@ -1003 +1017 @@
     chdir (directory_before_chdir);
 }
-#endif
-
-#ifndef _MSC_VER
-extern char *mktemp PARAMS ((char *template));
-#endif
-extern int mkstemp PARAMS ((char *template));
+#endif  /* __MSDOS__ */
+
+#ifndef _MSC_VER /* bird */
+char *mktemp (char *template);
+#endif
+int mkstemp (char *template);
 
 FILE *
@@ -1061 +1075 @@
 {
   static char *stdin_nm = 0;
-  struct file *f;
-  int i;
   int makefile_status = MAKE_SUCCESS;
-  char **p;
   struct dep *read_makefiles;
   PATH_VAR (current_directory);
@@ -1193 +1204 @@
 # else  /* setvbuf not reversed.  */
   /* Some buggy systems lose if we pass 0 instead of allocating ourselves.  */
-  setvbuf (stdout, (char *) 0, _IOLBF, BUFSIZ);
+  setvbuf (stdout, 0, _IOLBF, BUFSIZ);
 # endif /* setvbuf reversed.  */
 #elif HAVE_SETLINEBUF
@@ -1301 +1312 @@
 
 #ifndef _AMIGA
-  for (i = 0; envp[i] != 0; ++i)
-    {
-      int do_not_define = 0;
-      char *ep = envp[i];
-
-      while (*ep != '\0' && *ep != '=')
-        ++ep;
+  {
+    unsigned int i;
+
+    for (i = 0; envp[i] != 0; ++i)
+      {
+        int do_not_define = 0;
+        char *ep = envp[i];
+
+        while (*ep != '\0' && *ep != '=')
+          ++ep;
 #ifdef WINDOWS32
-      if (!unix_path && strneq(envp[i], "PATH=", 5))
-        unix_path = ep+1;
-      else if (!strnicmp(envp[i], "Path=", 5)) {
-        do_not_define = 1; /* it gets defined after loop exits */
-        if (!windows32_path)
-          windows32_path = ep+1;
+        if (!unix_path && strneq(envp[i], "PATH=", 5))
+          unix_path = ep+1;
+        else if (!strnicmp(envp[i], "Path=", 5)) {
+          do_not_define = 1; /* it gets defined after loop exits */
+          if (!windows32_path)
+            windows32_path = ep+1;
+        }
+#endif
+        /* The result of pointer arithmetic is cast to unsigned int for
+           machines where ptrdiff_t is a different size that doesn't widen
+           the same.  */
+        if (!do_not_define)
+          {
+            struct variable *v;
+
+            v = define_variable (envp[i], (unsigned int) (ep - envp[i]),
+                                 ep + 1, o_env, 1);
+            /* Force exportation of every variable culled from the
+               environment.  We used to rely on target_environment's
+               v_default code to do this.  But that does not work for the
+               case where an environment variable is redefined in a makefile
+               with `override'; it should then still be exported, because it
+               was originally in the environment.  */
+            v->export = v_export;
+
+            /* Another wrinkle is that POSIX says the value of SHELL set in
+               the makefile won't change the value of SHELL given to
+               subprocesses.  */
+            if (streq (v->name, "SHELL"))
+              {
+#ifndef __MSDOS__
+                v->export = v_noexport;
+#endif
+                shell_var.name = "SHELL";
+                shell_var.value = xstrdup (ep + 1);
+              }
+
+            /* If MAKE_RESTARTS is set, remember it but don't export it.  */
+            if (streq (v->name, "MAKE_RESTARTS"))
+              {
+                v->export = v_noexport;
+                restarts = (unsigned int) atoi (ep + 1);
+              }
+          }
       }
-#endif
-      /* The result of pointer arithmetic is cast to unsigned int for
-         machines where ptrdiff_t is a different size that doesn't widen
-         the same.  */
-      if (!do_not_define)
-        {
-          struct variable *v;
-
-          v = define_variable (envp[i], (unsigned int) (ep - envp[i]),
-                               ep + 1, o_env, 1);
-          /* Force exportation of every variable culled from the environment.
-             We used to rely on target_environment's v_default code to do this.
-             But that does not work for the case where an environment variable
-             is redefined in a makefile with `override'; it should then still
-             be exported, because it was originally in the environment.  */
-          v->export = v_export;
-
-          /* Another wrinkle is that POSIX says the value of SHELL set in the
-             makefile won't change the value of SHELL given to subprocesses  */
-          if (streq (v->name, "SHELL"))
-            {
-#ifndef __MSDOS__
-              v->export = v_noexport;
-#endif
-              shell_var.name = "SHELL";
-              shell_var.value = xstrdup (ep + 1);
-            }
-
-          /* If MAKE_RESTARTS is set, remember it but don't export it.  */
-          if (streq (v->name, "MAKE_RESTARTS"))
-            {
-              v->export = v_noexport;
-              restarts = (unsigned int) atoi (ep + 1);
-            }
-        }
-    }
+  }
 #ifdef WINDOWS32
     /* If we didn't find a correctly spelled PATH we define PATH as
@@ -1397 +1414 @@
 #if 0
   /* People write things like:
-        MFLAGS="CC=gcc -pipe" "CFLAGS=-g"
+        MFLAGS="CC=gcc -pipe" "CFLAGS=-g"
      and we set the -p, -i and -e switches.  Doesn't seem quite right.  */
   decode_env_switches (STRING_SIZE_TUPLE ("MFLAGS"));
@@ -1464 +1481 @@
       && argv[0] != 0
       && (argv[0][0] != '/' && (argv[0][0] == '\0' || argv[0][1] != ':'))
-#ifdef __EMX__
+# 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]);
+    argv[0] = xstrdup (concat (current_directory, "/", argv[0]));
 #else  /* !__MSDOS__ */
   if (current_directory[0] != '\0'
-      && argv[0] != 0 && argv[0][0] != '/' && strchr (argv[0], '/') != 0)
-    argv[0] = concat (current_directory, "/", argv[0]);
+      && argv[0] != 0 && argv[0][0] != '/' && strchr (argv[0], '/') != 0
+#ifdef HAVE_DOS_PATHS
+      && (argv[0][0] != '\\' && (!argv[0][0] || argv[0][1] != ':'))
+      && strchr (argv[0], '\\') != 0
+#endif
+      )
+    argv[0] = xstrdup (concat (current_directory, "/", argv[0]));
 #endif /* !__MSDOS__ */
 #endif /* WINDOWS32 */
@@ -1507 +1529 @@
 
       /* Now allocate a buffer big enough and fill it.  */
-      p = value = (char *) alloca (len);
+      p = value = alloca (len);
       for (cv = command_variables; cv != 0; cv = cv->next)
         {
@@ -1590 +1612 @@
       }
     }
-#endif
+#endif /* KMK */
 
   /* If there were -C flags, move ourselves about.  */
   if (directories != 0)
-    for (i = 0; directories->list[i] != 0; ++i)
-      {
-        char *dir = directories->list[i];
-        char *expanded = 0;
-        if (dir[0] == '~')
-          {
-            expanded = tilde_expand (dir);
-            if (expanded != 0)
-              dir = expanded;
-          }
+    {
+      unsigned int i;
+      for (i = 0; directories->list[i] != 0; ++i)
+        {
+          const char *dir = directories->list[i];
 #ifdef WINDOWS32
-        /* WINDOWS32 chdir() doesn't work if the directory has a trailing '/'
-           But allow -C/ just in case someone wants that.  */
-        {
-          char *p = dir + strlen (dir) - 1;
-          while (p > dir && (p[0] == '/' || p[0] == '\\'))
-            --p;
-          p[1] = '\0';
+          /* WINDOWS32 chdir() doesn't work if the directory has a trailing '/'
+             But allow -C/ just in case someone wants that.  */
+          {
+            char *p = (char *)dir + strlen (dir) - 1;
+            while (p > dir && (p[0] == '/' || p[0] == '\\'))
+              --p;
+            p[1] = '\0';
+          }
+#endif
+          if (chdir (dir) < 0)
+            pfatal_with_name (dir);
         }
-#endif
-        if (chdir (dir) < 0)
-          pfatal_with_name (dir);
-        if (expanded)
-          free (expanded);
-      }
+    }
 
 #ifdef WINDOWS32
@@ -1656 +1672 @@
   /* Construct the list of include directories to search.  */
 
-  construct_include_path (include_directories == 0 ? (char **) 0
-                          : include_directories->list);
+  construct_include_path (include_directories == 0
+                          ? 0 : include_directories->list);
 
   /* Figure out where we are now, after chdir'ing.  */
@@ -1688 +1704 @@
   if (makefiles != 0)
     {
-      register unsigned int i;
+      unsigned int i;
       for (i = 0; i < makefiles->idx; ++i)
         if (makefiles->list[i][0] == '-' && makefiles->list[i][1] == '\0')
@@ -1721 +1737 @@
               tmpdir = DEFAULT_TMPDIR;
 
-            template = (char *) alloca (strlen (tmpdir)
-                                        + sizeof (DEFAULT_TMPFILE) + 1);
+            template = alloca (strlen (tmpdir) + sizeof (DEFAULT_TMPFILE) + 1);
             strcpy (template, tmpdir);
 
@@ -1746 +1761 @@
                   pfatal_with_name (_("fwrite (temporary file)"));
               }
-            (void) fclose (outfile);
+            fclose (outfile);
 
             /* Replace the name that read_all_makefiles will
                see with the name of the temporary file.  */
-            makefiles->list[i] = xstrdup (stdin_nm);
+            makefiles->list[i] = strcache_add (stdin_nm);
 
             /* Make sure the temporary file will not be remade.  */
-            f = enter_file (stdin_nm);
-            f->updated = 1;
-            f->update_status = 0;
-            f->command_state = cs_finished;
-            /* Can't be intermediate, or it'll be removed too early for
-               make re-exec.  */
-            f->intermediate = 0;
-            f->dontcare = 0;
+            {
+              struct file *f = enter_file (strcache_add (stdin_nm));
+              f->updated = 1;
+              f->update_status = 0;
+              f->command_state = cs_finished;
+              /* Can't be intermediate, or it'll be removed too early for
+                 make re-exec.  */
+              f->intermediate = 0;
+              f->dontcare = 0;
+            }
           }
     }
 
-#if !defined(__EMX__) || defined(__KLIBC__) /* Don't use a SIGCHLD handler for good old EMX */
+#if !defined(__EMX__) || defined(__KLIBC__) /* Don't use a SIGCHLD handler for good old EMX (bird) */
 #if defined(MAKE_JOBSERVER) || !defined(HAVE_WAIT_NOHANG)
   /* Set up to handle children dying.  This must be done before
@@ -1779 +1796 @@
      If none of these are true, we don't need a signal handler at all.  */
   {
-    extern RETSIGTYPE child_handler PARAMS ((int sig));
+    RETSIGTYPE child_handler (int sig);
 # if defined SIGCHLD
     bsd_signal (SIGCHLD, child_handler);
@@ -1819 +1836 @@
   define_default_variables ();
 
-  default_file = enter_file (".DEFAULT");
+  default_file = enter_file (strcache_add (".DEFAULT"));
 
   {
@@ -1829 +1846 @@
 
   read_makefiles
-    = read_all_makefiles (makefiles == 0 ? (char **) 0 : makefiles->list);
+    = read_all_makefiles (makefiles == 0 ? 0 : makefiles->list);
 
 #ifdef WINDOWS32
@@ -1884 +1901 @@
   if (jobserver_fds)
   {
-    char *cp;
+    const char *cp;
     unsigned int ui;
 
@@ -1898 +1915 @@
       fatal (NILF,
              _("internal error: invalid --jobserver-fds string `%s'"), cp);
+
+    DB (DB_JOBS,
+        (_("Jobserver client (fds %d,%d)\n"), job_fds[0], job_fds[1]));
 
     /* The combination of a pipe + !job_slots means we're using the
@@ -1940 +1960 @@
   if (job_slots > 1)
     {
+      char *cp;
       char c = '+';
 
@@ -1963 +1984 @@
       /* Fill in the jobserver_fds struct for our children.  */
 
+      cp = xmalloc ((sizeof ("1024")*2)+1);
+      sprintf (cp, "%d,%d", job_fds[0], job_fds[1]);
+
       jobserver_fds = (struct stringlist *)
                         xmalloc (sizeof (struct stringlist));
-      jobserver_fds->list = (char **) xmalloc (sizeof (char *));
-      jobserver_fds->list[0] = xmalloc ((sizeof ("1024")*2)+1);
-
-      sprintf (jobserver_fds->list[0], "%d,%d", job_fds[0], job_fds[1]);
+      jobserver_fds->list = xmalloc (sizeof (char *));
+      jobserver_fds->list[0] = cp;
       jobserver_fds->idx = 1;
       jobserver_fds->max = 1;
@@ -2018 +2040 @@
 
   if (old_files != 0)
-    for (p = old_files->list; *p != 0; ++p)
-      {
-        f = enter_command_line_file (*p);
-        f->last_mtime = f->mtime_before_update = OLD_MTIME;
-        f->updated = 1;
-        f->update_status = 0;
-        f->command_state = cs_finished;
-      }
+    {
+      const char **p;
+      for (p = old_files->list; *p != 0; ++p)
+        {
+          struct file *f = enter_file (*p);
+          f->last_mtime = f->mtime_before_update = OLD_MTIME;
+          f->updated = 1;
+          f->update_status = 0;
+          f->command_state = cs_finished;
+        }
+    }
 
   if (!restarts && new_files != 0)
     {
+      const char **p;
       for (p = new_files->list; *p != 0; ++p)
         {
-          f = enter_command_line_file (*p);
+          struct file *f = enter_file (*p);
           f->last_mtime = f->mtime_before_update = NEW_MTIME;
         }
@@ -2063 +2089 @@
         while (d != 0)
           {
-            register struct file *f = d->file;
+            struct file *f = d->file;
             if (f->double_colon)
               for (f = f->double_colon; f != NULL; f = f->prev)
@@ -2096 +2122 @@
             if (f == NULL || !f->double_colon)
               {
-                makefile_mtimes = (FILE_TIMESTAMP *)
-                  xrealloc ((char *) makefile_mtimes,
-                            (mm_idx + 1) * sizeof (FILE_TIMESTAMP));
+                makefile_mtimes = xrealloc (makefile_mtimes,
+                                            (mm_idx+1)
+                                            * sizeof (FILE_TIMESTAMP));
                 makefile_mtimes[mm_idx++] = file_mtime_no_search (d->file);
                 last = d;
@@ -2217 +2243 @@
                     char *p = &argv[i][2];
                     if (*p == '\0')
-                      argv[++i] = makefiles->list[j];
+                      /* This cast is OK since we never modify argv.  */
+                      argv[++i] = (char *) makefiles->list[j];
                     else
-                      argv[i] = concat ("-f", makefiles->list[j], "");
+                      argv[i] = xstrdup (concat ("-f", makefiles->list[j], ""));
                     ++j;
                   }
@@ -2227 +2254 @@
           if (stdin_nm)
             {
-              nargv = (char **) xmalloc ((nargc + 2) * sizeof (char *));
-              bcopy ((char *) argv, (char *) nargv, argc * sizeof (char *));
-              nargv[nargc++] = concat ("-o", stdin_nm, "");
+              nargv = xmalloc ((nargc + 2) * sizeof (char *));
+              memcpy (nargv, argv, argc * sizeof (char *));
+              nargv[nargc++] = xstrdup (concat ("-o", stdin_nm, ""));
               nargv[nargc] = 0;
             }
@@ -2235 +2262 @@
           if (directories != 0 && directories->idx > 0)
             {
-              char bad;
+              int bad = 1;
               if (directory_before_chdir != 0)
                 {
                   if (chdir (directory_before_chdir) < 0)
-                    {
                       perror_with_name ("chdir", "");
-                      bad = 1;
-                    }
                   else
                     bad = 0;
                 }
-              else
-                bad = 1;
               if (bad)
                 fatal (NILF, _("Couldn't change back to original directory."));
@@ -2264 +2286 @@
 
 #ifndef _AMIGA
-          for (p = environ; *p != 0; ++p)
-            {
-              if (strneq (*p, MAKELEVEL_NAME, MAKELEVEL_LENGTH)
-                  && (*p)[MAKELEVEL_LENGTH] == '=')
-                {
-                  /* The SGI compiler apparently can't understand
-                     the concept of storing the result of a function
-                     in something other than a local variable.  */
-                  char *sgi_loses;
-                  sgi_loses = (char *) alloca (40);
-                  *p = sgi_loses;
-                  sprintf (*p, "%s=%u", MAKELEVEL_NAME, makelevel);
-                }
-              if (strneq (*p, "MAKE_RESTARTS=", 14))
-                {
-                  char *sgi_loses;
-                  sgi_loses = (char *) alloca (40);
-                  *p = sgi_loses;
-                  sprintf (*p, "MAKE_RESTARTS=%u", restarts);
-                  restarts = 0;
-                }
-            }
+          {
+            char **p;
+            for (p = environ; *p != 0; ++p)
+              {
+                if (strneq (*p, MAKELEVEL_NAME, MAKELEVEL_LENGTH)
+                    && (*p)[MAKELEVEL_LENGTH] == '=')
+                  {
+                    *p = alloca (40);
+                    sprintf (*p, "%s=%u", MAKELEVEL_NAME, makelevel);
+                  }
+                if (strneq (*p, "MAKE_RESTARTS=", 14))
+                  {
+                    *p = alloca (40);
+                    sprintf (*p, "MAKE_RESTARTS=%u", restarts);
+                    restarts = 0;
+                  }
+              }
+          }
 #else /* AMIGA */
           {
@@ -2351 +2369 @@
       /* Free the makefile mtimes (if we allocated any).  */
       if (makefile_mtimes)
-        free ((char *) makefile_mtimes);
+        free (makefile_mtimes);
     }
 
@@ -2363 +2381 @@
   if (restarts && new_files != 0)
     {
+      const char **p;
       for (p = new_files->list; *p != 0; ++p)
         {
-          f = enter_command_line_file (*p);
+          struct file *f = enter_file (*p);
           f->last_mtime = f->mtime_before_update = NEW_MTIME;
         }
@@ -2404 +2423 @@
                       fatal (NILF, _(".DEFAULT_GOAL contains more than one target"));
 
-                    default_goal_file = enter_file (ns->name);
+                    default_goal_file = enter_file (strcache_add (ns->name));
 
                     ns->name = 0; /* It was reused by enter_file(). */
@@ -2508 +2527 @@
 
         case string:
+        case filename:
         case positive_int:
         case floating:
@@ -2552 +2572 @@
 
       if (! cv) {
-        cv = (struct command_variable *) xmalloc (sizeof (*cv));
+        cv = xmalloc (sizeof (*cv));
         cv->variable = v;
         cv->next = command_variables;
@@ -2563 +2583 @@
          target!  Enter it as a file and add it to the dep chain of
          goals.  */
-      struct file *f = enter_command_line_file (arg);
+      struct file *f = enter_file (strcache_add (expand_command_line_file (arg)));
       f->cmd_target = 1;
 
@@ -2581 +2601 @@
       {
         /* Add this target name to the MAKECMDGOALS variable. */
-        struct variable *v;
-        char *value;
-
-        v = lookup_variable (STRING_SIZE_TUPLE ("MAKECMDGOALS"));
-        if (v == 0)
+        struct variable *gv;
+        const char *value;
+
+        gv = lookup_variable (STRING_SIZE_TUPLE ("MAKECMDGOALS"));
+        if (gv == 0)
           value = f->name;
         else
@@ -2591 +2611 @@
             /* Paste the old and new values together */
             unsigned int oldlen, newlen;
-
-            oldlen = strlen (v->value);
+            char *vp;
+
+            oldlen = strlen (gv->value);
             newlen = strlen (f->name);
-            value = (char *) alloca (oldlen + 1 + newlen + 1);
-            bcopy (v->value, value, oldlen);
-            value[oldlen] = ' ';
-            bcopy (f->name, &value[oldlen + 1], newlen + 1);
+            vp = alloca (oldlen + 1 + newlen + 1);
+            memcpy (vp, gv->value, oldlen);
+            vp[oldlen] = ' ';
+            memcpy (&vp[oldlen + 1], f->name, newlen + 1);
+            value = vp;
           }
         define_variable ("MAKECMDGOALS", 12, value, o_default, 0);
@@ -2629 +2651 @@
     printf (_("\nThis program is built for %s/%s/%s (%s) [" __DATE__ " " __TIME__ "]\n"),
             BUILD_PLATFORM, BUILD_PLATFORM_ARCH, BUILD_PLATFORM_CPU, remote_description);
-#else
+#else  /* !KMK */
   if (!remote_description || *remote_description == '\0')
     fprintf (usageto, _("\nThis program built for %s\n"), make_host);
@@ -2635 +2657 @@
     fprintf (usageto, _("\nThis program built for %s (%s)\n"),
              make_host, remote_description);
-#endif
+#endif /* !KMK */
 
   fprintf (usageto, _("Report bugs to <bug-make@gnu.org>\n"));
@@ -2702 +2724 @@
 
                 case string:
+                case filename:
                   if (!doit)
                     break;
 
                   if (optarg == 0)
-                    optarg = cs->noarg_value;
+                    optarg = xstrdup (cs->noarg_value);
                   else if (*optarg == '\0')
                     {
@@ -2721 +2744 @@
                       sl->max = 5;
                       sl->idx = 0;
-                      sl->list = (char **) xmalloc (5 * sizeof (char *));
+                      sl->list = xmalloc (5 * sizeof (char *));
                       *(struct stringlist **) cs->value_ptr = sl;
                     }
@@ -2727 +2750 @@
                     {
                       sl->max += 5;
-                      sl->list = (char **)
-                        xrealloc ((char *) sl->list,
-                                  sl->max * sizeof (char *));
+                      sl->list = xrealloc (sl->list,
+                                           sl->max * sizeof (char *));
                     }
-                  sl->list[sl->idx++] = optarg;
+                  if (cs->type == filename)
+                    sl->list[sl->idx++] = expand_command_line_file (optarg);
+                  else
+                    sl->list[sl->idx++] = optarg;
                   sl->list[sl->idx] = 0;
                   break;
@@ -2816 +2841 @@
 decode_env_switches (char *envar, unsigned int len)
 {
-  char *varref = (char *) alloca (2 + len + 2);
+  char *varref = alloca (2 + len + 2);
   char *value, *p;
   int argc;
@@ -2824 +2849 @@
   varref[0] = '$';
   varref[1] = '(';
-  bcopy (envar, &varref[2], len);
+  memcpy (&varref[2], envar, len);
   varref[2 + len] = ')';
   varref[2 + len + 1] = '\0';
@@ -2836 +2861 @@
 
   /* Allocate a vector that is definitely big enough.  */
-  argv = (char **) alloca ((1 + len + 1) * sizeof (char *));
+  argv = alloca ((1 + len + 1) * sizeof (char *));
 
   /* Allocate a buffer to copy the value into while we split it into words
      and unquote it.  We must use permanent storage for this because
      decode_switches may store pointers into the passed argument words.  */
-  p = (char *) xmalloc (2 * len);
+  p = xmalloc (2 * len);
 
   /* getopt will look at the arguments starting at ARGV[1].
@@ -2872 +2897 @@
        need permanent storage for this in case decode_switches saves
        pointers into the value.  */
-    argv[1] = concat ("-", argv[1], "");
+    argv[1] = xstrdup (concat ("-", argv[1], ""));
 
   /* Parse those words.  */
@@ -2886 +2911 @@
 
 static char *
-quote_for_env (char *out, char *in)
+quote_for_env (char *out, const char *in)
 {
   while (*in != '\0')
@@ -2924 +2949 @@
       struct flag *next;
       const struct command_switch *cs;
-      char *arg;
+      const char *arg;
     };
   struct flag *flags = 0;
@@ -2930 +2955 @@
 #define ADD_FLAG(ARG, LEN) \
   do {                                                                        \
-    struct flag *new = (struct flag *) alloca (sizeof (struct flag));         \
+    struct flag *new = alloca (sizeof (struct flag));                         \
     new->cs = cs;                                                             \
     new->arg = (ARG);                                                         \
@@ -2948 +2973 @@
       switch (cs->type)
         {
-        default:
-          abort ();
-
         case ignore:
           break;
@@ -2980 +3002 @@
               else
                 {
-                  char *buf = (char *) alloca (30);
+                  char *buf = alloca (30);
                   sprintf (buf, "%u", *(unsigned int *) cs->value_ptr);
                   ADD_FLAG (buf, strlen (buf));
@@ -3001 +3023 @@
               else
                 {
-                  char *buf = (char *) alloca (100);
+                  char *buf = alloca (100);
                   sprintf (buf, "%g", *(double *) cs->value_ptr);
                   ADD_FLAG (buf, strlen (buf));
@@ -3009 +3031 @@
 #endif
 
+        case filename:
         case string:
           if (all)
@@ -3015 +3038 @@
               if (sl != 0)
                 {
-                  /* Add the elements in reverse order, because
-                     all the flags get reversed below; and the order
-                     matters for some switches (like -I).  */
-                  register unsigned int i = sl->idx;
+                  /* Add the elements in reverse order, because all the flags
+                     get reversed below; and the order matters for some
+                     switches (like -I).  */
+                  unsigned int i = sl->idx;
                   while (i-- > 0)
                     ADD_FLAG (sl->list[i], strlen (sl->list[i]));
@@ -3024 +3047 @@
             }
           break;
+
+        default:
+          abort ();
         }
 
@@ -3032 +3058 @@
   /* Construct the value in FLAGSTRING.
      We allocate enough space for a preceding dash and trailing null.  */
-  flagstring = (char *) alloca (1 + flagslen + 1);
-  bzero (flagstring, 1 + flagslen + 1);
+  flagstring = alloca (1 + flagslen + 1);
+  memset (flagstring, '\0', 1 + flagslen + 1);
   p = flagstring;
   words = 1;
@@ -3125 +3151 @@
       if (posix_pedantic)
         {
-          bcopy (posixref, p, sizeof posixref - 1);
+          memcpy (p, posixref, sizeof posixref - 1);
           p += sizeof posixref - 1;
         }
       else
         {
-          bcopy (ref, p, sizeof ref - 1);
+          memcpy (p, ref, sizeof ref - 1);
           p += sizeof ref - 1;
         }
@@ -3342 +3368 @@
       if (print_data_base_flag)
         print_data_base ();
+
+      verify_file_data_base ();
 
       clean_jobserver (status);