Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/util-linux/mdev.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/util-linux/mdev.c (modified) (16 diffs)

branches/3.3/mindi-busybox/util-linux/mdev.c

@@ -98 +98 @@
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 #include "xregex.h"
 
@@ -284 +285 @@
 #endif
     struct rule cur_rule;
-    char timestr[sizeof("60.123456")];
+    char timestr[sizeof("HH:MM:SS.123456")];
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
+#define G (*(struct globals*)bb_common_bufsiz1)
 #define INIT_G() do { \
+    setup_common_bufsiz(); \
     IF_NOT_FEATURE_MDEV_CONF(G.cur_rule.maj = -1;) \
     IF_NOT_FEATURE_MDEV_CONF(G.cur_rule.mode = 0660;) \
@@ -324 +326 @@
     }
     make_default_cur_rule();
-}
-
-/* In later versions, endofname is in libbb */
-#define endofname mdev_endofname
-static
-const char* FAST_FUNC
-endofname(const char *name)
-{
-#define is_name(c)      ((c) == '_' || isalpha((unsigned char)(c)))
-#define is_in_name(c)   ((c) == '_' || isalnum((unsigned char)(c)))
-    if (!is_name(*name))
-        return name;
-    while (*++name) {
-        if (!is_in_name(*name))
-            break;
-    }
-    return name;
 }
 
@@ -418 +403 @@
 
         /* 2nd field: uid:gid - device ownership */
-        if (get_uidgid(&G.cur_rule.ugid, tokens[1], /*allow_numeric:*/ 1) == 0) {
+        if (get_uidgid(&G.cur_rule.ugid, tokens[1]) == 0) {
             bb_error_msg("unknown user/group '%s' on line %d", tokens[1], G.parser->lineno);
             goto next_rule;
@@ -424 +409 @@
 
         /* 3rd field: mode - device permissions */
-        bb_parse_mode(tokens[2], &G.cur_rule.mode);
+        G.cur_rule.mode = bb_parse_mode(tokens[2], G.cur_rule.mode);
 
         /* 4th field (opt): ">|=alias" or "!" to not create the node */
@@ -489 +474 @@
         parse_next_rule();
         if (G.rule_vec) { /* mdev -s */
-            rule = memcpy(xmalloc(sizeof(G.cur_rule)), &G.cur_rule, sizeof(G.cur_rule));
+            rule = xmemdup(&G.cur_rule, sizeof(G.cur_rule));
             G.rule_vec = xrealloc_vector(G.rule_vec, 4, G.rule_idx);
             G.rule_vec[G.rule_idx++] = rule;
@@ -628 +613 @@
      */
     type = S_IFCHR;
-    if (strstr(path, "/block/") || (G.subsystem && strncmp(G.subsystem, "block", 5) == 0))
+    if (strstr(path, "/block/") || (G.subsystem && is_prefixed_with(G.subsystem, "block")))
         type = S_IFBLK;
 
@@ -941 +926 @@
     struct timeval tv;
     gettimeofday(&tv, NULL);
-    sprintf(G.timestr, "%u.%06u", (unsigned)tv.tv_sec % 60, (unsigned)tv.tv_usec);
+    sprintf(
+        strftime_HHMMSS(G.timestr, sizeof(G.timestr), &tv.tv_sec),
+        ".%06u",
+        (unsigned)tv.tv_usec
+    );
     return G.timestr;
 }
@@ -961 +950 @@
  */
 static int
-wait_for_seqfile(const char *seq)
+wait_for_seqfile(unsigned expected_seq)
 {
     /* We time out after 2 sec */
@@ -976 +965 @@
     for (;;) {
         int seqlen;
-        char seqbuf[sizeof(int)*3 + 2];
+        char seqbuf[sizeof(long)*3 + 2];
+        unsigned seqbufnum;
 
         if (seq_fd < 0) {
@@ -982 +972 @@
             if (seq_fd < 0)
                 break;
+            close_on_exec_on(seq_fd);
         }
         seqlen = pread(seq_fd, seqbuf, sizeof(seqbuf) - 1, 0);
@@ -990 +981 @@
         }
         seqbuf[seqlen] = '\0';
-        if (seqbuf[0] == '\n') {
+        if (seqbuf[0] == '\n' || seqbuf[0] == '\0') {
             /* seed file: write out seq ASAP */
-            xwrite_str(seq_fd, seq);
+            xwrite_str(seq_fd, utoa(expected_seq));
             xlseek(seq_fd, 0, SEEK_SET);
             dbg2("first seq written");
             break;
         }
-        if (strcmp(seq, seqbuf) == 0) {
+        seqbufnum = atoll(seqbuf);
+        if (seqbufnum == expected_seq) {
             /* correct idx */
             break;
         }
+        if (seqbufnum > expected_seq) {
+            /* a later mdev runs already (this was seen by users to happen) */
+            /* do not overwrite seqfile on exit */
+            close(seq_fd);
+            seq_fd = -1;
+            break;
+        }
         if (do_once) {
-            dbg2("%s waiting for '%s'", curtime(), seqbuf);
+            dbg2("%s mdev.seq='%s', need '%u'", curtime(), seqbuf, expected_seq);
             do_once = 0;
         }
@@ -1010 +1009 @@
         }
         if (--timeout == 0) {
-            dbg1("%s waiting for '%s'", "timed out", seqbuf);
+            dbg1("%s mdev.seq='%s'", "timed out", seqbuf);
             break;
         }
@@ -1093 +1092 @@
         char *env_devpath;
         unsigned my_pid;
+        unsigned seqnum = seqnum; /* for compiler */
         int seq_fd;
         smalluint op;
@@ -1101 +1101 @@
          * DEVPATH is like "/block/sda" or "/class/input/mice"
          */
+        env_devname = getenv("DEVNAME"); /* can be NULL */
+        G.subsystem = getenv("SUBSYSTEM");
         action = getenv("ACTION");
-        op = index_in_strings(keywords, action);
-        env_devname = getenv("DEVNAME"); /* can be NULL */
         env_devpath = getenv("DEVPATH");
-        G.subsystem = getenv("SUBSYSTEM");
         if (!action || !env_devpath /*|| !G.subsystem*/)
             bb_show_usage();
         fw = getenv("FIRMWARE");
         seq = getenv("SEQNUM");
+        op = index_in_strings(keywords, action);
 
         my_pid = getpid();
         open_mdev_log(seq, my_pid);
 
-        seq_fd = seq ? wait_for_seqfile(seq) : -1;
+        seq_fd = -1;
+        if (seq) {
+            seqnum = atoll(seq);
+            seq_fd = wait_for_seqfile(seqnum);
+        }
 
         dbg1("%s "
@@ -1142 +1146 @@
         dbg1("%s exiting", curtime());
         if (seq_fd >= 0) {
-            xwrite_str(seq_fd, utoa(xatou(seq) + 1));
+            xwrite_str(seq_fd, utoa(seqnum + 1));
             signal_mdevs(my_pid);
         }