Changeset 1993 for trunk/src/kmk/variable.c

Timestamp:

Oct 29, 2008, 1:37:51 AM (17 years ago)

Author:

bird

Message:

Merged in current GNU Make code (CVS from 2008-10-28). Ref #55.

File:

• trunk/src/kmk/variable.c (modified) (18 diffs)

trunk/src/kmk/variable.c

@@ -1 +1 @@
 /* Internals of variables for 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.
@@ -7 +7 @@
 GNU Make is free software; you can redistribute it and/or modify it under the
 terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2, or (at your option) any later version.
+Foundation; either version 3 of the License, or (at your option) any later
+version.
 
 GNU Make is distributed in the hope that it will be useful, but WITHOUT ANY
@@ -14 +15 @@
 
 You should have received a copy of the GNU General Public License along with
-GNU Make; see the file COPYING.  If not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.  */
+this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "make.h"
@@ -388 +388 @@
 
 static struct variable *
-handle_special_var (struct variable *var)
+lookup_special_var (struct variable *var)
 {
   static unsigned long last_var_count = 0;
@@ -492 +492 @@
       v = (struct variable *) strcache2_get_user_val (&variable_strcache, name);
       if (MY_PREDICT_TRUE (v))
-        return MY_PREDICT_FALSE (v->special) ? handle_special_var (v) : v;
+        return MY_PREDICT_FALSE (v->special) ? lookup_special_var (v) : v;
       assert (setlist->next == 0);
       return 0;
@@ -506 +506 @@
       if (   (void *)v != hash_deleted_item
           && v->name == name)
-        return MY_PREDICT_FALSE (v->special) ? handle_special_var (v) : v;
+        return MY_PREDICT_FALSE (v->special) ? lookup_special_var (v) : v;
 
       /* the rest of the loop  */
@@ -521 +521 @@
           if (   (void *)v != hash_deleted_item
               && v->name == name)
-            return MY_PREDICT_FALSE (v->special) ? handle_special_var (v) : v;
+            return MY_PREDICT_FALSE (v->special) ? lookup_special_var (v) : v;
         } /* inner collision loop */
     }
@@ -537 +537 @@
           v = (struct variable *) strcache2_get_user_val (&variable_strcache, name);
           if (MY_PREDICT_TRUE (v))
-            return MY_PREDICT_FALSE (v->special) ? handle_special_var (v) : v;
+            return MY_PREDICT_FALSE (v->special) ? lookup_special_var (v) : v;
           assert (setlist->next == 0);
           return 0;
@@ -551 +551 @@
           if (   (void *)v != hash_deleted_item
               && v->name == name)
-            return MY_PREDICT_FALSE (v->special) ? handle_special_var (v) : v;
+            return MY_PREDICT_FALSE (v->special) ? lookup_special_var (v) : v;
 
           /* the rest of the loop  */
@@ -565 +565 @@
               if (   (void *)v != hash_deleted_item
                   && v->name == name)
-                return MY_PREDICT_FALSE (v->special) ? handle_special_var (v) : v;
+                return MY_PREDICT_FALSE (v->special) ? lookup_special_var (v) : v;
             } /* inner collision loop */
         }
@@ -591 +591 @@
       v = (struct variable *) hash_find_item_strcached (&setlist->set->table, &var_key);
       if (v)
-        return MY_PREDICT_FALSE (v->special) ? handle_special_var (v) : v;
+        return MY_PREDICT_FALSE (v->special) ? lookup_special_var (v) : v;
     }
   return 0;
@@ -639 +639 @@
 # endif /* CONFIG_WITH_STRCACHE2 */
       if (v)
-        return v->special ? handle_special_var (v) : v;
+        return v->special ? lookup_special_var (v) : v;
     }
 
@@ -1366 +1366 @@
      isn't one there.  */
   v = define_variable ("SHELL", 5, default_shell, o_default, 0);
+#ifdef __MSDOS__
+  v->export = v_export;  /*  Export always SHELL.  */
+#endif
 
   /* On MSDOS we do use SHELL from environment, since it isn't a standard
@@ -1517 +1520 @@
 
               case v_noexport:
-                /* If this is the SHELL variable and it's not exported, then
-                   add the value from our original environment.  */
-                if (streq (v->name, "SHELL"))
-                  {
-                    extern struct variable shell_var;
-                    v = &shell_var;
-                    break;
-                  }
-                continue;
+                {
+                  /* If this is the SHELL variable and it's not exported,
+                     then add the value from our original environment, if
+                     the original environment defined a value for SHELL.  */
+                  extern struct variable shell_var;
+                  if (streq (v->name, "SHELL") && shell_var.value)
+                    {
+                      v = &shell_var;
+                      break;
+                    }
+                  continue;
+                }
 
               case v_ifset:
@@ -1715 +1721 @@
 }
 #endif /* CONFIG_WITH_VALUE_LENGTH */
+
+
+static struct variable *
+set_special_var (struct variable *var)
+{
+  if (streq (var->name, RECIPEPREFIX_NAME))
+    {
+      /* The user is resetting the command introduction prefix.  This has to
+         happen immediately, so that subsequent rules are interpreted
+         properly.  */
+      cmd_prefix = var->value[0]=='\0' ? RECIPEPREFIX_DEFAULT : var->value[0];
+    }
+
+  return var;
+}
 
 
@@ -1783 +1804 @@
       v = lookup_variable (varname, varname_len);
       if (v)
-        return v;
+#ifndef CONFIG_WITH_VALUE_LENGTH
+        return v->special ? set_special_var (v) : v;
+#else  /* CONFIG_WITH_VALUE_LENGTH */
+        {
+          if (free_value)
+            free (free_value);
+          return v->special ? set_special_var (v) : v;
+        }
+#endif /* CONFIG_WITH_VALUE_LENGTH */
 
       conditional = 1;
@@ -1997 +2026 @@
         }
       else
-        v = lookup_variable (varname, varname_len);
+        {
+          if (alloc_value)
+            free (alloc_value);
+
+          alloc_value = allocated_variable_expand (p);
+          if (find_and_set_default_shell (alloc_value))
+            {
+              v = define_variable_in_set (varname, varname_len, p,
+                                          origin, flavor == f_recursive,
+                                          (target_var
+                                           ? current_variable_set_list->set
+                                           : NULL),
+                                          flocp);
+              no_default_sh_exe = 0;
+            }
+          else
+            v = lookup_variable (varname, varname_len);
+        }
     }
   else
@@ -2031 +2077 @@
 #endif
 
-  return v;
+  return v->special ? set_special_var (v) : v;
 }