Bash-4.4 patch 4

[thirdparty/bash.git] / variables.h

diff --git a/variables.h b/variables.h
index 1a783b925d9569807c25f754005b0e922d136bed..25c9ae072a15fdffe0491d12c8d057bb5282a607 100644 (file)
--- a/variables.h
+++ b/variables.h
@@ -1,6 +1,6 @@
 /* variables.h -- data structures for shell variables. */
 
-/* Copyright (C) 1987-2012 Free Software Foundation, Inc.
+/* Copyright (C) 1987-2015 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 
@@ -156,6 +156,9 @@ typedef struct _vlist {
 
 #define tempvar_p(var)         ((((var)->attributes) & (att_tempvar)))
 
+/* Variable names: lvalues */
+#define name_cell(var)         ((var)->name)
+
 /* Acessing variable values: rvalues */
 #define value_cell(var)                ((var)->value)
 #define function_cell(var)     (COMMAND *)((var)->value)
@@ -165,8 +168,9 @@ typedef struct _vlist {
 
 #define NAMEREF_MAX    8       /* only 8 levels of nameref indirection */
 
-#define var_isnull(var)                ((var)->value == 0)
 #define var_isset(var)         ((var)->value != 0)
+#define var_isunset(var)       ((var)->value == 0)
+#define var_isnull(var)                ((var)->value && *(var)->value == 0)
 
 /* Assigning variable values: lvalues */
 #define var_setvalue(var, str) ((var)->value = (str))
@@ -211,6 +215,12 @@ typedef struct _vlist {
              (var)->exportstr = (char *)NULL; \
            } \
        } while (0)
+
+#define ifsname(s)     ((s)[0] == 'I' && (s)[1] == 'F' && (s)[2] == 'S' && (s)[3] == '\0')
+
+/* Special value for nameref with invalid value for creation or assignment */
+extern SHELL_VAR nameref_invalid_value;
+#define INVALID_NAMEREF_VALUE  (void *)&nameref_invalid_value
        
 /* Stuff for hacking variables. */
 typedef int sh_var_map_func_t __P((SHELL_VAR *));
@@ -240,16 +250,20 @@ extern SHELL_VAR *find_function __P((const char *));
 extern FUNCTION_DEF *find_function_def __P((const char *));
 extern SHELL_VAR *find_variable __P((const char *));
 extern SHELL_VAR *find_variable_noref __P((const char *));
-extern SHELL_VAR *find_variable_last_nameref __P((const char *));
-extern SHELL_VAR *find_global_variable_last_nameref __P((const char *));
+extern SHELL_VAR *find_variable_last_nameref __P((const char *, int));
+extern SHELL_VAR *find_global_variable_last_nameref __P((const char *, int));
 extern SHELL_VAR *find_variable_nameref __P((SHELL_VAR *));
-extern SHELL_VAR *find_variable_internal __P((const char *, int));
+extern SHELL_VAR *find_variable_nameref_for_create __P((const char *, int));
+extern SHELL_VAR *find_variable_nameref_for_assignment __P((const char *, int));
+/*extern SHELL_VAR *find_variable_internal __P((const char *, int));*/
 extern SHELL_VAR *find_variable_tempenv __P((const char *));
 extern SHELL_VAR *find_variable_notempenv __P((const char *));
 extern SHELL_VAR *find_global_variable __P((const char *));
 extern SHELL_VAR *find_global_variable_noref __P((const char *));
 extern SHELL_VAR *find_shell_variable __P((const char *));
 extern SHELL_VAR *find_tempenv_variable __P((const char *));
+extern SHELL_VAR *find_variable_no_invisible __P((const char *));
+extern SHELL_VAR *find_variable_for_assignment __P((const char *));
 extern SHELL_VAR *copy_variable __P((SHELL_VAR *));
 extern SHELL_VAR *make_local_variable __P((const char *));
 extern SHELL_VAR *bind_variable __P((const char *, char *, int));
@@ -288,7 +302,9 @@ extern SHELL_VAR *bind_var_to_int __P((char *, intmax_t));
 extern int assign_in_env __P((WORD_DESC *, int));
 
 extern int unbind_variable __P((const char *));
+extern int check_unbind_variable __P((const char *));
 extern int unbind_nameref __P((const char *));
+extern int unbind_variable_noref __P((const char *));
 extern int unbind_func __P((const char *));
 extern int unbind_function_def __P((const char *));
 extern int delete_var __P((const char *, VAR_CONTEXT *));
@@ -320,6 +336,7 @@ extern void dispose_used_env_vars __P((void));
 extern void dispose_function_env __P((void));
 extern void dispose_builtin_env __P((void));
 extern void merge_temporary_env __P((void));
+extern void flush_temporary_env __P((void));
 extern void merge_builtin_env __P((void));
 extern void kill_all_local_variables __P((void));
 
@@ -372,6 +389,7 @@ extern void sv_ifs __P((char *));
 extern void sv_path __P((char *));
 extern void sv_mail __P((char *));
 extern void sv_funcnest __P((char *));
+extern void sv_execignore __P((char *));
 extern void sv_globignore __P((char *));
 extern void sv_ignoreeof __P((char *));
 extern void sv_strict_posix __P((char *));