aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2014-10-27 16:56:46 +0800
committerBen Hutchings <ben@decadent.org.uk>2020-03-28 21:42:54 +0000
commit6297d755e71777d4fcf55d106d11f9e631fa547f (patch)
treeb28e30fa5ae0c4ec62bcd4bcefc91d660f86d831
parent1fb4949c5a40f0bb6da7993a2ab034ec3b39477d (diff)
downloadklibc-6297d755e71777d4fcf55d106d11f9e631fa547f.tar.gz
[klibc] dash: [BUILTIN] Handle -- in dotcmd
[ dash commit 12ad48bb31b003eb6d3106478b7760a031969a36 ] This patch adds a nextopt call in dotcmd in order to handle --. Reported-by: Stephane Chazelas <stephane_chazelas@yahoo.fr> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-rw-r--r--usr/dash/main.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/usr/dash/main.c b/usr/dash/main.c
index 00c5e00d0c414..985e8c4e5e2c4 100644
--- a/usr/dash/main.c
+++ b/usr/dash/main.c
@@ -321,15 +321,19 @@ dotcmd(int argc, char **argv)
{
int status = 0;
- if (argc >= 2) { /* That's what SVR2 does */
+ nextopt(nullstr);
+ argv = argptr;
+
+ if (*argv) {
char *fullname;
- fullname = find_dot_file(argv[1]);
+ fullname = find_dot_file(*argv);
setinputfile(fullname, INPUT_PUSH_FILE);
commandname = fullname;
status = cmdloop(0);
popfile();
}
+
return status;
}