aboutsummaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorGravatar Denis Vlasenko <vda.linux@googlemail.com>2008-05-06 15:30:27 +0000
committerGravatar Denis Vlasenko <vda.linux@googlemail.com>2008-05-06 15:30:27 +0000
commitdddfaff36354050d170bcc1d1328cc23e5b0065e (patch)
tree23e11e5fdf0e1f8330ccf19fe427df64728d1188 /shell
parent380bcfc9f7ce8a979aa6ec16b15e586c65c8f3aa (diff)
downloadbusybox-dddfaff36354050d170bcc1d1328cc23e5b0065e.tar.gz
busybox-dddfaff36354050d170bcc1d1328cc23e5b0065e.tar.bz2
ash: make set -o and set +o work as in dash/bash.
by Cristian Ionescu-Idbohrn. function old new delta options 565 625 +60 getoptscmd 709 698 -11
Diffstat (limited to 'shell')
-rw-r--r--shell/ash.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/shell/ash.c b/shell/ash.c
index 80241381b..200e2d4a3 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -9486,7 +9486,7 @@ setparam(char **argv)
* Oh well. Let's mimic that.
*/
static int
-minus_o(char *name, int val)
+plus_minus_o(char *name, int val)
{
int i;
@@ -9497,13 +9497,15 @@ minus_o(char *name, int val)
return 0;
}
}
- ash_msg("illegal option -o %s", name);
+ ash_msg("illegal option %co %s", val ? '-' : '+', name);
return 1;
}
- out1str("Current option settings\n");
for (i = 0; i < NOPTS; i++)
- out1fmt("%-16s%s\n", optnames(i),
- optlist[i] ? "on" : "off");
+ if (val) {
+ out1fmt("%-16s%s\n", optnames(i), optlist[i] ? "on" : "off");
+ } else {
+ out1fmt("set %co %s\n", optlist[i] ? '-' : '+', optnames(i));
+ }
return 0;
}
static void
@@ -9517,7 +9519,7 @@ setoption(int flag, int val)
return;
}
}
- ash_msg_and_raise_error("illegal option -%c", flag);
+ ash_msg_and_raise_error("illegal option %c%c", val ? '-' : '+', flag);
/* NOTREACHED */
}
static int
@@ -9555,7 +9557,7 @@ options(int cmdline)
if (c == 'c' && cmdline) {
minusc = p; /* command is after shell args */
} else if (c == 'o') {
- if (minus_o(*argptr, val)) {
+ if (plus_minus_o(*argptr, val)) {
/* it already printed err message */
return 1; /* error */
}