Merge commit 'e4dcba1c103dc28e927e004791e331aaf604383d'

Conflicts:
	libbb/make_directory.c

2 files changed, 5 insertions, 4 deletions

diff --git a/runit/chpst.c b/runit/chpst.c
index b08d42300..dc8a26aeb 100644
--- a/runit/chpst.c
+++ b/runit/chpst.c
@@ -122,10 +122,10 @@ static NOINLINE void edir(const char *directory_name)
                         if ((errno == EISDIR) && directory_name) {
                                 if (option_mask32 & OPT_v)
                                         bb_perror_msg("warning: %s/%s is a directory",
-                                                directory_name, d->d_name);
+                                                directory_name, d->d_name);
                                 continue;
-                        } else
-                                bb_perror_msg_and_die("open %s/%s",
+                        }
+                        bb_perror_msg_and_die("open %s/%s",
                                                 directory_name, d->d_name);
                 }
                 size = full_read(fd, buf, sizeof(buf)-1);
diff --git a/runit/svlogd.c b/runit/svlogd.c
index 052806c25..c3ff4e9c1 100644
--- a/runit/svlogd.c
+++ b/runit/svlogd.c
@@ -1114,7 +1114,8 @@ int svlogd_main(int argc, char **argv)
                 /* Search for '\n' (in fact, np already holds the result) */
                 linelen = stdin_cnt;
                 if (np) {
- print_to_nl:           /* NB: starting from here lineptr may point
+ print_to_nl:
+                        /* NB: starting from here lineptr may point
                          * farther out into line[] */
                         linelen = np - lineptr + 1;
                 }