Changeset 280 in kBuild for branches/GNU/src/gmake/expand.c

Timestamp:

May 16, 2005 4:54:02 PM (20 years ago)

Author:

bird

Message:

Current make snaphot, 2005-05-16.

Location:

branches/GNU/src/gmake

Files:

• . (modified) (1 prop)
• expand.c (modified) (3 diffs)

branches/GNU/src/gmake

@@ -34 +34 @@
 README.DOS
 README.W32
+README.OS2
 aclocal.m4
 autom4te.cache

@@ -34 +34 @@
 README.DOS
 README.W32
+README.OS2
 aclocal.m4
 autom4te.cache

branches/GNU/src/gmake/expand.c

@@ -155 +155 @@
     warn_undefined (name, length);
 
-  if (v == 0 || *v->value == '\0')
+  /* If there's no variable by that name or it has no value, stop now.  */
+  if (v == 0 || (*v->value == '\0' && !v->append))
     return o;
 
@@ -306 +307 @@
                       warn_undefined (beg, colon - beg);
 
+                    /* If the variable is not empty, perform the
+                       substitution.  */
                     if (v != 0 && *v->value != '\0')
                       {
-                        char *value = (v->recursive ? recursively_expand (v)
+                        char *pattern, *replace, *ppercent, *rpercent;
+                        char *value = (v->recursive
+                                       ? recursively_expand (v)
                                        : v->value);
-                        char *pattern, *percent;
-                        if (free_beg)
-                          {
-                            *subst_end = '\0';
-                            pattern = subst_beg;
-                          }
+
+                        /* Copy the pattern and the replacement.  Add in an
+                           extra % at the beginning to use in case there
+                           isn't one in the pattern.  */
+                        pattern = (char *) alloca (subst_end - subst_beg + 2);
+                        *(pattern++) = '%';
+                        bcopy (subst_beg, pattern, subst_end - subst_beg);
+                        pattern[subst_end - subst_beg] = '\0';
+
+                        replace = (char *) alloca (replace_end
+                                                   - replace_beg + 2);
+                        *(replace++) = '%';
+                        bcopy (replace_beg, replace,
+                               replace_end - replace_beg);
+                        replace[replace_end - replace_beg] = '\0';
+
+                        /* Look for %.  Set the percent pointers properly
+                           based on whether we find one or not.  */
+                        ppercent = find_percent (pattern);
+                        if (ppercent)
+                          {
+                            ++ppercent;
+                            rpercent = 0;
+                          }
                         else
-                          {
-                            pattern = (char *) alloca (subst_end - subst_beg
-                                                       + 1);
-                            bcopy (subst_beg, pattern, subst_end - subst_beg);
-                            pattern[subst_end - subst_beg] = '\0';
-                          }
-                        percent = find_percent (pattern);
-                        if (percent != 0)
-                          {
-                            char *replace;
-                            if (free_beg)
-                              {
-                                *replace_end = '\0';
-                                replace = replace_beg;
-                              }
-                            else
-                              {
-                                replace = (char *) alloca (replace_end
-                                                           - replace_beg
-                                                           + 1);
-                                bcopy (replace_beg, replace,
-                                       replace_end - replace_beg);
-                                replace[replace_end - replace_beg] = '\0';
-                              }
-
-                            o = patsubst_expand (o, value, pattern, replace,
-                                                 percent, (char *) 0);
-                          }
-                        else
-                          o = subst_expand (o, value,
-                                            pattern, replace_beg,
-                                            strlen (pattern),
-                                            end - replace_beg,
-                                            0, 1);
+                          {
+                            ppercent = pattern;
+                            rpercent = replace;
+                            --pattern;
+                            --replace;
+                          }
+
+                        o = patsubst_expand (o, value, pattern, replace,
+                                             ppercent, rpercent);
+
                         if (v->recursive)
                           free (value);
@@ -447 +446 @@
    FILE's commands were found.  Expansion uses FILE's variable set list.  */
 
-static char *
+char *
 variable_expand_for_file (char *line, struct file *file)
 {

@@ -34 +34 @@
 README.DOS
 README.W32
+README.OS2
 aclocal.m4
 autom4te.cache