Changeset 900 in kBuild for vendor/gnumake/current/expand.c

Timestamp:

May 23, 2007 3:13:11 AM (18 years ago)

Author:

bird

Message:

Load /home/bird/src/Gnu/make/2007-05-23 into vendor/gnumake/current.

File:

• vendor/gnumake/current/expand.c (modified) (18 diffs)

vendor/gnumake/current/expand.c

@@ -56 +56 @@
 
 char *
-variable_buffer_output (char *ptr, char *string, unsigned int length)
+variable_buffer_output (char *ptr, const char *string, unsigned int length)
 {
   register unsigned int newlen = length + (ptr - variable_buffer);
@@ -66 +66 @@
                                 ? newlen + 100
                                 : 2 * variable_buffer_length);
-      variable_buffer = (char *) xrealloc (variable_buffer,
-                                           variable_buffer_length);
+      variable_buffer = xrealloc (variable_buffer, variable_buffer_length);
       ptr = variable_buffer + offset;
     }
 
-  bcopy (string, ptr, length);
+  memcpy (ptr, string, length);
   return ptr + length;
 }
@@ -85 +84 @@
     {
       variable_buffer_length = 200;
-      variable_buffer = (char *) xmalloc (variable_buffer_length);
+      variable_buffer = xmalloc (variable_buffer_length);
       variable_buffer[0] = '\0';
     }
@@ -95 +94 @@
 /* Recursively expand V.  The returned string is malloc'd.  */
 
-static char *allocated_variable_append PARAMS ((const struct variable *v));
+static char *allocated_variable_append (const struct variable *v);
 
 char *
@@ -162 +161 @@
 #endif
 static char *
-reference_variable (char *o, char *name, unsigned int length)
-{
-  register struct variable *v;
+reference_variable (char *o, const char *name, unsigned int length)
+{
+  struct variable *v;
   char *value;
 
@@ -194 +193 @@
    LINE is NULL, start at the beginning of the buffer.
    Return a pointer to LINE, or to the beginning of the buffer if LINE is
-   NULL.  */
-
+   NULL.
+ */
 char *
-variable_expand_string (char *line, char *string, long length)
-{
-  register struct variable *v;
-  register char *p, *o, *p1;
-  char save_char = '\0';
+variable_expand_string (char *line, const char *string, long length)
+{
+  struct variable *v;
+  const char *p, *p1;
+  char *abuf = NULL;
+  char *o;
   unsigned int line_offset;
 
   if (!line)
     line = initialize_variable_output();
-
-  p = string;
   o = line;
   line_offset = line - variable_buffer;
 
-  if (length >= 0)
-    {
-      save_char = string[length];
-      string[length] = '\0';
-    }
+  if (length == 0)
+    {
+      variable_buffer_output (o, "", 1);
+      return (variable_buffer);
+    }
+
+  /* If we want a subset of the string, allocate a temporary buffer for it.
+     Most of the functions we use here don't work with length limits.  */
+  if (length > 0 && string[length] != '\0')
+    {
+      abuf = xmalloc(length+1);
+      memcpy(abuf, string, length);
+      abuf[length] = '\0';
+      string = abuf;
+    }
+  p = string;
 
   while (1)
@@ -246 +255 @@
             char openparen = *p;
             char closeparen = (openparen == '(') ? ')' : '}';
-            register char *beg = p + 1;
-            int free_beg = 0;
-            char *op, *begp;
-            char *end, *colon;
+            const char *begp;
+            const char *beg = p + 1;
+            char *op;
+            char *abeg = NULL;
+            const char *end, *colon;
 
             op = o;
@@ -285 +295 @@
                 if (count < 0)
                   {
-                    beg = expand_argument (beg, p); /* Expand the name.  */
-                    free_beg = 1; /* Remember to free BEG when finished.  */
+                    abeg = expand_argument (beg, p); /* Expand the name.  */
+                    beg = abeg;
                     end = strchr (beg, '\0');
                   }
@@ -304 +314 @@
               {
                 /* This looks like a substitution reference: $(FOO:A=B).  */
-                char *subst_beg, *subst_end, *replace_beg, *replace_end;
+                const char *subst_beg, *subst_end, *replace_beg, *replace_end;
 
                 subst_beg = colon + 1;
@@ -336 +346 @@
                            extra % at the beginning to use in case there
                            isn't one in the pattern.  */
-                        pattern = (char *) alloca (subst_end - subst_beg + 2);
+                        pattern = alloca (subst_end - subst_beg + 2);
                         *(pattern++) = '%';
-                        bcopy (subst_beg, pattern, subst_end - subst_beg);
+                        memcpy (pattern, subst_beg, subst_end - subst_beg);
                         pattern[subst_end - subst_beg] = '\0';
 
-                        replace = (char *) alloca (replace_end
-                                                   - replace_beg + 2);
+                        replace = alloca (replace_end - replace_beg + 2);
                         *(replace++) = '%';
-                        bcopy (replace_beg, replace,
+                        memcpy (replace, replace_beg,
                                replace_end - replace_beg);
                         replace[replace_end - replace_beg] = '\0';
@@ -354 +363 @@
                           {
                             ++ppercent;
-                            rpercent = 0;
+                            rpercent = find_percent (replace);
+                            if (rpercent)
+                              ++rpercent;
                           }
                         else
@@ -364 +375 @@
                           }
 
-                        o = patsubst_expand (o, value, pattern, replace,
-                                             ppercent, rpercent);
+                        o = patsubst_expand_pat (o, value, pattern, replace,
+                                                 ppercent, rpercent);
 
                         if (v->recursive)
@@ -378 +389 @@
                 o = reference_variable (o, beg, end - beg);
 
-          if (free_beg)
-            free (beg);
+          if (abeg)
+            free (abeg);
           }
           break;
@@ -403 +414 @@
     }
 
-  if (save_char)
-    string[length] = save_char;
-
-  (void)variable_buffer_output (o, "", 1);
+  if (abuf)
+    free (abuf);
+
+  variable_buffer_output (o, "", 1);
   return (variable_buffer + line_offset);
 }
@@ -417 +428 @@
 
 char *
-variable_expand (char *line)
+variable_expand (const char *line)
 {
   return variable_expand_string(NULL, line, (long)-1);
@@ -438 +449 @@
 
   if (!end || *end == '\0')
-    return allocated_variable_expand ((char *)str);
-
-  tmp = (char *) alloca (end - str + 1);
-  bcopy (str, tmp, end - str);
+    return allocated_variable_expand (str);
+
+  tmp = alloca (end - str + 1);
+  memcpy (tmp, str, end - str);
   tmp[end - str] = '\0';
 
@@ -452 +463 @@
 
 char *
-variable_expand_for_file (char *line, struct file *file)
+variable_expand_for_file (const char *line, struct file *file)
 {
   char *result;
@@ -543 +554 @@
 
 char *
-allocated_variable_expand_for_file (char *line, struct file *file)
+allocated_variable_expand_for_file (const char *line, struct file *file)
 {
   char *value;