diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2009-11-13 09:08:27 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2009-11-13 09:08:27 +0100 |
commit | 6331cf059ccfdf35f4e5a505cbae885094cc41b0 (patch) | |
tree | ccb4b4f0d96d9636861a75f7fc6c97b8b15bd306 /coreutils | |
parent | f4fee418ae9f5308b4d32bc8d4e618f779f3203f (diff) | |
download | busybox-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 'coreutils')
-rw-r--r-- | coreutils/date.c | 2 | ||||
-rw-r--r-- | coreutils/id.c | 2 | ||||
-rw-r--r-- | coreutils/libcoreutils/cp_mv_stat.c | 4 | ||||
-rw-r--r-- | coreutils/md5_sha1_sum.c | 2 | ||||
-rw-r--r-- | coreutils/mv.c | 6 | ||||
-rw-r--r-- | coreutils/od_bloaty.c | 2 | ||||
-rw-r--r-- | coreutils/rm.c | 2 | ||||
-rw-r--r-- | coreutils/stat.c | 4 |
8 files changed, 12 insertions, 12 deletions
diff --git a/coreutils/date.c b/coreutils/date.c index a230fe2b7..51200e64c 100644 --- a/coreutils/date.c +++ b/coreutils/date.c | |||
@@ -164,7 +164,7 @@ int date_main(int argc UNUSED_PARAM, char **argv) | |||
164 | 164 | ||
165 | /* if setting time, set it */ | 165 | /* if setting time, set it */ |
166 | if ((opt & OPT_SET) && stime(&tm) < 0) { | 166 | if ((opt & OPT_SET) && stime(&tm) < 0) { |
167 | bb_perror_msg("cannot set date"); | 167 | bb_perror_msg("can't set date"); |
168 | } | 168 | } |
169 | } | 169 | } |
170 | 170 | ||
diff --git a/coreutils/id.c b/coreutils/id.c index 6022c9fa4..ec9227d06 100644 --- a/coreutils/id.c +++ b/coreutils/id.c | |||
@@ -175,7 +175,7 @@ int id_main(int argc UNUSED_PARAM, char **argv) | |||
175 | } | 175 | } |
176 | } else if (n < 0) { /* error in get_groups() */ | 176 | } else if (n < 0) { /* error in get_groups() */ |
177 | if (!ENABLE_DESKTOP) | 177 | if (!ENABLE_DESKTOP) |
178 | bb_error_msg_and_die("cannot get groups"); | 178 | bb_error_msg_and_die("can't get groups"); |
179 | else | 179 | else |
180 | return EXIT_FAILURE; | 180 | return EXIT_FAILURE; |
181 | } | 181 | } |
diff --git a/coreutils/libcoreutils/cp_mv_stat.c b/coreutils/libcoreutils/cp_mv_stat.c index 0fd467c30..5ba07ecc3 100644 --- a/coreutils/libcoreutils/cp_mv_stat.c +++ b/coreutils/libcoreutils/cp_mv_stat.c | |||
@@ -29,11 +29,11 @@ int FAST_FUNC cp_mv_stat2(const char *fn, struct stat *fn_stat, stat_func sf) | |||
29 | if (errno != ENOENT) { | 29 | if (errno != ENOENT) { |
30 | #if ENABLE_FEATURE_VERBOSE_CP_MESSAGE | 30 | #if ENABLE_FEATURE_VERBOSE_CP_MESSAGE |
31 | if (errno == ENOTDIR) { | 31 | if (errno == ENOTDIR) { |
32 | bb_error_msg("cannot stat '%s': Path has non-directory component", fn); | 32 | bb_error_msg("can't stat '%s': Path has non-directory component", fn); |
33 | return -1; | 33 | return -1; |
34 | } | 34 | } |
35 | #endif | 35 | #endif |
36 | bb_perror_msg("cannot stat '%s'", fn); | 36 | bb_perror_msg("can't stat '%s'", fn); |
37 | return -1; | 37 | return -1; |
38 | } | 38 | } |
39 | return 0; | 39 | return 0; |
diff --git a/coreutils/md5_sha1_sum.c b/coreutils/md5_sha1_sum.c index a988b9cbf..a64026d3d 100644 --- a/coreutils/md5_sha1_sum.c +++ b/coreutils/md5_sha1_sum.c | |||
@@ -174,7 +174,7 @@ int md5_sha1_sum_main(int argc UNUSED_PARAM, char **argv) | |||
174 | } | 174 | } |
175 | /* | 175 | /* |
176 | if (fclose_if_not_stdin(pre_computed_stream) == EOF) { | 176 | if (fclose_if_not_stdin(pre_computed_stream) == EOF) { |
177 | bb_perror_msg_and_die("cannot close file %s", file_ptr); | 177 | bb_perror_msg_and_die("can't close file %s", file_ptr); |
178 | } | 178 | } |
179 | */ | 179 | */ |
180 | } else { | 180 | } else { |
diff --git a/coreutils/mv.c b/coreutils/mv.c index be10b030a..1c5a46792 100644 --- a/coreutils/mv.c +++ b/coreutils/mv.c | |||
@@ -87,10 +87,10 @@ int mv_main(int argc, char **argv) | |||
87 | if (errno != EXDEV | 87 | if (errno != EXDEV |
88 | || (source_exists = cp_mv_stat2(*argv, &source_stat, lstat)) < 1 | 88 | || (source_exists = cp_mv_stat2(*argv, &source_stat, lstat)) < 1 |
89 | ) { | 89 | ) { |
90 | bb_perror_msg("cannot rename '%s'", *argv); | 90 | bb_perror_msg("can't rename '%s'", *argv); |
91 | } else { | 91 | } else { |
92 | static const char fmt[] ALIGN1 = | 92 | static const char fmt[] ALIGN1 = |
93 | "cannot overwrite %sdirectory with %sdirectory"; | 93 | "can't overwrite %sdirectory with %sdirectory"; |
94 | 94 | ||
95 | if (dest_exists) { | 95 | if (dest_exists) { |
96 | if (dest_exists == 3) { | 96 | if (dest_exists == 3) { |
@@ -105,7 +105,7 @@ int mv_main(int argc, char **argv) | |||
105 | } | 105 | } |
106 | } | 106 | } |
107 | if (unlink(dest) < 0) { | 107 | if (unlink(dest) < 0) { |
108 | bb_perror_msg("cannot remove '%s'", dest); | 108 | bb_perror_msg("can't remove '%s'", dest); |
109 | goto RET_1; | 109 | goto RET_1; |
110 | } | 110 | } |
111 | } | 111 | } |
diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c index 1d5769bd8..0c4740b47 100644 --- a/coreutils/od_bloaty.c +++ b/coreutils/od_bloaty.c | |||
@@ -807,7 +807,7 @@ skip(off_t n_skip) | |||
807 | } | 807 | } |
808 | 808 | ||
809 | if (n_skip) | 809 | if (n_skip) |
810 | bb_error_msg_and_die("cannot skip past end of combined input"); | 810 | bb_error_msg_and_die("can't skip past end of combined input"); |
811 | } | 811 | } |
812 | 812 | ||
813 | 813 | ||
diff --git a/coreutils/rm.c b/coreutils/rm.c index 6b3fbcf25..3090cc323 100644 --- a/coreutils/rm.c +++ b/coreutils/rm.c | |||
@@ -42,7 +42,7 @@ int rm_main(int argc UNUSED_PARAM, char **argv) | |||
42 | const char *base = bb_get_last_path_component_strip(*argv); | 42 | const char *base = bb_get_last_path_component_strip(*argv); |
43 | 43 | ||
44 | if (DOT_OR_DOTDOT(base)) { | 44 | if (DOT_OR_DOTDOT(base)) { |
45 | bb_error_msg("cannot remove '.' or '..'"); | 45 | bb_error_msg("can't remove '.' or '..'"); |
46 | } else if (remove_file(*argv, flags) >= 0) { | 46 | } else if (remove_file(*argv, flags) >= 0) { |
47 | continue; | 47 | continue; |
48 | } | 48 | } |
diff --git a/coreutils/stat.c b/coreutils/stat.c index 44a03e5e7..2bc9a086c 100644 --- a/coreutils/stat.c +++ b/coreutils/stat.c | |||
@@ -383,7 +383,7 @@ static bool do_statfs(const char *filename, const char *format) | |||
383 | } | 383 | } |
384 | #endif | 384 | #endif |
385 | if (statfs(filename, &statfsbuf) != 0) { | 385 | if (statfs(filename, &statfsbuf) != 0) { |
386 | bb_perror_msg("cannot read file system information for '%s'", filename); | 386 | bb_perror_msg("can't read file system information for '%s'", filename); |
387 | return 0; | 387 | return 0; |
388 | } | 388 | } |
389 | 389 | ||
@@ -495,7 +495,7 @@ static bool do_stat(const char *filename, const char *format) | |||
495 | } | 495 | } |
496 | #endif | 496 | #endif |
497 | if ((option_mask32 & OPT_DEREFERENCE ? stat : lstat) (filename, &statbuf) != 0) { | 497 | if ((option_mask32 & OPT_DEREFERENCE ? stat : lstat) (filename, &statbuf) != 0) { |
498 | bb_perror_msg("cannot stat '%s'", filename); | 498 | bb_perror_msg("can't stat '%s'", filename); |
499 | return 0; | 499 | return 0; |
500 | } | 500 | } |
501 | 501 | ||