[gentoo-commits] proj/openrc:master commit in: src/rc/

[William Hubbs]

commit:     9eb669591e16c5ee0ca07babe058d0b7b2396077
Author:     Austin English <austinenglish <AT> gmail <DOT> com>
AuthorDate: Fri Mar 31 18:59:38 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Apr  3 15:43:40 2017 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=9eb66959

start-stop-daemon: warn if calling --start with --retry or --stop with --wait

This fixes #122

 src/rc/start-stop-daemon.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/rc/start-stop-daemon.c b/src/rc/start-stop-daemon.c
index e9f9848c..c88bc962 100644
--- a/src/rc/start-stop-daemon.c
+++ b/src/rc/start-stop-daemon.c
@@ -960,6 +960,9 @@ int main(int argc, char **argv)
                if (redirect_stdout || redirect_stderr)
                        eerrorx("%s: --stdout and --stderr are only relevant"
                            " with --start", applet);
+               if (start_wait)
+                       ewarn("using --wait with --stop has no effect,"
+                           " use --retry instead");
        } else {
                if (!exec)
                        eerrorx("%s: nothing to start", applet);
@@ -1012,7 +1015,11 @@ int main(int argc, char **argv)
                eerror("%s: %s does not exist", applet,
                    *exec_file ? exec_file : exec);
                exit(EXIT_FAILURE);
+
        }
+       if (start && retry)
+               ewarn("using --retry with --start has no effect,"
+                   " use --wait instead");
 
        /* If we don't have a pidfile we should check if it's interpreted
         * or not. If it we, we need to pass the interpreter through