Bash-4.3 patch 34

diff --git a/-i b/-i
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..e999b2f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+-i

diff --git a/builtins/set.def b/builtins/set.def
index c4a7001dffeb279cafe6294b44e49f961430531b..9fbbca14b65838d29c2531794f4eee5438ce1c32 100644 (file)
--- a/builtins/set.def
+++ b/builtins/set.def
@@ -751,9 +751,11 @@ unset_builtin (list)
   WORD_LIST *list;
 {
   int unset_function, unset_variable, unset_array, opt, nameref, any_failed;
+  int global_unset_func, global_unset_var;
   char *name;
 
   unset_function = unset_variable = unset_array = nameref = any_failed = 0;
+  global_unset_func = global_unset_var = 0;
 
   reset_internal_getopt ();
   while ((opt = internal_getopt (list, "fnv")) != -1)
@@ -761,10 +763,10 @@ unset_builtin (list)
       switch (opt)
        {
        case 'f':
-         unset_function = 1;
+         global_unset_func = 1;
          break;
        case 'v':
-         unset_variable = 1;
+         global_unset_var = 1;
          break;
        case 'n':
          nameref = 1;
@@ -777,7 +779,7 @@ unset_builtin (list)
 
   list = loptend;
 
-  if (unset_function && unset_variable)
+  if (global_unset_func && global_unset_var)
     {
       builtin_error (_("cannot simultaneously unset a function and a variable"));
       return (EXECUTION_FAILURE);
@@ -795,6 +797,9 @@ unset_builtin (list)
 
       name = list->word->word;
 
+      unset_function = global_unset_func;
+      unset_variable = global_unset_var;
+
 #if defined (ARRAY_VARS)
       unset_array = 0;
       if (!unset_function && valid_array_reference (name))

diff --git a/patchlevel.h b/patchlevel.h
index cefe6bdd3a130b8fc0fe4ffdd5c3d29ab185c424..db8e28c9ed6e3e50abe4b3f68fb58b3cb71c5c88 100644 (file)
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -25,6 +25,6 @@
    regexp `^#define[   ]*PATCHLEVEL', since that's what support/mkversion.sh
    looks for to find the patch level (for the sccs version string). */
 
-#define PATCHLEVEL 33
+#define PATCHLEVEL 34
 
 #endif /* _PATCHLEVEL_H_ */