commit bash-20161230 snapshot

builtins/Makefile.in

@@ -1,6 +1,6 @@
 # This Makefile for building libbuiltins.a is in -*- text -*- for Emacs.
 #
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
 
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -331,7 +331,7 @@ bashgetopt.o: ../pathnames.h $(topdir)/externs.h $(srcdir)/common.h
 bashgetopt.o: $(BASHINCDIR)/chartypes.h
 common.o: $(topdir)/bashtypes.h $(BASHINCDIR)/posixstat.h $(topdir)/bashansi.h $(BASHINCDIR)/ansi_stdlib.h
 common.o: $(topdir)/shell.h $(topdir)/syntax.h ../config.h $(topdir)/bashjmp.h $(BASHINCDIR)/posixjmp.h
-common.o: $(topdir)/sig.h $(topdir)/command.h
+common.o: $(topdir)/sig.h $(topdir)/command.h $(topdir)/parser.h
 common.o: $(topdir)/general.h $(topdir)/xmalloc.h $(BASHINCDIR)/stdc.h $(BASHINCDIR)/memalloc.h
 common.o: $(topdir)/variables.h $(topdir)/conftypes.h $(topdir)/input.h
 common.o: $(topdir)/siglist.h $(topdir)/bashhist.h $(topdir)/quit.h
@@ -347,7 +347,7 @@ evalfile.o: $(topdir)/command.h $(topdir)/general.h $(topdir)/xmalloc.h $(topdir
 evalfile.o: $(topdir)/variables.h $(topdir)/conftypes.h $(topdir)/quit.h $(BASHINCDIR)/maxpath.h
 evalfile.o: $(topdir)/unwind_prot.h $(topdir)/dispose_cmd.h
 evalfile.o: $(topdir)/make_cmd.h $(topdir)/subst.h $(topdir)/sig.h
-evalfile.o: ../pathnames.h $(topdir)/externs.h
+evalfile.o: ../pathnames.h $(topdir)/externs.h $(topdir)/parser.h
 evalfile.o: $(topdir)/jobs.h $(topdir)/builtins.h $(topdir)/flags.h
 evalfile.o: $(topdir)/input.h $(topdir)/execute_cmd.h
 evalfile.o: $(topdir)/bashhist.h $(srcdir)/common.h
@@ -386,19 +386,18 @@ bind.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h $(topdir)/
 bind.o: $(topdir)/subst.h $(topdir)/externs.h $(srcdir)/bashgetopt.h
 bind.o: $(topdir)/general.h $(topdir)/xmalloc.h $(BASHINCDIR)/maxpath.h $(topdir)/bashline.h
 bind.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h $(topdir)/conftypes.h 
-bind.o: ../pathnames.h
 break.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h 
 break.o: $(topdir)/error.h $(topdir)/general.h $(topdir)/xmalloc.h
 break.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h $(topdir)/sig.h
 break.o: $(topdir)/subst.h $(topdir)/externs.h $(BASHINCDIR)/maxpath.h
 break.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h $(topdir)/conftypes.h
-break.o: ../pathnames.h
+break.o: ../pathnames.h $(topdir)/execute_cmd.h
 builtin.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
 builtin.o: $(topdir)/error.h $(topdir)/general.h $(topdir)/xmalloc.h $(topdir)/externs.h
 builtin.o: $(topdir)/quit.h $(srcdir)/common.h $(BASHINCDIR)/maxpath.h $(topdir)/sig.h
 builtin.o: $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h $(topdir)/subst.h
 builtin.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h $(topdir)/conftypes.h 
-builtin.o: $(srcdir)/bashgetopt.h ../pathnames.h
+builtin.o: $(srcdir)/bashgetopt.h ../pathnames.h $(topdir)/execute_cmd.h
 caller.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h $(topdir)/error.h
 caller.o: $(topdir)/general.h $(topdir)/xmalloc.h $(topdir)/quit.h $(topdir)/dispose_cmd.h
 caller.o: $(topdir)/make_cmd.h $(topdir)/subst.h $(topdir)/externs.h $(topdir)/sig.h
@@ -457,10 +456,11 @@ exit.o: $(topdir)/error.h $(topdir)/general.h $(topdir)/xmalloc.h
 exit.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h $(topdir)/sig.h
 exit.o: $(topdir)/subst.h $(topdir)/externs.h  $(topdir)/jobs.h
 exit.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h $(topdir)/conftypes.h
+exit.o: $(topdir)/execute_cmd.h
 exit.o: $(BASHINCDIR)/maxpath.h ./builtext.h ../pathnames.h
 fc.o: $(topdir)/bashtypes.h $(BASHINCDIR)/posixstat.h
 fc.o: $(topdir)/builtins.h $(topdir)/command.h $(srcdir)/bashgetopt.h
-fc.o: $(topdir)/bashhist.h
+fc.o: $(topdir)/bashhist.h $(topdir)/parser.h
 fc.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h $(topdir)/error.h
 fc.o: $(topdir)/general.h $(topdir)/xmalloc.h $(BASHINCDIR)/maxpath.h
 fc.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h $(topdir)/sig.h
@@ -474,30 +474,34 @@ fg_bg.o: $(topdir)/error.h $(topdir)/general.h $(topdir)/xmalloc.h
 fg_bg.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h $(topdir)/sig.h
 fg_bg.o: $(topdir)/subst.h $(topdir)/externs.h $(BASHINCDIR)/maxpath.h
 fg_bg.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h $(topdir)/conftypes.h
+fg_bg.o: $(topdir)/execute_cmd.h
 fg_bg.o: $(topdir)/jobs.h ../pathnames.h
 getopts.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
 getopts.o: $(topdir)/error.h $(topdir)/general.h $(topdir)/xmalloc.h
 getopts.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h $(topdir)/sig.h
 getopts.o: $(topdir)/subst.h $(topdir)/externs.h $(BASHINCDIR)/maxpath.h
 getopts.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h $(topdir)/conftypes.h
+getopts.o: $(topdir)/execute_cmd.h
 getopts.o: ../pathnames.h
 hash.o: $(topdir)/builtins.h $(topdir)/command.h $(topdir)/quit.h
 hash.o: $(topdir)/findcmd.h $(topdir)/hashlib.h $(topdir)/sig.h
 hash.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
 hash.o: $(topdir)/error.h $(topdir)/general.h $(topdir)/xmalloc.h
-hash.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h $(topdir)/conftypes.h
+hash.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h
+hash.o: $(topdir)/conftypes.h $(topdir)/execute_cmd.h
 hash.o: $(srcdir)/common.h $(BASHINCDIR)/maxpath.h ../pathnames.h
 help.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
 help.o: $(topdir)/error.h $(topdir)/general.h $(topdir)/xmalloc.h
 help.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
 help.o: $(topdir)/subst.h $(topdir)/externs.h $(BASHINCDIR)/maxpath.h
-help.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h $(topdir)/conftypes.h
+help.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h
+help.o: $(topdir)/conftypes.h $(topdir)/execute_cmd.h
 help.o: ${srcdir}/common.h $(topdir)/sig.h ../pathnames.h
 history.o: $(topdir)/bashtypes.h
 history.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
 history.o: $(topdir)/error.h $(topdir)/general.h $(topdir)/xmalloc.h
 history.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
-history.o: $(topdir)/subst.h $(topdir)/externs.h $(topdir)/sig.h
+history.o: $(topdir)/subst.h $(topdir)/externs.h $(topdir)/sig.h  $(topdir)/parser.h
 history.o: ${BASHINCDIR}/filecntl.h $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h
 history.o: $(topdir)/variables.h $(topdir)/conftypes.h $(topdir)/bashhist.h $(BASHINCDIR)/maxpath.h
 history.o: ../pathnames.h
@@ -552,20 +556,22 @@ return.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
 return.o: $(topdir)/error.h $(topdir)/general.h $(topdir)/xmalloc.h
 return.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h $(topdir)/sig.h
 return.o: $(topdir)/subst.h $(topdir)/externs.h $(BASHINCDIR)/maxpath.h
-return.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h $(topdir)/conftypes.h
+return.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h
+return.o: $(topdir)/conftypes.h $(topdir)/execute_cmd.h
 return.o: ../pathnames.h
 set.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
 set.o: $(topdir)/general.h $(topdir)/xmalloc.h $(topdir)/subst.h $(topdir)/externs.h
 set.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
 set.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h $(topdir)/conftypes.h
 set.o: $(BASHINCDIR)/maxpath.h $(topdir)/error.h $(topdir)/sig.h
-set.o: $(topdir)/arrayfunc.h ../pathnames.h
+set.o: $(topdir)/arrayfunc.h ../pathnames.h $(topdir)/parser.h
 setattr.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
 setattr.o: $(topdir)/error.h $(topdir)/general.h $(topdir)/xmalloc.h $(BASHINCDIR)/maxpath.h
 setattr.o: $(topdir)/quit.h $(srcdir)/common.h $(srcdir)/bashgetopt.h
 setattr.o: $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h $(topdir)/subst.h
 setattr.o: $(topdir)/externs.h $(topdir)/flags.h $(topdir)/sig.h
-setattr.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h $(topdir)/conftypes.h 
+setattr.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h
+setattr.o: $(topdir)/conftypes.h $(topdir)/execute_cmd.h
 setattr.o: $(topdir)/arrayfunc.h ../pathnames.h
 shift.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
 shift.o: $(topdir)/error.h $(topdir)/general.h $(topdir)/xmalloc.h
@@ -586,6 +592,7 @@ source.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h $(topdir
 source.o: $(topdir)/subst.h $(topdir)/externs.h $(BASHINCDIR)/maxpath.h
 source.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h $(topdir)/conftypes.h
 source.o: $(srcdir)/bashgetopt.h $(topdir)/flags.h $(topdir)/trap.h
+source.o: $(topdir)/execute_cmd.h
 source.o: ../pathnames.h
 suspend.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
 suspend.o: $(topdir)/error.h $(topdir)/general.h $(topdir)/xmalloc.h
@@ -598,7 +605,7 @@ test.o: $(topdir)/error.h $(topdir)/general.h $(topdir)/xmalloc.h
 test.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h $(topdir)/sig.h
 test.o: $(topdir)/subst.h $(topdir)/externs.h $(BASHINCDIR)/maxpath.h
 test.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h $(topdir)/conftypes.h
-test.o: $(topdir)/test.h ../pathnames.h
+test.o: $(topdir)/execute_cmd.h $(topdir)/test.h ../pathnames.h
 times.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
 times.o: $(topdir)/error.h $(topdir)/general.h $(topdir)/xmalloc.h
 times.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h $(topdir)/sig.h
@@ -615,6 +622,7 @@ type.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
 type.o: $(topdir)/error.h $(topdir)/general.h $(topdir)/xmalloc.h
 type.o: $(topdir)/quit.h $(srcdir)/common.h $(BASHINCDIR)/maxpath.h $(topdir)/sig.h
 type.o: $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h $(topdir)/subst.h
+type.o: $(topdir)/execute_cmd.h $(topdir)/parser.h
 type.o: $(topdir)/externs.h $(topdir)/hashcmd.h ../pathnames.h
 type.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h $(topdir)/conftypes.h 
 ulimit.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
@@ -634,7 +642,7 @@ wait.o: $(topdir)/error.h $(topdir)/general.h $(topdir)/xmalloc.h
 wait.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
 wait.o: $(topdir)/subst.h $(topdir)/externs.h $(BASHINCDIR)/maxpath.h
 wait.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h $(topdir)/conftypes.h
-wait.o: $(topdir)/jobs.h $(topdir)/sig.h
+wait.o: $(topdir)/jobs.h $(topdir)/sig.h $(topdir)/execute_cmd.h
 wait.o: $(BASHINCDIR)/chartypes.h ../pathnames.h
 
 complete.o: ../config.h ../pathnames.h

builtins/alias.def

@@ -65,8 +65,6 @@ $END
 
 static void print_alias __P((alias_t *, int));
 
-extern int posixly_correct;
-
 /* Hack the alias command in a Korn shell way. */
 int
 alias_builtin (list)

builtins/bind.def

@@ -89,8 +89,6 @@ extern int errno;
 static int query_bindings __P((char *));
 static int unbind_command __P((char *));
 
-extern int no_line_editing;
-
 #define BIND_RETURN(x)  do { return_code = x; goto bind_exit; } while (0)
 
 #define LFLAG	0x0001

builtins/break.def

@@ -43,11 +43,9 @@ $END
 #include "../bashintl.h"
 
 #include "../shell.h"
+#include "../execute_cmd.h"
 #include "common.h"
 
-extern char *this_command_name;
-extern int posixly_correct;
-
 static int check_loop_level __P((void));
 
 /* The depth of while's and until's. */

builtins/builtin.def

@@ -43,11 +43,10 @@ $END
 #endif
 
 #include "../shell.h"
+#include "../execute_cmd.h"
 #include "common.h"
 #include "bashgetopt.h"
 
-extern char *this_command_name;
-
 /* Run the command mentioned in list directly, without going through the
    normal alias/function/builtin/filename lookup process. */
 int

builtins/cd.def

@@ -54,8 +54,6 @@ $PRODUCES cd.c
 extern int errno;
 #endif /* !errno */
 
-extern int posixly_correct;
-extern int array_needs_making;
 extern const char * const bash_getcwd_errstr;
 
 static int bindpwd __P((int));

builtins/command.def

@@ -60,8 +60,6 @@ $END
 extern size_t confstr __P((int, char *, size_t));
 #endif
 
-extern int subshell_environment;
-
 static void restore_path __P((char *));
 
 /* Run the commands mentioned in LIST without paying attention to shell

builtins/common.c

@@ -1,6 +1,6 @@
 /* common.c - utility functions for all builtins */
 
-/* Copyright (C) 1987-2016 Free Software Foundation, Inc.
+/* Copyright (C) 1987-2017 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 
@@ -49,6 +49,7 @@
 #include "../shell.h"
 #include "maxpath.h"
 #include "../flags.h"
+#include "../parser.h"
 #include "../jobs.h"
 #include "../builtins.h"
 #include "../input.h"
@@ -67,13 +68,6 @@
 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. */

builtins/common.h

@@ -212,4 +212,29 @@ extern int force_execute_file __P((const char *, int));
 extern int source_file __P((const char *, int));
 extern int fc_execute_file __P((const char *));
 
+/* variables from common.c */
+extern sh_builtin_func_t *this_shell_builtin;
+extern sh_builtin_func_t *last_shell_builtin;
+
+/* variables from evalfile.c */
+extern int sourcelevel;
+
+/* variables from evalstring.c */
+extern int parse_and_execute_level;
+
+/* variables from break.def/continue.def */
+extern int breaking;
+extern int continuing;
+extern int loop_level;
+
+/* variables from read.def */
+extern int sigalrm_seen;
+
+/* variables from source.def */
+extern int source_searches_cwd;
+extern int source_uses_path;
+
+/* variables from wait.def */
+extern int wait_intr_flag;
+
 #endif /* !__COMMON_H */

builtins/declare.def

@@ -88,9 +88,6 @@ $END
 #include "builtext.h"
 #include "bashgetopt.h"
 
-extern int array_needs_making;
-extern int posixly_correct;
-
 static int declare_internal __P((register WORD_LIST *, int));
 
 /* Declare or change variable attributes. */
@@ -303,7 +300,11 @@ declare_internal (list, local_var)
 
       name = savestring (list->word->word);
       wflags = list->word->flags;
+#if defined (ARRAY_VARS)
       assoc_noexpand = assoc_expand_once && (wflags & W_ASSIGNMENT);
+#else
+      assoc_noexpand = 0;
+#endif
       offset = assignment (name, assoc_noexpand ? 2 : 0);
       aflags = 0;
       created_var = 0;

builtins/echo.def

@@ -99,8 +99,6 @@ int xpg_echo = 1;
 int xpg_echo = 0;
 #endif /* DEFAULT_ECHO_TO_XPG */
 
-extern int posixly_correct;
-
 /* Print the words in LIST to standard output.  If the first word is
    `-n', then don't print a trailing newline.  We also support the
    echo syntax from Version 9 Unix systems. */

builtins/evalfile.c

@@ -1,6 +1,6 @@
 /* evalfile.c - read and evaluate commands from a file or file descriptor */
 
-/* Copyright (C) 1996-2015 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2017 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 
@@ -36,6 +36,7 @@
 #include "../bashintl.h"
 
 #include "../shell.h"
+#include "../parser.h"
 #include "../jobs.h"
 #include "../builtins.h"
 #include "../flags.h"
@@ -68,13 +69,6 @@ extern int errno;
 #define FEVAL_REGFILE		0x080
 #define FEVAL_NOPUSHARGS	0x100
 
-extern int posixly_correct;
-extern int indirection_level, subshell_environment;
-extern int return_catch_flag, return_catch_value;
-extern int last_command_exit_value;
-extern int executing_command_builtin;
-extern int current_token;		/* parse.y */
-
 /* How many `levels' of sourced files we have. */
 int sourcelevel = 0;
 

builtins/evalstring.c

@@ -1,6 +1,6 @@
 /* evalstring.c - evaluate a string as one or more shell commands. */
 
-/* Copyright (C) 1996-2015 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2017 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 
@@ -39,6 +39,7 @@
 #include "../jobs.h"
 #include "../builtins.h"
 #include "../flags.h"
+#include "../parser.h"
 #include "../input.h"
 #include "../execute_cmd.h"
 #include "../redir.h"
@@ -60,19 +61,6 @@ extern int errno;
 
 #define IS_BUILTIN(s)	(builtin_address_internal(s, 0) != (struct builtin *)NULL)
 
-extern int indirection_level, subshell_environment;
-extern int line_number, line_number_for_err_trap;
-extern int current_token, shell_eof_token;
-extern int last_command_exit_value;
-extern int running_trap;
-extern int loop_level;
-extern int executing_list;
-extern int comsub_ignore_return;
-extern int posixly_correct;
-extern int return_catch_flag, return_catch_value;
-extern sh_builtin_func_t *this_shell_builtin;
-extern char *the_printed_command_except_trap;
-
 int parse_and_execute_level = 0;
 
 static int cat_file __P((REDIRECT *));

builtins/exec.def

@@ -74,7 +74,6 @@ $END
 extern int errno;
 #endif /* !errno */
 
-extern int subshell_environment;
 extern REDIRECT *redirection_undo_list;
 extern char *exec_argv0;
 

builtins/exit.def

@@ -41,17 +41,14 @@ $END
 #include "../bashintl.h"
 
 #include "../shell.h"
+#include "../execute_cmd.h"
 #include "../jobs.h"
+#include "../trap.h"
 
 #include "common.h"
 #include "builtext.h"	/* for jobs_builtin */
 
 extern int check_jobs_at_exit;
-extern int last_command_exit_value;
-extern int running_trap, trap_saved_exit_value;
-extern int subshell_environment;
-extern sh_builtin_func_t *this_shell_builtin;
-extern sh_builtin_func_t *last_shell_builtin;
 
 static int exit_or_logout __P((WORD_LIST *));
 static int sourced_logout;

builtins/fc.def

@@ -75,6 +75,7 @@ $END
 #include "../shell.h"
 #include "../builtins.h"
 #include "../flags.h"
+#include "../parser.h"
 #include "../bashhist.h"
 #include "maxpath.h"
 #include <readline/history.h>
@@ -85,11 +86,6 @@ $END
 extern int errno;
 #endif /* !errno */
 
-extern int current_command_line_count;
-extern int literal_history;
-extern int posixly_correct;
-extern int subshell_environment, interactive_shell;
-
 extern int unlink __P((const char *));
 
 extern FILE *sh_mktmpfp __P((char *, int, char **));

builtins/fg_bg.def

@@ -46,13 +46,12 @@ $END
 #include "../bashintl.h"
 
 #include "../shell.h"
+#include "../execute_cmd.h"
 #include "../jobs.h"
 #include "common.h"
 #include "bashgetopt.h"
 
 #if defined (JOB_CONTROL)
-extern char *this_command_name;
-
 static int fg_bg __P((WORD_LIST *, int));
 
 /* How to bring a job into the foreground. */

builtins/getopts.def

@@ -77,6 +77,7 @@ $END
 #include "../bashintl.h"
 
 #include "../shell.h"
+#include "../execute_cmd.h"
 #include "common.h"
 #include "bashgetopt.h"
 #include "getopt.h"
@@ -85,8 +86,6 @@ $END
 #define G_INVALID_OPT	-2
 #define G_ARG_MISSING	-3
 
-extern char *this_command_name;
-
 static int getopts_unbind_variable __P((char *));
 static int getopts_bind_variable __P((char *, char *));
 static int dogetopts __P((int, char **));

builtins/hash.def

@@ -61,15 +61,14 @@ $END
 
 #include "../shell.h"
 #include "../builtins.h"
+#include "../execute_cmd.h"
 #include "../flags.h"
 #include "../findcmd.h"
 #include "../hashcmd.h"
 #include "common.h"
 #include "bashgetopt.h"
 
-extern int posixly_correct;
 extern int dot_found_in_search;
-extern char *this_command_name;
 
 static int add_hashed_command __P((char *, int));
 static int print_hash_info __P((BUCKET_CONTENTS *));

builtins/help.def

@@ -64,6 +64,7 @@ $END
 
 #include "../shell.h"
 #include "../builtins.h"
+#include "../execute_cmd.h"
 #include "../pathexp.h"
 #include "common.h"
 #include "bashgetopt.h"
@@ -78,9 +79,6 @@ extern int errno;
 extern const char * const bash_copyright;
 extern const char * const bash_license;
 
-extern char *this_command_name;
-extern struct builtin *current_builtin;
-
 static void show_builtin_command_help __P((void));
 static int open_helpfile __P((char *));
 static void show_desc __P((char *, int));
@@ -132,7 +130,7 @@ help_builtin (list)
 
   if (glob_pattern_p (list->word->word))
     {
-      printf (ngettext ("Shell commands matching keyword `", "Shell commands matching keywords `", (list->next ? 2 : 1)));
+      printf ("%s", ngettext ("Shell commands matching keyword `", "Shell commands matching keywords `", (list->next ? 2 : 1)));
       print_word_list (list, ", ");
       printf ("'\n\n");
     }

builtins/history.def

@@ -75,6 +75,7 @@ $END
 #include "../bashintl.h"
 
 #include "../shell.h"
+#include "../parser.h"
 #include "../bashhist.h"
 #include <readline/history.h>
 #include "bashgetopt.h"
@@ -84,9 +85,6 @@ $END
 extern int errno;
 #endif
 
-extern int current_command_line_count;
-extern int force_append_history;	/* shopt -s histappend */
-
 static char *histtime __P((HIST_ENTRY *, const char *));
 static int display_history __P((WORD_LIST *));
 static void push_history __P((WORD_LIST *));

builtins/kill.def

@@ -70,8 +70,6 @@ $END
 extern int errno;
 #endif /* !errno */
 
-extern int posixly_correct;
-
 static void kill_error __P((pid_t, int));
 
 #if !defined (CONTINUE_AFTER_KILL_ERROR)

builtins/read.def

@@ -112,8 +112,6 @@ $END
 extern int errno;
 #endif
 
-extern int posixly_correct;
-
 struct ttsave
 {
   int fd;

builtins/return.def

@@ -46,13 +46,10 @@ $END
 #include "../bashintl.h"
 
 #include "../shell.h"
+#include "../execute_cmd.h"
 #include "common.h"
 #include "bashgetopt.h"
 
-extern int last_command_exit_value;
-extern int subshell_environment;
-extern int return_catch_flag, return_catch_value;
-
 /* If we are executing a user-defined function then exit with the value
    specified as an argument.  if no argument is given, then the last
    exit status is used. */

builtins/set.def

@@ -35,6 +35,7 @@ $PRODUCES set.c
 #include "../bashintl.h"
 
 #include "../shell.h"
+#include "../parser.h"
 #include "../flags.h"
 #include "common.h"
 #include "bashgetopt.h"
@@ -49,14 +50,6 @@ $PRODUCES set.c
 #  include "../bashhist.h"
 #endif
 
-extern int posixly_correct, ignoreeof, eof_encountered_limit;
-#if defined (HISTORY)
-extern int dont_save_function_defs;
-#endif
-#if defined (READLINE)
-extern int no_line_editing;
-#endif /* READLINE */
-
 $BUILTIN set
 $FUNCTION set_builtin
 $SHORT_DOC set [-abefhkmnptuvxBCHP] [-o option-name] [--] [arg ...]

builtins/setattr.def

@@ -34,13 +34,11 @@ $PRODUCES setattr.c
 #include "../bashintl.h"
 
 #include "../shell.h"
+#include "../execute_cmd.h"
 #include "../flags.h"
 #include "common.h"
 #include "bashgetopt.h"
 
-extern int posixly_correct;
-extern int array_needs_making;
-extern char *this_command_name;
 extern sh_builtin_func_t *this_shell_builtin;
 
 #ifdef ARRAY_VARS

builtins/shopt.def

@@ -110,16 +110,13 @@ extern int enable_hostname_completion __P((int));
 extern int prog_completion_enabled;
 #endif
 
-#if defined (RESTRICTED_SHELL)
-extern char *shell_name;
-#endif
-
 #if defined (DEBUGGER)
 extern int debugging_mode;
 #endif
 
 #if defined (ARRAY_VARS)
 extern int assoc_expand_once;
+extern int array_expand_once;
 #endif
 
 static void shopt_error __P((char *));

builtins/source.def

@@ -69,6 +69,7 @@ $END
 #include "../bashintl.h"
 
 #include "../shell.h"
+#include "../execute_cmd.h"
 #include "../flags.h"
 #include "../findcmd.h"
 #include "common.h"
@@ -79,10 +80,6 @@ $END
 extern int errno;
 #endif /* !errno */
 
-extern int posixly_correct;
-extern int last_command_exit_value;
-extern int executing_command_builtin;
-
 static void maybe_pop_dollar_vars __P((void));
 
 /* If non-zero, `.' uses $PATH to look up the script to be sourced. */

builtins/test.def

@@ -125,11 +125,10 @@ $END
 #include "../bashintl.h"
 
 #include "../shell.h"
+#include "../execute_cmd.h"
 #include "../test.h"
 #include "common.h"
 
-extern char *this_command_name;
-
 /* TEST/[ builtin. */
 int
 test_builtin (list)

builtins/trap.def

@@ -97,9 +97,6 @@ static int display_traps __P((WORD_LIST *));
 #define REVERT 1		/* Revert to this signals original value. */
 #define IGNORE 2		/* Ignore this signal. */
 
-extern int posixly_correct, subshell_environment;
-extern int sourcelevel, running_trap;
-
 int
 trap_builtin (list)
      WORD_LIST *list;

builtins/type.def

@@ -64,6 +64,8 @@ $END
 #include "../bashintl.h"
 
 #include "../shell.h"
+#include "../parser.h"
+#include "../execute_cmd.h"
 #include "../findcmd.h"
 #include "../hashcmd.h"
 
@@ -76,9 +78,6 @@ $END
 
 extern int find_reserved_word __P((char *));
 
-extern char *this_command_name;
-extern int expand_aliases, posixly_correct;
-
 /* For each word in LIST, find out what the shell is going to do with
    it as a simple command. i.e., which file would this shell use to
    execve, or if it is a builtin command, or an alias.  Possible flag

builtins/ulimit.def

@@ -203,8 +203,6 @@ extern int errno;
 
 #define BLOCKSIZE(x)	(((x) == POSIXBLK) ? (posixly_correct ? 512 : 1024) : (x))
 
-extern int posixly_correct;
-
 static int _findlim __P((int));
 
 static int ulimit_internal __P((int, char *, int, int));

builtins/wait.def

@@ -68,12 +68,12 @@ $END
 #include "../bashansi.h"
 
 #include "../shell.h"
+#include "../execute_cmd.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;
 int wait_intr_flag;