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

trunk/src/gmakenew/commands.c

@@ -34 +34 @@
 #endif
 
-extern int remote_kill PARAMS ((int id, int sig));
+int remote_kill (int id, int sig);
 
 #ifndef HAVE_UNISTD_H
-extern int getpid ();
+int getpid ();
 #endif
 
@@ -46 +46 @@
 set_file_variables (struct file *file)
 {
-  struct dep *d;
-  char *at, *percent, *star, *less;
+  const struct dep *d;
+  const char *at, *percent, *star, *less;
 
 #ifndef NO_ARCHIVES
@@ -56 +56 @@
     {
       unsigned int len;
+      const char *cp;
       char *p;
 
-      p = strchr (file->name, '(');
-      at = (char *) alloca (p - file->name + 1);
-      bcopy (file->name, at, p - file->name);
-      at[p - file->name] = '\0';
-      len = strlen (p + 1);
-      percent = (char *) alloca (len);
-      bcopy (p + 1, percent, len - 1);
-      percent[len - 1] = '\0';
+      cp = strchr (file->name, '(');
+      p = alloca (cp - file->name + 1);
+      memcpy (p, file->name, cp - file->name);
+      p[cp - file->name] = '\0';
+      at = p;
+      len = strlen (cp + 1);
+      p = alloca (len);
+      memcpy (p, cp + 1, len - 1);
+      p[len - 1] = '\0';
+      percent = p;
     }
   else
@@ -80 +83 @@
          any suffix in the .SUFFIXES list stripped off for
          explicit rules.  We store this in the `stem' member.  */
-      register struct dep *d;
-      char *name;
+      const char *name;
       unsigned int len;
 
@@ -97 +99 @@
         }
 
-      for (d = enter_file (".SUFFIXES")->deps; d != 0; d = d->next)
+      for (d = enter_file (strcache_add (".SUFFIXES"))->deps; d ; d = d->next)
         {
           unsigned int slen = strlen (dep_name (d));
           if (len > slen && strneq (dep_name (d), name + (len - slen), slen))
             {
-              file->stem = savestring (name, len - slen);
+              file->stem = strcache_add_len (name, len - slen);
               break;
             }
@@ -139 +141 @@
   {
     static char *plus_value=0, *bar_value=0, *qmark_value=0;
-    static unsigned int qmark_max=0, plus_max=0, bar_max=0;
+    static unsigned int plus_max=0, bar_max=0, qmark_max=0;
 
     unsigned int qmark_len, plus_len, bar_len;
@@ -166 +168 @@
       if (! d->ignore_mtime)
         {
-          char *c = dep_name (d);
+          const char *c = dep_name (d);
 
 #ifndef NO_ARCHIVES
@@ -178 +180 @@
             len = strlen (c);
 
-          bcopy (c, cp, len);
+          memcpy (cp, c, len);
           cp += len;
           *cp++ = FILE_LIST_SEPARATOR;
@@ -217 +219 @@
     for (d = file->deps; d != 0; d = d->next)
       {
-        char *c = dep_name (d);
+        const char *c = dep_name (d);
 
 #ifndef NO_ARCHIVES
@@ -231 +233 @@
         if (d->ignore_mtime)
           {
-            bcopy (c, bp, len);
+            memcpy (bp, c, len);
             bp += len;
             *bp++ = FILE_LIST_SEPARATOR;
@@ -237 +239 @@
         else
           {
-            bcopy (c, cp, len);
+            memcpy (cp, c, len);
             cp += len;
             *cp++ = FILE_LIST_SEPARATOR;
             if (d->changed)
               {
-                bcopy (c, qp, len);
+                memcpy (qp, c, len);
                 qp += len;
                 *qp++ = FILE_LIST_SEPARATOR;
@@ -271 +273 @@
 chop_commands (struct commands *cmds)
 {
-  register char *p;
+  const char *p;
   unsigned int nlines, idx;
   char **lines;
@@ -286 +288 @@
 
   nlines = 5;
-  lines = (char **) xmalloc (5 * sizeof (char *));
+  lines = xmalloc (5 * sizeof (char *));
   idx = 0;
   p = cmds->commands;
   while (*p != '\0')
     {
-      char *end = p;
+      const char *end = p;
     find_end:;
       end = strchr (end, '\n');
@@ -299 +301 @@
         {
           int backslash = 1;
-          register char *b;
+          const char *b;
           for (b = end - 2; b >= p && *b == '\\'; --b)
             backslash = !backslash;
@@ -312 +314 @@
         {
           nlines += 2;
-          lines = (char **) xrealloc ((char *) lines,
-                                      nlines * sizeof (char *));
+          lines = xrealloc (lines, nlines * sizeof (char *));
         }
       lines[idx++] = savestring (p, end - p);
@@ -324 +325 @@
     {
       nlines = idx;
-      lines = (char **) xrealloc ((char *) lines,
-                                  nlines * sizeof (char *));
+      lines = xrealloc (lines, nlines * sizeof (char *));
     }
 
@@ -332 +332 @@
 
   cmds->any_recurse = 0;
-  cmds->lines_flags = (char *) xmalloc (nlines);
+  cmds->lines_flags = xmalloc (nlines);
   for (idx = 0; idx < nlines; ++idx)
     {
@@ -382 +382 @@
 execute_file_commands (struct file *file)
 {
-  register char *p;
+  const char *p;
 
   /* Don't go through all the preparations if
@@ -474 +474 @@
   if (sig == SIGTERM)
     {
-      register struct child *c;
+      struct child *c;
       for (c = children; c != 0; c = c->next)
         if (!c->remote)
@@ -492 +492 @@
     )
     {
-      register struct child *c;
+      struct child *c;
 
       /* Remote children won't automatically get signals sent
@@ -546 +546 @@
 
 static void
-delete_target (struct file *file, char *on_behalf_of)
+delete_target (struct file *file, const char *on_behalf_of)
 {
   struct stat st;
@@ -601 +601 @@
 
   /* Delete the target file if it changed.  */
-  delete_target (child->file, (char *) 0);
+  delete_target (child->file, NULL);
 
   /* Also remove any non-precious targets listed in the `also_make' member.  */
@@ -614 +614 @@
 
 void
-print_commands (struct commands *cmds)
+print_commands (const struct commands *cmds)
 {
-  register char *s;
+  const char *s;
 
   fputs (_("#  commands to execute"), stdout);
@@ -629 +629 @@
   while (*s != '\0')
     {
-      char *end;
+      const char *end;
 
       while (isspace ((unsigned char)*s))