Merge branch busybox (up to "ash: comment out free(p) just before...")

2 files changed, 3 insertions, 3 deletions

diff --git a/runit/runsvdir.c b/runit/runsvdir.c
index 2b7927542..84916e929 100644
--- a/runit/runsvdir.c
+++ b/runit/runsvdir.c
@@ -181,9 +181,9 @@ static NOINLINE int do_rescan(void)
                         continue;
                 /* Do we have this service listed already? */
                 for (i = 0; i < svnum; i++) {
-                        if ((sv[i].ino == s.st_ino)
+                        if (sv[i].ino == s.st_ino
 #if CHECK_DEVNO_TOO
-                         && (sv[i].dev == s.st_dev)
+                         && sv[i].dev == s.st_dev
 #endif
                         ) {
                                 if (sv[i].pid == 0) /* restart if it has died */
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;
                         }