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

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

@@ -5 +5 @@
  * Copyright 1995, 1996, 1997, 1998, 1999, 2000 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.
  */
 
@@ -38 +35 @@
     if (force)
         return;
-    if(val == -1)
-        bb_perror_msg_and_die("cannot stat %s", device);
+    if (val == -1)
+        bb_perror_msg_and_die("can't stat '%s'", device);
     if (!S_ISBLK(s.st_mode)) {
         printf("%s is not a block special device.\n", device);
@@ -83 +80 @@
     retval = ext2fs_check_if_mounted(device, &mount_flags);
     if (retval) {
-        bb_error_msg("cannot determine if %s is mounted", device);
+        bb_error_msg("can't determine if %s is mounted", device);
         return;
     }
@@ -99 +96 @@
         goto force_check;
     }
-
 }
 
@@ -220 +216 @@
                     fs->blocksize, io_ptr, &jfs);
     if (retval)
-        bb_error_msg_and_die("cannot journal device %s", journal_device);
-    if(!quiet)
+        bb_error_msg_and_die("can't journal device %s", journal_device);
+    if (!quiet)
         printf("Adding journal to device %s: ", journal_device);
     fflush(stdout);
     retval = ext2fs_add_journal_device(fs, jfs);
-    if(retval)
+    if (retval)
         bb_error_msg_and_die("\nFailed to add journal to device %s", journal_device);
-    if(!quiet)
+    if (!quiet)
         puts("done");
     ext2fs_close(jfs);
@@ -243 +239 @@
         return;
     }
-    if(!quiet)
+    if (!quiet)
         printf("Creating journal (%ld blocks): ", journal_blocks);
     fflush(stdout);
     retval = ext2fs_add_journal_inode(fs, journal_blocks,
                           journal_flags);
-    if(retval)
-        bb_error_msg_and_die("cannot create journal");
-    if(!quiet)
+    if (retval)
+        bb_error_msg_and_die("can't create journal");
+    if (!quiet)
         puts("done");
 }
@@ -263 +259 @@
      else
         oldpath = PATH_SET;
-    putenv (oldpath);
+    putenv(oldpath);
     return oldpath;
 }