summaryrefslogtreecommitdiff
path: root/runit
diff options
context:
space:
mode:
authorFrancis Rounds <Francis.Rounds@4bridgeworks.com>2016-09-14 11:53:51 (GMT)
committerDenys Vlasenko <vda.linux@googlemail.com>2016-09-15 12:05:04 (GMT)
commitd2c5de0130d46e3314908cddb5f831a84a9f9e27 (patch)
treed82b95851a7ae360f4a9f0cd76b69dfd15a969ac /runit
parentde1996dac516a49cd4c86270b918721f6e9f3f5d (diff)
downloadbusybox-d2c5de0130d46e3314908cddb5f831a84a9f9e27.zip
busybox-d2c5de0130d46e3314908cddb5f831a84a9f9e27.tar.gz
busybox-d2c5de0130d46e3314908cddb5f831a84a9f9e27.tar.bz2
svlogd: strip leading '!' from processor lines
When using svlogd's processor functionality to run arbitrary commands on log rotation, the line in the config is executed verbatim, i.e. the exclamation mark is included. For example, if the config file contains: s100 !cat then when it's time to rotate the log files after each 100 bytes, sh -c "!cat" will be run, instead of sh -c "cat" as intended. The result is svlogd logging /bin/bash: !cat: command not found svlogd: warning: processor failed, restart: /tmp/svlogd/ over and over again as it keeps attempting to execute the processor and failing (unless you happen to have a "!cat" binary around :)). Skipping the exclamation mark when performing the wstrdup() fixes the issue. Signed-off-by: Francis Rounds <francis.rounds@4bridgeworks.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'runit')
-rw-r--r--runit/svlogd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/runit/svlogd.c b/runit/svlogd.c
index 7cae81c..3ed13b6 100644
--- a/runit/svlogd.c
+++ b/runit/svlogd.c
@@ -784,7 +784,7 @@ static NOINLINE unsigned logdir_open(struct logdir *ld, const char *fn)
case '!':
if (s[1]) {
free(ld->processor);
- ld->processor = wstrdup(s);
+ ld->processor = wstrdup(&s[1]);
}
break;
}