From 89f0b3486dfea233e6000f9af95b39a3ea7fd96e Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Sat, 18 Nov 2006 22:04:09 +0000 Subject: rodata cleanup. "unable to" == "cannot". -300 bytes --- coreutils/libcoreutils/cp_mv_stat.c | 2 +- coreutils/mkdir.c | 2 +- coreutils/rm.c | 2 +- coreutils/rmdir.c | 4 ++-- coreutils/stty.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'coreutils') diff --git a/coreutils/libcoreutils/cp_mv_stat.c b/coreutils/libcoreutils/cp_mv_stat.c index 0849ebc6c..2e4f25e21 100644 --- a/coreutils/libcoreutils/cp_mv_stat.c +++ b/coreutils/libcoreutils/cp_mv_stat.c @@ -27,7 +27,7 @@ int cp_mv_stat2(const char *fn, struct stat *fn_stat, stat_func sf) { if (sf(fn, fn_stat) < 0) { if (errno != ENOENT) { - bb_perror_msg("unable to stat '%s'", fn); + bb_perror_msg("cannot stat '%s'", fn); return -1; } return 0; diff --git a/coreutils/mkdir.c b/coreutils/mkdir.c index 1aee8b2b5..c4d267695 100644 --- a/coreutils/mkdir.c +++ b/coreutils/mkdir.c @@ -44,7 +44,7 @@ int mkdir_main (int argc, char **argv) if(opt & 1) { mode = 0777; if (!bb_parse_mode (smode, &mode)) { - bb_error_msg_and_die ("invalid mode `%s'", smode); + bb_error_msg_and_die ("invalid mode '%s'", smode); } } if(opt & 2) diff --git a/coreutils/rm.c b/coreutils/rm.c index 490694a6e..5df7d5f65 100644 --- a/coreutils/rm.c +++ b/coreutils/rm.c @@ -38,7 +38,7 @@ int rm_main(int argc, char **argv) const char *base = bb_get_last_path_component(*argv); if ((base[0] == '.') && (!base[1] || ((base[1] == '.') && !base[2]))) { - bb_error_msg("cannot remove `.' or `..'"); + bb_error_msg("cannot remove '.' or '..'"); } else if (remove_file(*argv, flags) >= 0) { continue; } diff --git a/coreutils/rmdir.c b/coreutils/rmdir.c index 05ea0e9ff..c61bae795 100644 --- a/coreutils/rmdir.c +++ b/coreutils/rmdir.c @@ -38,7 +38,7 @@ int rmdir_main(int argc, char **argv) do { if (rmdir(path) < 0) { - bb_perror_msg("`%s'", path); /* Match gnu rmdir msg. */ + bb_perror_msg("'%s'", path); /* Match gnu rmdir msg. */ status = EXIT_FAILURE; } else if (flags) { /* Note: path was not empty or null since rmdir succeeded. */ @@ -46,7 +46,7 @@ int rmdir_main(int argc, char **argv) /* Path is now just the parent component. Note that dirname * returns "." if there are no parents. We must distinguish * this from the case of the original path starting with '.'. - */ + */ if (do_dot || (*path != '.') || path[1]) { continue; } diff --git a/coreutils/stty.c b/coreutils/stty.c index 8c16c27a9..22784a260 100644 --- a/coreutils/stty.c +++ b/coreutils/stty.c @@ -917,7 +917,7 @@ end_option: new_mode.c_cflag &= (~CIBAUD); if (speed_was_set || memcmp(&mode, &new_mode, sizeof(mode)) != 0) #endif - perror_on_device_and_die ("%s: unable to perform all requested operations"); + perror_on_device_and_die("%s: cannot perform all requested operations"); } } -- cgit v1.2.3