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

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

@@ -9 +9 @@
  * 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.
  */
 
@@ -396 +393 @@
 #endif
     if (ts.tm_mday == 0) {
-        bb_error_msg_and_die("Cannot parse date/time specifier: %s", str);
+        bb_error_msg_and_die("can't parse date/time specifier: %s", str);
     }
     return mktime(&ts);
@@ -558 +555 @@
 }
 
-#ifdef CONFIG_FINDFS
-static ATTRIBUTE_NORETURN void do_findfs(int argc, char **argv)
-{
-    if ((argc != 2) ||
-        (strncmp(argv[1], "LABEL=", 6) && strncmp(argv[1], "UUID=", 5)))
-        bb_show_usage();
-    device_name = x_blkid_get_devname(argv[1]);
-    puts(device_name);
-    exit(0);
-}
-#else
-#define do_findfs(x, y)
-#endif
-
 static void tune2fs_clean_up(void)
 {
@@ -578 +561 @@
 }
 
-int tune2fs_main(int argc, char **argv);
+int tune2fs_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int tune2fs_main(int argc, char **argv)
 {
@@ -589 +572 @@
         atexit(tune2fs_clean_up);
 
-    if (ENABLE_FINDFS && (applet_name[0] == 'f')) /* findfs */
-        do_findfs(argc, argv);  /* no return */
-    else if (ENABLE_E2LABEL && (applet_name[0] == 'e')) /* e2label */
+    if (ENABLE_E2LABEL && (applet_name[0] == 'e')) /* e2label */
         parse_e2label_options(argc, argv);
     else
@@ -610 +591 @@
     retval = ext2fs_check_if_mounted(device_name, &mount_flags);
     if (retval)
-        bb_error_msg_and_die("cannot determine if %s is mounted", device_name);
+        bb_error_msg_and_die("can't determine if %s is mounted", device_name);
     /* Normally we only need to write out the superblock */
     fs->flags |= EXT2_FLAG_SUPER_ONLY;