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

trunk/src/gmakenew/variable.c

@@ -43 +43 @@
 
 struct pattern_var *
-create_pattern_var (char *target, char *suffix)
-{
-  register struct pattern_var *p
-    = (struct pattern_var *) xmalloc (sizeof (struct pattern_var));
+create_pattern_var (const char *target, const char *suffix)
+{
+  register struct pattern_var *p = xmalloc (sizeof (struct pattern_var));
 
   if (last_pattern_var != 0)
@@ -65 +64 @@
 
 static struct pattern_var *
-lookup_pattern_var (struct pattern_var *start, char *target)
+lookup_pattern_var (struct pattern_var *start, const char *target)
 {
   struct pattern_var *p;
@@ -72 +71 @@
   for (p = start ? start->next : pattern_vars; p != 0; p = p->next)
     {
-      char *stem;
+      const char *stem;
       unsigned int stemlen;
 
@@ -278 +277 @@
 
 #ifndef VARIABLE_BUCKETS
+# ifdef KMK /* Move to Makefile.kmk? */
+#  define VARIABLE_BUCKETS              16384
+# else  /*!KMK*/
 #define VARIABLE_BUCKETS                523
+# endif /*!KMK*/
 #endif
 #ifndef PERFILE_VARIABLE_BUCKETS
@@ -298 +301 @@
 init_hash_global_variable_set (void)
 {
-  hash_init (&global_variable_set.table,
-#ifdef KMK /* FIMXE: just redefine the bucket size! */
-             16384,
-#else
-             VARIABLE_BUCKETS,
-#endif
+  hash_init (&global_variable_set.table, VARIABLE_BUCKETS,
              variable_hash_1, variable_hash_2, variable_hash_cmp);
 }
@@ -317 +315 @@
 struct variable *
 define_variable_in_set (const char *name, unsigned int length,
-                        char *value, unsigned int value_length, int duplicate_value,
+                        const char *value, unsigned int value_length, int duplicate_value,
                         enum variable_origin origin, int recursive,
                         struct variable_set *set, const struct floc *flocp)
@@ -323 +321 @@
 struct variable *
 define_variable_in_set (const char *name, unsigned int length,
-                        char *value, enum variable_origin origin,
+                        const char *value, enum variable_origin origin,
                         int recursive, struct variable_set *set,
                         const struct floc *flocp)
@@ -368 +366 @@
               if (v->value != 0)
                 free (v->value);
-              v->value = value;
+              v->value = (char *)value;
               v->value_alloc_len = value_length + 1;
             }
@@ -399 +397 @@
   /* Create a new variable definition and add it to the hash table.  */
 
-  v = (struct variable *) xmalloc (sizeof (struct variable));
+  v = xmalloc (sizeof (struct variable));
   v->name = savestring (name, length);
   v->length = length;
@@ -416 +414 @@
     {
       v->value_alloc_len = value_length + 1;
-      v->value = value;
+      v->value = (char *)value;
     }
   else
@@ -531 +529 @@
               }
 
-            bcopy (v->name, p, l);
+            memcpy (p, v->name, l);
             p += l;
             *(p++) = ' ';
@@ -698 +696 @@
    parent of FILE's variable set.
 
-   If we're READing a makefile, don't do the pattern variable search now,
+   If we're READING a makefile, don't do the pattern variable search now,
    since the pattern variable might not have been defined yet.  */
 
@@ -710 +708 @@
       l = (struct variable_set_list *)
         xmalloc (sizeof (struct variable_set_list));
-      l->set = (struct variable_set *) xmalloc (sizeof (struct variable_set));
+      l->set = xmalloc (sizeof (struct variable_set));
       hash_init (&l->set->table, PERFILE_VARIABLE_BUCKETS,
                  variable_hash_1, variable_hash_2, variable_hash_cmp);
@@ -806 +804 @@
   register struct variable_set *set;
 
-  set = (struct variable_set *) xmalloc (sizeof (struct variable_set));
+  set = xmalloc (sizeof (struct variable_set));
   hash_init (&set->table, SMALL_SCOPE_VARIABLE_BUCKETS,
              variable_hash_1, variable_hash_2, variable_hash_cmp);
@@ -831 +829 @@
   hash_map (&list->set->table, free_variable_name_and_value);
   hash_free (&list->set->table, 1);
-  free ((char *) list->set);
-  free ((char *) list);
+  free (list->set);
+  free (list);
 }
 
@@ -888 +886 @@
 
   /* Free the one we no longer need.  */
-  free ((char *) setlist);
+  free (setlist);
   hash_map (&set->table, free_variable_name_and_value);
   hash_free (&set->table, 1);
-  free ((char *) set);
+  free (set);
 }
 
@@ -1036 +1034 @@
   /* Define KMK_FEATURES to indicate various working KMK features. */
 # if defined(CONFIG_WITH_TOUPPER_TOLOWER) \
+  && defined(CONFIG_WITH_RSORT) \
   && defined(CONFIG_WITH_ABSPATHEX) \
   && defined(CONFIG_WITH_VALUE_LENGTH) && defined(CONFIG_WITH_COMPARE) \
@@ -1043 +1042 @@
   && defined(KMK_HELPERS)
   (void) define_variable ("KMK_FEATURES", 12,
-                          "append-dash-n "
-                          "abspath abspathex"
+                          "append-dash-n abspath"
+                          " rsort"
+                          " abspathex"
                           " toupper tolower"
                           " comp-vars comp-cmds"
@@ -1054 +1054 @@
 # else /* MSC can't deal with strings mixed with #if/#endif, thus the slow way. */
   strcpy(buf, "append-dash-n abspath");
+#  if defined(CONFIG_WITH_RSORT)
+  strcat(buf, " rsort");
+#  endif
 #  if defined(CONFIG_WITH_ABSPATHEX)
   strcat(buf, " abspathex");
@@ -1316 +1319 @@
   hash_delete (&table, &makelevel_key);
 
-  result = result_0 = (char **) xmalloc ((table.ht_fill + 2) * sizeof (char *));
+  result = result_0 = xmalloc ((table.ht_fill + 2) * sizeof (char *));
 
   v_slot = (struct variable **) table.ht_vec;
@@ -1337 +1340 @@
               convert_Path_to_windows32(value, ';');
 #endif
-            *result++ = concat (v->name, "=", value);
+            *result++ = xstrdup (concat (v->name, "=", value));
             free (value);
           }
@@ -1347 +1350 @@
               convert_Path_to_windows32(v->value, ';');
 #endif
-            *result++ = concat (v->name, "=", v->value);
+            *result++ = xstrdup (concat (v->name, "=", v->value));
           }
       }
 
-  *result = (char *) xmalloc (100);
-  (void) sprintf (*result, "%s=%u", MAKELEVEL_NAME, makelevel + 1);
+  *result = xmalloc (100);
+  sprintf (*result, "%s=%u", MAKELEVEL_NAME, makelevel + 1);
   *++result = 0;
 
@@ -1363 +1366 @@
 #ifdef CONFIG_WITH_VALUE_LENGTH
 static struct variable *
-do_variable_definition_append (const struct floc *flocp, struct variable *v, char *value,
+do_variable_definition_append (const struct floc *flocp, struct variable *v, const char *value,
                                enum variable_origin origin)
 {
@@ -1430 +1433 @@
 struct variable *
 do_variable_definition (const struct floc *flocp, const char *varname,
-                        char *value, enum variable_origin origin,
+                        const char *value, enum variable_origin origin,
                         enum variable_flavor flavor, int target_var)
 {
-  char *p, *alloc_value = NULL;
+  const char *p;
+  char *alloc_value = NULL;
   struct variable *v;
   int append = 0;
@@ -1507 +1511 @@
 
             unsigned int oldlen, vallen;
-            char *val;
+            const char *val;
+            char *tp;
 
             val = value;
@@ -1524 +1529 @@
             oldlen = strlen (v->value);
             vallen = strlen (val);
-            p = (char *) alloca (oldlen + 1 + vallen + 1);
-            bcopy (v->value, p, oldlen);
-            p[oldlen] = ' ';
-            bcopy (val, &p[oldlen + 1], vallen + 1);
+            tp = alloca (oldlen + 1 + vallen + 1);
+            memcpy (tp, v->value, oldlen);
+            tp[oldlen] = ' ';
+            memcpy (&tp[oldlen + 1], val, vallen + 1);
+            p = tp;
 #endif /* !CONFIG_WITH_VALUE_LENGTH */
           }
@@ -1554 +1560 @@
 
       /* See if we can find "/bin/sh.exe", "/bin/sh.com", etc.  */
-      if (__dosexec_find_on_path (p, (char **)0, shellpath))
+      if (__dosexec_find_on_path (p, NULL, shellpath))
         {
-          char *p;
-
-          for (p = shellpath; *p; p++)
-            {
-              if (*p == '\\')
-                *p = '/';
-            }
+          char *tp;
+
+          for (tp = shellpath; *tp; tp++)
+            if (*tp == '\\')
+              *tp = '/';
+
           v = define_variable_loc (varname, varname_len,
                                    shellpath, origin, flavor == f_recursive,
@@ -1569 +1574 @@
       else
         {
-          char *shellbase, *bslash;
+          const char *shellbase, *bslash;
           struct variable *pathv = lookup_variable ("PATH", 4);
           char *path_string;
@@ -1590 +1595 @@
           if (pathv)
             pathlen = strlen (pathv->value);
-          path_string = (char *)xmalloc (5 + pathlen + 2 + 1);
+          path_string = xmalloc (5 + pathlen + 2 + 1);
           /* On MSDOS, current directory is considered as part of $PATH.  */
           sprintf (path_string, "PATH=.;%s", pathv ? pathv->value : "");
           fake_env[0] = path_string;
-          fake_env[1] = (char *)0;
+          fake_env[1] = 0;
           if (__dosexec_find_on_path (shellbase, fake_env, shellpath))
             {
-              char *p;
-
-              for (p = shellpath; *p; p++)
-                {
-                  if (*p == '\\')
-                    *p = '/';
-                }
+              char *tp;
+
+              for (tp = shellpath; *tp; tp++)
+                if (*tp == '\\')
+                  *tp = '/';
+
               v = define_variable_loc (varname, varname_len,
                                        shellpath, origin,
@@ -1773 +1777 @@
 
   /* Expand the name, so "$(foo)bar = baz" works.  */
-  name = (char *) alloca (end - beg + 1);
-  bcopy (beg, name, end - beg);
+  name = alloca (end - beg + 1);
+  memcpy (name, beg, end - beg);
   name[end - beg] = '\0';
   v->name = allocated_variable_expand (name);
@@ -1827 +1831 @@
 print_variable (const void *item, void *arg)
 {
-  const struct variable *v = (struct variable *) item;
-  const char *prefix = (char *) arg;
+  const struct variable *v = item;
+  const char *prefix = arg;
   const char *origin;
 
@@ -1942 +1946 @@
 
 void
-print_file_variables (struct file *file)
+print_file_variables (const struct file *file)
 {
   if (file->variables != 0)
@@ -1969 +1973 @@
    */
   convert_Path_to_windows32 (path, ';');
-  environ_path = concat ("PATH", "=", path);
+  environ_path = xstrdup (concat ("PATH", "=", path));
   putenv (environ_path);
   free (path);