s6

commit fe878fbbd80f2e75cc46876a6149362d58ecd403
parent 26d5a78bf3ee8ef99fd0962ede3c2522d12c741c
Author: Mira Ressel <aranea@aixah.de>
Date:   Sat, 13 Mar 2021 16:40:56 +0100

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.

Diffstat:
M
doc/s6-log.html
 | 
2
+-
M
src/daemontools-extras/s6-log.c
 | 
2
+-

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git 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
@@ -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")