From: Francis Rounds <Francis.Rounds@4bridgeworks.com>
Date: Wed, 14 Sep 2016 11:53:51 +0000 (+0000)
Subject: svlogd: strip leading '!' from processor lines
X-Git-Tag: 1_26_0~266
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d2c5de0130d46e3314908cddb5f831a84a9f9e27;p=oweals%2Fbusybox.git

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>
---

diff --git a/runit/svlogd.c b/runit/svlogd.c
index 7cae81cb2..3ed13b67b 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;
 			}