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)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/mke2fs.c
r1765 r2725 6 6 * 2003, 2004, 2005 by Theodore Ts'o. 7 7 * 8 * This file may be redistributed under the terms of the GNU Public 9 * License. 8 * Licensed under GPLv2, see file LICENSE in this source tree. 10 9 */ 11 10 … … 177 176 if (retval) { 178 177 va_start(ap, fmt); 179 fprintf(stderr, "\nCould not ");178 fprintf(stderr, "\nCould not "); 180 179 vfprintf(stderr, fmt, ap); 181 180 fprintf(stderr, "\n"); … … 210 209 if (retval) { 211 210 va_start(ap, fmt); 212 fprintf(stderr, "\nWarning: ");211 fprintf(stderr, "\nWarning: "); 213 212 vfprintf(stderr, fmt, ap); 214 213 fprintf(stderr, "\n"); … … 226 225 errcode_t retval; 227 226 228 f = xfopen (bad_blocks_file, "r");227 f = xfopen_for_read(bad_blocks_file); 229 228 retval = ext2fs_read_bb_FILE(fs, f, bb_list, invalid_block); 230 229 fclose (f); … … 247 246 f = popen(buf, "r"); 248 247 if (!f) { 249 bb_perror_msg_and_die("can not run '%s'", buf);248 bb_perror_msg_and_die("can't run '%s'", buf); 250 249 } 251 250 retval = ext2fs_read_bb_FILE(fs, f, bb_list, invalid_block); … … 642 641 s->s_inodes_per_group); 643 642 if (fs->group_desc_count == 1) { 644 puts("");643 bb_putchar('\n'); 645 644 return; 646 645 } … … 677 676 } 678 677 679 if ((sb->s_creator_os = e2p_string2os(os)) >= 0) {678 if ((sb->s_creator_os = e2p_string2os(os)) >= 0) { 680 679 return 1; 681 680 } else if (!strcasecmp("GNU", os)) { … … 801 800 ext2_ino_t num_inodes = 0; 802 801 errcode_t retval; 803 char * extended_opts = 0;804 const char * fs_type = 0;802 char * extended_opts = NULL; 803 const char * fs_type = NULL; 805 804 blk_t dev_size; 806 805 long sysval; … … 897 896 break; 898 897 case 'r': 899 param.s_rev_level = xatoi_ u(optarg);898 param.s_rev_level = xatoi_positive(optarg); 900 899 if (param.s_rev_level == EXT2_GOOD_OLD_REV) { 901 900 param.s_feature_incompat = 0; … … 914 913 #ifdef EXT2_DYNAMIC_REV 915 914 case 'I': 916 inode_size = xatoi_ u(optarg);915 inode_size = xatoi_positive(optarg); 917 916 break; 918 917 #endif 919 918 case 'N': 920 num_inodes = xatoi_ u(optarg);919 num_inodes = xatoi_positive(optarg); 921 920 break; 922 921 case 'v': … … 1188 1187 if (ENABLE_FEATURE_CLEAN_UP) 1189 1188 atexit(mke2fs_clean_up); 1190 if (!PRS(argc, argv))1189 if (!PRS(argc, argv)) 1191 1190 return 0; 1192 1191 … … 1307 1306 NULL, &ret_blk, NULL); 1308 1307 1309 mke2fs_warning_msg(retval, "can not zero block %u at end of filesystem", ret_blk);1308 mke2fs_warning_msg(retval, "can't zero block %u at end of filesystem", ret_blk); 1310 1309 write_inode_tables(fs); 1311 1310 create_root_dir(fs);
Note:
See TracChangeset
for help on using the changeset viewer.