summaryrefslogtreecommitdiff
path: root/e2fsprogs/old_e2fsprogs
diff options
context:
space:
mode:
authorDenys Vlasenko2009-11-13 09:08:27 +0100
committerDenys Vlasenko2009-11-13 09:08:27 +0100
commit6331cf059ccfdf35f4e5a505cbae885094cc41b0 (patch)
treeccb4b4f0d96d9636861a75f7fc6c97b8b15bd306 /e2fsprogs/old_e2fsprogs
parentf4fee418ae9f5308b4d32bc8d4e618f779f3203f (diff)
downloadbusybox-6331cf059ccfdf35f4e5a505cbae885094cc41b0.zip
busybox-6331cf059ccfdf35f4e5a505cbae885094cc41b0.tar.gz
*: use "can't" instead of "cannot"
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'e2fsprogs/old_e2fsprogs')
-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
6 files changed, 15 insertions, 15 deletions
diff --git a/e2fsprogs/old_e2fsprogs/blkid/resolve.c b/e2fsprogs/old_e2fsprogs/blkid/resolve.c
index 7942de2..0f92158 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)
exit(1);
}
if (blkid_get_cache(&cache, bb_dev_null) < 0) {
- fprintf(stderr, "cannot get blkid cache\n");
+ fprintf(stderr, "Can't get blkid cache\n");
exit(1);
}
diff --git a/e2fsprogs/old_e2fsprogs/e2fsck.c b/e2fsprogs/old_e2fsprogs/e2fsck.c
index 6531f5d..c715d3e 100644
--- a/e2fsprogs/old_e2fsprogs/e2fsck.c
+++ b/e2fsprogs/old_e2fsprogs/e2fsck.c
@@ -9400,7 +9400,7 @@ static const struct e2fsck_problem problem_table[] = {
/* Cannot proceed without a root inode. */
{ PR_3_NO_ROOT_INODE_ABORT,
- N_("Cannot proceed without a @r.\n"),
+ N_("can't proceed without a @r.\n"),
PROMPT_NONE, PR_FATAL },
/* Internal error: couldn't find dir_info */
@@ -12653,7 +12653,7 @@ static void check_mount(e2fsck_t ctx)
printf(_("%s is mounted. "), ctx->filesystem_name);
if (!ctx->interactive)
- bb_error_msg_and_die(_("cannot continue, aborting"));
+ bb_error_msg_and_die(_("can't continue, aborting"));
printf(_("\n\n\007\007\007\007WARNING!!! "
"Running e2fsck on a mounted filesystem may cause\n"
"SEVERE filesystem damage.\007\007\007\n\n"));
@@ -13373,7 +13373,7 @@ restart:
* happen, unless the hardware or
* device driver is being bogus.
*/
- bb_error_msg(_("cannot set superblock flags on %s"), ctx->device_name);
+ bb_error_msg(_("can't set superblock flags on %s"), ctx->device_name);
bb_error_msg_and_die(0);
}
retval = e2fsck_run_ext3_journal(ctx);
diff --git a/e2fsprogs/old_e2fsprogs/fsck.c b/e2fsprogs/old_e2fsprogs/fsck.c
index 98e4e38..687938c 100644
--- a/e2fsprogs/old_e2fsprogs/fsck.c
+++ b/e2fsprogs/old_e2fsprogs/fsck.c
@@ -1001,7 +1001,7 @@ static int ignore(struct fs_info *fs)
s = find_fsck(fs->type);
if (s == NULL) {
if (wanted)
- bb_error_msg("cannot check %s: fsck.%s not found",
+ bb_error_msg("can't check %s: fsck.%s not found",
fs->device, fs->type);
return 1;
}
@@ -1203,7 +1203,7 @@ static void PRS(int argc, char **argv)
* /proc/partitions isn't found.
*/
if (access("/proc/partitions", R_OK) < 0) {
- bb_perror_msg_and_die("cannot open /proc/partitions "
+ bb_perror_msg_and_die("can't open /proc/partitions "
"(is /proc mounted?)");
}
/*
@@ -1215,7 +1215,7 @@ static void PRS(int argc, char **argv)
"must be root to scan for matching filesystems: %s\n", arg);
else
bb_error_msg_and_die(
- "cannot find matching filesystem: %s", arg);
+ "can't find matching filesystem: %s", arg);
}
devices[num_devices++] = dev ? dev : string_copy(arg);
continue;
diff --git a/e2fsprogs/old_e2fsprogs/mke2fs.c b/e2fsprogs/old_e2fsprogs/mke2fs.c
index a132743..32f0329 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)
mke2fs_verbose("Running command: %s\n", buf);
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);
pclose(f);
@@ -1305,7 +1305,7 @@ int mke2fs_main (int argc, char **argv)
retval = zero_blocks(fs, start, blocks - start,
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);
create_lost_and_found(fs);
diff --git a/e2fsprogs/old_e2fsprogs/tune2fs.c b/e2fsprogs/old_e2fsprogs/tune2fs.c
index 1d39ed1..00f8682 100644
--- a/e2fsprogs/old_e2fsprogs/tune2fs.c
+++ b/e2fsprogs/old_e2fsprogs/tune2fs.c
@@ -392,7 +392,7 @@ static time_t parse_time(char *str)
ts.tm_mday = 0;
#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);
}
@@ -590,7 +590,7 @@ int tune2fs_main(int argc, char **argv)
}
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;
diff --git a/e2fsprogs/old_e2fsprogs/util.c b/e2fsprogs/old_e2fsprogs/util.c
index 7ab6591..326492d 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)
if (force)
return;
if (val == -1)
- bb_perror_msg_and_die("cannot stat %s", device);
+ 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);
proceed_question();
@@ -79,7 +79,7 @@ void check_mount(const char *device, int force, const char *type)
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;
}
if (mount_flags & EXT2_MF_MOUNTED) {
@@ -216,7 +216,7 @@ void make_journal_device(char *journal_device, ext2_filsys fs, int quiet, int fo
EXT2_FLAG_JOURNAL_DEV_OK, 0,
fs->blocksize, io_ptr, &jfs);
if (retval)
- bb_error_msg_and_die("cannot journal device %s", journal_device);
+ bb_error_msg_and_die("can't journal device %s", journal_device);
if (!quiet)
printf("Adding journal to device %s: ", journal_device);
fflush(stdout);
@@ -245,7 +245,7 @@ void make_journal_blocks(ext2_filsys fs, int journal_size, int journal_flags, in
retval = ext2fs_add_journal_inode(fs, journal_blocks,
journal_flags);
if (retval)
- bb_error_msg_and_die("cannot create journal");
+ bb_error_msg_and_die("can't create journal");
if (!quiet)
puts("done");
}