summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMira Ressel <aranea@aixah.de>2021-03-13 16:40:56 +0100
committerLaurent Bercot <ska-skaware@skarnet.org>2021-03-13 15:52:26 +0000
commitfe878fbbd80f2e75cc46876a6149362d58ecd403 (patch)
tree0e695ad97cd2c199905cb7120fa402eb97547624
parent26d5a78bf3ee8ef99fd0962ede3c2522d12c741c (diff)
downloads6-fe878fbbd80f2e75cc46876a6149362d58ecd403.tar.xz
s6-log: Recommend the usage of a -- argument separator
Logging scripts will commonly start with a -, which will trigger a parsing error that might not be obvious to users when no argument separator is used.
-rw-r--r--doc/s6-log.html2
-rw-r--r--src/daemontools-extras/s6-log.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/s6-log.html b/doc/s6-log.html
index 158dd57..c0e5313 100644
--- a/doc/s6-log.html
+++ b/doc/s6-log.html
@@ -27,7 +27,7 @@ with full POSIX regular expression support.
<h2> Interface </h2>
<pre>
- s6-log [ -d <em>notif</em> ] [ -q | -v ] [ -b ] [ -p ] [ -l <em>linelimit</em> ] <em>logging script</em>
+ s6-log [ -d <em>notif</em> ] [ -q | -v ] [ -b ] [ -p ] [ -l <em>linelimit</em> ] [ -- ] <em>logging script</em>
</pre>
<p>
diff --git a/src/daemontools-extras/s6-log.c b/src/daemontools-extras/s6-log.c
index 7959222..798422d 100644
--- a/src/daemontools-extras/s6-log.c
+++ b/src/daemontools-extras/s6-log.c
@@ -39,7 +39,7 @@
#include <execline/config.h>
#endif
-#define USAGE "s6-log [ -d notif ] [ -q | -v ] [ -b ] [ -p ] [ -l linelimit ] logging_script"
+#define USAGE "s6-log [ -d notif ] [ -q | -v ] [ -b ] [ -p ] [ -l linelimit ] [ -- ] logging_script"
#define dieusage() strerr_dieusage(100, USAGE)
#define dienomem() strerr_diefu1sys(111, "stralloc_catb")