bash-4.4-rc2 release

[thirdparty/bash.git] / general.h

diff --git a/general.h b/general.h
index e252af569641eed835e2f837f0f82521266615ba..ba7e96878e578a2ebc98b622655ae973d850f31b 100644 (file)
--- a/general.h
+++ b/general.h
@@ -1,6 +1,6 @@
 /* general.h -- defines that everybody likes to use. */
 
-/* Copyright (C) 1993-2009 Free Software Foundation, Inc.
+/* Copyright (C) 1993-2016 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 
@@ -124,7 +124,7 @@ typedef struct {
   int token;
 } STRING_INT_ALIST;
 
-/* A macro to avoid making an unneccessary function call. */
+/* A macro to avoid making an unnecessary function call. */
 #define REVERSE_LIST(list, type) \
   ((list && list->next) ? (type)list_reverse ((GENERIC_LIST *)list) \
                        : (type)(list))
@@ -219,6 +219,9 @@ typedef int sh_ignore_func_t __P((const char *));   /* sh_icpfunc_t */
 typedef int sh_assign_func_t __P((const char *));
 typedef int sh_wassign_func_t __P((WORD_DESC *, int));
 
+typedef int sh_load_func_t __P((char *));
+typedef void sh_unload_func_t __P((char *));
+
 typedef int sh_builtin_func_t __P((WORD_LIST *)); /* sh_wlist_func_t */
 
 #endif /* SH_FUNCTION_TYPEDEF */
@@ -286,6 +289,8 @@ extern int legal_identifier __P((char *));
 extern int importable_function_name __P((char *, size_t));
 extern int exportable_function_name __P((char *));
 extern int check_identifier __P((WORD_DESC *, int));
+extern int valid_nameref_value __P((char *, int));
+extern int check_selfref __P((const char *, const char *, int));
 extern int legal_alias_name __P((char *, int));
 extern int assignment __P((const char *, int));
 
@@ -327,4 +332,6 @@ extern int group_member __P((gid_t));
 extern char **get_group_list __P((int *));
 extern int *get_group_array __P((int *));
 
+extern char *conf_standard_path __P((void));
+
 #endif /* _GENERAL_H_ */