summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2013-11-08 13:12:13 (GMT)
committer Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>2013-11-08 13:12:13 (GMT)
commit200c1c46f4aa2cb70e0e3581a5bd8aa72a1aac0f (patch)
treece3c03c060c1f052147a7c493e78d0983f1bdfdc
parentb541d1fcbd39f9fa8768a57e48a334b1929303e5 (diff)
downloadbusybox-200c1c46f4aa2cb70e0e3581a5bd8aa72a1aac0f.tar.gz
busybox-200c1c46f4aa2cb70e0e3581a5bd8aa72a1aac0f.tar.bz2
ash: Use setvar2 some more
(add/remove: 0/0 grow/shrink: 10/15 up/down: 13/-27) Total: -14 bytes Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
-rw-r--r--shell/ash.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/shell/ash.c b/shell/ash.c
index d696bbd..f9b4d3f 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -2286,7 +2286,7 @@ unsetvar(const char *s)
free(vp);
INT_ON;
} else {
- setvar(s, 0, 0);
+ setvar2(s, 0);
vp->flags &= ~VEXPORT;
}
ok:
@@ -6339,7 +6339,7 @@ subevalvar(char *p, char *varname, int strloc, int subtype,
switch (subtype) {
case VSASSIGN:
- setvar(varname, startp, 0);
+ setvar2(varname, startp);
amount = startp - expdest;
STADJUST(amount, expdest);
return startp;
@@ -8554,7 +8554,7 @@ evalfor(union node *n, int flags)
loopnest++;
flags &= EV_TESTED;
for (sp = arglist.list; sp; sp = sp->next) {
- setvar(n->nfor.var, sp->text, 0);
+ setvar2(n->nfor.var, sp->text);
evaltree(n->nfor.body, flags);
if (evalskip) {
if (evalskip == SKIPCONT && --skipcount <= 0) {
@@ -9451,7 +9451,7 @@ evalcommand(union node *cmd, int flags)
* '_' in 'vi' command mode during line editing...
* However I implemented that within libedit itself.
*/
- setvar("_", lastarg, 0);
+ setvar2("_", lastarg);
}
popstackmark(&smark);
}
@@ -12273,7 +12273,6 @@ dotcmd(int argc, char **argv)
* bash returns exitcode 1 instead.
*/
fullname = find_dot_file(argv[1]);
-
argv += 2;
argc -= 2;
if (argc) { /* argc > 0, argv[0] != NULL */
@@ -13012,7 +13011,7 @@ init(void)
}
}
- setvar("PPID", utoa(getppid()), 0);
+ setvar2("PPID", utoa(getppid()));
p = lookupvar("PWD");
if (p) {
@@ -13267,7 +13266,7 @@ int ash_main(int argc UNUSED_PARAM, char **argv)
hp = lookupvar("HOME");
if (hp) {
hp = concat_path_file(hp, ".ash_history");
- setvar("HISTFILE", hp, 0);
+ setvar2("HISTFILE", hp);
free((char*)hp);
hp = lookupvar("HISTFILE");
}