X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=flags.h;h=d5ed334e14afe8973cac991f75df0c8be6db3433;hb=4f747edc625815f449048579f6e65869914dd715;hp=9c93b34d3f66c272886929384bfbdb056e79b841;hpb=bb70624e964126b7ac4ff085ba163a9c35ffa18f;p=thirdparty%2Fbash.git

diff --git a/flags.h b/flags.h
index 9c93b34d3..d5ed334e1 100644
--- a/flags.h
+++ b/flags.h
@@ -1,23 +1,23 @@
 /* flags.h -- a list of all the flags that the shell knows about.  You add
    a flag to this program by adding the name here, and in flags.c. */
 
-/* Copyright (C) 1993 Free Software Foundation, Inc.
+/* Copyright (C) 1993-2015 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 2, or (at your option) any later
-   version.
+   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.
+   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; see the file COPYING.  If not, write to the Free Software
-   Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   You should have received a copy of the GNU General Public License
+   along with Bash.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #if !defined (_FLAGS_H_)
 #define _FLAGS_H_
@@ -37,15 +37,18 @@ struct flags_alist {
   int *value;
 };
 
-extern struct flags_alist shell_flags[];
+extern const struct flags_alist shell_flags[];
+extern char optflags[];
 
 extern int
-  mark_modified_vars, exit_immediately_on_error, disallow_filename_globbing,
+  mark_modified_vars, errexit_flag, exit_immediately_on_error,
+  disallow_filename_globbing,
   place_keywords_in_env, read_but_dont_execute,
-  just_one_command, unbound_vars_is_error, echo_input_at_read,
+  just_one_command, unbound_vars_is_error, echo_input_at_read, verbose_flag,
   echo_command_at_execute, no_invisible_vars, noclobber,
-  hashing_enabled, forced_interactive, privileged_mode,
-  asynchronous_notification, interactive_comments, no_symbolic_links;
+  hashing_enabled, forced_interactive, privileged_mode, jobs_m_flag,
+  asynchronous_notification, interactive_comments, no_symbolic_links,
+  function_trace_mode, error_trace_mode, pipefail_opt;
 
 #if 0
 extern int lexical_scoping;
@@ -69,6 +72,11 @@ extern int change_flag __P((int, int));
 extern char *which_set_flags __P((void));
 extern void reset_shell_flags __P((void));
 
+extern char *get_current_flags __P((void));
+extern void set_current_flags __P((const char *));
+
+extern void initialize_flags __P((void));
+
 /* A macro for efficiency. */
 #define change_flag_char(flag, on_or_off)  change_flag (flag, on_or_off)