commit bash-20070719 snapshot

diff --git a/lib/readline/input.c b/lib/readline/input.c
index 607f5e26154889e557ff90667b447381596ae35c..cd8233585fc37b9faf1635be58cd87a4c474d494 100644 (file)
--- a/lib/readline/input.c
+++ b/lib/readline/input.c
@@ -578,7 +578,7 @@ _rl_read_mbstring (first, mb, mlen)
 
   c = first;
   memset (mb, 0, mlen);
-  for (i = 0; c > 0 && i < mlen; i++)
+  for (i = 0; c >= 0 && i < mlen; i++)
     {
       mb[i] = (char)c;
       memset (&ps, 0, sizeof (mbstate_t));

diff --git a/subst.c b/subst.c
index a71229f27b9c43baa4fb7445d195ff3cabc7c377..fcf221cb9056d67032fa20bdccee50164660b1de 100644 (file)
--- a/subst.c
+++ b/subst.c
@@ -163,8 +163,6 @@ int allow_null_glob_expansion;
 /* Non-zero means to throw an error when globbing fails to match anything. */
 int fail_glob_expansion;
 
-int assigining_in_environment;
-
 #if 0
 /* Variables to keep track of which words in an expanded word list (the
    output of expand_word_list_internal) are the result of globbing

diff --git a/variables.c b/variables.c
index b8645aa35aac191490189d25f04a46aef4d0da3d..a7c8eb03c24afa861cf6c171b8375620acf3fd9d 100644 (file)
--- a/variables.c
+++ b/variables.c
@@ -1861,10 +1861,10 @@ make_variable_value (var, value, flags)
        }
       rval = evalexp (value, &expok);
       if (expok == 0)
-        {
-          top_level_cleanup ();
+       {
+         top_level_cleanup ();
          jump_to_top_level (DISCARD);
-        }
+       }
       if (flags & ASS_APPEND)
        rval += lval;
       retval = itos (rval);