commit: d7a09327f76e94226ee324a6e70cf415aa96cf89 Author: Will Miles <wmiles <AT> sgl <DOT> com> AuthorDate: Fri Mar 13 16:34:29 2015 +0000 Commit: William Hubbs <williamh <AT> gentoo <DOT> org> CommitDate: Tue Mar 24 20:35:47 2015 +0000 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=d7a09327
start-stop-daemon:Fix regression for --test The previous fix to --test (PR #34) prevented reading one too many arguments when --exec -or --name was not specified, but created a regression where the last argument would not print if either of those arguments was specified. This corrects the issue. Fixes #41. src/rc/start-stop-daemon.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/rc/start-stop-daemon.c b/src/rc/start-stop-daemon.c index 3afbf2e..7919835 100644 --- a/src/rc/start-stop-daemon.c +++ b/src/rc/start-stop-daemon.c @@ -919,10 +919,13 @@ start_stop_daemon(int argc, char **argv) exec = name; if (name && start) *argv = name; - } else if (name) + } else if (name) { *--argv = name; - else if (exec) + ++argc; + } else if (exec) { *--argv = exec; + ++argc; + }; if (stop || sig != -1) { if (sig == -1)