Bash-4.3 patch 46

[thirdparty/bash.git] / shell.h

diff --git a/shell.h b/shell.h
index bc3890325949931d3d88c48d12ae97102cadbfe6..3cf25df0bd64155ce45f698d15fd696644c23e5c 100644 (file)
--- a/shell.h
+++ b/shell.h
@@ -55,7 +55,11 @@ extern int EOF_Reached;
 /* Usage messages by builtins result in a return status of 2. */
 #define EX_BADUSAGE    2
 
+#define EX_MISCERROR   2
+
 /* Special exit statuses used by the shell, internally and externally. */
+#define EX_RETRYFAIL   124
+#define EX_WEXPCOMSUB  125
 #define EX_BINARY_FILE 126
 #define EX_NOEXEC      126
 #define EX_NOINPUT     126
@@ -89,8 +93,11 @@ extern int debugging_mode;
 extern int executing, login_shell;
 extern int interactive, interactive_shell;
 extern int startup_state;
+extern int subshell_environment;
 extern int shell_compatibility_level;
 
+extern int locale_mb_cur_max;
+
 /* Structure to pass around that holds a bitmap of file descriptors
    to close, and the size of that structure.  Used in execute_cmd.c. */
 struct fd_bitmap {
@@ -131,6 +138,9 @@ typedef struct _sh_parser_state_t {
   int parser_state;
   int *token_state;
 
+  char *token;
+  int token_buffer_size;
+
   /* input line state -- line number saved elsewhere */
   int input_line_terminator;
   int eof_encountered;
@@ -139,6 +149,8 @@ typedef struct _sh_parser_state_t {
   /* Nothing right now for multibyte state, but might want something later. */
 #endif
 
+  char **prompt_string_pointer;
+
   /* history state affecting or modified by the parser */
   int current_command_line_count;
 #if defined (HISTORY)
@@ -156,9 +168,22 @@ typedef struct _sh_parser_state_t {
   /* flags state affecting the parser */
   int expand_aliases;
   int echo_input_at_read;
-  
+  int need_here_doc;
+
 } sh_parser_state_t;
 
+typedef struct _sh_input_line_state_t {
+  char *input_line;
+  size_t input_line_index;
+  size_t input_line_size;
+  size_t input_line_len;
+} sh_input_line_state_t;
+
 /* Let's try declaring these here. */
+extern char *parser_remaining_input __P((void));
+
 extern sh_parser_state_t *save_parser_state __P((sh_parser_state_t *));
 extern void restore_parser_state __P((sh_parser_state_t *));
+
+extern sh_input_line_state_t *save_input_line_state __P((sh_input_line_state_t *));
+extern void restore_input_line_state __P((sh_input_line_state_t *));