Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/fsck.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/e2fsprogs/old_e2fsprogs/fsck.c (modified) (17 diffs)

branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/fsck.c

@@ -21 +21 @@
  *      2001, 2002, 2003, 2004, 2005 by  Theodore Ts'o.
  *
- * %Begin-Header%
- * This file may be redistributed under the terms of the GNU Public
- * License.
- * %End-Header%
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
@@ -286 +283 @@
     if (!s)
         return 0;
-    ret = strdup(s);
+    ret = xstrdup(s);
     return ret;
 }
@@ -353 +350 @@
         return;
 
-    for (p = q = word; *p; q++) {
-        c = *p++;
-        if (c != '\\') {
-            *q = c;
-        } else {
-            *q = bb_process_escape_sequence(&p);
-        }
-    }
-    *q = 0;
+    strcpy_and_process_escape_sequences(word, word);
 }
 
@@ -381 +370 @@
     struct fs_info *fs;
 
-    if (!(fs = malloc(sizeof(struct fs_info))))
-        return NULL;
+    fs = xmalloc(sizeof(struct fs_info));
 
     fs->device = string_copy(device);
@@ -478 +466 @@
     struct fs_info *fs;
 
-    if ((f = fopen(filename, "r")) == NULL) {
-        bb_perror_msg("WARNING: cannot open %s", filename);
+    if ((f = fopen_or_warn(filename, "r")) == NULL) {
         return;
     }
@@ -535 +522 @@
 static char *find_fsck(char *type)
 {
-  char *s;
-  const char *tpl;
-  char *p = string_copy(fsck_path);
-  struct stat st;
-
-  /* Are we looking for a program or just a type? */
-  tpl = (strncmp(type, "fsck.", 5) ? "%s/fsck.%s" : "%s/%s");
-
-  for(s = strtok(p, ":"); s; s = strtok(NULL, ":")) {
-    s = xasprintf(tpl, s, type);
-    if (stat(s, &st) == 0) break;
-    free(s);
-  }
-  free(p);
-  return s;
+    char *s;
+    const char *tpl;
+    char *p = string_copy(fsck_path);
+    struct stat st;
+
+    /* Are we looking for a program or just a type? */
+    tpl = (strncmp(type, "fsck.", 5) ? "%s/fsck.%s" : "%s/%s");
+
+    for (s = strtok(p, ":"); s; s = strtok(NULL, ":")) {
+        s = xasprintf(tpl, s, type);
+        if (stat(s, &st) == 0) break;
+        free(s);
+    }
+    free(p);
+    return s;
 }
 
@@ -578 +565 @@
     pid_t   pid;
 
-    inst = malloc(sizeof(struct fsck_instance));
-    if (!inst)
-        return ENOMEM;
-    memset(inst, 0, sizeof(struct fsck_instance));
+    inst = xzalloc(sizeof(struct fsck_instance));
 
     prog = xasprintf("fsck.%s", type);
@@ -614 +598 @@
         for (i=0; i < argc; i++)
             printf("%s ", argv[i]);
-        puts("");
+        bb_putchar('\n');
     }
 
@@ -621 +605 @@
         pid = -1;
     else if ((pid = fork()) < 0) {
-        perror("fork");
+        perror("vfork"+1);
         return errno;
     } else if (pid == 0) {
@@ -627 +611 @@
             close(0);
         (void) execv(s, argv);
-        bb_perror_msg_and_die("%s", argv[0]);
+        bb_simple_perror_msg_and_die(argv[0]);
     }
 
@@ -887 +871 @@
     num = 0;
     s = strtok(list, ",");
-    while(s) {
+    while (s) {
         negate = 0;
         if (strncmp(s, "no", 2) == 0) {
@@ -932 +916 @@
 
     s = strtok(list, ",");
-    while(s) {
+    while (s) {
         if (strcmp(s, opt) == 0) {
             free(list);
@@ -1006 +990 @@
     if (s == NULL) {
         if (wanted)
-            bb_error_msg("cannot check %s: fsck.%s not found",
+            bb_error_msg("can't check %s: fsck.%s not found",
                 fs->device, fs->type);
         return 1;
@@ -1175 +1159 @@
 {
     int     i, j;
-    char    *arg, *dev, *tmp = 0;
+    char    *arg, *dev, *tmp = NULL;
     char    options[128];
     int     opt = 0;
@@ -1208 +1192 @@
                  */
                 if (access("/proc/partitions", R_OK) < 0) {
-                    bb_perror_msg_and_die("cannot open /proc/partitions "
+                    bb_perror_msg_and_die("can't open /proc/partitions "
                             "(is /proc mounted?)");
                 }
@@ -1220 +1204 @@
                 else
                     bb_error_msg_and_die(
-        "cannot find matching filesystem: %s", arg);
+        "can't find matching filesystem: %s", arg);
             }
             devices[num_devices++] = dev ? dev : string_copy(arg);
@@ -1322 +1306 @@
 }
 
-int fsck_main(int argc, char **argv);
+int fsck_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int fsck_main(int argc, char **argv)
 {