aboutsummaryrefslogtreecommitdiff
path: root/e2fsprogs
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2009-11-13 09:08:27 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2009-11-13 09:08:27 +0100
commit6331cf059ccfdf35f4e5a505cbae885094cc41b0 (patch)
treeccb4b4f0d96d9636861a75f7fc6c97b8b15bd306 /e2fsprogs
parentf4fee418ae9f5308b4d32bc8d4e618f779f3203f (diff)
downloadbusybox-w32-6331cf059ccfdf35f4e5a505cbae885094cc41b0.tar.gz
busybox-w32-6331cf059ccfdf35f4e5a505cbae885094cc41b0.tar.bz2
busybox-w32-6331cf059ccfdf35f4e5a505cbae885094cc41b0.zip
*: use "can't" instead of "cannot"
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'e2fsprogs')
-rw-r--r--e2fsprogs/fsck.c2
-rw-r--r--e2fsprogs/old_e2fsprogs/blkid/resolve.c2
-rw-r--r--e2fsprogs/old_e2fsprogs/e2fsck.c6
-rw-r--r--e2fsprogs/old_e2fsprogs/fsck.c6
-rw-r--r--e2fsprogs/old_e2fsprogs/mke2fs.c4
-rw-r--r--e2fsprogs/old_e2fsprogs/tune2fs.c4
-rw-r--r--e2fsprogs/old_e2fsprogs/util.c8
7 files changed, 16 insertions, 16 deletions
diff --git a/e2fsprogs/fsck.c b/e2fsprogs/fsck.c
index 21b2fdc0d..fd0401b47 100644
--- a/e2fsprogs/fsck.c
+++ b/e2fsprogs/fsck.c
@@ -298,7 +298,7 @@ static void load_fs_info(const char *filename)
298 298
299 fstab = setmntent(filename, "r"); 299 fstab = setmntent(filename, "r");
300 if (!fstab) { 300 if (!fstab) {
301 bb_perror_msg("cannot read %s", filename); 301 bb_perror_msg("can't read %s", filename);
302 return; 302 return;
303 } 303 }
304 304
diff --git a/e2fsprogs/old_e2fsprogs/blkid/resolve.c b/e2fsprogs/old_e2fsprogs/blkid/resolve.c
index 7942de2cd..0f92158e2 100644
--- a/e2fsprogs/old_e2fsprogs/blkid/resolve.c
+++ b/e2fsprogs/old_e2fsprogs/blkid/resolve.c
@@ -121,7 +121,7 @@ int main(int argc, char **argv)
121 exit(1); 121 exit(1);
122 } 122 }
123 if (blkid_get_cache(&cache, bb_dev_null) < 0) { 123 if (blkid_get_cache(&cache, bb_dev_null) < 0) {
124 fprintf(stderr, "cannot get blkid cache\n"); 124 fprintf(stderr, "Can't get blkid cache\n");
125 exit(1); 125 exit(1);
126 } 126 }
127 127
diff --git a/e2fsprogs/old_e2fsprogs/e2fsck.c b/e2fsprogs/old_e2fsprogs/e2fsck.c
index 6531f5d16..c715d3e9a 100644
--- a/e2fsprogs/old_e2fsprogs/e2fsck.c
+++ b/e2fsprogs/old_e2fsprogs/e2fsck.c
@@ -9400,7 +9400,7 @@ static const struct e2fsck_problem problem_table[] = {
9400 9400
9401 /* Cannot proceed without a root inode. */ 9401 /* Cannot proceed without a root inode. */
9402 { PR_3_NO_ROOT_INODE_ABORT, 9402 { PR_3_NO_ROOT_INODE_ABORT,
9403 N_("Cannot proceed without a @r.\n"), 9403 N_("can't proceed without a @r.\n"),
9404 PROMPT_NONE, PR_FATAL }, 9404 PROMPT_NONE, PR_FATAL },
9405 9405
9406 /* Internal error: couldn't find dir_info */ 9406 /* Internal error: couldn't find dir_info */
@@ -12653,7 +12653,7 @@ static void check_mount(e2fsck_t ctx)
12653 12653
12654 printf(_("%s is mounted. "), ctx->filesystem_name); 12654 printf(_("%s is mounted. "), ctx->filesystem_name);
12655 if (!ctx->interactive) 12655 if (!ctx->interactive)
12656 bb_error_msg_and_die(_("cannot continue, aborting")); 12656 bb_error_msg_and_die(_("can't continue, aborting"));
12657 printf(_("\n\n\007\007\007\007WARNING!!! " 12657 printf(_("\n\n\007\007\007\007WARNING!!! "
12658 "Running e2fsck on a mounted filesystem may cause\n" 12658 "Running e2fsck on a mounted filesystem may cause\n"
12659 "SEVERE filesystem damage.\007\007\007\n\n")); 12659 "SEVERE filesystem damage.\007\007\007\n\n"));
@@ -13373,7 +13373,7 @@ restart:
13373 * happen, unless the hardware or 13373 * happen, unless the hardware or
13374 * device driver is being bogus. 13374 * device driver is being bogus.
13375 */ 13375 */
13376 bb_error_msg(_("cannot set superblock flags on %s"), ctx->device_name); 13376 bb_error_msg(_("can't set superblock flags on %s"), ctx->device_name);
13377 bb_error_msg_and_die(0); 13377 bb_error_msg_and_die(0);
13378 } 13378 }
13379 retval = e2fsck_run_ext3_journal(ctx); 13379 retval = e2fsck_run_ext3_journal(ctx);
diff --git a/e2fsprogs/old_e2fsprogs/fsck.c b/e2fsprogs/old_e2fsprogs/fsck.c
index 98e4e38fe..687938c24 100644
--- a/e2fsprogs/old_e2fsprogs/fsck.c
+++ b/e2fsprogs/old_e2fsprogs/fsck.c
@@ -1001,7 +1001,7 @@ static int ignore(struct fs_info *fs)
1001 s = find_fsck(fs->type); 1001 s = find_fsck(fs->type);
1002 if (s == NULL) { 1002 if (s == NULL) {
1003 if (wanted) 1003 if (wanted)
1004 bb_error_msg("cannot check %s: fsck.%s not found", 1004 bb_error_msg("can't check %s: fsck.%s not found",
1005 fs->device, fs->type); 1005 fs->device, fs->type);
1006 return 1; 1006 return 1;
1007 } 1007 }
@@ -1203,7 +1203,7 @@ static void PRS(int argc, char **argv)
1203 * /proc/partitions isn't found. 1203 * /proc/partitions isn't found.
1204 */ 1204 */
1205 if (access("/proc/partitions", R_OK) < 0) { 1205 if (access("/proc/partitions", R_OK) < 0) {
1206 bb_perror_msg_and_die("cannot open /proc/partitions " 1206 bb_perror_msg_and_die("can't open /proc/partitions "
1207 "(is /proc mounted?)"); 1207 "(is /proc mounted?)");
1208 } 1208 }
1209 /* 1209 /*
@@ -1215,7 +1215,7 @@ static void PRS(int argc, char **argv)
1215 "must be root to scan for matching filesystems: %s\n", arg); 1215 "must be root to scan for matching filesystems: %s\n", arg);
1216 else 1216 else
1217 bb_error_msg_and_die( 1217 bb_error_msg_and_die(
1218 "cannot find matching filesystem: %s", arg); 1218 "can't find matching filesystem: %s", arg);
1219 } 1219 }
1220 devices[num_devices++] = dev ? dev : string_copy(arg); 1220 devices[num_devices++] = dev ? dev : string_copy(arg);
1221 continue; 1221 continue;
diff --git a/e2fsprogs/old_e2fsprogs/mke2fs.c b/e2fsprogs/old_e2fsprogs/mke2fs.c
index a1327437d..32f0329c3 100644
--- a/e2fsprogs/old_e2fsprogs/mke2fs.c
+++ b/e2fsprogs/old_e2fsprogs/mke2fs.c
@@ -245,7 +245,7 @@ static void test_disk(ext2_filsys fs, badblocks_list *bb_list)
245 mke2fs_verbose("Running command: %s\n", buf); 245 mke2fs_verbose("Running command: %s\n", buf);
246 f = popen(buf, "r"); 246 f = popen(buf, "r");
247 if (!f) { 247 if (!f) {
248 bb_perror_msg_and_die("cannot run '%s'", buf); 248 bb_perror_msg_and_die("can't run '%s'", buf);
249 } 249 }
250 retval = ext2fs_read_bb_FILE(fs, f, bb_list, invalid_block); 250 retval = ext2fs_read_bb_FILE(fs, f, bb_list, invalid_block);
251 pclose(f); 251 pclose(f);
@@ -1305,7 +1305,7 @@ int mke2fs_main (int argc, char **argv)
1305 retval = zero_blocks(fs, start, blocks - start, 1305 retval = zero_blocks(fs, start, blocks - start,
1306 NULL, &ret_blk, NULL); 1306 NULL, &ret_blk, NULL);
1307 1307
1308 mke2fs_warning_msg(retval, "cannot 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);
1309 write_inode_tables(fs); 1309 write_inode_tables(fs);
1310 create_root_dir(fs); 1310 create_root_dir(fs);
1311 create_lost_and_found(fs); 1311 create_lost_and_found(fs);
diff --git a/e2fsprogs/old_e2fsprogs/tune2fs.c b/e2fsprogs/old_e2fsprogs/tune2fs.c
index 1d39ed1b0..00f8682a5 100644
--- a/e2fsprogs/old_e2fsprogs/tune2fs.c
+++ b/e2fsprogs/old_e2fsprogs/tune2fs.c
@@ -392,7 +392,7 @@ static time_t parse_time(char *str)
392 ts.tm_mday = 0; 392 ts.tm_mday = 0;
393#endif 393#endif
394 if (ts.tm_mday == 0) { 394 if (ts.tm_mday == 0) {
395 bb_error_msg_and_die("Cannot parse date/time specifier: %s", str); 395 bb_error_msg_and_die("can't parse date/time specifier: %s", str);
396 } 396 }
397 return mktime(&ts); 397 return mktime(&ts);
398} 398}
@@ -590,7 +590,7 @@ int tune2fs_main(int argc, char **argv)
590 } 590 }
591 retval = ext2fs_check_if_mounted(device_name, &mount_flags); 591 retval = ext2fs_check_if_mounted(device_name, &mount_flags);
592 if (retval) 592 if (retval)
593 bb_error_msg_and_die("cannot determine if %s is mounted", device_name); 593 bb_error_msg_and_die("can't determine if %s is mounted", device_name);
594 /* Normally we only need to write out the superblock */ 594 /* Normally we only need to write out the superblock */
595 fs->flags |= EXT2_FLAG_SUPER_ONLY; 595 fs->flags |= EXT2_FLAG_SUPER_ONLY;
596 596
diff --git a/e2fsprogs/old_e2fsprogs/util.c b/e2fsprogs/old_e2fsprogs/util.c
index 7ab6591d5..326492d49 100644
--- a/e2fsprogs/old_e2fsprogs/util.c
+++ b/e2fsprogs/old_e2fsprogs/util.c
@@ -35,7 +35,7 @@ void check_plausibility(const char *device, int force)
35 if (force) 35 if (force)
36 return; 36 return;
37 if (val == -1) 37 if (val == -1)
38 bb_perror_msg_and_die("cannot stat %s", device); 38 bb_perror_msg_and_die("can't stat %s", device);
39 if (!S_ISBLK(s.st_mode)) { 39 if (!S_ISBLK(s.st_mode)) {
40 printf("%s is not a block special device.\n", device); 40 printf("%s is not a block special device.\n", device);
41 proceed_question(); 41 proceed_question();
@@ -79,7 +79,7 @@ void check_mount(const char *device, int force, const char *type)
79 79
80 retval = ext2fs_check_if_mounted(device, &mount_flags); 80 retval = ext2fs_check_if_mounted(device, &mount_flags);
81 if (retval) { 81 if (retval) {
82 bb_error_msg("cannot determine if %s is mounted", device); 82 bb_error_msg("can't determine if %s is mounted", device);
83 return; 83 return;
84 } 84 }
85 if (mount_flags & EXT2_MF_MOUNTED) { 85 if (mount_flags & EXT2_MF_MOUNTED) {
@@ -216,7 +216,7 @@ void make_journal_device(char *journal_device, ext2_filsys fs, int quiet, int fo
216 EXT2_FLAG_JOURNAL_DEV_OK, 0, 216 EXT2_FLAG_JOURNAL_DEV_OK, 0,
217 fs->blocksize, io_ptr, &jfs); 217 fs->blocksize, io_ptr, &jfs);
218 if (retval) 218 if (retval)
219 bb_error_msg_and_die("cannot journal device %s", journal_device); 219 bb_error_msg_and_die("can't journal device %s", journal_device);
220 if (!quiet) 220 if (!quiet)
221 printf("Adding journal to device %s: ", journal_device); 221 printf("Adding journal to device %s: ", journal_device);
222 fflush(stdout); 222 fflush(stdout);
@@ -245,7 +245,7 @@ void make_journal_blocks(ext2_filsys fs, int journal_size, int journal_flags, in
245 retval = ext2fs_add_journal_inode(fs, journal_blocks, 245 retval = ext2fs_add_journal_inode(fs, journal_blocks,
246 journal_flags); 246 journal_flags);
247 if (retval) 247 if (retval)
248 bb_error_msg_and_die("cannot create journal"); 248 bb_error_msg_and_die("can't create journal");
249 if (!quiet) 249 if (!quiet)
250 puts("done"); 250 puts("done");
251} 251}