Merge branch 'origin/master' (early part)

14 files changed, 41 insertions, 25 deletions

diff --git a/shell/Kbuild.src b/shell/Kbuild.src
index a669bdfb0..c00aec92a 100644
--- a/shell/Kbuild.src
+++ b/shell/Kbuild.src
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org>
 #
-# Licensed under the GPL v2, see the file LICENSE in this tarball.
+# Licensed under GPLv2, see file LICENSE in this source tree.
 
 lib-y:=
 
diff --git a/shell/ash.c b/shell/ash.c
index f7fad88cd..6d67a1f8a 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -13,7 +13,7 @@
  * Copyright (c) 1997-2005 Herbert Xu <herbert@gondor.apana.org.au>
  * was re-ported from NetBSD and debianized.
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 /*
@@ -5204,9 +5204,13 @@ noclobberopen(const char *fname)
          * revealed that it was a regular file, and the file has not been
          * replaced, return the file descriptor.
          */
-        if (fstat(fd, &finfo2) == 0 && !S_ISREG(finfo2.st_mode)
-         && finfo.st_dev == finfo2.st_dev && finfo.st_ino == finfo2.st_ino)
+        if (fstat(fd, &finfo2) == 0
+         && !S_ISREG(finfo2.st_mode)
+         && finfo.st_dev == finfo2.st_dev
+         && finfo.st_ino == finfo2.st_ino
+        ) {
                 return fd;
+        }
 
         /* The file has been replaced.  badness. */
         close(fd);
@@ -11611,10 +11615,9 @@ readtoken1(int c, int syntax, char *eofmark, int striptabs)
                                         if (dqvarnest > 0) {
                                                 dqvarnest--;
                                         }
-                                        USTPUTC(CTLENDVAR, out);
-                                } else {
-                                        USTPUTC(c, out);
+                                        c = CTLENDVAR;
                                 }
+                                USTPUTC(c, out);
                                 break;
 #if ENABLE_SH_MATH_SUPPORT
                         case CLP:       /* '(' in arithmetic */
@@ -11623,25 +11626,23 @@ readtoken1(int c, int syntax, char *eofmark, int striptabs)
                                 break;
                         case CRP:       /* ')' in arithmetic */
                                 if (parenlevel > 0) {
-                                        USTPUTC(c, out);
-                                        --parenlevel;
+                                        parenlevel--;
                                 } else {
                                         if (pgetc() == ')') {
                                                 if (--arinest == 0) {
-                                                        USTPUTC(CTLENDARI, out);
                                                         syntax = prevsyntax;
                                                         dblquote = (syntax == DQSYNTAX);
-                                                } else
-                                                        USTPUTC(')', out);
+                                                        c = CTLENDARI;
+                                                }
                                         } else {
                                                 /*
                                                  * unbalanced parens
                                                  * (don't 2nd guess - no error)
                                                  */
                                                 pungetc();
-                                                USTPUTC(')', out);
                                         }
                                 }
+                                USTPUTC(c, out);
                                 break;
 #endif
                         case CBQUOTE:   /* '`' */
diff --git a/shell/ash_ptr_hack.c b/shell/ash_ptr_hack.c
index 68d907292..f69840825 100644
--- a/shell/ash_ptr_hack.c
+++ b/shell/ash_ptr_hack.c
@@ -2,7 +2,7 @@
 /*
  * Copyright (C) 2008 by Denys Vlasenko <vda.linux@googlemail.com>
  *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
 struct globals_misc;
diff --git a/shell/ash_test/ash-vars/var_bash5.right b/shell/ash_test/ash-vars/var_bash5.right
new file mode 100644
index 000000000..278ed3228
--- /dev/null
+++ b/shell/ash_test/ash-vars/var_bash5.right
@@ -0,0 +1,4 @@
+a/
+a/d
+a/e/f
+Done: 0
diff --git a/shell/ash_test/ash-vars/var_bash5.tests b/shell/ash_test/ash-vars/var_bash5.tests
new file mode 100755
index 000000000..3f49321e1
--- /dev/null
+++ b/shell/ash_test/ash-vars/var_bash5.tests
@@ -0,0 +1,11 @@
+# This testcase checks whether slashes in ${v/a/b} are parsed before or after expansions
+# in a part
+
+v='a/b/c'
+s='b/c'
+r='e/f'
+echo "${v/$s}"
+echo "${v/$s/d}"
+echo "${v/$s/$r}"
+
+echo Done: $?
diff --git a/shell/bbsh.c b/shell/bbsh.c
index 83132f928..8e25db458 100644
--- a/shell/bbsh.c
+++ b/shell/bbsh.c
@@ -4,7 +4,7 @@
  *
  * Copyright 2006 Rob Landley <rob@landley.net>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 // A section of code that gets repeatedly or conditionally executed is stored
diff --git a/shell/cttyhack.c b/shell/cttyhack.c
index 7a5e1ffd2..d1cb7fcc3 100644
--- a/shell/cttyhack.c
+++ b/shell/cttyhack.c
@@ -1,8 +1,8 @@
 /* vi: set sw=4 ts=4: */
 /*
- * Licensed under GPLv2
- *
  * Copyright (c) 2007 Denys Vlasenko <vda.linux@googlemail.com>
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 #include "libbb.h"
 
diff --git a/shell/hush.c b/shell/hush.c
index df4058998..e8dfb2499 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -79,7 +79,7 @@
  *              $ "export" i=`echo 'aaa  bbb'`; echo "$i"
  *              aaa
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 #include "busybox.h"  /* for APPLET_IS_NOFORK/NOEXEC */
 #include <malloc.h>   /* for malloc_trim */
diff --git a/shell/match.c b/shell/match.c
index fb6a38ef1..8b1ddacd5 100644
--- a/shell/match.c
+++ b/shell/match.c
@@ -4,7 +4,7 @@
  * This code is derived from software contributed to Berkeley by
  * Kenneth Almquist.
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
  * Copyright (c) 1989, 1991, 1993, 1994
  *      The Regents of the University of California.  All rights reserved.
diff --git a/shell/math.c b/shell/math.c
index 91fb28f05..f0cc2e35d 100644
--- a/shell/math.c
+++ b/shell/math.c
@@ -23,7 +23,7 @@
  * rewrote arith (see notes to this), added locale support,
  * rewrote dynamic variables.
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 /* Copyright (c) 2001 Aaron Lehmann <aaronl@vitelus.com>
 
diff --git a/shell/random.c b/shell/random.c
index 7f5821cbc..853ab085a 100644
--- a/shell/random.c
+++ b/shell/random.c
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2009 Denys Vlasenko
  *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 #include "libbb.h"
 #include "random.h"
diff --git a/shell/random.h b/shell/random.h
index 08563402c..180c48abb 100644
--- a/shell/random.h
+++ b/shell/random.h
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2009 Denys Vlasenko
  *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 #ifndef SHELL_RANDOM_H
 #define SHELL_RANDOM_H 1
diff --git a/shell/shell_common.c b/shell/shell_common.c
index 957d71928..0b9d4ebe6 100644
--- a/shell/shell_common.c
+++ b/shell/shell_common.c
@@ -14,7 +14,7 @@
  * Copyright (c) 2010 Denys Vlasenko
  * Split from ash.c
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 #include "libbb.h"
 #include "shell_common.h"
@@ -429,7 +429,7 @@ shell_builtin_ulimit(char **argv)
                                                 else
                                                         val = bb_strtoull(val_str, NULL, 10);
                                                 if (errno) {
-                                                        bb_error_msg("bad number");
+                                                        bb_error_msg("invalid number '%s'", val_str);
                                                         return EXIT_FAILURE;
                                                 }
                                                 val <<= l->factor_shift;
diff --git a/shell/shell_common.h b/shell/shell_common.h
index 1e9f6a691..f06bc4120 100644
--- a/shell/shell_common.h
+++ b/shell/shell_common.h
@@ -14,7 +14,7 @@
  * Copyright (c) 2010 Denys Vlasenko
  * Split from ash.c
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 #ifndef SHELL_COMMON_H
 #define SHELL_COMMON_H 1