[klibc] [klibc:update-dash] [BUILTIN] Handle -- in dotcmd
klibc-bot for Herbert Xu
herbert at gondor.apana.org.au
Thu Jan 24 19:15:28 PST 2019
Commit-ID: cf7826f66c01eed24475a140d934b7a75b28d23e
Gitweb: http://git.kernel.org/?p=libs/klibc/klibc.git;a=commit;h=cf7826f66c01eed24475a140d934b7a75b28d23e
Author: Herbert Xu <herbert at gondor.apana.org.au>
AuthorDate: Mon, 27 Oct 2014 16:56:46 +0800
Committer: Ben Hutchings <ben at decadent.org.uk>
CommitDate: Fri, 25 Jan 2019 02:57:21 +0000
[klibc] [BUILTIN] Handle -- in dotcmd
This patch adds a nextopt call in dotcmd in order to handle --.
Reported-by: Stephane Chazelas <stephane_chazelas at yahoo.fr>
Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
---
usr/dash/main.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/usr/dash/main.c b/usr/dash/main.c
index 00c5e00d..985e8c4e 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;
}
More information about the klibc
mailing list