Changeset 903 for trunk/src/gmakenew/job.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/job.c (modified) (42 diffs)

trunk/src/gmakenew/job.c

@@ -103 +103 @@
 # include <starlet.h>
 # include <lib$routines.h>
-static void vmsWaitForChildren PARAMS ((int *));
+static void vmsWaitForChildren (int *);
 #endif
 
@@ -135 +135 @@
 
 #if !defined (wait) && !defined (POSIX)
-extern int wait ();
+int wait ();
 #endif
 
@@ -180 +180 @@
 
 #ifndef HAVE_UNISTD_H
-# ifndef _MSC_VER
-extern int dup2 ();
-extern int execve ();
-extern void _exit ();
+# ifndef _MSC_VER /* bird */
+int dup2 ();
+int execve ();
+void _exit ();
+# endif /* bird */
+# ifndef VMS
+int geteuid ();
+int getegid ();
+int setgid ();
+int getgid ();
 # endif
-# ifndef VMS
-extern int geteuid ();
-extern int getegid ();
-extern int setgid ();
-extern int getgid ();
-# endif
-#endif
-
-extern char *allocated_variable_expand_for_file PARAMS ((char *line, struct file *file));
-
-extern int getloadavg PARAMS ((double loadavg[], int nelem));
-extern int start_remote_job PARAMS ((char **argv, char **envp, int stdin_fd,
-                int *is_remote, int *id_ptr, int *used_stdin));
-extern int start_remote_job_p PARAMS ((int));
-extern int remote_status PARAMS ((int *exit_code_ptr, int *signal_ptr,
-                int *coredump_ptr, int block));
-
-RETSIGTYPE child_handler PARAMS ((int));
-static void free_child PARAMS ((struct child *));
-static void start_job_command PARAMS ((struct child *child));
-static int load_too_high PARAMS ((void));
-static int job_next_command PARAMS ((struct child *));
-static int start_waiting_job PARAMS ((struct child *));
+#endif
+
+int getloadavg (double loadavg[], int nelem);
+int start_remote_job (char **argv, char **envp, int stdin_fd, int *is_remote,
+                      int *id_ptr, int *used_stdin);
+int start_remote_job_p (int);
+int remote_status (int *exit_code_ptr, int *signal_ptr, int *coredump_ptr,
+                   int block);
+
+RETSIGTYPE child_handler (int);
+static void free_child (struct child *);
+static void start_job_command (struct child *child);
+static int load_too_high (void);
+static int job_next_command (struct child *);
+static int start_waiting_job (struct child *);
 
 
@@ -310 +308 @@
         {
           const unsigned final_size = path_size + size + 1;
-          char *const path = (char *) xmalloc (final_size);
+          char *const path = xmalloc (final_size);
           memcpy (path, temp_path, final_size);
           *fd = _open_osfhandle ((long)h, 0);
@@ -369 +367 @@
   i = 0;
   while (known_os2shells[i] != NULL) {
-    if (stricmp (name, known_os2shells[i]) == 0) /* strcasecmp() */
+    if (strcasecmp (name, known_os2shells[i]) == 0)
       return 0; /* not a unix shell */
     i++;
@@ -386 +384 @@
 
 static void
-child_error (char *target_name, int exit_code, int exit_sig, int coredump,
-             int ignored)
+child_error (const char *target_name,
+             int exit_code, int exit_sig, int coredump, int ignored)
 {
   if (ignored && silent_flag)
@@ -435 +433 @@
     }
 
-#if defined __EMX__ && !defined(__INNOTEK_LIBC__)
+#if defined __EMX__ && !defined(__INNOTEK_LIBC__) /* bird */
   /* The signal handler must called only once! */
   signal (SIGCHLD, SIG_DFL);
@@ -510 +508 @@
 
          The test and decrement are not atomic; if it is compiled into:
-                register = dead_children - 1;
+                register = dead_children - 1;
                 dead_children = register;
          a SIGCHLD could come between the two instructions.
@@ -925 +923 @@
       for (i = 0; i < child->file->cmds->ncommand_lines; ++i)
         free (child->command_lines[i]);
-      free ((char *) child->command_lines);
+      free (child->command_lines);
     }
 
@@ -933 +931 @@
       while (*ep != 0)
         free (*ep++);
-      free ((char *) child->environment);
-    }
-
-  free ((char *) child);
+      free (child->environment);
+    }
+
+  free (child);
 }
 
@@ -977 +975 @@
   struct sigaction sa;
 
-#if defined(__EMX__) && !defined(__KLIBC__)
+#if defined(__EMX__) && !defined(__KLIBC__) /* bird */
   /* The child handler must be turned off here.  */
   signal (SIGCHLD, SIG_DFL);
 #endif
 
-  bzero ((char *) &sa, sizeof sa);
+  memset (&sa, '\0', sizeof sa);
   sa.sa_handler = child_handler;
   sa.sa_flags = set_handler ? 0 : SA_RESTART;
@@ -1098 +1096 @@
 #ifndef VMS
       free (argv[0]);
-      free ((char *) argv);
+      free (argv);
 #endif
       child->file->update_status = 1;
@@ -1113 +1111 @@
         {
           free (argv[0]);
-          free ((char *) argv);
+          free (argv);
         }
 #endif
@@ -1184 +1182 @@
     {
       free (argv[0]);
-      free ((char *) argv);
+      free (argv);
       goto next_command;
     }
@@ -1195 +1193 @@
 #ifndef VMS
       free (argv[0]);
-      free ((char *) argv);
+      free (argv);
 #endif
       goto next_command;
@@ -1506 +1504 @@
 #ifndef VMS
   free (argv[0]);
-  free ((char *) argv);
+  free (argv);
 #endif
 
@@ -1625 +1623 @@
 new_job (struct file *file)
 {
-  register struct commands *cmds = file->cmds;
-  register struct child *c;
+  struct commands *cmds = file->cmds;
+  struct child *c;
   char **lines;
-  register unsigned int i;
+  unsigned int i;
 
   /* Let any previously decided-upon jobs that are waiting
@@ -1641 +1639 @@
 
   /* Expand the command lines and store the results in LINES.  */
-  lines = (char **) xmalloc (cmds->ncommand_lines * sizeof (char *));
+  lines = xmalloc (cmds->ncommand_lines * sizeof (char *));
   for (i = 0; i < cmds->ncommand_lines; ++i)
     {
@@ -1667 +1665 @@
                we processed (where IN points) and the new chunk
                we are about to process (where REF points).  */
-            bcopy (in, out, ref - in);
+            memmove (out, in, ref - in);
 
           /* Move both pointers past the boring stuff.  */
@@ -1745 +1743 @@
      `struct child', and add that to the chain.  */
 
-  c = (struct child *) xmalloc (sizeof (struct child));
-  bzero ((char *)c, sizeof (struct child));
+  c = xmalloc (sizeof (struct child));
+  memset (c, '\0', sizeof (struct child));
   c->file = file;
   c->command_lines = lines;
@@ -1866 +1864 @@
   /* The job is now primed.  Start it running.
      (This will notice if there are in fact no commands.)  */
-  (void) start_waiting_job (c);
+  if (cmds->fileinfo.filenm)
+    DB (DB_BASIC, (_("Invoking commands from %s:%lu to update target `%s'.\n"),
+                   cmds->fileinfo.filenm, cmds->fileinfo.lineno,
+                   c->file->name));
+  else
+    DB (DB_BASIC, (_("Invoking builtin commands to update target `%s'.\n"),
+                   c->file->name));
+
+
+  start_waiting_job (c);
 
 #ifndef CONFIG_WITH_EXTENDED_NOTPARALLEL
@@ -2293 +2300 @@
 # endif
 
-        new_argv = (char **) alloca ((1 + argc + 1) * sizeof (char *));
+        new_argv = alloca ((1 + argc + 1) * sizeof (char *));
         new_argv[0] = shell;
 
@@ -2486 +2493 @@
                              "shift", "switch", "test", "times", "trap",
                              "umask", "wait", "while", 0 };
-#endif
-  register int i;
-  register char *p;
-  register char *ap;
+# ifdef HAVE_DOS_PATHS
+  /* This is required if the MSYS/Cygwin ports (which do not define
+     WINDOWS32) are compiled with HAVE_DOS_PATHS defined, which uses
+     sh_chars_sh[] directly (see below).  */
+  static char *sh_chars_sh = sh_chars;
+# endif  /* HAVE_DOS_PATHS */
+#endif
+  int i;
+  char *p;
+  char *ap;
   char *end;
   int instring, word_has_equals, seen_nonequals, last_argument_was_empty;
@@ -2521 +2534 @@
   else if (strcmp (shell, default_shell))
   {
-    char *s1 = _fullpath(NULL, shell, 0);
-    char *s2 = _fullpath(NULL, default_shell, 0);
-
-    slow_flag = strcmp((s1 ? s1 : ""), (s2 ? s2 : ""));
+    char *s1 = _fullpath (NULL, shell, 0);
+    char *s2 = _fullpath (NULL, default_shell, 0);
+
+    slow_flag = strcmp ((s1 ? s1 : ""), (s2 ? s2 : ""));
 
     if (s1)
@@ -2535 +2548 @@
 #else  /* not WINDOWS32 */
 #if defined (__MSDOS__) || defined (__EMX__)
-  else if (stricmp (shell, default_shell))
+  else if (strcasecmp (shell, default_shell))
     {
       extern int _is_unixy_shell (const char *_path);
@@ -2587 +2600 @@
 
   /* More than 1 arg per character is impossible.  */
-  new_argv = (char **) xmalloc (i * sizeof (char *));
+  new_argv = xmalloc (i * sizeof (char *));
 
   /* All the args can fit in a buffer as big as LINE is.   */
-  ap = new_argv[0] = argstr = (char *) xmalloc (i);
+  ap = new_argv[0] = argstr = xmalloc (i);
   end = ap + i;
 
@@ -2629 +2642 @@
                   *(ap++) = *p;
                 }
-              /* If there's a TAB here, skip it.  */
-              if (p[1] == '\t')
+              /* If there's a command prefix char here, skip it.  */
+              if (p[1] == cmd_prefix)
                 ++p;
             }
@@ -2679 +2692 @@
                 ++p;
 
-                /* If there is a tab after a backslash-newline, remove it.  */
-                if (p[1] == '\t')
+                /* If there is a command prefix after a backslash-newline,
+                   remove it.  */
+                if (p[1] == cmd_prefix)
                   ++p;
 
@@ -2807 +2821 @@
       /* Line was empty.  */
       free (argstr);
-      free ((char *)new_argv);
+      free (new_argv);
       return 0;
     }
@@ -2820 +2834 @@
       /* Free the old argument list we were working on.  */
       free (argstr);
-      free ((char *)new_argv);
+      free (new_argv);
     }
 
@@ -2833 +2847 @@
     char *dptr;
 
-    buffer = (char *)xmalloc (strlen (line)+1);
+    buffer = xmalloc (strlen (line)+1);
 
     ptr = line;
@@ -2850 +2864 @@
     *dptr = 0;
 
-    new_argv = (char **) xmalloc (2 * sizeof (char *));
+    new_argv = xmalloc (2 * sizeof (char *));
     new_argv[0] = buffer;
     new_argv[1] = 0;
@@ -2886 +2900 @@
     unsigned int line_len = strlen (line);
 
-    char *new_line = (char *) alloca (shell_len + (sizeof (minus_c) - 1)
-                                      + (line_len * 2) + 1);
+    char *new_line = alloca (shell_len + (sizeof (minus_c)-1)
+                             + (line_len*2) + 1);
     char *command_ptr = NULL; /* used for batch_mode_shell mode */
 
@@ -2896 +2910 @@
 
     ap = new_line;
-    bcopy (shell, ap, shell_len);
+    memcpy (ap, shell, shell_len);
     ap += shell_len;
-    bcopy (minus_c, ap, sizeof (minus_c) - 1);
+    memcpy (ap, minus_c, sizeof (minus_c) - 1);
     ap += sizeof (minus_c) - 1;
     command_ptr = ap;
@@ -2930 +2944 @@
 
             ++p;
-            if (p[1] == '\t')
+            if (p[1] == cmd_prefix)
               ++p;
 
@@ -2965 +2979 @@
       /* Need to allocate new_argv, although it's unused, because
         start_job_command will want to free it and its 0'th element.  */
-      new_argv = (char **) xmalloc(2 * sizeof (char *));
+      new_argv = xmalloc(2 * sizeof (char *));
       new_argv[0] = xstrdup ("");
       new_argv[1] = NULL;
@@ -2992 +3006 @@
 
       /* create argv */
-      new_argv = (char **) xmalloc(3 * sizeof (char *));
+      new_argv = xmalloc(3 * sizeof (char *));
       if (unixy_shell) {
         new_argv[0] = xstrdup (shell);
@@ -3004 +3018 @@
 #endif /* WINDOWS32 */
     if (unixy_shell)
-      new_argv = construct_command_argv_internal (new_line, (char **) NULL,
-                                                  (char *) 0, (char *) 0,
-                                                  (char **) 0);
+      new_argv = construct_command_argv_internal (new_line, 0, 0, 0, 0);
 #ifdef __EMX__
     else if (!unixy_shell)
@@ -3023 +3035 @@
               {
                 q += 2; /* remove '\\' and '\n' */
-                if (q[0] == '\t')
-                  q++; /* remove 1st tab in the next line */
+                /* Remove any command prefix in the next line */
+                if (q[0] == cmd_prefix)
+                  q++;
               }
             else
@@ -3064 +3077 @@
 
           /* exactly 3 arguments + NULL */
-          new_argv = (char **) xmalloc (4 * sizeof (char *));
+          new_argv = xmalloc (4 * sizeof (char *));
           /* Exactly strlen(shell) + strlen("/c") + strlen(line) + 3 times
              the trailing '\0' */
-          new_argv[0] = (char *) malloc (sh_len + line_len + 5);
+          new_argv[0] = xmalloc (sh_len + line_len + 5);
           memcpy (new_argv[0], shell, sh_len + 1);
           new_argv[1] = new_argv[0] + sh_len + 1;
@@ -3082 +3095 @@
            instead of recursively calling ourselves, because we
            cannot backslash-escape the special characters (see above).  */
-        new_argv = (char **) xmalloc (sizeof (char *));
+        new_argv = xmalloc (sizeof (char *));
         line_len = strlen (new_line) - shell_len - sizeof (minus_c) + 1;
         new_argv[0] = xmalloc (line_len + 1);
@@ -3140 +3153 @@
     }
 
-  argv = (char **)malloc (argc * sizeof (char *));
+  argv = xmalloc (argc * sizeof (char *));
   if (argv == 0)
     abort ();