make enable builtin use register_builtins()

Author: radhermit

builtins/common.c

@@ -1099,10 +1099,7 @@ set_expand_once (int nval, int uwp)
 }
 #endif
 
-#if defined (BUILD_LIBRARY)
-/* Register a given array of new builtins into the internal list.
- * (Mostly copied from the enable builtin used when loading dynamic builtins.)
- */
+/* Register a given array of new builtins into the internal list. */
 int
 register_builtins (struct builtin **new_builtins, size_t num_new_builtins)
 {
@@ -1133,4 +1130,3 @@ register_builtins (struct builtin **new_builtins, size_t num_new_builtins)
 
   return (EXECUTION_SUCCESS);
 }
-#endif

builtins/common.h

@@ -91,7 +91,6 @@ extern int no_options (WORD_LIST *);
 
 #if defined (BUILD_LIBRARY)
 /* scallop extensions */
-extern int register_builtins (struct builtin **, size_t);
 extern int scallop_source_file (const char *);
 extern int scallop_evalstring (const char *, int);
 #endif
@@ -149,6 +148,7 @@ extern sh_builtin_func_t *find_shell_builtin (const char *);
 extern sh_builtin_func_t *builtin_address (const char *);
 extern sh_builtin_func_t *find_special_builtin (const char *);
 extern void initialize_shell_builtins (void);
+extern int register_builtins (struct builtin **, size_t);
 
 #if defined (ARRAY_VARS)
 extern int set_expand_once (int, int);

builtins/enable.def

@@ -472,29 +472,7 @@ dyn_load_builtin (WORD_LIST *list, int flags, char *filename)
     }
 
   if (new)
-    {
-      total = num_shell_builtins + new;
-      size = (total + 1) * sizeof (struct builtin);
-
-      new_shell_builtins = (struct builtin *)xmalloc (size);
-      FASTCOPY ((char *)shell_builtins, (char *)new_shell_builtins,
-		num_shell_builtins * sizeof (struct builtin));
-      for (replaced = 0; replaced < new; replaced++)
-	FASTCOPY ((char *)new_builtins[replaced],
-		  (char *)&new_shell_builtins[num_shell_builtins + replaced],
-		  sizeof (struct builtin));
-
-      new_shell_builtins[total].name = (char *)0;
-      new_shell_builtins[total].function = (sh_builtin_func_t *)0;
-      new_shell_builtins[total].flags = 0;
-
-      if (shell_builtins != static_shell_builtins)
-	free (shell_builtins);
-
-      shell_builtins = new_shell_builtins;
-      num_shell_builtins = total;
-      initialize_shell_builtins ();
-    }
+    register_builtins(new_builtins, new);
 
   free (new_builtins);
   return (EXECUTION_SUCCESS);