Merge branch 'busybox' into merge

2 files changed, 18 insertions, 10 deletions

diff --git a/runit/runsv.c b/runit/runsv.c
index 36d85101e..ecab8cdf5 100644
--- a/runit/runsv.c
+++ b/runit/runsv.c
@@ -58,11 +58,19 @@ static void gettimeofday_ns(struct timespec *ts)
 #else
 static void gettimeofday_ns(struct timespec *ts)
 {
-        BUILD_BUG_ON(sizeof(struct timeval) != sizeof(struct timespec));
-        BUILD_BUG_ON(sizeof(((struct timeval*)ts)->tv_usec) != sizeof(ts->tv_nsec));
-        /* Cheat */
-        gettimeofday((void*)ts, NULL);
-        ts->tv_nsec *= 1000;
+        if (sizeof(struct timeval) == sizeof(struct timespec)
+         && sizeof(((struct timeval*)ts)->tv_usec) == sizeof(ts->tv_nsec)
+        ) {
+                /* Cheat */
+                xgettimeofday((void*)ts);
+                ts->tv_nsec *= 1000;
+        } else {
+                /* For example, musl has "incompatible" layouts */
+                struct timeval tv;
+                xgettimeofday(&tv);
+                ts->tv_sec = tv.tv_sec;
+                ts->tv_nsec = tv.tv_usec * 1000;
+        }
 }
 #endif
 
@@ -651,7 +659,7 @@ int runsv_main(int argc UNUSED_PARAM, char **argv)
                                 gettimeofday_ns(&svd[0].start);
                                 update_status(&svd[0]);
                                 if (LESS(svd[0].start.tv_sec, deadline))
-                                        sleep(1);
+                                        sleep1();
                         }
                         if (haslog) {
                                 if (child == svd[1].pid) {
@@ -664,7 +672,7 @@ int runsv_main(int argc UNUSED_PARAM, char **argv)
                                         gettimeofday_ns(&svd[1].start);
                                         update_status(&svd[1]);
                                         if (LESS(svd[1].start.tv_sec, deadline))
-                                                sleep(1);
+                                                sleep1();
                                 }
                         }
                 } /* for (;;) */
diff --git a/runit/svlogd.c b/runit/svlogd.c
index a250058a1..294e31aca 100644
--- a/runit/svlogd.c
+++ b/runit/svlogd.c
@@ -351,7 +351,7 @@ static void fmt_time_human_30nul(char *s, char dt_delim)
         struct tm *ptm;
         struct timeval tv;
 
-        gettimeofday(&tv, NULL);
+        xgettimeofday(&tv);
         ptm = gmtime_r(&tv.tv_sec, &tm);
         /* ^^^ using gmtime_r() instead of gmtime() to not use static data */
         sprintf(s, "%04u-%02u-%02u%c%02u:%02u:%02u.%06u000",
@@ -376,7 +376,7 @@ static void fmt_time_bernstein_25(char *s)
         struct timeval tv;
         unsigned sec_hi;
 
-        gettimeofday(&tv, NULL);
+        xgettimeofday(&tv);
         sec_hi = (0x400000000000000aULL + tv.tv_sec) >> 32;
         tv.tv_sec = (time_t)(0x400000000000000aULL) + tv.tv_sec;
         tv.tv_usec *= 1000;
@@ -775,7 +775,7 @@ static NOINLINE unsigned logdir_open(struct logdir *ld, const char *fn)
                                 ld->nmin = xatoi_positive(&s[1]);
                                 break;
                         case 't': {
-                                static const struct suffix_mult mh_suffixes[] = {
+                                static const struct suffix_mult mh_suffixes[] ALIGN_SUFFIX = {
                                         { "m", 60 },
                                         { "h", 60*60 },
                                         /*{ "d", 24*60*60 },*/