From 12ad48bb31b003eb6d3106478b7760a031969a36 Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Mon, 27 Oct 2014 16:56:46 +0800 Subject: [BUILTIN] Handle -- in dotcmd This patch adds a nextopt call in dotcmd in order to handle --. Reported-by: Stephane Chazelas Signed-off-by: Herbert Xu --- ChangeLog | 1 + src/main.c | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f015066..5212a9a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ * Use error instead of warnx for fatal errors in printf. * Optimise handling of backslash octals in printf. * Simplify echo command. + * Handle -- in dotcmd. 2014-10-13 Eric Blake diff --git a/src/main.c b/src/main.c index 00c5e00..985e8c4 100644 --- a/src/main.c +++ b/src/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; } -- cgit 1.4.1