Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/miscutils/makedevs.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/miscutils/makedevs.c (modified) (4 diffs)

branches/2.2.9/mindi-busybox/miscutils/makedevs.c

@@ -11 +11 @@
 
 #if ENABLE_FEATURE_MAKEDEVS_LEAF
-int makedevs_main(int argc, char **argv);
+/*
+makedevs NAME TYPE MAJOR MINOR FIRST LAST [s]
+TYPEs:
+b       Block device
+c       Character device
+f       FIFO
+
+FIRST..LAST specify numbers appended to NAME.
+If 's' is the last argument, the base device is created as well.
+Examples:
+        makedevs /dev/ttyS c 4 66 2 63   ->  ttyS2-ttyS63
+        makedevs /dev/hda b 3 0 0 8 s    ->  hda,hda1-hda8
+*/
+int makedevs_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int makedevs_main(int argc, char **argv)
 {
     mode_t mode;
-    char *basedev, *type, *nodname, buf[255];
+    char *basedev, *type, *nodname, *buf;
     int Smajor, Sminor, S, E;
 
-    if (argc < 7 || *argv[1]=='-')
+    if (argc < 7 || argv[1][0] == '-')
         bb_show_usage();
 
     basedev = argv[1];
+    buf = xasprintf("%s%u", argv[1], (unsigned)-1);
     type = argv[2];
-    Smajor = xatoi_u(argv[3]);
-    Sminor = xatoi_u(argv[4]);
-    S = xatoi_u(argv[5]);
-    E = xatoi_u(argv[6]);
-    nodname = argc == 8 ? basedev : buf;
+    Smajor = xatoi_positive(argv[3]);
+    Sminor = xatoi_positive(argv[4]);
+    S = xatoi_positive(argv[5]);
+    E = xatoi_positive(argv[6]);
+    nodname = argv[7] ? basedev : buf;
 
     mode = 0660;
-
     switch (type[0]) {
     case 'c':
@@ -46 +59 @@
 
     while (S <= E) {
-        int sz;
-
-        sz = snprintf(buf, sizeof(buf), "%s%d", basedev, S);
-        if (sz < 0 || sz >= sizeof(buf))  /* libc different */
-            bb_error_msg_and_die("%s too large", basedev);
-
-    /* if mode != S_IFCHR and != S_IFBLK third param in mknod() ignored */
-
+        sprintf(buf, "%s%u", basedev, S);
+
+        /* if mode != S_IFCHR and != S_IFBLK,
+         * third param in mknod() ignored */
         if (mknod(nodname, mode, makedev(Smajor, Sminor)))
-            bb_error_msg("failed to create: %s", nodname);
-
-        if (nodname == basedev) /* ex. /dev/hda - to /dev/hda1 ... */
+            bb_perror_msg("can't create '%s'", nodname);
+
+        /*if (nodname == basedev)*/ /* ex. /dev/hda - to /dev/hda1 ... */
             nodname = buf;
         S++;
@@ -68 +77 @@
 #elif ENABLE_FEATURE_MAKEDEVS_TABLE
 
-/* Licensed under the GPL v2 or later, see the file LICENSE in this tarball. */
-
-int makedevs_main(int argc, char **argv);
-int makedevs_main(int argc, char **argv)
+/* Licensed under GPLv2 or later, see file LICENSE in this source tree. */
+
+int makedevs_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int makedevs_main(int argc UNUSED_PARAM, char **argv)
 {
-    FILE *table = stdin;
-    char *rootdir = NULL;
-    char *line = NULL;
-    int linenum = 0;
+    parser_t *parser;
+    char *line = (char *)"-";
     int ret = EXIT_SUCCESS;
 
+    opt_complementary = "=1"; /* exactly one param */
     getopt32(argv, "d:", &line);
-    if (line)
-        table = xfopen(line, "r");
-
-    if (optind >= argc || (rootdir=argv[optind])==NULL) {
-        bb_error_msg_and_die("root directory not specified");
-    }
-
-    xchdir(rootdir);
+    argv += optind;
+
+    xchdir(*argv); /* ensure root dir exists */
 
     umask(0);
 
-    printf("rootdir=%s\n", rootdir);
-    if (line) {
-        printf("table='%s'\n", line);
+    printf("rootdir=%s\ntable=", *argv);
+    if (NOT_LONE_DASH(line)) {
+        printf("'%s'\n", line);
     } else {
-        printf("table=<stdin>\n");
-    }
-
-    while ((line = xmalloc_getline(table))) {
+        puts("<stdin>");
+    }
+
+    parser = config_open(line);
+    while (config_read(parser, &line, 1, 1, "# \t", PARSE_NORMAL)) {
+        int linenum;
         char type;
-        unsigned int mode = 0755;
-        unsigned int major = 0;
-        unsigned int minor = 0;
-        unsigned int count = 0;
-        unsigned int increment = 0;
-        unsigned int start = 0;
+        unsigned mode = 0755;
+        unsigned major = 0;
+        unsigned minor = 0;
+        unsigned count = 0;
+        unsigned increment = 0;
+        unsigned start = 0;
         char name[41];
         char user[41];
         char group[41];
-        char *full_name;
+        char *full_name = name;
         uid_t uid;
         gid_t gid;
 
-        linenum++;
-
-        if ((2 > sscanf(line, "%40s %c %o %40s %40s %u %u %u %u %u", name,
-                        &type, &mode, user, group, &major,
-                        &minor, &start, &increment, &count)) ||
-                ((major | minor | start | count | increment) > 255))
-        {
-            if (*line=='\0' || *line=='#' || isspace(*line))
-                continue;
-            bb_error_msg("line %d invalid: '%s'", linenum, line);
+        linenum = parser->lineno;
+
+        if ((2 > sscanf(line, "%40s %c %o %40s %40s %u %u %u %u %u",
+                    name, &type, &mode, user, group,
+                    &major, &minor, &start, &increment, &count))
+         || ((unsigned)(major | minor | start | count | increment) > 255)
+        ) {
+            bb_error_msg("invalid line %d: '%s'", linenum, line);
             ret = EXIT_FAILURE;
             continue;
         }
-        if (name[0] == '#') {
-            continue;
-        }
 
         gid = (*group) ? get_ug_id(group, xgroup2gid) : getgid();
         uid = (*user) ? get_ug_id(user, xuname2uid) : getuid();
-        full_name = concat_path_file(rootdir, name);
+        /* We are already in the right root dir,
+         * so make absolute paths relative */
+        if ('/' == *full_name)
+            full_name++;
 
         if (type == 'd') {
             bb_make_directory(full_name, mode | S_IFDIR, FILEUTILS_RECUR);
             if (chown(full_name, uid, gid) == -1) {
-                bb_perror_msg("line %d: chown failed for %s", linenum, full_name);
-                ret = EXIT_FAILURE;
-                goto loop;
-            }
-            if ((mode != -1) && (chmod(full_name, mode) < 0)){
-                bb_perror_msg("line %d: chmod failed for %s", linenum, full_name);
-                ret = EXIT_FAILURE;
-                goto loop;
+ chown_fail:
+                bb_perror_msg("line %d: can't chown %s", linenum, full_name);
+                ret = EXIT_FAILURE;
+                continue;
+            }
+            if (chmod(full_name, mode) < 0) {
+ chmod_fail:
+                bb_perror_msg("line %d: can't chmod %s", linenum, full_name);
+                ret = EXIT_FAILURE;
+                continue;
             }
         } else if (type == 'f') {
@@ -151 +156 @@
                 bb_perror_msg("line %d: regular file '%s' does not exist", linenum, full_name);
                 ret = EXIT_FAILURE;
-                goto loop;
-            }
-            if (chown(full_name, uid, gid) == -1) {
-                bb_perror_msg("line %d: chown failed for %s", linenum, full_name);
-                ret = EXIT_FAILURE;
-                goto loop;
-            }
-            if ((mode != -1) && (chmod(full_name, mode) < 0)){
-                bb_perror_msg("line %d: chmod failed for %s", linenum, full_name);
-                ret = EXIT_FAILURE;
-                goto loop;
-            }
+                continue;
+            }
+            if (chown(full_name, uid, gid) < 0)
+                goto chown_fail;
+            if (chmod(full_name, mode) < 0)
+                goto chmod_fail;
         } else {
             dev_t rdev;
+            unsigned i;
+            char *full_name_inc;
 
             if (type == 'p') {
                 mode |= S_IFIFO;
-            }
-            else if (type == 'c') {
+            } else if (type == 'c') {
                 mode |= S_IFCHR;
-            }
-            else if (type == 'b') {
+            } else if (type == 'b') {
                 mode |= S_IFBLK;
             } else {
                 bb_error_msg("line %d: unsupported file type %c", linenum, type);
                 ret = EXIT_FAILURE;
-                goto loop;
-            }
-
-            if (count > 0) {
-                int i;
-                char *full_name_inc;
-
-                full_name_inc = xmalloc(strlen(full_name) + 4);
-                for (i = start; i < count; i++) {
-                    sprintf(full_name_inc, "%s%d", full_name, i);
-                    rdev = makedev(major, minor + (i * increment - start));
-                    if (mknod(full_name_inc, mode, rdev) == -1) {
-                        bb_perror_msg("line %d: cannot create node %s", linenum, full_name_inc);
-                        ret = EXIT_FAILURE;
-                    }
-                    else if (chown(full_name_inc, uid, gid) == -1) {
-                        bb_perror_msg("line %d: chown failed for %s", linenum, full_name_inc);
-                        ret = EXIT_FAILURE;
-                    }
-                    if ((mode != -1) && (chmod(full_name_inc, mode) < 0)){
-                        bb_perror_msg("line %d: chmod failed for %s", linenum, full_name_inc);
-                        ret = EXIT_FAILURE;
-                    }
-                }
-                free(full_name_inc);
-            } else {
-                rdev = makedev(major, minor);
-                if (mknod(full_name, mode, rdev) == -1) {
-                    bb_perror_msg("line %d: cannot create node %s", linenum, full_name);
+                continue;
+            }
+
+            full_name_inc = xmalloc(strlen(full_name) + sizeof(int)*3 + 2);
+            if (count)
+                count--;
+            for (i = start; i <= start + count; i++) {
+                sprintf(full_name_inc, count ? "%s%u" : "%s", full_name, i);
+                rdev = makedev(major, minor + (i - start) * increment);
+                if (mknod(full_name_inc, mode, rdev) < 0) {
+                    bb_perror_msg("line %d: can't create node %s", linenum, full_name_inc);
+                    ret = EXIT_FAILURE;
+                } else if (chown(full_name_inc, uid, gid) < 0) {
+                    bb_perror_msg("line %d: can't chown %s", linenum, full_name_inc);
+                    ret = EXIT_FAILURE;
+                } else if (chmod(full_name_inc, mode) < 0) {
+                    bb_perror_msg("line %d: can't chmod %s", linenum, full_name_inc);
                     ret = EXIT_FAILURE;
                 }
-                else if (chown(full_name, uid, gid) == -1) {
-                    bb_perror_msg("line %d: chown failed for %s", linenum, full_name);
-                    ret = EXIT_FAILURE;
-                }
-                if ((mode != -1) && (chmod(full_name, mode) < 0)){
-                    bb_perror_msg("line %d: chmod failed for %s", linenum, full_name);
-                    ret = EXIT_FAILURE;
-                }
-            }
+            }
+            free(full_name_inc);
         }
-loop:
-        free(line);
-        free(full_name);
-    }
-    fclose(table);
+    }
+    if (ENABLE_FEATURE_CLEAN_UP)
+        config_close(parser);
 
     return ret;