diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-20 13:28:22 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-20 13:28:22 +0000 |
| commit | e1a0d486e4804eae098571f1a6788394c2ee51ae (patch) | |
| tree | c6f3435738900c8d53832eb919b1b2c3d524f2e5 /coreutils | |
| parent | dd2982882bb192ea757f32514bc2ea0bc96f5ba0 (diff) | |
| download | busybox-w32-e1a0d486e4804eae098571f1a6788394c2ee51ae.tar.gz busybox-w32-e1a0d486e4804eae098571f1a6788394c2ee51ae.tar.bz2 busybox-w32-e1a0d486e4804eae098571f1a6788394c2ee51ae.zip | |
message string changes, mostly for consistency, also -32 bytes in .rodata
Diffstat (limited to 'coreutils')
| -rw-r--r-- | coreutils/chown.c | 2 | ||||
| -rw-r--r-- | coreutils/du.c | 2 | ||||
| -rw-r--r-- | coreutils/expr.c | 2 | ||||
| -rw-r--r-- | coreutils/install.c | 4 | ||||
| -rw-r--r-- | coreutils/nohup.c | 4 | ||||
| -rw-r--r-- | coreutils/realpath.c | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/coreutils/chown.c b/coreutils/chown.c index b73f66a89..42f973f32 100644 --- a/coreutils/chown.c +++ b/coreutils/chown.c | |||
| @@ -30,7 +30,7 @@ static int fileAction(const char *fileName, struct stat *statbuf, | |||
| 30 | (gid == (gid_t)-1) ? statbuf->st_gid : gid)) { | 30 | (gid == (gid_t)-1) ? statbuf->st_gid : gid)) { |
| 31 | return TRUE; | 31 | return TRUE; |
| 32 | } | 32 | } |
| 33 | bb_perror_msg("%s", fileName); /* A filename could have % in it... */ | 33 | bb_perror_msg("%s", fileName); /* A filename can have % in it... */ |
| 34 | return FALSE; | 34 | return FALSE; |
| 35 | } | 35 | } |
| 36 | 36 | ||
diff --git a/coreutils/du.c b/coreutils/du.c index f61d978b7..efc449097 100644 --- a/coreutils/du.c +++ b/coreutils/du.c | |||
| @@ -165,7 +165,7 @@ int du_main(int argc, char **argv) | |||
| 165 | } | 165 | } |
| 166 | #endif | 166 | #endif |
| 167 | 167 | ||
| 168 | /* Note: SUSv3 specifies that -a and -s options can not be used together | 168 | /* Note: SUSv3 specifies that -a and -s options cannot be used together |
| 169 | * in strictly conforming applications. However, it also says that some | 169 | * in strictly conforming applications. However, it also says that some |
| 170 | * du implementations may produce output when -a and -s are used together. | 170 | * du implementations may produce output when -a and -s are used together. |
| 171 | * gnu du exits with an error code in this case. We choose to simply | 171 | * gnu du exits with an error code in this case. We choose to simply |
diff --git a/coreutils/expr.c b/coreutils/expr.c index e7fdc5f1e..ea99d8b5b 100644 --- a/coreutils/expr.c +++ b/coreutils/expr.c | |||
| @@ -250,7 +250,7 @@ of a basic regular expression is not portable; it is being ignored", pv->u.s); | |||
| 250 | memset(&re_buffer, 0, sizeof(re_buffer)); | 250 | memset(&re_buffer, 0, sizeof(re_buffer)); |
| 251 | memset(re_regs, 0, sizeof(*re_regs)); | 251 | memset(re_regs, 0, sizeof(*re_regs)); |
| 252 | if (regcomp(&re_buffer, pv->u.s, 0) != 0) | 252 | if (regcomp(&re_buffer, pv->u.s, 0) != 0) |
| 253 | bb_error_msg_and_die("Invalid regular expression"); | 253 | bb_error_msg_and_die("invalid regular expression"); |
| 254 | 254 | ||
| 255 | /* expr uses an anchored pattern match, so check that there was a | 255 | /* expr uses an anchored pattern match, so check that there was a |
| 256 | * match and that the match starts at offset 0. */ | 256 | * match and that the match starts at offset 0. */ |
diff --git a/coreutils/install.c b/coreutils/install.c index 2178d435d..54adc2b6e 100644 --- a/coreutils/install.c +++ b/coreutils/install.c | |||
| @@ -61,7 +61,7 @@ int install_main(int argc, char **argv) | |||
| 61 | umask(0); | 61 | umask(0); |
| 62 | 62 | ||
| 63 | /* Create directories | 63 | /* Create directories |
| 64 | * dont use bb_make_directory() as it cant change uid or gid | 64 | * don't use bb_make_directory() as it can't change uid or gid |
| 65 | * perhaps bb_make_directory() should be improved. | 65 | * perhaps bb_make_directory() should be improved. |
| 66 | */ | 66 | */ |
| 67 | if (flags & INSTALL_OPT_DIRECTORY) { | 67 | if (flags & INSTALL_OPT_DIRECTORY) { |
| @@ -77,7 +77,7 @@ int install_main(int argc, char **argv) | |||
| 77 | } | 77 | } |
| 78 | if (mkdir(*argv, mode) == -1) { | 78 | if (mkdir(*argv, mode) == -1) { |
| 79 | if (errno != EEXIST) { | 79 | if (errno != EEXIST) { |
| 80 | bb_perror_msg("coulnt create %s", *argv); | 80 | bb_perror_msg("cannot create %s", *argv); |
| 81 | ret = EXIT_FAILURE; | 81 | ret = EXIT_FAILURE; |
| 82 | break; | 82 | break; |
| 83 | } | 83 | } |
diff --git a/coreutils/nohup.c b/coreutils/nohup.c index 439fbb173..21adfc1c3 100644 --- a/coreutils/nohup.c +++ b/coreutils/nohup.c | |||
| @@ -42,12 +42,12 @@ int nohup_main(int argc, char **argv) | |||
| 42 | * Else redirect to /dev/null. | 42 | * Else redirect to /dev/null. |
| 43 | */ | 43 | */ |
| 44 | temp = isatty(STDERR_FILENO); | 44 | temp = isatty(STDERR_FILENO); |
| 45 | if (temp) bb_error_msg("Appending to %s", nohupout); | 45 | if (temp) bb_error_msg("appending to %s", nohupout); |
| 46 | dup2(temp ? STDOUT_FILENO : nullfd, STDERR_FILENO); | 46 | dup2(temp ? STDOUT_FILENO : nullfd, STDERR_FILENO); |
| 47 | close(nullfd); | 47 | close(nullfd); |
| 48 | signal (SIGHUP, SIG_IGN); | 48 | signal (SIGHUP, SIG_IGN); |
| 49 | 49 | ||
| 50 | execvp(argv[1],argv+1); | 50 | execvp(argv[1],argv+1); |
| 51 | if (00 && ENABLE_FEATURE_CLEAN_UP && home) free(nohupout); | 51 | if (00 && ENABLE_FEATURE_CLEAN_UP && home) free(nohupout); |
| 52 | bb_perror_msg_and_die("%s",argv[1]); | 52 | bb_perror_msg_and_die("%s", argv[1]); |
| 53 | } | 53 | } |
diff --git a/coreutils/realpath.c b/coreutils/realpath.c index 993fa1c9d..0fd2c7625 100644 --- a/coreutils/realpath.c +++ b/coreutils/realpath.c | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | /* Mar 16, 2003 Manuel Novoa III (mjn3@codepoet.org) | 5 | /* Mar 16, 2003 Manuel Novoa III (mjn3@codepoet.org) |
| 6 | * | 6 | * |
| 7 | * Now does proper error checking on output and returns a failure exit code | 7 | * Now does proper error checking on output and returns a failure exit code |
| 8 | * if one or more paths can not be resolved. | 8 | * if one or more paths cannot be resolved. |
| 9 | * | 9 | * |
| 10 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. | 10 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. |
| 11 | */ | 11 | */ |
