commit bash-20150123 snapshot

builtins/alias.def

@@ -33,7 +33,7 @@ A trailing space in VALUE causes the next word to be checked for
 alias substitution when the alias is expanded.
 
 Options:
-  -p	Print all defined aliases in a reusable format
+  -p	print all defined aliases in a reusable format
 
 Exit Status:
 alias returns true unless a NAME is supplied for which no alias has been
@@ -160,7 +160,7 @@ $SHORT_DOC unalias [-a] name [name ...]
 Remove each NAME from the list of defined aliases.
 
 Options:
-  -a	remove all alias definitions.
+  -a	remove all alias definitions
 
 Return success unless a NAME is not an existing alias.
 $END

builtins/bind.def

@@ -54,7 +54,7 @@ Options:
   -f  filename       Read key bindings from FILENAME.
   -x  keyseq:shell-command	Cause SHELL-COMMAND to be executed when
 				KEYSEQ is entered.
-  -X		     List key sequences bound with -x and associated commands
+  -X                 List key sequences bound with -x and associated commands
                      in a form that can be reused as input.
 
 Exit Status:

builtins/cd.def

@@ -93,16 +93,17 @@ the word is assumed to be  a variable name.  If that variable has a value,
 its value is used for DIR.
 
 Options:
-    -L	force symbolic links to be followed: resolve symbolic links in
-	DIR after processing instances of `..'
-    -P	use the physical directory structure without following symbolic
-	links: resolve symbolic links in DIR before processing instances
-	of `..'
-    -e	if the -P option is supplied, and the current working directory
-	cannot be determined successfully, exit with a non-zero status
+  -L	force symbolic links to be followed: resolve symbolic
+		links in DIR after processing instances of `..'
+  -P	use the physical directory structure without following
+		symbolic links: resolve symbolic links in DIR before
+		processing instances of `..'
+  -e	if the -P option is supplied, and the current working
+		directory cannot be determined successfully, exit with
+		a non-zero status
 #if defined (O_XATTR)
-    -@  on systems that support it, present a file with extended attributes
-        as a directory containing the file attributes
+  -@	on systems that support it, present a file with extended
+		attributes as a directory containing the file attributes
 #endif
 
 The default is to follow symbolic links, as if `-L' were specified.
@@ -450,7 +451,7 @@ Print the name of the current working directory.
 
 Options:
   -L	print the value of $PWD if it names the current working
-	directory
+		directory
   -P	print the physical directory, without any symbolic links
 
 By default, `pwd' behaves as if `-L' were specified.

builtins/command.def

@@ -30,10 +30,10 @@ information about the specified COMMANDs.  Can be used to invoke commands
 on disk when a function with the same name exists.
 
 Options:
-  -p	use a default value for PATH that is guaranteed to find all of
-	the standard utilities
-  -v	print a description of COMMAND similar to the `type' builtin
-  -V	print a more verbose description of each COMMAND
+  -p    use a default value for PATH that is guaranteed to find all of
+        the standard utilities
+  -v    print a description of COMMAND similar to the `type' builtin
+  -V    print a more verbose description of each COMMAND
 
 Exit Status:
 Returns exit status of COMMAND, or failure if COMMAND is not found.

builtins/common.c

@@ -242,7 +242,7 @@ sh_invalidnum (s)
 {
   char *msg;
 
-  if (*s == '0' && isdigit (s[1]))
+  if (*s == '0' && isdigit ((unsigned char)s[1]))
     msg = _("invalid octal number");
   else if (*s == '0' && s[1] == 'x')
     msg = _("invalid hex number");

builtins/common.c~

@@ -0,0 +1,918 @@
+/* common.c - utility functions for all builtins */
+
+/* Copyright (C) 1987-2010 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 Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   Bash is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with Bash.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <config.h>
+
+#if defined (HAVE_UNISTD_H)
+#  ifdef _MINIX
+#    include <sys/types.h>
+#  endif
+#  include <unistd.h>
+#endif
+
+#include <stdio.h>
+#include <chartypes.h>
+#include "../bashtypes.h"
+#include "posixstat.h"
+#include <signal.h>
+
+#include <errno.h>
+
+#if defined (PREFER_STDARG)
+#  include <stdarg.h>
+#else
+#  include <varargs.h>
+#endif
+
+#include "../bashansi.h"
+#include "../bashintl.h"
+
+#define NEED_FPURGE_DECL
+
+#include "../shell.h"
+#include "maxpath.h"
+#include "../flags.h"
+#include "../jobs.h"
+#include "../builtins.h"
+#include "../input.h"
+#include "../execute_cmd.h"
+#include "../trap.h"
+#include "bashgetopt.h"
+#include "common.h"
+#include "builtext.h"
+#include <tilde/tilde.h>
+
+#if defined (HISTORY)
+#  include "../bashhist.h"
+#endif
+
+#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 trap_saved_exit_value;
+extern int running_trap;
+extern int posixly_correct;
+extern char *this_command_name, *shell_name;
+extern const char * const bash_getcwd_errstr;
+
+/* Used by some builtins and the mainline code. */
+sh_builtin_func_t *last_shell_builtin = (sh_builtin_func_t *)NULL;
+sh_builtin_func_t *this_shell_builtin = (sh_builtin_func_t *)NULL;
+
+/* **************************************************************** */
+/*								    */
+/*	     Error reporting, usage, and option processing	    */
+/*								    */
+/* **************************************************************** */
+
+/* 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. */
+
+static void
+builtin_error_prolog ()
+{
+  char *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);
+}
+
+void
+#if defined (PREFER_STDARG)
+builtin_error (const char *format, ...)
+#else
+builtin_error (format, va_alist)
+     const char *format;
+     va_dcl
+#endif
+{
+  va_list args;
+
+  builtin_error_prolog ();
+
+  SH_VA_START (args, format);
+
+  vfprintf (stderr, format, args);
+  va_end (args);
+  fprintf (stderr, "\n");
+}
+
+void
+#if defined (PREFER_STDARG)
+builtin_warning (const char *format, ...)
+#else
+builtin_warning (format, va_alist)
+     const char *format;
+     va_dcl
+#endif
+{
+  va_list args;
+
+  builtin_error_prolog ();
+  fprintf (stderr, _("warning: "));
+
+  SH_VA_START (args, format);
+
+  vfprintf (stderr, format, args);
+  va_end (args);
+  fprintf (stderr, "\n");
+}
+
+/* Print a usage summary for the currently-executing builtin command. */
+void
+builtin_usage ()
+{
+  if (this_command_name && *this_command_name)
+    fprintf (stderr, _("%s: usage: "), this_command_name);
+  fprintf (stderr, "%s\n", _(current_builtin->short_doc));
+  fflush (stderr);
+}
+
+/* Return if LIST is NULL else barf and jump to top_level.  Used by some
+   builtins that do not accept arguments. */
+void
+no_args (list)
+     WORD_LIST *list;
+{
+  if (list)
+    {
+      builtin_error (_("too many arguments"));
+      top_level_cleanup ();
+      jump_to_top_level (DISCARD);
+    }
+}
+
+/* Check that no options were given to the currently-executing builtin,
+   and return 0 if there were options. */
+int
+no_options (list)
+     WORD_LIST *list;
+{
+  int opt;
+
+  reset_internal_getopt ();
+  if ((opt = internal_getopt (list, "")) != -1)
+    {
+      if (opt == GETOPT_HELP)
+	{
+	  builtin_help ();
+	  return (2);
+	}
+      builtin_usage ();
+      return (1);
+    }
+  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;
+{
+  char *msg;
+
+  if (*s == '0' && isdigit (s[1]))
+    msg = _("invalid octal number");
+  else if (*s == '0' && s[1] == 'x')
+    msg = _("invalid hex number");
+  else
+    msg = _("invalid number");
+  builtin_error ("%s: %s", s, msg);
+}
+
+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"), s);
+  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
+
+void
+sh_notbuiltin (s)
+     char *s;
+{
+  builtin_error (_("%s: not a shell builtin"), s);
+}
+
+void
+sh_wrerror ()
+{
+#if defined (DONT_REPORT_BROKEN_PIPE_WRITE_ERRORS) && defined (EPIPE)
+  if (errno != EPIPE)
+#endif /* DONT_REPORT_BROKEN_PIPE_WRITE_ERRORS && EPIPE */
+  builtin_error (_("write error: %s"), strerror (errno));
+}
+
+void
+sh_ttyerror (set)
+     int set;
+{
+  if (set)
+    builtin_error (_("error setting terminal attributes: %s"), strerror (errno));
+  else
+    builtin_error (_("error getting terminal attributes: %s"), strerror (errno));
+}
+
+int
+sh_chkwrite (s)
+     int s;
+{
+  fflush (stdout);
+  if (ferror (stdout))
+    {
+      sh_wrerror ();
+      fpurge (stdout);
+      clearerr (stdout);
+      return (EXECUTION_FAILURE);
+    }
+  return (s);
+}
+
+/* **************************************************************** */
+/*								    */
+/*	     Shell positional parameter manipulation		    */
+/*								    */
+/* **************************************************************** */
+
+/* Convert a WORD_LIST into a C-style argv.  Return the number of elements
+   in the list in *IP, if IP is non-null.  A convenience function for
+   loadable builtins; also used by `test'. */
+char **
+make_builtin_argv (list, ip)
+     WORD_LIST *list;
+     int *ip;
+{
+  char **argv;
+
+  argv = strvec_from_word_list (list, 0, 1, ip);
+  argv[0] = this_command_name;
+  return argv;
+}
+
+/* Remember LIST in $1 ... $9, and REST_OF_ARGS.  If DESTRUCTIVE is
+   non-zero, then discard whatever the existing arguments are, else
+   only discard the ones that are to be replaced. */
+void
+remember_args (list, destructive)
+     WORD_LIST *list;
+     int destructive;
+{
+  register int i;
+
+  for (i = 1; i < 10; i++)
+    {
+      if ((destructive || list) && dollar_vars[i])
+	{
+	  free (dollar_vars[i]);
+	  dollar_vars[i] = (char *)NULL;
+	}
+
+      if (list)
+	{
+	  dollar_vars[i] = savestring (list->word->word);
+	  list = list->next;
+	}
+    }
+
+  /* If arguments remain, assign them to REST_OF_ARGS.
+     Note that copy_word_list (NULL) returns NULL, and
+     that dispose_words (NULL) does nothing. */
+  if (destructive || list)
+    {
+      dispose_words (rest_of_args);
+      rest_of_args = copy_word_list (list);
+    }
+
+  if (destructive)
+    set_dollar_vars_changed ();
+
+  invalidate_cached_quoted_dollar_at ();
+}
+
+static int changed_dollar_vars;
+
+/* Have the dollar variables been reset to new values since we last
+   checked? */
+int
+dollar_vars_changed ()
+{
+  return (changed_dollar_vars);
+}
+
+void
+set_dollar_vars_unchanged ()
+{
+  changed_dollar_vars = 0;
+}
+
+void
+set_dollar_vars_changed ()
+{
+  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		    */
+/*								    */
+/* **************************************************************** */
+
+/* Read a numeric arg for this_command_name, the name of the shell builtin
+   that wants it.  LIST is the word list that the arg is to come from.
+   Accept only the numeric argument; report an error if other arguments
+   follow.  If FATAL is 1, call throw_to_top_level, which exits the
+   shell; if it's 2, call jump_to_top_level (DISCARD), which aborts the
+   current command; if FATAL is 0, return an indication of an invalid
+   number by setting *NUMOK == 0 and return -1. */
+int
+get_numeric_arg (list, fatal, count)
+     WORD_LIST *list;
+     int fatal;
+     intmax_t *count;
+{
+  char *arg;
+
+  if (count)
+    *count = 1;
+
+  if (list && list->word && ISOPTION (list->word->word, '-'))
+    list = list->next;
+
+  if (list)
+    {
+      arg = list->word->word;
+      if (arg == 0 || (legal_number (arg, count) == 0))
+	{
+	  sh_neednumarg (list->word->word ? list->word->word : "`'");
+	  if (fatal == 0)
+	    return 0;
+	  else if (fatal == 1)		/* fatal == 1; abort */
+	    throw_to_top_level ();
+	  else				/* fatal == 2; discard current command */
+	    {
+	      top_level_cleanup ();
+	      jump_to_top_level (DISCARD);
+	    }
+	}
+      no_args (list->next);
+    }
+
+  return (1);
+}
+
+/* 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)
+    {
+      /* If we're not running the DEBUG trap, the return builtin, when not
+	 given any arguments, uses the value of $? before the trap ran.  If
+	 given an argument, return uses it.  This means that the trap can't
+	 change $?.  The DEBUG trap gets to change $?, though, since that is
+	 part of its reason for existing, and because the extended debug mode
+	 does things with the return value. */
+      if (this_shell_builtin == return_builtin && running_trap > 0 && running_trap != DEBUG_TRAP+1)
+	return (trap_saved_exit_value);
+      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 EX_BADUSAGE;
+    }
+  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
+read_octal (string)
+     char *string;
+{
+  int result, digits;
+
+  result = digits = 0;
+  while (*string && ISOCTAL (*string))
+    {
+      digits++;
+      result = (result * 8) + (*string++ - '0');
+      if (result > 0777)
+	return -1;
+    }
+
+  if (digits == 0 || *string)
+    result = -1;
+
+  return (result);
+}
+
+/* **************************************************************** */
+/*								    */
+/*	     Manipulating the current working directory		    */
+/*								    */
+/* **************************************************************** */
+
+/* Return a consed string which is the current working directory.
+   FOR_WHOM is the name of the caller for error printing.  */
+char *the_current_working_directory = (char *)NULL;
+
+char *
+get_working_directory (for_whom)
+     char *for_whom;
+{
+  if (no_symbolic_links)
+    {
+      FREE (the_current_working_directory);
+      the_current_working_directory = (char *)NULL;
+    }
+
+  if (the_current_working_directory == 0)
+    {
+#if defined (GETCWD_BROKEN)
+      the_current_working_directory = getcwd (0, PATH_MAX);
+#else
+      the_current_working_directory = getcwd (0, 0);
+#endif
+      if (the_current_working_directory == 0)
+	{
+	  fprintf (stderr, _("%s: error retrieving current directory: %s: %s\n"),
+		   (for_whom && *for_whom) ? for_whom : get_name_for_error (),
+		   _(bash_getcwd_errstr), strerror (errno));
+	  return (char *)NULL;
+	}
+    }
+
+  return (savestring (the_current_working_directory));
+}
+
+/* Make NAME our internal idea of the current working directory. */
+void
+set_working_directory (name)
+     char *name;
+{
+  FREE (the_current_working_directory);
+  the_current_working_directory = savestring (name);
+}
+
+/* **************************************************************** */
+/*								    */
+/*	     	Job control support functions			    */
+/*								    */
+/* **************************************************************** */
+
+#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;
+  register JOB *j;
+
+  job = NO_JOB;
+  wl = strlen (name);
+  for (i = js.j_jobslots - 1; i >= 0; i--)
+    {
+      j = get_job_by_jid (i);
+      if (j == 0 || ((flags & JM_STOPPED) && J_JOBSTATE(j) != JSTOPPED))
+        continue;
+
+      p = j->pipe;
+      do
+        {
+	  if (flags & JM_EXACT)
+	    {
+	      cl = strlen (p->command);
+	      match = STREQN (p->command, name, cl);
+	    }
+	  else if (flags & JM_SUBSTRING)
+	    match = strcasestr (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
+	        internal_error (_("%s: ambiguous job spec"), name);
+	      return (DUP_JOB);
+	    }
+	  else
+	    job = i;
+        }
+      while (p != j->pipe);
+    }
+
+  return (job);
+}
+
+/* Return the job spec found in LIST. */
+int
+get_job_spec (list)
+     WORD_LIST *list;
+{
+  register char *word;
+  int job, jflags;
+
+  if (list == 0)
+    return (js.j_current);
+
+  word = list->word->word;
+
+  if (*word == '\0')
+    return (NO_JOB);
+
+  if (*word == '%')
+    word++;
+
+  if (DIGIT (*word) && all_digits (word))
+    {
+      job = atoi (word);
+      return (job > js.j_jobslots ? NO_JOB : job - 1);
+    }
+
+  jflags = 0;
+  switch (*word)
+    {
+    case 0:
+    case '%':
+    case '+':
+      return (js.j_current);
+
+    case '-':
+      return (js.j_previous);
+
+    case '?':			/* Substring search requested. */
+      jflags |= JM_SUBSTRING;
+      word++;
+      /* FALLTHROUGH */
+
+    default:
+      return get_job_by_name (word, jflags);
+    }
+}
+#endif /* JOB_CONTROL */
+
+/*
+ * NOTE:  `kill' calls this function with forcecols == 0
+ */
+int
+display_signal_list (list, forcecols)
+     WORD_LIST *list;
+     int forcecols;
+{
+  register int i, column;
+  char *name;
+  int result, signum, dflags;
+  intmax_t lsignum;
+
+  result = EXECUTION_SUCCESS;
+  if (!list)
+    {
+      for (i = 1, column = 0; i < NSIG; i++)
+	{
+	  name = signal_name (i);
+	  if (STREQN (name, "SIGJUNK", 7) || STREQN (name, "Unknown", 7))
+	    continue;
+
+	  if (posixly_correct && !forcecols)
+	    {
+	      /* This is for the kill builtin.  POSIX.2 says the signal names
+		 are displayed without the `SIG' prefix. */
+	      if (STREQN (name, "SIG", 3))
+		name += 3;
+	      printf ("%s%s", name, (i == NSIG - 1) ? "" : " ");
+	    }
+	  else
+	    {
+	      printf ("%2d) %s", i, name);
+
+	      if (++column < 5)
+		printf ("\t");
+	      else
+		{
+		  printf ("\n");
+		  column = 0;
+		}
+	    }
+	}
+
+      if ((posixly_correct && !forcecols) || column != 0)
+	printf ("\n");
+      return result;
+    }
+
+  /* List individual signal names or numbers. */
+  while (list)
+    {
+      if (legal_number (list->word->word, &lsignum))
+	{
+	  /* This is specified by Posix.2 so that exit statuses can be
+	     mapped into signal numbers. */
+	  if (lsignum > 128)
+	    lsignum -= 128;
+	  if (lsignum < 0 || lsignum >= NSIG)
+	    {
+	      sh_invalidsig (list->word->word);
+	      result = EXECUTION_FAILURE;
+	      list = list->next;
+	      continue;
+	    }
+
+	  signum = lsignum;
+	  name = signal_name (signum);
+	  if (STREQN (name, "SIGJUNK", 7) || STREQN (name, "Unknown", 7))
+	    {
+	      list = list->next;
+	      continue;
+	    }
+#if defined (JOB_CONTROL)
+	  /* POSIX.2 says that `kill -l signum' prints the signal name without
+	     the `SIG' prefix. */
+	  printf ("%s\n", (this_shell_builtin == kill_builtin) ? name + 3 : name);
+#else
+	  printf ("%s\n", name);
+#endif
+	}
+      else
+	{
+	  dflags = DSIG_NOCASE;
+	  if (posixly_correct == 0 || this_shell_builtin != kill_builtin)
+	    dflags |= DSIG_SIGPREFIX;
+	  signum = decode_signal (list->word->word, dflags);
+	  if (signum == NO_SIG)
+	    {
+	      sh_invalidsig (list->word->word);
+	      result = EXECUTION_FAILURE;
+	      list = list->next;
+	      continue;
+	    }
+	  printf ("%d\n", signum);
+	}
+      list = list->next;
+    }
+  return (result);
+}
+
+/* **************************************************************** */
+/*								    */
+/*	    Finding builtin commands and their functions	    */
+/*								    */
+/* **************************************************************** */
+
+/* Perform a binary search and return the address of the builtin function
+   whose name is NAME.  If the function couldn't be found, or the builtin
+   is disabled or has no function associated with it, return NULL.
+   Return the address of the builtin.
+   DISABLED_OKAY means find it even if the builtin is disabled. */
+struct builtin *
+builtin_address_internal (name, disabled_okay)
+     char *name;
+     int disabled_okay;
+{
+  int hi, lo, mid, j;
+
+  hi = num_shell_builtins - 1;
+  lo = 0;
+
+  while (lo <= hi)
+    {
+      mid = (lo + hi) / 2;
+
+      j = shell_builtins[mid].name[0] - name[0];
+
+      if (j == 0)
+	j = strcmp (shell_builtins[mid].name, name);
+
+      if (j == 0)
+	{
+	  /* It must have a function pointer.  It must be enabled, or we
+	     must have explicitly allowed disabled functions to be found,
+	     and it must not have been deleted. */
+	  if (shell_builtins[mid].function &&
+	      ((shell_builtins[mid].flags & BUILTIN_DELETED) == 0) &&
+	      ((shell_builtins[mid].flags & BUILTIN_ENABLED) || disabled_okay))
+	    return (&shell_builtins[mid]);
+	  else
+	    return ((struct builtin *)NULL);
+	}
+      if (j > 0)
+	hi = mid - 1;
+      else
+	lo = mid + 1;
+    }
+  return ((struct builtin *)NULL);
+}
+
+/* Return the pointer to the function implementing builtin command NAME. */
+sh_builtin_func_t *
+find_shell_builtin (name)
+     char *name;
+{
+  current_builtin = builtin_address_internal (name, 0);
+  return (current_builtin ? current_builtin->function : (sh_builtin_func_t *)NULL);
+}
+
+/* Return the address of builtin with NAME, whether it is enabled or not. */
+sh_builtin_func_t *
+builtin_address (name)
+     char *name;
+{
+  current_builtin = builtin_address_internal (name, 1);
+  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. */
+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 :
+  			(sh_builtin_func_t *)NULL);
+}
+  
+static int
+shell_builtin_compare (sbp1, sbp2)
+     struct builtin *sbp1, *sbp2;
+{
+  int result;
+
+  if ((result = sbp1->name[0] - sbp2->name[0]) == 0)
+    result = strcmp (sbp1->name, sbp2->name);
+
+  return (result);
+}
+
+/* Sort the table of shell builtins so that the binary search will work
+   in find_shell_builtin. */
+void
+initialize_shell_builtins ()
+{
+  qsort (shell_builtins, num_shell_builtins, sizeof (struct builtin),
+    (QSFUNC *)shell_builtin_compare);
+}
+
+#if !defined (HELP_BUILTIN)
+void
+builtin_help ()
+{
+  printf ("%s: %s\n", this_command_name, _("help not available in this version"));
+}
+#endif

builtins/complete.def

@@ -33,11 +33,11 @@ allows them to be reused as input.
 Options:
   -p	print existing completion specifications in a reusable format
   -r	remove a completion specification for each NAME, or, if no
-	NAMEs are supplied, all completion specifications
+		NAMEs are supplied, all completion specifications
   -D	apply the completions and actions as the default for commands
-	without any specific completion defined
+		without any specific completion defined
   -E	apply the completions and actions to "empty" commands --
-	completion attempted on a blank line
+		completion attempted on a blank line
 
 When completion is attempted, the actions are applied in the order the
 uppercase-letter options are listed above.  The -D option takes

builtins/declare.def

@@ -31,9 +31,9 @@ display the attributes and values of all variables.
 Options:
   -f	restrict action or display to function names and definitions
   -F	restrict display to function names only (plus line number and
-	source file when debugging)
+		source file when debugging)
   -g	create global variables when used in a shell function; otherwise
-	ignored
+		ignored
   -p	display the attributes and value of each NAME
 
 Options which set attributes:

builtins/echo.def

@@ -59,9 +59,9 @@ Options:
   \v	vertical tab
   \\	backslash
   \0nnn	the character whose ASCII code is NNN (octal).  NNN can be
-	0 to 3 octal digits
+		0 to 3 octal digits
   \xHH	the eight-bit character whose value is HH (hexadecimal).  HH
-	can be one or two hex digits
+		can be one or two hex digits
 
 Exit Status:
 Returns success unless a write error occurs.

builtins/exec.def

@@ -31,8 +31,8 @@ any redirections take effect in the current shell.
 
 Options:
   -a name	pass NAME as the zeroth argument to COMMAND
-  -c		execute COMMAND with an empty environment
-  -l		place a dash in the zeroth argument to COMMAND
+  -c	execute COMMAND with an empty environment
+  -l	place a dash in the zeroth argument to COMMAND
 
 If the command cannot be executed, a non-interactive shell exits, unless
 the shell option `execfail' is set.

builtins/hash.def

@@ -29,15 +29,15 @@ Determine and remember the full pathname of each command NAME.  If
 no arguments are given, information about remembered commands is displayed.
 
 Options:
-  -d		forget the remembered location of each NAME
-  -l		display in a format that may be reused as input
+  -d	forget the remembered location of each NAME
+  -l	display in a format that may be reused as input
   -p pathname	use PATHNAME as the full pathname of NAME
-  -r		forget all remembered locations
-  -t		print the remembered location of each NAME, preceding
+  -r	forget all remembered locations
+  -t	print the remembered location of each NAME, preceding
 		each location with the corresponding NAME if multiple
 		NAMEs are given
 Arguments:
-  NAME		Each NAME is searched for in $PATH and added to the list
+  NAME	Each NAME is searched for in $PATH and added to the list
 		of remembered commands.
 
 Exit Status:

builtins/help.def

@@ -34,7 +34,7 @@ Options:
   -d	output short description for each topic
   -m	display usage in pseudo-manpage format
   -s	output only a short usage synopsis for each topic matching
-	PATTERN
+		PATTERN
 
 Arguments:
   PATTERN	Pattern specifiying a help topic

builtins/history.def

@@ -36,18 +36,18 @@ Options:
   -a	append history lines from this session to the history file
   -n	read all history lines not already read from the history file
   -r	read the history file and append the contents to the history
-	list
+		list
   -w	write the current history to the history file
-	and append them to the history list
+		and append them to the history list
 
   -p	perform history expansion on each ARG and display the result
-	without storing it in the history list
+		without storing it in the history list
   -s	append the ARGs to the history list as a single entry
 
 If FILENAME is given, it is used as the history file.  Otherwise,
-if $HISTFILE has a value, that is used, else ~/.bash_history.
+if HISTFILE has a value, that is used, else ~/.bash_history.
 
-If the $HISTTIMEFORMAT variable is set and not null, its value is used
+If the HISTTIMEFORMAT variable is set and not null, its value is used
 as a format string for strftime(3) to print the time stamp associated
 with each displayed history entry.  No time stamps are printed otherwise.
 

builtins/jobs.def

@@ -32,7 +32,7 @@ Without options, the status of all active jobs is displayed.
 Options:
   -l	lists process IDs in addition to the normal information
   -n	lists only processes that have changed status since the last
-	notification
+		notification
   -p	lists process IDs only
   -r	restrict output to running jobs
   -s	restrict output to stopped jobs
@@ -221,7 +221,7 @@ any JOBSPECs, the shell uses its notion of the current job.
 Options:
   -a	remove all jobs if JOBSPEC is not supplied
   -h	mark each JOBSPEC so that SIGHUP is not sent to the job if the
-	shell receives a SIGHUP
+		shell receives a SIGHUP
   -r	remove only running jobs
 
 Exit Status:

builtins/kill.def

@@ -33,7 +33,7 @@ Options:
   -s sig	SIG is a signal name
   -n sig	SIG is a signal number
   -l	list the signal names; if arguments follow `-l' they are
-	assumed to be signal numbers for which names should be listed
+		assumed to be signal numbers for which names should be listed
 
 Kill is a shell builtin for two reasons: it allows job IDs to be used
 instead of process IDs, and allows processes to be killed if the limit

builtins/mapfile.def

@@ -31,16 +31,17 @@ from file descriptor FD if the -u option is supplied.  The variable MAPFILE
 is the default ARRAY.
 
 Options:
-  -n count	Copy at most COUNT lines.  If COUNT is 0, all lines are copied.
-  -O origin	Begin assigning to ARRAY at index ORIGIN.  The default index is 0.
-  -s count 	Discard the first COUNT lines read.
-  -t		Remove a trailing newline from each line read.
-  -u fd		Read lines from file descriptor FD instead of the standard input.
-  -C callback	Evaluate CALLBACK each time QUANTUM lines are read.
-  -c quantum	Specify the number of lines read between each call to CALLBACK.
+  -n count	Copy at most COUNT lines.  If COUNT is 0, all lines are copied
+  -O origin	Begin assigning to ARRAY at index ORIGIN.  The default index is 0
+  -s count	Discard the first COUNT lines read
+  -t	Remove a trailing newline from each line read
+  -u fd	Read lines from file descriptor FD instead of the standard input
+  -C callback	Evaluate CALLBACK each time QUANTUM lines are read
+  -c quantum	Specify the number of lines read between each call to
+			CALLBACK
 
 Arguments:
-  ARRAY		Array variable name to use for file data.
+  ARRAY	Array variable name to use for file data
 
 If -C is supplied without -c, the default quantum is 5000.  When
 CALLBACK is evaluated, it is supplied the index of the next array

builtins/printf.def

@@ -40,8 +40,8 @@ printf interprets:
 
   %b	expand backslash escape sequences in the corresponding argument
   %q	quote the argument in a way that can be reused as shell input
-  %(fmt)T output the date-time string resulting from using FMT as a format
-        string for strftime(3)
+  %(fmt)T	output the date-time string resulting from using FMT as a format
+	        string for strftime(3)
 
 The format is re-used as necessary to consume all of the arguments.  If
 there are fewer arguments than the format requires,  extra format

builtins/pushd.def

@@ -32,19 +32,19 @@ directory.  With no arguments, exchanges the top two directories.
 
 Options:
   -n	Suppresses the normal change of directory when adding
-	directories to the stack, so only the stack is manipulated.
+		directories to the stack, so only the stack is manipulated.
 
 Arguments:
   +N	Rotates the stack so that the Nth directory (counting
-	from the left of the list shown by `dirs', starting with
-	zero) is at the top.
+		from the left of the list shown by `dirs', starting with
+		zero) is at the top.
 
   -N	Rotates the stack so that the Nth directory (counting
-	from the right of the list shown by `dirs', starting with
-	zero) is at the top.
+		from the right of the list shown by `dirs', starting with
+		zero) is at the top.
 
   dir	Adds DIR to the directory stack at the top, making it the
-	new current working directory.
+		new current working directory.
 
 The `dirs' builtin displays the directory stack.
 
@@ -64,16 +64,16 @@ the top directory from the stack, and changes to the new top directory.
 
 Options:
   -n	Suppresses the normal change of directory when removing
-	directories from the stack, so only the stack is manipulated.
+		directories from the stack, so only the stack is manipulated.
 
 Arguments:
   +N	Removes the Nth entry counting from the left of the list
-	shown by `dirs', starting with zero.  For example: `popd +0'
-	removes the first directory, `popd +1' the second.
+		shown by `dirs', starting with zero.  For example: `popd +0'
+		removes the first directory, `popd +1' the second.
 
   -N	Removes the Nth entry counting from the right of the list
-	shown by `dirs', starting with zero.  For example: `popd -0'
-	removes the last directory, `popd -1' the next to last.
+		shown by `dirs', starting with zero.  For example: `popd -0'
+		removes the last directory, `popd -1' the next to last.
 
 The `dirs' builtin displays the directory stack.
 
@@ -95,17 +95,19 @@ back up through the list with the `popd' command.
 Options:
   -c	clear the directory stack by deleting all of the elements
   -l	do not print tilde-prefixed versions of directories relative
-	to your home directory
+		to your home directory
   -p	print the directory stack with one entry per line
   -v	print the directory stack with one entry per line prefixed
-	with its position in the stack
+		with its position in the stack
 
 Arguments:
-  +N	Displays the Nth entry counting from the left of the list shown by
-	dirs when invoked without options, starting with zero.
+  +N	Displays the Nth entry counting from the left of the list
+		shown by dirs when invoked without options, starting with
+		zero.
 
-  -N	Displays the Nth entry counting from the right of the list shown by
-	dirs when invoked without options, starting with zero.
+  -N	Displays the Nth entry counting from the right of the list
+		shown by dirs when invoked without options, starting with
+		zero.
 
 Exit Status:
 Returns success unless an invalid option is supplied or an error occurs.

builtins/read.def

@@ -39,25 +39,27 @@ Options:
 		variable ARRAY, starting at zero
   -d delim	continue until the first character of DELIM is read, rather
 		than newline
-  -e		use Readline to obtain the line in an interactive shell
-  -i text	Use TEXT as the initial text for Readline
+  -e	use Readline to obtain the line in an interactive shell
+  -i text	use TEXT as the initial text for Readline
   -n nchars	return after reading NCHARS characters rather than waiting
-		for a newline, but honor a delimiter if fewer than NCHARS
-		characters are read before the delimiter
+		for a newline, but honor a delimiter if fewer than
+		NCHARS characters are read before the delimiter
   -N nchars	return only after reading exactly NCHARS characters, unless
-		EOF is encountered or read times out, ignoring any delimiter
+		EOF is encountered or read times out, ignoring any
+		delimiter
   -p prompt	output the string PROMPT without a trailing newline before
 		attempting to read
-  -r		do not allow backslashes to escape any characters
-  -s		do not echo input coming from a terminal
-  -t timeout	time out and return failure if a complete line of input is
-		not read within TIMEOUT seconds.  The value of the TMOUT
-		variable is the default timeout.  TIMEOUT may be a
-		fractional number.  If TIMEOUT is 0, read returns immediately,
-		without trying to read any data, returning success only if
-		input is available on the specified file descriptor.  The
-		exit status is greater than 128 if the timeout is exceeded
-  -u fd		read from file descriptor FD instead of the standard input
+  -r	do not allow backslashes to escape any characters
+  -s	do not echo input coming from a terminal
+  -t timeout	time out and return failure if a complete line of
+		input is not read within TIMEOUT seconds.  The value of the
+		TMOUT variable is the default timeout.  TIMEOUT may be a
+		fractional number.  If TIMEOUT is 0, read returns
+		immediately, without trying to read any data, returning
+		success only if input is available on the specified
+		file descriptor.  The exit status is greater than 128
+		if the timeout is exceeded
+  -u fd	read from file descriptor FD instead of the standard input
 
 Exit Status:
 The return code is zero, unless end-of-file is encountered, read times out

builtins/set.def

@@ -771,7 +771,7 @@ Options:
   -f	treat each NAME as a shell function
   -v	treat each NAME as a shell variable
   -n	treat each NAME as a name reference and unset the variable itself
-	rather than the variable it references
+		rather than the variable it references
 
 Without options, unset first tries to unset a variable, and if that fails,
 tries to unset a function.

builtins/setattr.def

@@ -94,8 +94,8 @@ Options:
   -a	refer to indexed array variables
   -A	refer to associative array variables
   -f	refer to shell functions
-  -p	display a list of all readonly variables or functions, depending on
-        whether or not the -f option is given
+  -p	display a list of all readonly variables or functions,
+		depending on whether or not the -f option is given
 
 An argument of `--' disables further option processing.
 

builtins/test.def

@@ -83,8 +83,9 @@ String operators:
 Other operators:
 
   -o OPTION      True if the shell option OPTION is enabled.
-  -v VAR	 True if the shell variable VAR is set
-  -R VAR	 True if the shell variable VAR is set and is a name reference.
+  -v VAR         True if the shell variable VAR is set.
+  -R VAR         True if the shell variable VAR is set and is a name
+                 reference.
   ! EXPR         True if expr is false.
   EXPR1 -a EXPR2 True if both expr1 AND expr2 are true.
   EXPR1 -o EXPR2 True if either expr1 OR expr2 is true.

builtins/type.def

@@ -30,18 +30,18 @@ command name.
 
 Options:
   -a	display all locations containing an executable named NAME;
-	includes aliases, builtins, and functions, if and only if
-	the `-p' option is not also used
+		includes aliases, builtins, and functions, if and only if
+		the `-p' option is not also used
   -f	suppress shell function lookup
   -P	force a PATH search for each NAME, even if it is an alias,
-	builtin, or function, and returns the name of the disk file
-	that would be executed
+		builtin, or function, and returns the name of the disk file
+		that would be executed
   -p	returns either the name of the disk file that would be executed,
-	or nothing if `type -t NAME' would not return `file'.
+		or nothing if `type -t NAME' would not return `file'
   -t	output a single word which is one of `alias', `keyword',
-	`function', `builtin', `file' or `', if NAME is an alias, shell
-	reserved word, shell function, shell builtin, disk file, or not 
-	found, respectively
+		`function', `builtin', `file' or `', if NAME is an alias,
+		shell reserved word, shell function, shell builtin, disk file,
+		or not found, respectively
 
 Arguments:
   NAME	Command name to be interpreted.

builtins/ulimit.def

@@ -52,7 +52,7 @@ Options:
   -v	the size of virtual memory
   -x	the maximum number of file locks
   -P	the maximum number of pseudoterminals
-  -T    the maximum number of threads
+  -T	the maximum number of threads
 
 Not all options are available on all platforms.
 

builtins/umask.def

@@ -145,8 +145,12 @@ umask_builtin (list)
 /* Print the umask in a symbolic form.  In the output, a letter is
    printed if the corresponding bit is clear in the umask. */
 static void
+#if defined (__STDC__)
+print_symbolic_umask (mode_t um)
+#else
 print_symbolic_umask (um)
      mode_t um;
+#endif
 {
   char ubits[4], gbits[4], obits[4];		/* u=rwx,g=rwx,o=rwx */
   int i;

builtins/umask.def~

@@ -0,0 +1,312 @@
+This file is umask.def, from which is created umask.c.
+It implements the builtin "umask" in Bash.
+
+Copyright (C) 1987-2009 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 Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Bash is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Bash.  If not, see <http://www.gnu.org/licenses/>.
+
+$PRODUCES umask.c
+
+$BUILTIN umask
+$FUNCTION umask_builtin
+$SHORT_DOC umask [-p] [-S] [mode]
+Display or set file mode mask.
+
+Sets the user file-creation mask to MODE.  If MODE is omitted, prints
+the current value of the mask.
+
+If MODE begins with a digit, it is interpreted as an octal number;
+otherwise it is a symbolic mode string like that accepted by chmod(1).
+
+Options:
+  -p	if MODE is omitted, output in a form that may be reused as input
+  -S	makes the output symbolic; otherwise an octal number is output
+
+Exit Status:
+Returns success unless MODE is invalid or an invalid option is given.
+$END
+
+#include <config.h>
+
+#include "../bashtypes.h"
+#include "filecntl.h"
+#if ! defined(_MINIX) && defined (HAVE_SYS_FILE_H)
+#  include <sys/file.h>
+#endif
+
+#if defined (HAVE_UNISTD_H)
+#include <unistd.h>
+#endif
+
+#include <stdio.h>
+#include <chartypes.h>
+
+#include "../bashintl.h"
+
+#include "../shell.h"
+#include "posixstat.h"
+#include "common.h"
+#include "bashgetopt.h"
+
+/* **************************************************************** */
+/*                                                                  */
+/*                     UMASK Builtin and Helpers                    */
+/*                                                                  */
+/* **************************************************************** */
+
+static void print_symbolic_umask __P((mode_t));
+static int symbolic_umask __P((WORD_LIST *));
+
+/* Set or display the mask used by the system when creating files.  Flag
+   of -S means display the umask in a symbolic mode. */
+int
+umask_builtin (list)
+     WORD_LIST *list;
+{
+  int print_symbolically, opt, umask_value, pflag;
+  mode_t umask_arg;
+
+  print_symbolically = pflag = 0;
+  reset_internal_getopt ();
+  while ((opt = internal_getopt (list, "Sp")) != -1)
+    {
+      switch (opt)
+	{
+	case 'S':
+	  print_symbolically++;
+	  break;
+	case 'p':
+	  pflag++;
+	  break;
+	default:
+	  builtin_usage ();
+	  return (EX_USAGE);
+	}
+    }
+
+  list = loptend;
+
+  if (list)
+    {
+      if (DIGIT (*list->word->word))
+	{
+	  umask_value = read_octal (list->word->word);
+
+	  /* Note that other shells just let you set the umask to zero
+	     by specifying a number out of range.  This is a problem
+	     with those shells.  We don't change the umask if the input
+	     is lousy. */
+	  if (umask_value == -1)
+	    {
+	      sh_erange (list->word->word, _("octal number"));
+	      return (EXECUTION_FAILURE);
+	    }
+	}
+      else
+	{
+	  umask_value = symbolic_umask (list);
+	  if (umask_value == -1)
+	    return (EXECUTION_FAILURE);
+	}
+      umask_arg = (mode_t)umask_value;
+      umask (umask_arg);
+      if (print_symbolically)
+	print_symbolic_umask (umask_arg);
+    }
+  else				/* Display the UMASK for this user. */
+    {
+      umask_arg = umask (022);
+      umask (umask_arg);
+
+      if (pflag)
+	printf ("umask%s ", (print_symbolically ? " -S" : ""));
+      if (print_symbolically)
+	print_symbolic_umask (umask_arg);
+      else
+	printf ("%04lo\n", (unsigned long)umask_arg);
+    }
+
+  return (sh_chkwrite (EXECUTION_SUCCESS));
+}
+
+/* Print the umask in a symbolic form.  In the output, a letter is
+   printed if the corresponding bit is clear in the umask. */
+static void
+print_symbolic_umask (um)
+     mode_t um;
+{
+  char ubits[4], gbits[4], obits[4];		/* u=rwx,g=rwx,o=rwx */
+  int i;
+
+  i = 0;
+  if ((um & S_IRUSR) == 0)
+    ubits[i++] = 'r';
+  if ((um & S_IWUSR) == 0)
+    ubits[i++] = 'w';
+  if ((um & S_IXUSR) == 0)
+    ubits[i++] = 'x';
+  ubits[i] = '\0';
+
+  i = 0;
+  if ((um & S_IRGRP) == 0)
+    gbits[i++] = 'r';
+  if ((um & S_IWGRP) == 0)
+    gbits[i++] = 'w';
+  if ((um & S_IXGRP) == 0)
+    gbits[i++] = 'x';
+  gbits[i] = '\0';
+
+  i = 0;
+  if ((um & S_IROTH) == 0)
+    obits[i++] = 'r';
+  if ((um & S_IWOTH) == 0)
+    obits[i++] = 'w';
+  if ((um & S_IXOTH) == 0)
+    obits[i++] = 'x';
+  obits[i] = '\0';
+
+  printf ("u=%s,g=%s,o=%s\n", ubits, gbits, obits);
+}
+
+int
+parse_symbolic_mode (mode, initial_bits)
+     char *mode;
+     int initial_bits;
+{
+  int who, op, perm, bits, c;
+  char *s;
+
+  for (s = mode, bits = initial_bits;;)
+    {
+      who = op = perm = 0;
+
+      /* Parse the `who' portion of the symbolic mode clause. */
+      while (member (*s, "agou"))
+	{
+	  switch (c = *s++)
+	    {
+	    case 'u':
+	      who |= S_IRWXU;
+	      continue;
+	    case 'g':
+	      who |= S_IRWXG;
+	      continue;
+	    case 'o':
+	      who |= S_IRWXO;
+	      continue;
+	    case 'a':
+	      who |= S_IRWXU | S_IRWXG | S_IRWXO;
+	      continue;
+	    default:
+	      break;
+	    }
+	}
+
+      /* The operation is now sitting in *s. */
+      op = *s++;
+      switch (op)
+	{
+	case '+':
+	case '-':
+	case '=':
+	  break;
+	default:
+	  builtin_error (_("`%c': invalid symbolic mode operator"), op);
+	  return (-1);
+	}
+
+      /* Parse out the `perm' section of the symbolic mode clause. */
+      while (member (*s, "rwx"))
+	{
+	  c = *s++;
+
+	  switch (c)
+	    {
+	    case 'r':
+	      perm |= S_IRUGO;
+	      break;
+	    case 'w':
+	      perm |= S_IWUGO;
+	      break;
+	    case 'x':
+	      perm |= S_IXUGO;
+	      break;
+	    }
+	}
+
+      /* Now perform the operation or return an error for a
+	 bad permission string. */
+      if (!*s || *s == ',')
+	{
+	  if (who)
+	    perm &= who;
+
+	  switch (op)
+	    {
+	    case '+':
+	      bits |= perm;
+	      break;
+	    case '-':
+	      bits &= ~perm;
+	      break;
+	    case '=':
+	      if (who == 0)
+		who = S_IRWXU | S_IRWXG | S_IRWXO;
+	      bits &= ~who;
+	      bits |= perm;
+	      break;
+
+	    /* No other values are possible. */
+	    }
+
+	  if (*s == '\0')
+	    break;
+	  else
+	    s++;	/* skip past ',' */
+	}
+      else
+	{
+	  builtin_error (_("`%c': invalid symbolic mode character"), *s);
+	  return (-1);
+	}
+    }
+
+  return (bits);
+}
+
+/* Set the umask from a symbolic mode string similar to that accepted
+   by chmod.  If the -S argument is given, then print the umask in a
+   symbolic form. */
+static int
+symbolic_umask (list)
+     WORD_LIST *list;
+{
+  int um, bits;
+
+  /* Get the initial umask.  Don't change it yet. */
+  um = umask (022);
+  umask (um);
+
+  /* All work is done with the complement of the umask -- it's
+     more intuitive and easier to deal with.  It is complemented
+     again before being returned. */
+  bits = parse_symbolic_mode (list->word->word, ~um & 0777);
+  if (bits == -1)
+    return (-1);
+
+  um = ~bits & 0777;
+  return (um);
+}

builtins/wait.def

@@ -1,7 +1,7 @@
 This file is wait.def, from which is created wait.c.
 It implements the builtin "wait" in Bash.
 
-Copyright (C) 1987-2013 Free Software Foundation, Inc.
+Copyright (C) 1987-2015 Free Software Foundation, Inc.
 
 This file is part of GNU Bash, the Bourne Again SHell.
 
@@ -131,7 +131,7 @@ wait_builtin (list)
 
      We handle SIGINT here; it's the only one that needs to be treated
      specially (I think), since it's handled specially in {no,}jobs.c. */
-  code = setjmp (wait_intr_buf);
+  code = setjmp_sigs (wait_intr_buf);
   if (code)
     {
       last_command_exit_signal = wait_signal_received;

builtins/wait.def~

@@ -0,0 +1,218 @@
+This file is wait.def, from which is created wait.c.
+It implements the builtin "wait" in Bash.
+
+Copyright (C) 1987-2013 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 Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Bash is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Bash.  If not, see <http://www.gnu.org/licenses/>.
+
+$BUILTIN wait
+$FUNCTION wait_builtin
+$DEPENDS_ON JOB_CONTROL
+$PRODUCES wait.c
+$SHORT_DOC wait [-n] [id ...]
+Wait for job completion and return exit status.
+
+Waits for each process identified by an ID, which may be a process ID or a
+job specification, and reports its termination status.  If ID is not
+given, waits for all currently active child processes, and the return
+status is zero.  If ID is a a job specification, waits for all processes
+in that job's pipeline.
+
+If the -n option is supplied, waits for the next job to terminate and
+returns its exit status.
+
+Exit Status:
+Returns the status of the last ID; fails if ID is invalid or an invalid
+option is given.
+$END
+
+$BUILTIN wait
+$FUNCTION wait_builtin
+$DEPENDS_ON !JOB_CONTROL
+$SHORT_DOC wait [pid ...]
+Wait for process completion and return exit status.
+
+Waits for each process specified by a PID and reports its termination status.
+If PID is not given, waits for all currently active child processes,
+and the return status is zero.  PID must be a process ID.
+
+Exit Status:
+Returns the status of the last PID; fails if PID is invalid or an invalid
+option is given.
+$END
+
+#include <config.h>
+
+#include "../bashtypes.h"
+#include <signal.h>
+
+#if defined (HAVE_UNISTD_H)
+#  include <unistd.h>
+#endif
+
+#include <chartypes.h>
+
+#include "../bashansi.h"
+
+#include "../shell.h"
+#include "../jobs.h"
+#include "common.h"
+#include "bashgetopt.h"
+
+extern int wait_signal_received;
+extern int last_command_exit_signal;
+
+procenv_t wait_intr_buf;
+
+/* Wait for the pid in LIST to stop or die.  If no arguments are given, then
+   wait for all of the active background processes of the shell and return
+   0.  If a list of pids or job specs are given, return the exit status of
+   the last one waited for. */
+
+#define WAIT_RETURN(s) \
+  do \
+    { \
+      interrupt_immediately = old_interrupt_immediately;\
+      wait_signal_received = 0; \
+      return (s);\
+    } \
+  while (0)
+
+int
+wait_builtin (list)
+     WORD_LIST *list;
+{
+  int status, code, opt, nflag;
+  volatile int old_interrupt_immediately;
+
+  USE_VAR(list);
+
+  nflag = 0;
+  reset_internal_getopt ();
+  while ((opt = internal_getopt (list, "n")) != -1)
+    {
+      switch (opt)
+	{
+#if defined (JOB_CONTROL)
+	case 'n':
+	  nflag = 1;
+	  break;
+#endif
+	default:
+	  builtin_usage ();
+	  return (EX_USAGE);
+	}
+    }
+  list = loptend;
+
+  old_interrupt_immediately = interrupt_immediately;
+#if 0
+  interrupt_immediately++;
+#endif
+
+  /* POSIX.2 says:  When the shell is waiting (by means of the wait utility)
+     for asynchronous commands to complete, the reception of a signal for
+     which a trap has been set shall cause the wait utility to return
+     immediately with an exit status greater than 128, after which the trap
+     associated with the signal shall be taken.
+
+     We handle SIGINT here; it's the only one that needs to be treated
+     specially (I think), since it's handled specially in {no,}jobs.c. */
+  code = setjmp_sigs (wait_intr_buf);
+  if (code)
+    {
+      last_command_exit_signal = wait_signal_received;
+      status = 128 + wait_signal_received;
+      WAIT_RETURN (status);
+    }
+
+  /* We support jobs or pids.
+     wait <pid-or-job> [pid-or-job ...] */
+
+#if defined (JOB_CONTROL)
+  if (nflag)
+    {
+      status = wait_for_any_job ();
+      if (status < 0)
+	status = 127;
+      WAIT_RETURN (status);
+    }
+#endif
+      
+  /* But wait without any arguments means to wait for all of the shell's
+     currently active background processes. */
+  if (list == 0)
+    {
+      wait_for_background_pids ();
+      WAIT_RETURN (EXECUTION_SUCCESS);
+    }
+
+  status = EXECUTION_SUCCESS;
+  while (list)
+    {
+      pid_t pid;
+      char *w;
+      intmax_t pid_value;
+
+      w = list->word->word;
+      if (DIGIT (*w))
+	{
+	  if (legal_number (w, &pid_value) && pid_value == (pid_t)pid_value)
+	    {
+	      pid = (pid_t)pid_value;
+	      status = wait_for_single_pid (pid);
+	    }
+	  else
+	    {
+	      sh_badpid (w);
+	      WAIT_RETURN (EXECUTION_FAILURE);
+	    }
+	}
+#if defined (JOB_CONTROL)
+      else if (*w && *w == '%')
+	/* Must be a job spec.  Check it out. */
+	{
+	  int job;
+	  sigset_t set, oset;
+
+	  BLOCK_CHILD (set, oset);
+	  job = get_job_spec (list);
+
+	  if (INVALID_JOB (job))
+	    {
+	      if (job != DUP_JOB)
+		sh_badjob (list->word->word);
+	      UNBLOCK_CHILD (oset);
+	      status = 127;	/* As per Posix.2, section 4.70.2 */
+	      list = list->next;
+	      continue;
+	    }
+
+	  /* Job spec used.  Wait for the last pid in the pipeline. */
+	  UNBLOCK_CHILD (oset);
+	  status = wait_for_job (job);
+	}
+#endif /* JOB_CONTROL */
+      else
+	{
+	  sh_badpid (w);
+	  status = EXECUTION_FAILURE;
+	}
+      list = list->next;
+    }
+
+  WAIT_RETURN (status);
+}