Merge branch 'busybox' into merge

2 files changed, 3 insertions, 3 deletions

diff --git a/runit/runsv.c b/runit/runsv.c
index ad8d84f74..3e1a3c8e5 100644
--- a/runit/runsv.c
+++ b/runit/runsv.c
@@ -172,7 +172,7 @@ static void update_status(struct svdir *s)
                 }
                 close(fd);
                 if (rename_or_warn("supervise/pid.new",
-                    s->islog ? "log/supervise/pid" : "log/supervise/pid"+4))
+                                s->islog ? "log/supervise/pid" : "log/supervise/pid"+4))
                         return;
                 pidchanged = 0;
         }
diff --git a/runit/svlogd.c b/runit/svlogd.c
index b0ba21bb6..b7a0a6e71 100644
--- a/runit/svlogd.c
+++ b/runit/svlogd.c
@@ -601,12 +601,12 @@ static int buffer_pwrite(int n, char *s, unsigned len)
 
                         while (fchdir(ld->fddir) == -1)
                                 pause2cannot("change directory, want remove old logfile",
-                                                         ld->name);
+                                                        ld->name);
                         oldest[0] = 'A';
                         oldest[1] = oldest[27] = '\0';
                         while (!(d = opendir(".")))
                                 pause2cannot("open directory, want remove old logfile",
-                                                         ld->name);
+                                                        ld->name);
                         errno = 0;
                         while ((f = readdir(d)))
                                 if ((f->d_name[0] == '@') && (strlen(f->d_name) == 27)) {