diff options
author | Elliott Hughes <enh@google.com> | 2019-05-02 18:41:11 -0700 |
---|---|---|
committer | Rob Landley <rob@landley.net> | 2019-05-03 11:35:59 -0500 |
commit | bd7c5c0555477d562bc7a4dab9561017a47b615e (patch) | |
tree | 42ae7a14d86c4ab011e52f6125c7ee95d733a0e2 | |
parent | d234c98318dc3e85c01092ddadfc9e7acddbbaef (diff) | |
download | toybox-bd7c5c0555477d562bc7a4dab9561017a47b615e.tar.gz |
env: fix case where a variable is replaced.
Found when trying to update the toybox prebuilt used for the Android
build.
Also add the corresponding test.
-rw-r--r-- | lib/env.c | 4 | ||||
-rwxr-xr-x | tests/env.test | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -58,11 +58,9 @@ void xsetenv(char *name, char *val) if (!memcmp(name, environ[i], len) && environ[i][len]=='=') { if (i>=envc) free(environ[i]); else { - char **delete = environ+i; - // move old entries down, add at end of old data toys.envc = envc--; - for (i=0; new ? i<envc : !!delete[i]; i++) delete[i] = delete[i+1]; + for (; new ? i<envc : !!environ[i]; i++) environ[i] = environ[i+1]; i = envc; } break; diff --git a/tests/env.test b/tests/env.test index 3098731d..4df118dd 100755 --- a/tests/env.test +++ b/tests/env.test @@ -19,3 +19,5 @@ unset WALRUS BANANA LETTERS FILTER testcmd "early fail" '--oops 2> /dev/null ; echo $?' "125\n" "" "" testcmd "why is this allowed" "=BLAH env | grep '^=BLAH\$'" "=BLAH\n" "" "" + +testcmd "replace" "A=foo PATH= `which printenv` A" "foo\n" "" "" |