Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/miscutils/devfsd.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/miscutils/devfsd.c (modified) (7 diffs)

branches/3.3/mindi-busybox/miscutils/devfsd.c

@@ -285 +285 @@
 /* Busybox stuff */
 #if ENABLE_DEVFSD_VERBOSE || ENABLE_DEBUG
-#define info_logger(p, fmt, args...)                 bb_info_msg(fmt, ## args)
+#define info_logger(p, fmt, args...)                 bb_error_msg(fmt, ## args)
 #define msg_logger(p, fmt, args...)                  bb_error_msg(fmt, ## args)
 #define msg_logger_and_die(p, fmt, args...)          bb_error_msg_and_die(fmt, ## args)
@@ -1084 +1084 @@
     struct passwd *pw_ent;
     struct group *grp_ent;
-    static const char *msg;
+    const char *msg;
+
+    if (isdigit(string[0]) || ((string[0] == '-') && isdigit(string[1])))
+        return atoi(string);
+
+    if (flag == UID && (pw_ent = getpwnam(string)) != NULL)
+        return pw_ent->pw_uid;
 
     if (ENABLE_DEVFSD_VERBOSE)
         msg = "user";
 
-    if (isdigit(string[0]) ||((string[0] == '-') && isdigit(string[1])))
-        return atoi(string);
-
-    if (flag == UID && (pw_ent = getpwnam(string)) != NULL)
-        return pw_ent->pw_uid;
-
-    if (flag == GID && (grp_ent = getgrnam(string)) != NULL)
-        return grp_ent->gr_gid;
-    else if (ENABLE_DEVFSD_VERBOSE)
-        msg = "group";
+    if (flag == GID) {
+        if ((grp_ent = getgrnam(string)) != NULL)
+            return grp_ent->gr_gid;
+        if (ENABLE_DEVFSD_VERBOSE)
+            msg = "group";
+    }
 
     if (ENABLE_DEVFSD_VERBOSE)
@@ -1141 +1143 @@
 static const char *get_variable(const char *variable, void *info)
 {
-    static char sbuf[sizeof(int)*3 + 2]; /* sign and NUL */
     static char *hostname;
 
     struct get_variable_info *gv_info = info;
     const char *field_names[] = {
-            "hostname", "mntpt", "devpath", "devname",
-            "uid", "gid", "mode", hostname, mount_point,
-            gv_info->devpath, gv_info->devname, NULL
+            "hostname", "mntpt", "devpath", "devname", "uid", "gid", "mode",
+            NULL, mount_point, gv_info->devpath, gv_info->devname, NULL
     };
     int i;
@@ -1154 +1154 @@
     if (!hostname)
         hostname = safe_gethostname();
+    field_names[7] = hostname;
+
     /* index_in_str_array returns i>=0  */
     i = index_in_str_array(field_names, variable);
@@ -1163 +1165 @@
 
     if (i == 4)
-        sprintf(sbuf, "%u", gv_info->info->uid);
-    else if (i == 5)
-        sprintf(sbuf, "%u", gv_info->info->gid);
-    else if (i == 6)
-        sprintf(sbuf, "%o", gv_info->info->mode);
-    return sbuf;
+        return auto_string(xasprintf("%u", gv_info->info->uid));
+    if (i == 5)
+        return auto_string(xasprintf("%u", gv_info->info->gid));
+    /* i == 6 */
+    return auto_string(xasprintf("%o", gv_info->info->mode));
 }   /*  End Function get_variable  */
 
@@ -1404 +1405 @@
     const char *pty1;
     const char *pty2;
-    size_t len;
     /* 1 to 5  "scsi/" , 6 to 9 "ide/host", 10 sbp/, 11 vcc/, 12 pty/ */
     static const char *const fmt[] = {
@@ -1424 +1424 @@
 
     for (trans = translate_table; trans->match != NULL; ++trans) {
-        len = strlen(trans->match);
-
-        if (strncmp(devname, trans->match, len) == 0) {
+        char *after_match = is_prefixed_with(devname, trans->match);
+        if (after_match) {
             if (trans->format == NULL)
-                return devname + len;
-            sprintf(buffer, trans->format, devname + len);
+                return after_match;
+            sprintf(buffer, trans->format, after_match);
             return buffer;
         }