diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-11-18 22:04:09 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-11-18 22:04:09 +0000 |
| commit | 89f0b3486dfea233e6000f9af95b39a3ea7fd96e (patch) | |
| tree | fc0d65e0d33b5b526b0d44d4c4da8143be3b53b1 | |
| parent | 61126ab30a90b74e45a79ccb97074ab71afa6054 (diff) | |
| download | busybox-w32-89f0b3486dfea233e6000f9af95b39a3ea7fd96e.tar.gz busybox-w32-89f0b3486dfea233e6000f9af95b39a3ea7fd96e.tar.bz2 busybox-w32-89f0b3486dfea233e6000f9af95b39a3ea7fd96e.zip | |
rodata cleanup. "unable to" == "cannot". -300 bytes
| -rw-r--r-- | coreutils/libcoreutils/cp_mv_stat.c | 2 | ||||
| -rw-r--r-- | coreutils/mkdir.c | 2 | ||||
| -rw-r--r-- | coreutils/rm.c | 2 | ||||
| -rw-r--r-- | coreutils/rmdir.c | 4 | ||||
| -rw-r--r-- | coreutils/stty.c | 2 | ||||
| -rw-r--r-- | debianutils/start_stop_daemon.c | 2 | ||||
| -rw-r--r-- | e2fsprogs/e2fsck.c | 2 | ||||
| -rw-r--r-- | include/usage.h | 20 | ||||
| -rw-r--r-- | libbb/remove_file.c | 16 | ||||
| -rw-r--r-- | libbb/run_parts.c | 2 | ||||
| -rw-r--r-- | libbb/xconnect.c | 4 | ||||
| -rw-r--r-- | libbb/xfuncs.c | 4 | ||||
| -rw-r--r-- | loginutils/login.c | 10 | ||||
| -rw-r--r-- | miscutils/crond.c | 10 | ||||
| -rw-r--r-- | miscutils/crontab.c | 6 | ||||
| -rw-r--r-- | modutils/insmod.c | 4 | ||||
| -rw-r--r-- | networking/ether-wake.c | 2 | ||||
| -rw-r--r-- | networking/nameif.c | 4 | ||||
| -rw-r--r-- | procps/sysctl.c | 2 | ||||
| -rw-r--r-- | shell/msh.c | 2 | ||||
| -rw-r--r-- | util-linux/fdisk.c | 8 | ||||
| -rw-r--r-- | util-linux/fdisk_sgi.c | 4 | ||||
| -rw-r--r-- | util-linux/fsck_minix.c | 2 | ||||
| -rw-r--r-- | util-linux/mkfs_minix.c | 14 |
24 files changed, 65 insertions, 65 deletions
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) | |||
| 27 | { | 27 | { |
| 28 | if (sf(fn, fn_stat) < 0) { | 28 | if (sf(fn, fn_stat) < 0) { |
| 29 | if (errno != ENOENT) { | 29 | if (errno != ENOENT) { |
| 30 | bb_perror_msg("unable to stat '%s'", fn); | 30 | bb_perror_msg("cannot stat '%s'", fn); |
| 31 | return -1; | 31 | return -1; |
| 32 | } | 32 | } |
| 33 | return 0; | 33 | 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) | |||
| 44 | if(opt & 1) { | 44 | if(opt & 1) { |
| 45 | mode = 0777; | 45 | mode = 0777; |
| 46 | if (!bb_parse_mode (smode, &mode)) { | 46 | if (!bb_parse_mode (smode, &mode)) { |
| 47 | bb_error_msg_and_die ("invalid mode `%s'", smode); | 47 | bb_error_msg_and_die ("invalid mode '%s'", smode); |
| 48 | } | 48 | } |
| 49 | } | 49 | } |
| 50 | if(opt & 2) | 50 | 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) | |||
| 38 | const char *base = bb_get_last_path_component(*argv); | 38 | const char *base = bb_get_last_path_component(*argv); |
| 39 | 39 | ||
| 40 | if ((base[0] == '.') && (!base[1] || ((base[1] == '.') && !base[2]))) { | 40 | if ((base[0] == '.') && (!base[1] || ((base[1] == '.') && !base[2]))) { |
| 41 | bb_error_msg("cannot remove `.' or `..'"); | 41 | bb_error_msg("cannot remove '.' or '..'"); |
| 42 | } else if (remove_file(*argv, flags) >= 0) { | 42 | } else if (remove_file(*argv, flags) >= 0) { |
| 43 | continue; | 43 | continue; |
| 44 | } | 44 | } |
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) | |||
| 38 | 38 | ||
| 39 | do { | 39 | do { |
| 40 | if (rmdir(path) < 0) { | 40 | if (rmdir(path) < 0) { |
| 41 | bb_perror_msg("`%s'", path); /* Match gnu rmdir msg. */ | 41 | bb_perror_msg("'%s'", path); /* Match gnu rmdir msg. */ |
| 42 | status = EXIT_FAILURE; | 42 | status = EXIT_FAILURE; |
| 43 | } else if (flags) { | 43 | } else if (flags) { |
| 44 | /* Note: path was not empty or null since rmdir succeeded. */ | 44 | /* Note: path was not empty or null since rmdir succeeded. */ |
| @@ -46,7 +46,7 @@ int rmdir_main(int argc, char **argv) | |||
| 46 | /* Path is now just the parent component. Note that dirname | 46 | /* Path is now just the parent component. Note that dirname |
| 47 | * returns "." if there are no parents. We must distinguish | 47 | * returns "." if there are no parents. We must distinguish |
| 48 | * this from the case of the original path starting with '.'. | 48 | * this from the case of the original path starting with '.'. |
| 49 | */ | 49 | */ |
| 50 | if (do_dot || (*path != '.') || path[1]) { | 50 | if (do_dot || (*path != '.') || path[1]) { |
| 51 | continue; | 51 | continue; |
| 52 | } | 52 | } |
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: | |||
| 917 | new_mode.c_cflag &= (~CIBAUD); | 917 | new_mode.c_cflag &= (~CIBAUD); |
| 918 | if (speed_was_set || memcmp(&mode, &new_mode, sizeof(mode)) != 0) | 918 | if (speed_was_set || memcmp(&mode, &new_mode, sizeof(mode)) != 0) |
| 919 | #endif | 919 | #endif |
| 920 | perror_on_device_and_die ("%s: unable to perform all requested operations"); | 920 | perror_on_device_and_die("%s: cannot perform all requested operations"); |
| 921 | } | 921 | } |
| 922 | } | 922 | } |
| 923 | 923 | ||
diff --git a/debianutils/start_stop_daemon.c b/debianutils/start_stop_daemon.c index 6d3877a7c..f52352995 100644 --- a/debianutils/start_stop_daemon.c +++ b/debianutils/start_stop_daemon.c | |||
| @@ -315,5 +315,5 @@ int start_stop_daemon_main(int argc, char **argv) | |||
| 315 | } | 315 | } |
| 316 | #endif | 316 | #endif |
| 317 | execv(startas, argv); | 317 | execv(startas, argv); |
| 318 | bb_perror_msg_and_die ("unable to start %s", startas); | 318 | bb_perror_msg_and_die("cannot start %s", startas); |
| 319 | } | 319 | } |
diff --git a/e2fsprogs/e2fsck.c b/e2fsprogs/e2fsck.c index 4920cd0f4..ea5b08ccc 100644 --- a/e2fsprogs/e2fsck.c +++ b/e2fsprogs/e2fsck.c | |||
| @@ -13377,7 +13377,7 @@ restart: | |||
| 13377 | * happen, unless the hardware or | 13377 | * happen, unless the hardware or |
| 13378 | * device driver is being bogus. | 13378 | * device driver is being bogus. |
| 13379 | */ | 13379 | */ |
| 13380 | bb_error_msg(_("unable to set superblock flags on %s"), ctx->device_name); | 13380 | bb_error_msg(_("cannot set superblock flags on %s"), ctx->device_name); |
| 13381 | bb_error_msg_and_die(0); | 13381 | bb_error_msg_and_die(0); |
| 13382 | } | 13382 | } |
| 13383 | retval = e2fsck_run_ext3_journal(ctx); | 13383 | retval = e2fsck_run_ext3_journal(ctx); |
diff --git a/include/usage.h b/include/usage.h index ccdfef74a..9b2d11a4d 100644 --- a/include/usage.h +++ b/include/usage.h | |||
| @@ -425,11 +425,11 @@ | |||
| 425 | "Displays the current time in the given FORMAT, or sets the system date.\n" \ | 425 | "Displays the current time in the given FORMAT, or sets the system date.\n" \ |
| 426 | "\nOptions:\n" \ | 426 | "\nOptions:\n" \ |
| 427 | "\t-R\t\tOutputs RFC-822 compliant date string\n" \ | 427 | "\t-R\t\tOutputs RFC-822 compliant date string\n" \ |
| 428 | "\t-d STRING\tDisplays time described by STRING, not `now'\n" \ | 428 | "\t-d STRING\tDisplays time described by STRING, not 'now'\n" \ |
| 429 | USE_FEATURE_DATE_ISOFMT( \ | 429 | USE_FEATURE_DATE_ISOFMT( \ |
| 430 | "\t-I[TIMESPEC]\tOutputs an ISO-8601 compliant date/time string\n" \ | 430 | "\t-I[TIMESPEC]\tOutputs an ISO-8601 compliant date/time string\n" \ |
| 431 | "\t\t\tTIMESPEC=`date' (or missing) for date only,\n" \ | 431 | "\t\t\tTIMESPEC='date' (or missing) for date only,\n" \ |
| 432 | "\t\t\t`hours', `minutes', or `seconds' for date and,\n" \ | 432 | "\t\t\t'hours', 'minutes', or 'seconds' for date and,\n" \ |
| 433 | "\t\t\ttime to the indicated precision\n" \ | 433 | "\t\t\ttime to the indicated precision\n" \ |
| 434 | "\t-D hint\t\tUse 'hint' as date format, via strptime()\n" \ | 434 | "\t-D hint\t\tUse 'hint' as date format, via strptime()\n" \ |
| 435 | ) \ | 435 | ) \ |
| @@ -774,8 +774,8 @@ USE_FEATURE_DATE_ISOFMT( \ | |||
| 774 | "\t or 0\n" \ | 774 | "\t or 0\n" \ |
| 775 | "\tlength STRING length of STRING\n" \ | 775 | "\tlength STRING length of STRING\n" \ |
| 776 | "\tquote TOKEN interpret TOKEN as a string, even if\n" \ | 776 | "\tquote TOKEN interpret TOKEN as a string, even if\n" \ |
| 777 | "\t it is a keyword like `match' or an\n" \ | 777 | "\t it is a keyword like 'match' or an\n" \ |
| 778 | "\t operator like `/'\n" \ | 778 | "\t operator like '/'\n" \ |
| 779 | "\t( EXPRESSION ) value of EXPRESSION\n\n" \ | 779 | "\t( EXPRESSION ) value of EXPRESSION\n\n" \ |
| 780 | "Beware that many operators need to be escaped or quoted for shells.\n" \ | 780 | "Beware that many operators need to be escaped or quoted for shells.\n" \ |
| 781 | "Comparisons are arithmetic if both ARGs are numbers, else\n" \ | 781 | "Comparisons are arithmetic if both ARGs are numbers, else\n" \ |
| @@ -980,11 +980,11 @@ USE_FEATURE_DATE_ISOFMT( \ | |||
| 980 | "while true ; do\n" \ | 980 | "while true ; do\n" \ |
| 981 | " case $1 in\n" \ | 981 | " case $1 in\n" \ |
| 982 | " -a|--a-long) echo \"Option a\" ; shift ;;\n" \ | 982 | " -a|--a-long) echo \"Option a\" ; shift ;;\n" \ |
| 983 | " -b|--b-long) echo \"Option b, argument `$2'\" ; shift 2 ;;\n" \ | 983 | " -b|--b-long) echo \"Option b, argument '$2'\" ; shift 2 ;;\n" \ |
| 984 | " -c|--c-long)\n" \ | 984 | " -c|--c-long)\n" \ |
| 985 | " case \"$2\" in\n" \ | 985 | " case \"$2\" in\n" \ |
| 986 | " \"\") echo \"Option c, no argument\"; shift 2 ;;\n" \ | 986 | " \"\") echo \"Option c, no argument\"; shift 2 ;;\n" \ |
| 987 | " *) echo \"Option c, argument `$2'\" ; shift 2 ;;\n" \ | 987 | " *) echo \"Option c, argument '$2'\" ; shift 2 ;;\n" \ |
| 988 | " esac ;;\n" \ | 988 | " esac ;;\n" \ |
| 989 | " --) shift ; break ;;\n" \ | 989 | " --) shift ; break ;;\n" \ |
| 990 | " *) echo \"Internal error!\" ; exit 1 ;;\n" \ | 990 | " *) echo \"Internal error!\" ; exit 1 ;;\n" \ |
| @@ -1639,7 +1639,7 @@ USE_FEATURE_DATE_ISOFMT( \ | |||
| 1639 | "\t-s\tLog to stderr as well as the system log\n" \ | 1639 | "\t-s\tLog to stderr as well as the system log\n" \ |
| 1640 | "\t-t TAG\tLog using the specified tag (defaults to user name)\n" \ | 1640 | "\t-t TAG\tLog using the specified tag (defaults to user name)\n" \ |
| 1641 | "\t-p PRIORITY\tEnter the message with the specified priority\n" \ | 1641 | "\t-p PRIORITY\tEnter the message with the specified priority\n" \ |
| 1642 | "\t\tThis may be numerical or a ``facility.level'' pair" | 1642 | "\t\tThis may be numerical or a 'facility.level' pair" |
| 1643 | #define logger_example_usage \ | 1643 | #define logger_example_usage \ |
| 1644 | "$ logger \"hello\"\n" | 1644 | "$ logger \"hello\"\n" |
| 1645 | 1645 | ||
| @@ -1943,7 +1943,7 @@ USE_FEATURE_MDEV_CONFIG( \ | |||
| 1943 | "[-dq] TEMPLATE" | 1943 | "[-dq] TEMPLATE" |
| 1944 | #define mktemp_full_usage \ | 1944 | #define mktemp_full_usage \ |
| 1945 | "Creates a temporary file with its name based on TEMPLATE.\n" \ | 1945 | "Creates a temporary file with its name based on TEMPLATE.\n" \ |
| 1946 | "TEMPLATE is any name with six `Xs' (i.e., /tmp/temp.XXXXXX).\n\n" \ | 1946 | "TEMPLATE is any name with six 'Xs' (i.e., /tmp/temp.XXXXXX).\n\n" \ |
| 1947 | "Options:\n" \ | 1947 | "Options:\n" \ |
| 1948 | "\t-d\t\tMake a directory instead of a file\n" \ | 1948 | "\t-d\t\tMake a directory instead of a file\n" \ |
| 1949 | "\t-q\t\tFail silently if an error occurs" | 1949 | "\t-q\t\tFail silently if an error occurs" |
| @@ -3125,7 +3125,7 @@ USE_FEATURE_START_STOP_DAEMON_FANCY( \ | |||
| 3125 | "\t-m max_ttl\tSet the max time-to-live (max number of hops)\n" \ | 3125 | "\t-m max_ttl\tSet the max time-to-live (max number of hops)\n" \ |
| 3126 | "\t-p port#\tSet the base UDP port number used in probes\n" \ | 3126 | "\t-p port#\tSet the base UDP port number used in probes\n" \ |
| 3127 | "\t\t(default is 33434)\n" \ | 3127 | "\t\t(default is 33434)\n" \ |
| 3128 | "\t-q nqueries\tSet the number of probes per ``ttl'' to nqueries\n" \ | 3128 | "\t-q nqueries\tSet the number of probes per 'ttl' to nqueries\n" \ |
| 3129 | "\t\t(default is 3)\n" \ | 3129 | "\t\t(default is 3)\n" \ |
| 3130 | "\t-s src_addr\tUse the following IP address as the source address\n" \ | 3130 | "\t-s src_addr\tUse the following IP address as the source address\n" \ |
| 3131 | "\t-t tos\tSet the type-of-service in probe packets to the following value\n" \ | 3131 | "\t-t tos\tSet the type-of-service in probe packets to the following value\n" \ |
diff --git a/libbb/remove_file.c b/libbb/remove_file.c index 509aa6a6d..ab159a481 100644 --- a/libbb/remove_file.c +++ b/libbb/remove_file.c | |||
| @@ -25,7 +25,7 @@ int remove_file(const char *path, int flags) | |||
| 25 | 25 | ||
| 26 | if (lstat(path, &path_stat) < 0) { | 26 | if (lstat(path, &path_stat) < 0) { |
| 27 | if (errno != ENOENT) { | 27 | if (errno != ENOENT) { |
| 28 | bb_perror_msg("unable to stat `%s'", path); | 28 | bb_perror_msg("cannot stat '%s'", path); |
| 29 | return -1; | 29 | return -1; |
| 30 | } | 30 | } |
| 31 | 31 | ||
| @@ -34,7 +34,7 @@ int remove_file(const char *path, int flags) | |||
| 34 | 34 | ||
| 35 | if (!path_exists) { | 35 | if (!path_exists) { |
| 36 | if (!(flags & FILEUTILS_FORCE)) { | 36 | if (!(flags & FILEUTILS_FORCE)) { |
| 37 | bb_perror_msg("cannot remove `%s'", path); | 37 | bb_perror_msg("cannot remove '%s'", path); |
| 38 | return -1; | 38 | return -1; |
| 39 | } | 39 | } |
| 40 | return 0; | 40 | return 0; |
| @@ -53,7 +53,7 @@ int remove_file(const char *path, int flags) | |||
| 53 | if ((!(flags & FILEUTILS_FORCE) && access(path, W_OK) < 0 && | 53 | if ((!(flags & FILEUTILS_FORCE) && access(path, W_OK) < 0 && |
| 54 | isatty(0)) || | 54 | isatty(0)) || |
| 55 | (flags & FILEUTILS_INTERACTIVE)) { | 55 | (flags & FILEUTILS_INTERACTIVE)) { |
| 56 | fprintf(stderr, "%s: descend into directory `%s'? ", applet_name, | 56 | fprintf(stderr, "%s: descend into directory '%s'? ", applet_name, |
| 57 | path); | 57 | path); |
| 58 | if (!bb_ask_confirmation()) | 58 | if (!bb_ask_confirmation()) |
| 59 | return 0; | 59 | return 0; |
| @@ -75,18 +75,18 @@ int remove_file(const char *path, int flags) | |||
| 75 | } | 75 | } |
| 76 | 76 | ||
| 77 | if (closedir(dp) < 0) { | 77 | if (closedir(dp) < 0) { |
| 78 | bb_perror_msg("unable to close `%s'", path); | 78 | bb_perror_msg("cannot close '%s'", path); |
| 79 | return -1; | 79 | return -1; |
| 80 | } | 80 | } |
| 81 | 81 | ||
| 82 | if (flags & FILEUTILS_INTERACTIVE) { | 82 | if (flags & FILEUTILS_INTERACTIVE) { |
| 83 | fprintf(stderr, "%s: remove directory `%s'? ", applet_name, path); | 83 | fprintf(stderr, "%s: remove directory '%s'? ", applet_name, path); |
| 84 | if (!bb_ask_confirmation()) | 84 | if (!bb_ask_confirmation()) |
| 85 | return status; | 85 | return status; |
| 86 | } | 86 | } |
| 87 | 87 | ||
| 88 | if (rmdir(path) < 0) { | 88 | if (rmdir(path) < 0) { |
| 89 | bb_perror_msg("unable to remove `%s'", path); | 89 | bb_perror_msg("cannot remove '%s'", path); |
| 90 | return -1; | 90 | return -1; |
| 91 | } | 91 | } |
| 92 | 92 | ||
| @@ -96,13 +96,13 @@ int remove_file(const char *path, int flags) | |||
| 96 | !S_ISLNK(path_stat.st_mode) && | 96 | !S_ISLNK(path_stat.st_mode) && |
| 97 | isatty(0)) || | 97 | isatty(0)) || |
| 98 | (flags & FILEUTILS_INTERACTIVE)) { | 98 | (flags & FILEUTILS_INTERACTIVE)) { |
| 99 | fprintf(stderr, "%s: remove `%s'? ", applet_name, path); | 99 | fprintf(stderr, "%s: remove '%s'? ", applet_name, path); |
| 100 | if (!bb_ask_confirmation()) | 100 | if (!bb_ask_confirmation()) |
| 101 | return 0; | 101 | return 0; |
| 102 | } | 102 | } |
| 103 | 103 | ||
| 104 | if (unlink(path) < 0) { | 104 | if (unlink(path) < 0) { |
| 105 | bb_perror_msg("unable to remove `%s'", path); | 105 | bb_perror_msg("cannot remove '%s'", path); |
| 106 | return -1; | 106 | return -1; |
| 107 | } | 107 | } |
| 108 | 108 | ||
diff --git a/libbb/run_parts.c b/libbb/run_parts.c index c1a45e3d9..fae91813c 100644 --- a/libbb/run_parts.c +++ b/libbb/run_parts.c | |||
| @@ -64,7 +64,7 @@ int run_parts(char **args, const unsigned char test_mode, char **env) | |||
| 64 | if (test_mode & 2) { | 64 | if (test_mode & 2) { |
| 65 | return(2); | 65 | return(2); |
| 66 | } | 66 | } |
| 67 | bb_perror_msg_and_die("unable to open `%s'", arg0); | 67 | bb_perror_msg_and_die("cannot open '%s'", arg0); |
| 68 | } | 68 | } |
| 69 | 69 | ||
| 70 | for (i = 0; i < entries; i++) { | 70 | for (i = 0; i < entries; i++) { |
diff --git a/libbb/xconnect.c b/libbb/xconnect.c index 7cf9d00e9..21ec2761a 100644 --- a/libbb/xconnect.c +++ b/libbb/xconnect.c | |||
| @@ -54,9 +54,9 @@ void xconnect(int s, const struct sockaddr *s_addr, socklen_t addrlen) | |||
| 54 | if (connect(s, s_addr, addrlen) < 0) { | 54 | if (connect(s, s_addr, addrlen) < 0) { |
| 55 | if (ENABLE_FEATURE_CLEAN_UP) close(s); | 55 | if (ENABLE_FEATURE_CLEAN_UP) close(s); |
| 56 | if (s_addr->sa_family == AF_INET) | 56 | if (s_addr->sa_family == AF_INET) |
| 57 | bb_perror_msg_and_die("unable to connect to remote host (%s)", | 57 | bb_perror_msg_and_die("cannot connect to remote host (%s)", |
| 58 | inet_ntoa(((struct sockaddr_in *)s_addr)->sin_addr)); | 58 | inet_ntoa(((struct sockaddr_in *)s_addr)->sin_addr)); |
| 59 | bb_perror_msg_and_die("unable to connect to remote host"); | 59 | bb_perror_msg_and_die("cannot connect to remote host"); |
| 60 | } | 60 | } |
| 61 | } | 61 | } |
| 62 | 62 | ||
diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c index 352515af4..44a551639 100644 --- a/libbb/xfuncs.c +++ b/libbb/xfuncs.c | |||
| @@ -412,7 +412,7 @@ DIR *warn_opendir(const char *path) | |||
| 412 | DIR *dp; | 412 | DIR *dp; |
| 413 | 413 | ||
| 414 | if ((dp = opendir(path)) == NULL) { | 414 | if ((dp = opendir(path)) == NULL) { |
| 415 | bb_perror_msg("unable to open `%s'", path); | 415 | bb_perror_msg("cannot open '%s'", path); |
| 416 | return NULL; | 416 | return NULL; |
| 417 | } | 417 | } |
| 418 | return dp; | 418 | return dp; |
| @@ -424,7 +424,7 @@ DIR *xopendir(const char *path) | |||
| 424 | DIR *dp; | 424 | DIR *dp; |
| 425 | 425 | ||
| 426 | if ((dp = opendir(path)) == NULL) | 426 | if ((dp = opendir(path)) == NULL) |
| 427 | bb_perror_msg_and_die("unable to open `%s'", path); | 427 | bb_perror_msg_and_die("cannot open '%s'", path); |
| 428 | return dp; | 428 | return dp; |
| 429 | } | 429 | } |
| 430 | 430 | ||
diff --git a/loginutils/login.c b/loginutils/login.c index 2ad52c63e..263a5a0a5 100644 --- a/loginutils/login.c +++ b/loginutils/login.c | |||
| @@ -260,11 +260,11 @@ int login_main(int argc, char **argv) | |||
| 260 | USE_FEATURE_UTMP( | 260 | USE_FEATURE_UTMP( |
| 261 | safe_strncpy(utent.ut_host, opt_host, sizeof(utent.ut_host)); | 261 | safe_strncpy(utent.ut_host, opt_host, sizeof(utent.ut_host)); |
| 262 | ) | 262 | ) |
| 263 | snprintf(fromhost, sizeof(fromhost)-1, " on `%.100s' from " | 263 | snprintf(fromhost, sizeof(fromhost)-1, " on '%.100s' from " |
| 264 | "`%.200s'", short_tty, opt_host); | 264 | "'%.200s'", short_tty, opt_host); |
| 265 | } | 265 | } |
| 266 | else | 266 | else |
| 267 | snprintf(fromhost, sizeof(fromhost)-1, " on `%.100s'", short_tty); | 267 | snprintf(fromhost, sizeof(fromhost)-1, " on '%.100s'", short_tty); |
| 268 | 268 | ||
| 269 | bb_setpgrp; | 269 | bb_setpgrp; |
| 270 | 270 | ||
| @@ -302,7 +302,7 @@ auth_failed: | |||
| 302 | bb_do_delay(FAIL_DELAY); | 302 | bb_do_delay(FAIL_DELAY); |
| 303 | puts("Login incorrect"); | 303 | puts("Login incorrect"); |
| 304 | if (++count == 3) { | 304 | if (++count == 3) { |
| 305 | syslog(LOG_WARNING, "invalid password for `%s'%s", | 305 | syslog(LOG_WARNING, "invalid password for '%s'%s", |
| 306 | username, fromhost); | 306 | username, fromhost); |
| 307 | return EXIT_FAILURE; | 307 | return EXIT_FAILURE; |
| 308 | } | 308 | } |
| @@ -319,7 +319,7 @@ auth_failed: | |||
| 319 | security_context_t old_tty_sid, new_tty_sid; | 319 | security_context_t old_tty_sid, new_tty_sid; |
| 320 | 320 | ||
| 321 | if (get_default_context(username, NULL, &user_sid)) { | 321 | if (get_default_context(username, NULL, &user_sid)) { |
| 322 | bb_error_msg_and_die("unable to get SID for %s", | 322 | bb_error_msg_and_die("cannot get SID for %s", |
| 323 | username); | 323 | username); |
| 324 | } | 324 | } |
| 325 | if (getfilecon(full_tty, &old_tty_sid) < 0) { | 325 | if (getfilecon(full_tty, &old_tty_sid) < 0) { |
diff --git a/miscutils/crond.c b/miscutils/crond.c index b18e27489..fa7964e4e 100644 --- a/miscutils/crond.c +++ b/miscutils/crond.c | |||
| @@ -654,7 +654,7 @@ static void SynchronizeDir(void) | |||
| 654 | 654 | ||
| 655 | remove(CRONUPDATE); | 655 | remove(CRONUPDATE); |
| 656 | if (chdir(CDir) < 0) { | 656 | if (chdir(CDir) < 0) { |
| 657 | crondlog("\311unable to find %s\n", CDir); | 657 | crondlog("\311cannot find %s\n", CDir); |
| 658 | } | 658 | } |
| 659 | { | 659 | { |
| 660 | DIR *dir = opendir("."); | 660 | DIR *dir = opendir("."); |
| @@ -673,7 +673,7 @@ static void SynchronizeDir(void) | |||
| 673 | } | 673 | } |
| 674 | closedir(dir); | 674 | closedir(dir); |
| 675 | } else { | 675 | } else { |
| 676 | crondlog("\311Unable to open current dir!\n"); | 676 | crondlog("\311cannot open current dir!\n"); |
| 677 | } | 677 | } |
| 678 | } | 678 | } |
| 679 | } | 679 | } |
| @@ -876,7 +876,7 @@ ForkJob(const char *user, CronLine * line, int mailFd, | |||
| 876 | close(mailFd); | 876 | close(mailFd); |
| 877 | } | 877 | } |
| 878 | execl(prog, prog, cmd, arg, NULL); | 878 | execl(prog, prog, cmd, arg, NULL); |
| 879 | crondlog("\024unable to exec, user %s cmd %s %s %s\n", user, prog, cmd, arg); | 879 | crondlog("\024cannot exec, user %s cmd %s %s %s\n", user, prog, cmd, arg); |
| 880 | if (mailf) { | 880 | if (mailf) { |
| 881 | fdprintf(1, "Exec failed: %s -c %s\n", prog, arg); | 881 | fdprintf(1, "Exec failed: %s -c %s\n", prog, arg); |
| 882 | } | 882 | } |
| @@ -926,7 +926,7 @@ static void RunJob(const char *user, CronLine * line) | |||
| 926 | line->cl_Shell); | 926 | line->cl_Shell); |
| 927 | line->cl_MailPos = lseek(mailFd, 0, SEEK_CUR); | 927 | line->cl_MailPos = lseek(mailFd, 0, SEEK_CUR); |
| 928 | } else { | 928 | } else { |
| 929 | crondlog("\024unable to create mail file user %s file %s, output to /dev/null\n", user, mailFile); | 929 | crondlog("\024cannot create mail file user %s file %s, output to /dev/null\n", user, mailFile); |
| 930 | } | 930 | } |
| 931 | 931 | ||
| 932 | ForkJob(user, line, mailFd, DEFAULT_SHELL, "-c", line->cl_Shell, mailFile); | 932 | ForkJob(user, line, mailFd, DEFAULT_SHELL, "-c", line->cl_Shell, mailFile); |
| @@ -1003,7 +1003,7 @@ static void RunJob(const char *user, CronLine * line) | |||
| 1003 | #endif | 1003 | #endif |
| 1004 | 1004 | ||
| 1005 | execl(DEFAULT_SHELL, DEFAULT_SHELL, "-c", line->cl_Shell, NULL); | 1005 | execl(DEFAULT_SHELL, DEFAULT_SHELL, "-c", line->cl_Shell, NULL); |
| 1006 | crondlog("\024unable to exec, user %s cmd %s -c %s\n", user, | 1006 | crondlog("\024cannot exec, user %s cmd %s -c %s\n", user, |
| 1007 | DEFAULT_SHELL, line->cl_Shell); | 1007 | DEFAULT_SHELL, line->cl_Shell); |
| 1008 | exit(0); | 1008 | exit(0); |
| 1009 | } else if (pid < 0) { | 1009 | } else if (pid < 0) { |
diff --git a/miscutils/crontab.c b/miscutils/crontab.c index 6ae1b020c..743ac74ae 100644 --- a/miscutils/crontab.c +++ b/miscutils/crontab.c | |||
| @@ -126,7 +126,7 @@ int crontab_main(int ac, char **av) | |||
| 126 | if (repFile) { | 126 | if (repFile) { |
| 127 | repFd = GetReplaceStream(caller, repFile); | 127 | repFd = GetReplaceStream(caller, repFile); |
| 128 | if (repFd < 0) | 128 | if (repFd < 0) |
| 129 | bb_error_msg_and_die("unable to read replacement file"); | 129 | bb_error_msg_and_die("cannot read replacement file"); |
| 130 | } | 130 | } |
| 131 | 131 | ||
| 132 | /* | 132 | /* |
| @@ -191,7 +191,7 @@ int crontab_main(int ac, char **av) | |||
| 191 | close(fd); | 191 | close(fd); |
| 192 | rename(path, pas->pw_name); | 192 | rename(path, pas->pw_name); |
| 193 | } else { | 193 | } else { |
| 194 | bb_error_msg("unable to create %s/%s", CDir, path); | 194 | bb_error_msg("cannot create %s/%s", CDir, path); |
| 195 | } | 195 | } |
| 196 | close(repFd); | 196 | close(repFd); |
| 197 | } | 197 | } |
| @@ -224,7 +224,7 @@ int crontab_main(int ac, char **av) | |||
| 224 | /* loop */ | 224 | /* loop */ |
| 225 | } | 225 | } |
| 226 | if (fo == NULL) { | 226 | if (fo == NULL) { |
| 227 | bb_error_msg("unable to append to %s/%s", CDir, CRONUPDATE); | 227 | bb_error_msg("cannot append to %s/%s", CDir, CRONUPDATE); |
| 228 | } | 228 | } |
| 229 | } | 229 | } |
| 230 | return 0; | 230 | return 0; |
diff --git a/modutils/insmod.c b/modutils/insmod.c index 49b823d0e..ff96736af 100644 --- a/modutils/insmod.c +++ b/modutils/insmod.c | |||
| @@ -4299,12 +4299,12 @@ int insmod_ng_main( int argc, char **argv) | |||
| 4299 | len = st.st_size; | 4299 | len = st.st_size; |
| 4300 | map = mmap(NULL, len, PROT_READ, MAP_PRIVATE, fd, 0); | 4300 | map = mmap(NULL, len, PROT_READ, MAP_PRIVATE, fd, 0); |
| 4301 | if (map == MAP_FAILED) { | 4301 | if (map == MAP_FAILED) { |
| 4302 | bb_perror_msg_and_die("cannot mmap `%s'", filename); | 4302 | bb_perror_msg_and_die("cannot mmap '%s'", filename); |
| 4303 | } | 4303 | } |
| 4304 | 4304 | ||
| 4305 | ret = syscall(__NR_init_module, map, len, options); | 4305 | ret = syscall(__NR_init_module, map, len, options); |
| 4306 | if (ret != 0) { | 4306 | if (ret != 0) { |
| 4307 | bb_perror_msg_and_die("cannot insert `%s': %s (%li)", | 4307 | bb_perror_msg_and_die("cannot insert '%s': %s (%li)", |
| 4308 | filename, moderror(errno), ret); | 4308 | filename, moderror(errno), ret); |
| 4309 | } | 4309 | } |
| 4310 | 4310 | ||
diff --git a/networking/ether-wake.c b/networking/ether-wake.c index aaed4a0ff..cc2fb62a3 100644 --- a/networking/ether-wake.c +++ b/networking/ether-wake.c | |||
| @@ -270,7 +270,7 @@ static inline int get_wol_pw(const char *ethoptarg, unsigned char *wol_passwd) | |||
| 270 | byte_cnt = sscanf(ethoptarg, "%d.%d.%d.%d", | 270 | byte_cnt = sscanf(ethoptarg, "%d.%d.%d.%d", |
| 271 | &passwd[0], &passwd[1], &passwd[2], &passwd[3]); | 271 | &passwd[0], &passwd[1], &passwd[2], &passwd[3]); |
| 272 | if (byte_cnt < 4) { | 272 | if (byte_cnt < 4) { |
| 273 | bb_error_msg("unable to read the Wake-On-LAN pass"); | 273 | bb_error_msg("cannot read Wake-On-LAN pass"); |
| 274 | return 0; | 274 | return 0; |
| 275 | } | 275 | } |
| 276 | 276 | ||
diff --git a/networking/nameif.c b/networking/nameif.c index 385e7fb71..52aad2873 100644 --- a/networking/nameif.c +++ b/networking/nameif.c | |||
| @@ -78,7 +78,7 @@ int nameif_main(int argc, char **argv) | |||
| 78 | 78 | ||
| 79 | while (*a) { | 79 | while (*a) { |
| 80 | if (strlen(*a) > IF_NAMESIZE) | 80 | if (strlen(*a) > IF_NAMESIZE) |
| 81 | bb_error_msg_and_die("interface name `%s' " | 81 | bb_error_msg_and_die("interface name '%s' " |
| 82 | "too long", *a); | 82 | "too long", *a); |
| 83 | ch = xzalloc(sizeof(mactable_t)); | 83 | ch = xzalloc(sizeof(mactable_t)); |
| 84 | ch->ifname = xstrdup(*a++); | 84 | ch->ifname = xstrdup(*a++); |
| @@ -104,7 +104,7 @@ int nameif_main(int argc, char **argv) | |||
| 104 | ch = xzalloc(sizeof(mactable_t)); | 104 | ch = xzalloc(sizeof(mactable_t)); |
| 105 | ch->ifname = xstrndup(line_ptr, name_length); | 105 | ch->ifname = xstrndup(line_ptr, name_length); |
| 106 | if (name_length > IF_NAMESIZE) | 106 | if (name_length > IF_NAMESIZE) |
| 107 | bb_error_msg_and_die("interface name `%s' " | 107 | bb_error_msg_and_die("interface name '%s' " |
| 108 | "too long", ch->ifname); | 108 | "too long", ch->ifname); |
| 109 | line_ptr += name_length; | 109 | line_ptr += name_length; |
| 110 | line_ptr += strspn(line_ptr, " \t"); | 110 | line_ptr += strspn(line_ptr, " \t"); |
diff --git a/procps/sysctl.c b/procps/sysctl.c index 297a12a85..49754489b 100644 --- a/procps/sysctl.c +++ b/procps/sysctl.c | |||
| @@ -43,7 +43,7 @@ static const char ERR_UNKNOWN_READING[] = | |||
| 43 | static const char ERR_PERMISSION_DENIED[] = | 43 | static const char ERR_PERMISSION_DENIED[] = |
| 44 | "error: permission denied on key '%s'\n"; | 44 | "error: permission denied on key '%s'\n"; |
| 45 | static const char ERR_PRELOAD_FILE[] = | 45 | static const char ERR_PRELOAD_FILE[] = |
| 46 | "error: unable to open preload file '%s'\n"; | 46 | "error: cannot open preload file '%s'\n"; |
| 47 | static const char WARN_BAD_LINE[] = | 47 | static const char WARN_BAD_LINE[] = |
| 48 | "warning: %s(%d): invalid syntax, continuing...\n"; | 48 | "warning: %s(%d): invalid syntax, continuing...\n"; |
| 49 | 49 | ||
diff --git a/shell/msh.c b/shell/msh.c index 6c805b53e..c0f013e98 100644 --- a/shell/msh.c +++ b/shell/msh.c | |||
| @@ -2786,7 +2786,7 @@ forkexec(struct op *t, int *pin, int *pout, int act, char **wp) | |||
| 2786 | newpid = vfork(); | 2786 | newpid = vfork(); |
| 2787 | 2787 | ||
| 2788 | if (newpid == -1) { | 2788 | if (newpid == -1) { |
| 2789 | DBGPRINTF(("FORKEXEC: ERROR, unable to vfork()!\n")); | 2789 | DBGPRINTF(("FORKEXEC: ERROR, cannot vfork()!\n")); |
| 2790 | return (-1); | 2790 | return (-1); |
| 2791 | } | 2791 | } |
| 2792 | 2792 | ||
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c index e47406b3c..bd2f1e87f 100644 --- a/util-linux/fdisk.c +++ b/util-linux/fdisk.c | |||
| @@ -441,7 +441,7 @@ static const struct systypes i386_sys_types[] = { | |||
| 441 | { "\x07" "HPFS/NTFS" }, /* OS/2 IFS, eg, HPFS or NTFS or QNX */ | 441 | { "\x07" "HPFS/NTFS" }, /* OS/2 IFS, eg, HPFS or NTFS or QNX */ |
| 442 | { "\x0a" "OS/2 Boot Manager" },/* OS/2 Boot Manager */ | 442 | { "\x0a" "OS/2 Boot Manager" },/* OS/2 Boot Manager */ |
| 443 | { "\x0b" "Win95 FAT32" }, | 443 | { "\x0b" "Win95 FAT32" }, |
| 444 | { "\x0c" "Win95 FAT32 (LBA)" },/* LBA really is `Extended Int 13h' */ | 444 | { "\x0c" "Win95 FAT32 (LBA)" },/* LBA really is 'Extended Int 13h' */ |
| 445 | { "\x0e" "Win95 FAT16 (LBA)" }, | 445 | { "\x0e" "Win95 FAT16 (LBA)" }, |
| 446 | { "\x0f" "Win95 Ext'd (LBA)" }, | 446 | { "\x0f" "Win95 Ext'd (LBA)" }, |
| 447 | { "\x11" "Hidden FAT12" }, | 447 | { "\x11" "Hidden FAT12" }, |
| @@ -1053,7 +1053,7 @@ read_extended(int ext) | |||
| 1053 | if (partitions >= MAXIMUM_PARTS) { | 1053 | if (partitions >= MAXIMUM_PARTS) { |
| 1054 | /* This is not a Linux restriction, but | 1054 | /* This is not a Linux restriction, but |
| 1055 | this program uses arrays of size MAXIMUM_PARTS. | 1055 | this program uses arrays of size MAXIMUM_PARTS. |
| 1056 | Do not try to `improve' this test. */ | 1056 | Do not try to 'improve' this test. */ |
| 1057 | struct pte *pre = &ptes[partitions-1]; | 1057 | struct pte *pre = &ptes[partitions-1]; |
| 1058 | #ifdef CONFIG_FEATURE_FDISK_WRITABLE | 1058 | #ifdef CONFIG_FEATURE_FDISK_WRITABLE |
| 1059 | printf(_("Warning: deleting partitions after %d\n"), | 1059 | printf(_("Warning: deleting partitions after %d\n"), |
| @@ -1716,7 +1716,7 @@ change_sysid(void) | |||
| 1716 | printf(_("Type 0 means free space to many systems\n" | 1716 | printf(_("Type 0 means free space to many systems\n" |
| 1717 | "(but not to Linux). Having partitions of\n" | 1717 | "(but not to Linux). Having partitions of\n" |
| 1718 | "type 0 is probably unwise. You can delete\n" | 1718 | "type 0 is probably unwise. You can delete\n" |
| 1719 | "a partition using the `d' command.\n")); | 1719 | "a partition using the 'd' command.\n")); |
| 1720 | /* break; */ | 1720 | /* break; */ |
| 1721 | } | 1721 | } |
| 1722 | 1722 | ||
| @@ -2434,7 +2434,7 @@ new_partition(void) | |||
| 2434 | } | 2434 | } |
| 2435 | else | 2435 | else |
| 2436 | printf(_("Invalid partition number " | 2436 | printf(_("Invalid partition number " |
| 2437 | "for type `%c'\n"), c); | 2437 | "for type '%c'\n"), c); |
| 2438 | } | 2438 | } |
| 2439 | } | 2439 | } |
| 2440 | } | 2440 | } |
diff --git a/util-linux/fdisk_sgi.c b/util-linux/fdisk_sgi.c index 8d6837f77..9d444c0be 100644 --- a/util-linux/fdisk_sgi.c +++ b/util-linux/fdisk_sgi.c | |||
| @@ -720,7 +720,7 @@ sgi_add_partition(int n, int sys) | |||
| 720 | first = read_int(0, 0, last-1, 0, mesg); | 720 | first = read_int(0, 0, last-1, 0, mesg); |
| 721 | if (first != 0) { | 721 | if (first != 0) { |
| 722 | printf(_("It is highly recommended that eleventh partition\n" | 722 | printf(_("It is highly recommended that eleventh partition\n" |
| 723 | "covers the entire disk and is of type `SGI volume'\n")); | 723 | "covers the entire disk and is of type 'SGI volume'\n")); |
| 724 | } | 724 | } |
| 725 | } else { | 725 | } else { |
| 726 | first = freelist[0].first; | 726 | first = freelist[0].first; |
| @@ -749,7 +749,7 @@ sgi_add_partition(int n, int sys) | |||
| 749 | last = last; /* align to cylinder if You know how ... */ | 749 | last = last; /* align to cylinder if You know how ... */ |
| 750 | if ( (sys == SGI_VOLUME) && (first != 0 || last != sgi_get_lastblock() ) ) | 750 | if ( (sys == SGI_VOLUME) && (first != 0 || last != sgi_get_lastblock() ) ) |
| 751 | printf(_("It is highly recommended that eleventh partition\n" | 751 | printf(_("It is highly recommended that eleventh partition\n" |
| 752 | "covers the entire disk and is of type `SGI volume'\n")); | 752 | "covers the entire disk and is of type 'SGI volume'\n")); |
| 753 | sgi_set_partition(n, first, last-first, sys); | 753 | sgi_set_partition(n, first, last-first, sys); |
| 754 | } | 754 | } |
| 755 | 755 | ||
diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c index 3ebc58b1f..9c831bd59 100644 --- a/util-linux/fsck_minix.c +++ b/util-linux/fsck_minix.c | |||
| @@ -445,7 +445,7 @@ static void read_block(unsigned int nr, char *addr) | |||
| 445 | return; | 445 | return; |
| 446 | } | 446 | } |
| 447 | if (BLOCK_SIZE * nr != lseek(IN, BLOCK_SIZE * nr, SEEK_SET)) { | 447 | if (BLOCK_SIZE * nr != lseek(IN, BLOCK_SIZE * nr, SEEK_SET)) { |
| 448 | printf("%s: unable to seek to block in file '%s'\n", | 448 | printf("%s: cannot seek to block in file '%s'\n", |
| 449 | bb_msg_read_error, current_name); | 449 | bb_msg_read_error, current_name); |
| 450 | errors_uncorrected = 1; | 450 | errors_uncorrected = 1; |
| 451 | memset(addr, 0, BLOCK_SIZE); | 451 | memset(addr, 0, BLOCK_SIZE); |
diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c index b154f4ab9..5cdbfead9 100644 --- a/util-linux/mkfs_minix.c +++ b/util-linux/mkfs_minix.c | |||
| @@ -312,17 +312,17 @@ static void write_tables(void) | |||
| 312 | if (lseek(DEV, 0, SEEK_SET)) | 312 | if (lseek(DEV, 0, SEEK_SET)) |
| 313 | bb_error_msg_and_die("seek to boot block failed in write_tables"); | 313 | bb_error_msg_and_die("seek to boot block failed in write_tables"); |
| 314 | if (512 != write(DEV, boot_block_buffer, 512)) | 314 | if (512 != write(DEV, boot_block_buffer, 512)) |
| 315 | bb_error_msg_and_die("unable to clear boot sector"); | 315 | bb_error_msg_and_die("cannot clear boot sector"); |
| 316 | if (BLOCK_SIZE != lseek(DEV, BLOCK_SIZE, SEEK_SET)) | 316 | if (BLOCK_SIZE != lseek(DEV, BLOCK_SIZE, SEEK_SET)) |
| 317 | bb_error_msg_and_die("seek failed in write_tables"); | 317 | bb_error_msg_and_die("seek failed in write_tables"); |
| 318 | if (BLOCK_SIZE != write(DEV, super_block_buffer, BLOCK_SIZE)) | 318 | if (BLOCK_SIZE != write(DEV, super_block_buffer, BLOCK_SIZE)) |
| 319 | bb_error_msg_and_die("unable to write super-block"); | 319 | bb_error_msg_and_die("cannot write super-block"); |
| 320 | if (IMAPS * BLOCK_SIZE != write(DEV, inode_map, IMAPS * BLOCK_SIZE)) | 320 | if (IMAPS * BLOCK_SIZE != write(DEV, inode_map, IMAPS * BLOCK_SIZE)) |
| 321 | bb_error_msg_and_die("unable to write inode map"); | 321 | bb_error_msg_and_die("cannot write inode map"); |
| 322 | if (ZMAPS * BLOCK_SIZE != write(DEV, zone_map, ZMAPS * BLOCK_SIZE)) | 322 | if (ZMAPS * BLOCK_SIZE != write(DEV, zone_map, ZMAPS * BLOCK_SIZE)) |
| 323 | bb_error_msg_and_die("unable to write zone map"); | 323 | bb_error_msg_and_die("cannot write zone map"); |
| 324 | if (INODE_BUFFER_SIZE != write(DEV, inode_buffer, INODE_BUFFER_SIZE)) | 324 | if (INODE_BUFFER_SIZE != write(DEV, inode_buffer, INODE_BUFFER_SIZE)) |
| 325 | bb_error_msg_and_die("unable to write inodes"); | 325 | bb_error_msg_and_die("cannot write inodes"); |
| 326 | 326 | ||
| 327 | } | 327 | } |
| 328 | 328 | ||
| @@ -570,7 +570,7 @@ static void setup_tables(void) | |||
| 570 | * /sbin/mkfs.minix -i 200 test.fs | 570 | * /sbin/mkfs.minix -i 200 test.fs |
| 571 | * */ | 571 | * */ |
| 572 | if (i >= 999) { | 572 | if (i >= 999) { |
| 573 | bb_error_msg_and_die("unable to allocate buffers for maps"); | 573 | bb_error_msg_and_die("cannot allocate buffers for maps"); |
| 574 | } | 574 | } |
| 575 | FIRSTZONE = NORM_FIRSTZONE; | 575 | FIRSTZONE = NORM_FIRSTZONE; |
| 576 | inode_map = xmalloc(IMAPS * BLOCK_SIZE); | 576 | inode_map = xmalloc(IMAPS * BLOCK_SIZE); |
| @@ -807,7 +807,7 @@ goodbye: | |||
| 807 | strcpy(tmp + 2, ".badblocks"); | 807 | strcpy(tmp + 2, ".badblocks"); |
| 808 | DEV = xopen(device_name, O_RDWR); | 808 | DEV = xopen(device_name, O_RDWR); |
| 809 | if (fstat(DEV, &statbuf) < 0) | 809 | if (fstat(DEV, &statbuf) < 0) |
| 810 | bb_error_msg_and_die("unable to stat %s", device_name); | 810 | bb_error_msg_and_die("cannot stat %s", device_name); |
| 811 | if (!S_ISBLK(statbuf.st_mode)) | 811 | if (!S_ISBLK(statbuf.st_mode)) |
| 812 | check = 0; | 812 | check = 0; |
| 813 | else if (statbuf.st_rdev == 0x0300 || statbuf.st_rdev == 0x0340) | 813 | else if (statbuf.st_rdev == 0x0300 || statbuf.st_rdev == 0x0340) |
