Merge branch 'busybox' into merge

Conflicts:
	archival/libarchive/open_transformer.c
	libbb/lineedit.c
	miscutils/man.c

1 files changed, 9 insertions, 1 deletions

diff --git a/shell/ash.c b/shell/ash.c
index 3f3e2f4bc..b95356034 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -6740,7 +6740,15 @@ subevalvar(char *p, char *varname, int strloc, int subtype,
                                 len = number(loc);
                         }
                 }
-                if (pos >= orig_len) {
+                if (pos < 0) {
+                        /* ${VAR:$((-n)):l} starts n chars from the end */
+                        pos = orig_len + pos;
+                }
+                if ((unsigned)pos >= orig_len) {
+                        /* apart from obvious ${VAR:999999:l},
+                         * covers ${VAR:$((-9999999)):l} - result is ""
+                         * (bash-compat)
+                         */
                         pos = 0;
                         len = 0;
                 }