Imported from ../bash-2.05b.tar.gz.

[platform/upstream/bash.git] / builtins / common.c

diff --git a/builtins/common.c b/builtins/common.c
index 1b82032..b818600 100644 (file)
--- a/builtins/common.c
+++ b/builtins/common.c
@@ -1,10 +1,10 @@
-/* Copyright (C) 1987, 1989, 1991 Free Software Foundation, Inc.
+/* Copyright (C) 1987-2002 Free Software Foundation, Inc.

 
    This file is part of GNU Bash, the Bourne Again SHell.
 
    Bash 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
 
    This file is part of GNU Bash, the Bourne Again SHell.
 
    Bash 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 1, or (at your option) any later
+   Software Foundation; either version 2, or (at your option) any later

    version.
 
    Bash is distributed in the hope that it will be useful, but WITHOUT ANY
    version.
 
    Bash is distributed in the hope that it will be useful, but WITHOUT ANY


@@ -14,31 +14,35 @@
    
    You should have received a copy of the GNU General Public License along
    with Bash; see the file COPYING.  If not, write to the Free Software
    
    You should have received a copy of the GNU General Public License along
    with Bash; see the file COPYING.  If not, write to the Free Software

-   Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
+   Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */

 
 #include <config.h>
 
 #if defined (HAVE_UNISTD_H)
 
 #include <config.h>
 
 #if defined (HAVE_UNISTD_H)

+#  ifdef _MINIX
+#    include <sys/types.h>
+#  endif

 #  include <unistd.h>
 #endif
 
 #include <stdio.h>
 #  include <unistd.h>
 #endif
 
 #include <stdio.h>

+#include <chartypes.h>

 #include "../bashtypes.h"
 #include "../bashtypes.h"

-#include "../posixstat.h"
+#include "posixstat.h"

 #include <signal.h>
 
 #include <signal.h>
 

+#include <errno.h>
+

 #if defined (PREFER_STDARG)
 #  include <stdarg.h>
 #else
 #if defined (PREFER_STDARG)
 #  include <stdarg.h>
 #else

-#  if defined (PREFER_VARARGS)
-#    include <varargs.h>
-#  endif
+#  include <varargs.h>

 #endif
 
 #include "../bashansi.h"
 
 #include "../shell.h"
 #endif
 
 #include "../bashansi.h"
 
 #include "../shell.h"

-#include "../maxpath.h"
+#include "maxpath.h"

 #include "../flags.h"
 #include "../jobs.h"
 #include "../builtins.h"
 #include "../flags.h"
 #include "../jobs.h"
 #include "../builtins.h"


@@ -54,20 +58,21 @@
 #  include "../bashhist.h"
 #endif
 
 #  include "../bashhist.h"
 #endif
 

-extern int no_symbolic_links, interactive, interactive_shell;
-extern int indirection_level, startup_state, subshell_environment;
+#if !defined (errno)
+extern int errno;   
+#endif /* !errno */
+
+extern int indirection_level, subshell_environment;

 extern int line_number;
 extern int last_command_exit_value;
 extern int running_trap;
 extern int line_number;
 extern int last_command_exit_value;
 extern int running_trap;

-extern int variable_context;

 extern int posixly_correct;
 extern char *this_command_name, *shell_name;
 extern int posixly_correct;
 extern char *this_command_name, *shell_name;

-extern COMMAND *global_command;

 extern char *bash_getcwd_errstr;
 
 /* Used by some builtins and the mainline code. */
 extern char *bash_getcwd_errstr;
 
 /* Used by some builtins and the mainline code. */

-Function *last_shell_builtin = (Function *)NULL;
-Function *this_shell_builtin = (Function *)NULL;
+sh_builtin_func_t *last_shell_builtin = (sh_builtin_func_t *)NULL;
+sh_builtin_func_t *this_shell_builtin = (sh_builtin_func_t *)NULL;

 
 /* **************************************************************** */
 /*                                                                 */
 
 /* **************************************************************** */
 /*                                                                 */


@@ -78,7 +83,6 @@ Function *this_shell_builtin = (Function *)NULL;
 /* This is a lot like report_error (), but it is for shell builtins
    instead of shell control structures, and it won't ever exit the
    shell. */
 /* This is a lot like report_error (), but it is for shell builtins
    instead of shell control structures, and it won't ever exit the
    shell. */

-#if defined (USE_VARARGS)

 void
 #if defined (PREFER_STDARG)
 builtin_error (const char *format, ...)
 void
 #if defined (PREFER_STDARG)
 builtin_error (const char *format, ...)


@@ -94,32 +98,18 @@ builtin_error (format, va_alist)
   name = get_name_for_error ();
   fprintf (stderr, "%s: ", name);
 
   name = get_name_for_error ();
   fprintf (stderr, "%s: ", name);
 

+  if (interactive_shell == 0)
+    fprintf (stderr, "line %d: ", executing_line_number ());
+

   if (this_command_name && *this_command_name)
     fprintf (stderr, "%s: ", this_command_name);
 
   if (this_command_name && *this_command_name)
     fprintf (stderr, "%s: ", this_command_name);
 

-#if defined (PREFER_STDARG)
-  va_start (args, format);
-#else
-  va_start (args);
-#endif
+  SH_VA_START (args, format);

 
   vfprintf (stderr, format, args);
   va_end (args);
   fprintf (stderr, "\n");
 }
 
   vfprintf (stderr, format, args);
   va_end (args);
   fprintf (stderr, "\n");
 }

-#else /* !USE_VARARGS */
-void
-builtin_error (format, arg1, arg2, arg3, arg4, arg5)
-     char *format, *arg1, *arg2, *arg3, *arg4, *arg5;
-{
-  if (this_command_name && *this_command_name)
-    fprintf (stderr, "%s: ", this_command_name);
-
-  fprintf (stderr, format, arg1, arg2, arg3, arg4, arg5);
-  fprintf (stderr, "\n");
-  fflush (stderr);
-}
-#endif /* !USE_VARARGS */

 
 /* Print a usage summary for the currently-executing builtin command. */
 void
 
 /* Print a usage summary for the currently-executing builtin command. */
 void


@@ -144,15 +134,6 @@ no_args (list)
     }
 }
 
     }
 }
 

-/* Function called when one of the builtin commands detects a bad
-   option. */
-void
-bad_option (s)
-     char *s;
-{
-  builtin_error ("unknown option: %s", s);
-}
-

 /* Check that no options were given to the currently-executing builtin,
    and return 0 if there were options. */
 int
 /* Check that no options were given to the currently-executing builtin,
    and return 0 if there were options. */
 int


@@ -168,6 +149,119 @@ no_options (list)
   return (0);
 }
 
   return (0);
 }
 

+void
+sh_needarg (s)
+     char *s;
+{
+  builtin_error ("%s: option requires an argument", s);
+}
+
+void
+sh_neednumarg (s)
+     char *s;
+{
+  builtin_error ("%s: numeric argument required", s);
+}
+
+void
+sh_notfound (s)
+     char *s;
+{
+  builtin_error ("%s: not found", s);
+}
+
+/* Function called when one of the builtin commands detects an invalid
+   option. */
+void
+sh_invalidopt (s)
+     char *s;
+{
+  builtin_error ("%s: invalid option", s);
+}
+
+void
+sh_invalidoptname (s)
+     char *s;
+{
+  builtin_error ("%s: invalid option name", s);
+}
+
+void
+sh_invalidid (s)
+     char *s;
+{
+  builtin_error ("`%s': not a valid identifier", s);
+}
+
+void
+sh_invalidnum (s)
+     char *s;
+{
+  builtin_error ("%s: invalid number", s);
+}
+
+void
+sh_invalidsig (s)
+     char *s;
+{
+  builtin_error ("%s: invalid signal specification", s);
+}
+
+void
+sh_badpid (s)
+     char *s;
+{
+  builtin_error ("`%s': not a pid or valid job spec", s);
+}
+
+void
+sh_readonly (s)
+     const char *s;
+{
+  builtin_error ("%s: readonly variable", s);
+}
+
+void
+sh_erange (s, desc)
+     char *s, *desc;
+{
+  if (s)
+    builtin_error ("%s: %s out of range", s, desc ? desc : "argument");
+  else
+    builtin_error ("%s out of range", desc ? desc : "argument");
+}
+
+#if defined (JOB_CONTROL)
+void
+sh_badjob (s)
+     char *s;
+{
+  builtin_error ("%s: no such job", s);
+}
+
+void
+sh_nojobs (s)
+     char *s;
+{
+  if (s)
+    builtin_error ("%s: no job control");
+  else
+    builtin_error ("no job control");
+}
+#endif
+
+#if defined (RESTRICTED_SHELL)
+void
+sh_restricted (s)
+     char *s;
+{
+  if (s)
+    builtin_error ("%s: restricted", s);
+  else
+    builtin_error ("restricted");
+}
+#endif
+

 /* **************************************************************** */
 /*                                                                 */
 /*          Shell positional parameter manipulation                */
 /* **************************************************************** */
 /*                                                                 */
 /*          Shell positional parameter manipulation                */


@@ -184,7 +278,7 @@ make_builtin_argv (list, ip)
 {
   char **argv;
 
 {
   char **argv;
 

-  argv = word_list_to_argv (list, 0, 1, ip);
+  argv = strvec_from_word_list (list, 0, 1, ip);

   argv[0] = this_command_name;
   return argv;
 }
   argv[0] = this_command_name;
   return argv;
 }


@@ -227,67 +321,6 @@ remember_args (list, destructive)
     set_dollar_vars_changed ();
 }
 
     set_dollar_vars_changed ();
 }
 

-/* **************************************************************** */
-/*                                                                 */
-/*              Pushing and Popping variable contexts              */
-/*                                                                 */
-/* **************************************************************** */
-
-static WORD_LIST **dollar_arg_stack = (WORD_LIST **)NULL;
-static int dollar_arg_stack_slots;
-static int dollar_arg_stack_index;
-
-void
-push_context ()
-{
-  push_dollar_vars ();
-  variable_context++;
-}
-
-void
-pop_context ()
-{
-  pop_dollar_vars ();
-  kill_all_local_variables ();
-  variable_context--;
-}
-
-/* Save the existing positional parameters on a stack. */
-void
-push_dollar_vars ()
-{
-  if (dollar_arg_stack_index + 2 > dollar_arg_stack_slots)
-    {
-      dollar_arg_stack = (WORD_LIST **)
-       xrealloc (dollar_arg_stack, (dollar_arg_stack_slots += 10)
-                 * sizeof (WORD_LIST **));
-    }
-  dollar_arg_stack[dollar_arg_stack_index++] = list_rest_of_args ();
-  dollar_arg_stack[dollar_arg_stack_index] = (WORD_LIST *)NULL;
-}
-
-/* Restore the positional parameters from our stack. */
-void
-pop_dollar_vars ()
-{
-  if (!dollar_arg_stack || dollar_arg_stack_index == 0)
-    return;
-
-  remember_args (dollar_arg_stack[--dollar_arg_stack_index], 1);
-  dispose_words (dollar_arg_stack[dollar_arg_stack_index]);
-  dollar_arg_stack[dollar_arg_stack_index] = (WORD_LIST *)NULL;
-}
-
-void
-dispose_saved_dollar_vars ()
-{
-  if (!dollar_arg_stack || dollar_arg_stack_index == 0)
-    return;
-
-  dispose_words (dollar_arg_stack[dollar_arg_stack_index]);
-  dollar_arg_stack[dollar_arg_stack_index] = (WORD_LIST *)NULL;
-}
-

 static int changed_dollar_vars;
 
 /* Have the dollar variables been reset to new values since we last
 static int changed_dollar_vars;
 
 /* Have the dollar variables been reset to new values since we last


@@ -307,12 +340,17 @@ set_dollar_vars_unchanged ()
 void
 set_dollar_vars_changed ()
 {
 void
 set_dollar_vars_changed ()
 {

-  changed_dollar_vars = 1;
+  if (variable_context)
+    changed_dollar_vars |= ARGS_FUNC;
+  else if (this_shell_builtin == set_builtin)
+    changed_dollar_vars |= ARGS_SETBLTIN;
+  else
+    changed_dollar_vars |= ARGS_INVOC;

 }
 
 /* **************************************************************** */
 /*                                                                 */
 }
 
 /* **************************************************************** */
 /*                                                                 */

-/*             Validating numeric input and arguments              */
+/*             Validating numeric input and arguments              */

 /*                                                                 */
 /* **************************************************************** */
 
 /*                                                                 */
 /* **************************************************************** */
 


@@ -322,21 +360,24 @@ set_dollar_vars_changed ()
    follow.  If FATAL is true, call throw_to_top_level, which exits the
    shell; if not, call jump_to_top_level (DISCARD), which aborts the
    current command. */
    follow.  If FATAL is true, call throw_to_top_level, which exits the
    shell; if not, call jump_to_top_level (DISCARD), which aborts the
    current command. */

-int
+intmax_t

 get_numeric_arg (list, fatal)
      WORD_LIST *list;
      int fatal;
 {
 get_numeric_arg (list, fatal)
      WORD_LIST *list;
      int fatal;
 {

-  long count = 1;
+  intmax_t count = 1;
+
+  if (list && list->word && ISOPTION (list->word->word, '-'))
+    list = list->next;

 
   if (list)
     {
       register char *arg;
 
       arg = list->word->word;
 
   if (list)
     {
       register char *arg;
 
       arg = list->word->word;

-      if (!arg || (legal_number (arg, &count) == 0))
+      if (arg == 0 || (legal_number (arg, &count) == 0))

        {
        {

-         builtin_error ("bad non-numeric arg `%s'", list->word->word);
+         sh_neednumarg (list->word->word);

          if (fatal)
            throw_to_top_level ();
          else
          if (fatal)
            throw_to_top_level ();
          else


@@ -344,9 +385,37 @@ get_numeric_arg (list, fatal)
        }
       no_args (list->next);
     }
        }
       no_args (list->next);
     }

+

   return (count);
 }
 
   return (count);
 }
 

+/* Get an eight-bit status value from LIST */
+int
+get_exitstat (list)
+     WORD_LIST *list;
+{
+  int status;
+  intmax_t sval;
+  char *arg;
+
+  if (list && list->word && ISOPTION (list->word->word, '-'))
+    list = list->next;
+
+  if (list == 0)
+    return (last_command_exit_value);      
+
+  arg = list->word->word;
+  if (arg == 0 || legal_number (arg, &sval) == 0)
+    {
+      sh_neednumarg (list->word->word ? list->word->word : "`'");
+      return 255;
+    }
+  no_args (list->next);
+
+  status = sval & 255;
+  return status;
+}
+

 /* Return the octal number parsed from STRING, or -1 to indicate
    that the string contained a bad number. */
 int
 /* Return the octal number parsed from STRING, or -1 to indicate
    that the string contained a bad number. */
 int


@@ -356,13 +425,15 @@ read_octal (string)
   int result, digits;
 
   result = digits = 0;
   int result, digits;
 
   result = digits = 0;

-  while (*string && *string >= '0' && *string < '8')
+  while (*string && ISOCTAL (*string))

     {
       digits++;
     {
       digits++;

-      result = (result * 8) + *string++ - '0';
+      result = (result * 8) + (*string++ - '0');
+      if (result > 0777)
+       return -1;

     }
 
     }
 

-  if (!digits || result > 0777 || *string)
+  if (digits == 0 || *string)

     result = -1;
 
   return (result);
     result = -1;
 
   return (result);


@@ -394,16 +465,14 @@ get_working_directory (for_whom)
 
   if (the_current_working_directory == 0)
     {
 
   if (the_current_working_directory == 0)
     {

-      the_current_working_directory = xmalloc (PATH_MAX);
+      the_current_working_directory = (char *)xmalloc (PATH_MAX);

       the_current_working_directory[0] = '\0';
       directory = getcwd (the_current_working_directory, PATH_MAX);
       if (directory == 0)
        {
       the_current_working_directory[0] = '\0';
       directory = getcwd (the_current_working_directory, PATH_MAX);
       if (directory == 0)
        {

-         fprintf (stderr, "%s: could not get current directory: %s\n",
+         fprintf (stderr, "%s: could not get current directory: %s: %s\n",

                   (for_whom && *for_whom) ? for_whom : get_name_for_error (),
                   (for_whom && *for_whom) ? for_whom : get_name_for_error (),

-                  the_current_working_directory[0]
-                       ? the_current_working_directory
-                       : bash_getcwd_errstr);
+                  bash_getcwd_errstr, strerror (errno));

 
          free (the_current_working_directory);
          the_current_working_directory = (char *)NULL;
 
          free (the_current_working_directory);
          the_current_working_directory = (char *)NULL;


@@ -430,13 +499,65 @@ set_working_directory (name)
 /* **************************************************************** */
 
 #if defined (JOB_CONTROL)
 /* **************************************************************** */
 
 #if defined (JOB_CONTROL)

+int
+get_job_by_name (name, flags)
+     const char *name;
+     int flags;
+{
+  register int i, wl, cl, match, job;
+  register PROCESS *p;
+
+  job = NO_JOB;
+  wl = strlen (name);
+  for (i = job_slots - 1; i >= 0; i--)
+    {
+      if (jobs[i] == 0 || ((flags & JM_STOPPED) && JOBSTATE(i) != JSTOPPED))
+        continue;
+
+      p = jobs[i]->pipe;
+      do
+        {
+         if (flags & JM_EXACT)
+           {
+             cl = strlen (p->command);
+             match = STREQN (p->command, name, cl);
+           }
+         else if (flags & JM_SUBSTRING)
+           match = strindex (p->command, name) != (char *)0;
+         else
+           match = STREQN (p->command, name, wl);
+
+         if (match == 0)
+           {
+             p = p->next;
+             continue;
+           }
+         else if (flags & JM_FIRSTMATCH)
+           return i;           /* return first match */
+         else if (job != NO_JOB)
+           {
+             if (this_shell_builtin)
+               builtin_error ("%s: ambiguous job spec", name);
+             else
+               report_error ("%s: ambiguous job spec", name);
+             return (DUP_JOB);
+           }
+         else
+           job = i;
+        }
+      while (p != jobs[i]->pipe);
+    }
+
+  return (job);
+}
+

 /* Return the job spec found in LIST. */
 int
 get_job_spec (list)
      WORD_LIST *list;
 {
   register char *word;
 /* Return the job spec found in LIST. */
 int
 get_job_spec (list)
      WORD_LIST *list;
 {
   register char *word;

-  int job, substring;
+  int job, jflags;

 
   if (list == 0)
     return (current_job);
 
   if (list == 0)
     return (current_job);


@@ -449,13 +570,17 @@ get_job_spec (list)
   if (*word == '%')
     word++;
 
   if (*word == '%')
     word++;
 

-  if (digit (*word) && all_digits (word))
+  if (DIGIT (*word) && all_digits (word))

     {
       job = atoi (word);
     {
       job = atoi (word);

-      return (job - 1);
+#if 0
+      return (job >= job_slots ? NO_JOB : job - 1);
+#else
+      return (job > job_slots ? NO_JOB : job - 1);
+#endif

     }
 
     }
 

-  substring = 0;
+  jflags = 0;

   switch (*word)
     {
     case 0:
   switch (*word)
     {
     case 0:


@@ -467,41 +592,12 @@ get_job_spec (list)
       return (previous_job);
 
     case '?':                  /* Substring search requested. */
       return (previous_job);
 
     case '?':                  /* Substring search requested. */

-      substring++;
+      jflags |= JM_SUBSTRING;

       word++;
       /* FALLTHROUGH */
 
     default:
       word++;
       /* FALLTHROUGH */
 
     default:

-      {
-       register int i, wl;
-
-       job = NO_JOB;
-       wl = strlen (word);
-       for (i = 0; i < job_slots; i++)
-         {
-           if (jobs[i])
-             {
-               register PROCESS *p;
-               p = jobs[i]->pipe;
-               do
-                 {
-                   if ((substring && strindex (p->command, word)) ||
-                       (STREQN (p->command, word, wl)))
-                     if (job != NO_JOB)
-                       {
-                         builtin_error ("ambigious job spec: %s", word);
-                         return (DUP_JOB);
-                       }
-                     else
-                       job = i;
-
-                   p = p->next;
-                 }
-               while (p != jobs[i]->pipe);
-             }
-         }
-       return (job);
-      }
+      return get_job_by_name (word, jflags);

     }
 }
 #endif /* JOB_CONTROL */
     }
 }
 #endif /* JOB_CONTROL */


@@ -514,7 +610,8 @@ display_signal_list (list, forcecols)
   register int i, column;
   char *name;
   int result;
   register int i, column;
   char *name;
   int result;

-  long signum;
+  int signum;
+  intmax_t lsignum;

 
   result = EXECUTION_SUCCESS;
   if (!list)
 
   result = EXECUTION_SUCCESS;
   if (!list)


@@ -549,20 +646,21 @@ display_signal_list (list, forcecols)
   /* List individual signal names or numbers. */
   while (list)
     {
   /* List individual signal names or numbers. */
   while (list)
     {

-      if (legal_number (list->word->word, &signum))
+      if (legal_number (list->word->word, &lsignum))

        {
          /* This is specified by Posix.2 so that exit statuses can be
             mapped into signal numbers. */
        {
          /* This is specified by Posix.2 so that exit statuses can be
             mapped into signal numbers. */

-         if (signum > 128)
-           signum -= 128;
-         if (signum < 0 || signum >= NSIG)
+         if (lsignum > 128)
+           lsignum -= 128;
+         if (lsignum < 0 || lsignum >= NSIG)

            {
            {

-             builtin_error ("bad signal number: %s", list->word->word);
+             sh_invalidsig (list->word->word);

              result = EXECUTION_FAILURE;
              list = list->next;
              continue;
            }
 
              result = EXECUTION_FAILURE;
              list = list->next;
              continue;
            }
 

+         signum = lsignum;

          name = signal_name (signum);
          if (STREQN (name, "SIGJUNK", 7) || STREQN (name, "Unknown", 7))
            {
          name = signal_name (signum);
          if (STREQN (name, "SIGJUNK", 7) || STREQN (name, "Unknown", 7))
            {


@@ -582,12 +680,12 @@ display_signal_list (list, forcecols)
          signum = decode_signal (list->word->word);
          if (signum == NO_SIG)
            {
          signum = decode_signal (list->word->word);
          if (signum == NO_SIG)
            {

-             builtin_error ("%s: not a signal specification", list->word->word);
+             sh_invalidsig (list->word->word);

              result = EXECUTION_FAILURE;
              list = list->next;
              continue;
            }
              result = EXECUTION_FAILURE;
              list = list->next;
              continue;
            }

-         printf ("%ld\n", signum);
+         printf ("%d\n", signum);

        }
       list = list->next;
     }
        }
       list = list->next;
     }


@@ -645,33 +743,33 @@ builtin_address_internal (name, disabled_okay)
 }
 
 /* Return the pointer to the function implementing builtin command NAME. */
 }
 
 /* Return the pointer to the function implementing builtin command NAME. */

-Function *
+sh_builtin_func_t *

 find_shell_builtin (name)
      char *name;
 {
   current_builtin = builtin_address_internal (name, 0);
 find_shell_builtin (name)
      char *name;
 {
   current_builtin = builtin_address_internal (name, 0);

-  return (current_builtin ? current_builtin->function : (Function *)NULL);
+  return (current_builtin ? current_builtin->function : (sh_builtin_func_t *)NULL);

 }
 
 /* Return the address of builtin with NAME, whether it is enabled or not. */
 }
 
 /* Return the address of builtin with NAME, whether it is enabled or not. */

-Function *
+sh_builtin_func_t *

 builtin_address (name)
      char *name;
 {
   current_builtin = builtin_address_internal (name, 1);
 builtin_address (name)
      char *name;
 {
   current_builtin = builtin_address_internal (name, 1);

-  return (current_builtin ? current_builtin->function : (Function *)NULL);
+  return (current_builtin ? current_builtin->function : (sh_builtin_func_t *)NULL);

 }
 
 /* Return the function implementing the builtin NAME, but only if it is a
    POSIX.2 special builtin. */
 }
 
 /* Return the function implementing the builtin NAME, but only if it is a
    POSIX.2 special builtin. */

-Function *
+sh_builtin_func_t *

 find_special_builtin (name)
      char *name;
 {
   current_builtin = builtin_address_internal (name, 0);
   return ((current_builtin && (current_builtin->flags & SPECIAL_BUILTIN)) ?
                        current_builtin->function :
 find_special_builtin (name)
      char *name;
 {
   current_builtin = builtin_address_internal (name, 0);
   return ((current_builtin && (current_builtin->flags & SPECIAL_BUILTIN)) ?
                        current_builtin->function :

-                       (Function *)NULL);
+                       (sh_builtin_func_t *)NULL);

 }
   
 static int
 }
   
 static int


@@ -692,149 +790,5 @@ void
 initialize_shell_builtins ()
 {
   qsort (shell_builtins, num_shell_builtins, sizeof (struct builtin),
 initialize_shell_builtins ()
 {
   qsort (shell_builtins, num_shell_builtins, sizeof (struct builtin),

-    shell_builtin_compare);
-}
-
-/* **************************************************************** */
-/*                                                                 */
-/*      Functions for quoting strings to be re-read as input       */
-/*                                                                 */
-/* **************************************************************** */
-
-/* Return a new string which is the single-quoted version of STRING.
-   Used by alias and trap, among others. */
-char *
-single_quote (string)
-     char *string;
-{
-  register int c;
-  char *result, *r, *s;
-
-  result = (char *)xmalloc (3 + (4 * strlen (string)));
-  r = result;
-  *r++ = '\'';
-
-  for (s = string; s && (c = *s); s++)
-    {
-      *r++ = c;
-
-      if (c == '\'')
-       {
-         *r++ = '\\';  /* insert escaped single quote */
-         *r++ = '\'';
-         *r++ = '\'';  /* start new quoted string */
-       }
-    }
-
-  *r++ = '\'';
-  *r = '\0';
-
-  return (result);
-}
-
-/* Quote STRING using double quotes.  Return a new string. */
-char *
-double_quote (string)
-     char *string;
-{
-  register int c;
-  char *result, *r, *s;
-
-  result = (char *)xmalloc (3 + (2 * strlen (string)));
-  r = result;
-  *r++ = '"';
-
-  for (s = string; s && (c = *s); s++)
-    {
-      switch (c)
-        {
-       case '"':
-       case '$':
-       case '`':
-       case '\\':
-         *r++ = '\\';
-       default:
-         *r++ = c;
-         break;
-        }
-    }
-
-  *r++ = '"';
-  *r = '\0';
-
-  return (result);
-}
-
-/* Quote special characters in STRING using backslashes.  Return a new
-   string. */
-char *
-backslash_quote (string)
-     char *string;
-{
-  int c;
-  char *result, *r, *s;
-
-  result = xmalloc (2 * strlen (string) + 1);
-
-  for (r = result, s = string; s && (c = *s); s++)
-    {
-      switch (c)
-       {
-       case ' ': case '\t': case '\n':         /* IFS white space */
-       case '\'': case '"': case '\\':         /* quoting chars */
-       case '|': case '&': case ';':           /* shell metacharacters */
-       case '(': case ')': case '<': case '>':
-       case '!': case '{': case '}':           /* reserved words */
-       case '*': case '[': case '?': case ']': /* globbing chars */
-       case '^':
-       case '$': case '`':                     /* expansion chars */
-         *r++ = '\\';
-         *r++ = c;
-         break;
-       case '#':                               /* comment char */
-#if 0
-       case '~':                               /* tilde expansion */
-#endif
-         if (s == string)
-           *r++ = '\\';
-         /* FALLTHROUGH */
-       default:
-         *r++ = c;
-         break;
-       }
-    }
-
-  *r = '\0';
-  return (result);
-}
-
-int
-contains_shell_metas (string)
-     char *string;
-{
-  char *s;
-
-  for (s = string; s && *s; s++)
-    {
-      switch (*s)
-       {
-       case ' ': case '\t': case '\n':         /* IFS white space */
-       case '\'': case '"': case '\\':         /* quoting chars */
-       case '|': case '&': case ';':           /* shell metacharacters */
-       case '(': case ')': case '<': case '>':
-       case '!': case '{': case '}':           /* reserved words */
-       case '*': case '[': case '?': case ']': /* globbing chars */
-       case '^':
-       case '$': case '`':                     /* expansion chars */
-         return (1);
-       case '#':
-         if (s == string)                      /* comment char */
-           return (1);
-         /* FALLTHROUGH */
-       default:
-         break;
-       }
-    }
-
-  return (0);
+    (QSFUNC *)shell_builtin_compare);

 }
 }