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

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

@@ -6 +6 @@
  *  2003, 2004, 2005 by Theodore Ts'o.
  *
- * This file may be redistributed under the terms of the GNU Public
- * License.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
@@ -177 +176 @@
     if (retval) {
         va_start(ap, fmt);
-        fprintf(stderr,"\nCould not ");
+        fprintf(stderr, "\nCould not ");
         vfprintf(stderr, fmt, ap);
         fprintf(stderr, "\n");
@@ -210 +209 @@
     if (retval) {
         va_start(ap, fmt);
-        fprintf(stderr,"\nWarning: ");
+        fprintf(stderr, "\nWarning: ");
         vfprintf(stderr, fmt, ap);
         fprintf(stderr, "\n");
@@ -226 +225 @@
     errcode_t   retval;
 
-    f = xfopen(bad_blocks_file, "r");
+    f = xfopen_for_read(bad_blocks_file);
     retval = ext2fs_read_bb_FILE(fs, f, bb_list, invalid_block);
     fclose (f);
@@ -247 +246 @@
     f = popen(buf, "r");
     if (!f) {
-        bb_perror_msg_and_die("cannot run '%s'", buf);
+        bb_perror_msg_and_die("can't run '%s'", buf);
     }
     retval = ext2fs_read_bb_FILE(fs, f, bb_list, invalid_block);
@@ -642 +641 @@
             s->s_inodes_per_group);
     if (fs->group_desc_count == 1) {
-        puts("");
+        bb_putchar('\n');
         return;
     }
@@ -677 +676 @@
     }
 
-    if((sb->s_creator_os = e2p_string2os(os)) >= 0) {
+    if ((sb->s_creator_os = e2p_string2os(os)) >= 0) {
         return 1;
     } else if (!strcasecmp("GNU", os)) {
@@ -801 +800 @@
     ext2_ino_t  num_inodes = 0;
     errcode_t   retval;
-    char *      extended_opts = 0;
-    const char *    fs_type = 0;
+    char *      extended_opts = NULL;
+    const char *    fs_type = NULL;
     blk_t       dev_size;
     long        sysval;
@@ -897 +896 @@
             break;
         case 'r':
-            param.s_rev_level = xatoi_u(optarg);
+            param.s_rev_level = xatoi_positive(optarg);
             if (param.s_rev_level == EXT2_GOOD_OLD_REV) {
                 param.s_feature_incompat = 0;
@@ -914 +913 @@
 #ifdef EXT2_DYNAMIC_REV
         case 'I':
-            inode_size = xatoi_u(optarg);
+            inode_size = xatoi_positive(optarg);
             break;
 #endif
         case 'N':
-            num_inodes = xatoi_u(optarg);
+            num_inodes = xatoi_positive(optarg);
             break;
         case 'v':
@@ -1188 +1187 @@
     if (ENABLE_FEATURE_CLEAN_UP)
         atexit(mke2fs_clean_up);
-    if(!PRS(argc, argv))
+    if (!PRS(argc, argv))
         return 0;
 
@@ -1307 +1306 @@
                          NULL, &ret_blk, NULL);
 
-        mke2fs_warning_msg(retval, "cannot zero block %u at end of filesystem", ret_blk);
+        mke2fs_warning_msg(retval, "can't zero block %u at end of filesystem", ret_blk);
         write_inode_tables(fs);
         create_root_dir(fs);