apply post-1.18.0 patches, bump version to 1.18.11_18_1

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

1 files changed, 5 insertions, 2 deletions

diff --git a/runit/runsvdir.c b/runit/runsvdir.c
index e77eeff04..166664237 100644
--- a/runit/runsvdir.c
+++ b/runit/runsvdir.c
@@ -312,8 +312,11 @@ int runsvdir_main(int argc UNUSED_PARAM, char **argv)
                                                 last_mtime = s.st_mtime;
                                                 last_dev = s.st_dev;
                                                 last_ino = s.st_ino;
-                                                //if (now <= mtime)
-                                                //      sleep(1);
+                                                /* if the svdir changed this very second, wait until the
+                                                 * next second, because we won't be able to detect more
+                                                 * changes within this second */
+                                                while (time(NULL) == last_mtime)
+                                                        usleep(100000);
                                                 need_rescan = do_rescan();
                                                 while (fchdir(curdir) == -1) {
                                                         warn2_cannot("change directory, pausing", "");