Bash-4.3 patch 7

[thirdparty/bash.git] / arrayfunc.h

diff --git a/arrayfunc.h b/arrayfunc.h
index 44dd39d10b754f57c592e54e458959dca913727f..26f4879af3d48149d6c74a3895fd6648dccb1311 100644 (file)
--- a/arrayfunc.h
+++ b/arrayfunc.h
@@ -1,6 +1,6 @@
 /* arrayfunc.h -- declarations for miscellaneous array functions in arrayfunc.c */
 
-/* Copyright (C) 2001-2009 Free Software Foundation, Inc.
+/* Copyright (C) 2001-2010 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 
@@ -25,13 +25,22 @@
 
 #if defined (ARRAY_VARS)
 
+/* Flags for array_value_internal and callers array_value/get_array_value */
+#define AV_ALLOWALL    0x001
+#define AV_QUOTED      0x002
+#define AV_USEIND      0x004
+
 extern SHELL_VAR *convert_var_to_array __P((SHELL_VAR *));
 extern SHELL_VAR *convert_var_to_assoc __P((SHELL_VAR *));
 
+extern char *make_array_variable_value __P((SHELL_VAR *, arrayind_t, char *, char *, int));
+
 extern SHELL_VAR *bind_array_variable __P((char *, arrayind_t, char *, int));
 extern SHELL_VAR *bind_array_element __P((SHELL_VAR *, arrayind_t, char *, int));
 extern SHELL_VAR *assign_array_element __P((char *, char *, int));
 
+extern SHELL_VAR *bind_assoc_variable __P((SHELL_VAR *, char *, char *, char *, int));
+
 extern SHELL_VAR *find_or_make_array_variable __P((char *, int));
 
 extern SHELL_VAR *assign_array_from_string  __P((char *, char *, int));
@@ -42,21 +51,27 @@ extern void assign_compound_array_list __P((SHELL_VAR *, WORD_LIST *, int));
 extern SHELL_VAR *assign_array_var_from_string __P((SHELL_VAR *, char *, int));
 
 extern int unbind_array_element __P((SHELL_VAR *, char *));
-extern int skipsubscript __P((const char *, int));
+extern int skipsubscript __P((const char *, int, int));
 
 extern void print_array_assignment __P((SHELL_VAR *, int));
 extern void print_assoc_assignment __P((SHELL_VAR *, int));
 
-extern arrayind_t array_expand_index __P((char *, int));
+extern arrayind_t array_expand_index __P((SHELL_VAR *, char *, int));
 extern int valid_array_reference __P((char *));
-extern char *array_value __P((char *, int, int *));
-extern char *get_array_value __P((char *, int, int *));
+extern char *array_value __P((char *, int, int, int *, arrayind_t *));
+extern char *get_array_value __P((char *, int, int *, arrayind_t *));
 
 extern char *array_keys __P((char *, int));
 
 extern char *array_variable_name __P((char *, char **, int *));
 extern SHELL_VAR *array_variable_part __P((char *, char **, int *));
 
+#else
+
+#define AV_ALLOWALL    0
+#define AV_QUOTED      0
+#define AV_USEIND      0
+
 #endif
 
 #endif /* !_ARRAYFUNC_H_ */