vi: fixes to string search in colon commands, closes 10321

[oweals/busybox.git] / libbb / rtc.c

diff --git a/libbb/rtc.c b/libbb/rtc.c
index 2f38b8a7e65c17a49cbb05517d588a364127ea13..c4117ba34f71902b74a4aee5e348969b8e330b38 100644 (file)
--- a/libbb/rtc.c
+++ b/libbb/rtc.c
@@ -1,7 +1,7 @@
 /*
  * Common RTC functions
  *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
 #include "libbb.h"
@@ -22,14 +22,7 @@ int FAST_FUNC rtc_adjtime_is_utc(void)
                char buffer[128];
 
                while (fgets(buffer, sizeof(buffer), f)) {
-                       int len = strlen(buffer);
-
-                       while (len && isspace(buffer[len - 1]))
-                               len--;
-
-                       buffer[len] = 0;
-
-                       if (strncmp(buffer, "UTC", 3) == 0) {
+                       if (is_prefixed_with(buffer, "UTC")) {
                                utc = 1;
                                break;
                        }
@@ -40,34 +33,68 @@ int FAST_FUNC rtc_adjtime_is_utc(void)
        return utc;
 }
 
+/* rtc opens are exclusive.
+ * Try to run two "hwclock -w" at the same time to see it.
+ * Users wouldn't expect that to fail merely because /dev/rtc
+ * was momentarily busy, let's try a bit harder on errno == EBUSY.
+ */
+static int open_loop_on_busy(const char *name, int flags)
+{
+       int rtc;
+       /*
+        * Tested with two parallel "hwclock -w" loops.
+        * With try = 10, no failures with 2x1000000 loop iterations.
+        */
+       int try = 1000 / 20;
+ again:
+       errno = 0;
+       rtc = open(name, flags);
+       if (errno == EBUSY) {
+               usleep(20 * 1000);
+               if (--try != 0)
+                       goto again;
+               /* EBUSY. Last try, exit on error instead of returning -1 */
+               return xopen(name, flags);
+       }
+       return rtc;
+}
+
+/* Never fails */
 int FAST_FUNC rtc_xopen(const char **default_rtc, int flags)
 {
        int rtc;
+       const char *name =
+               "/dev/rtc""\0"
+               "/dev/rtc0""\0"
+               "/dev/misc/rtc""\0";
 
-       if (!*default_rtc) {
-               *default_rtc = "/dev/rtc";
-               rtc = open(*default_rtc, flags);
-               if (rtc >= 0)
-                       return rtc;
-               *default_rtc = "/dev/rtc0";
-               rtc = open(*default_rtc, flags);
+       if (!*default_rtc)
+               goto try_name;
+       name = ""; /*else: we have rtc name, don't try other names */
+
+       for (;;) {
+               rtc = open_loop_on_busy(*default_rtc, flags);
                if (rtc >= 0)
                        return rtc;
-               *default_rtc = "/dev/misc/rtc";
+               if (!name[0])
+                       return xopen(*default_rtc, flags);
+ try_name:
+               *default_rtc = name;
+               name += strlen(name) + 1;
        }
-
-       return xopen(*default_rtc, flags);
 }
 
-time_t FAST_FUNC rtc_read_time(int fd, int utc)
+void FAST_FUNC rtc_read_tm(struct tm *ptm, int fd)
 {
-       struct tm tm;
-       char *oldtz = 0;
-       time_t t = 0;
+       memset(ptm, 0, sizeof(*ptm));
+       xioctl(fd, RTC_RD_TIME, ptm);
+       ptm->tm_isdst = -1; /* "not known" */
+}
 
-       memset(&tm, 0, sizeof(struct tm));
-       xioctl(fd, RTC_RD_TIME, &tm);
-       tm.tm_isdst = -1; /* not known */
+time_t FAST_FUNC rtc_tm2time(struct tm *ptm, int utc)
+{
+       char *oldtz = oldtz; /* for compiler */
+       time_t t;
 
        if (utc) {
                oldtz = getenv("TZ");
@@ -75,7 +102,7 @@ time_t FAST_FUNC rtc_read_time(int fd, int utc)
                tzset();
        }
 
-       t = mktime(&tm);
+       t = mktime(ptm);
 
        if (utc) {
                unsetenv("TZ");