aboutsummaryrefslogtreecommitdiff
path: root/coreutils
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2006-10-20 13:28:22 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2006-10-20 13:28:22 +0000
commite1a0d486e4804eae098571f1a6788394c2ee51ae (patch)
treec6f3435738900c8d53832eb919b1b2c3d524f2e5 /coreutils
parentdd2982882bb192ea757f32514bc2ea0bc96f5ba0 (diff)
downloadbusybox-e1a0d486e4804eae098571f1a6788394c2ee51ae.tar.gz
message string changes, mostly for consistency, also -32 bytes in .rodata
Diffstat (limited to 'coreutils')
-rw-r--r--coreutils/chown.c2
-rw-r--r--coreutils/du.c2
-rw-r--r--coreutils/expr.c2
-rw-r--r--coreutils/install.c4
-rw-r--r--coreutils/nohup.c4
-rw-r--r--coreutils/realpath.c2
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,
(gid == (gid_t)-1) ? statbuf->st_gid : gid)) {
return TRUE;
}
- bb_perror_msg("%s", fileName); /* A filename could have % in it... */
+ bb_perror_msg("%s", fileName); /* A filename can have % in it... */
return FALSE;
}
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)
}
#endif
- /* Note: SUSv3 specifies that -a and -s options can not be used together
+ /* Note: SUSv3 specifies that -a and -s options cannot be used together
* in strictly conforming applications. However, it also says that some
* du implementations may produce output when -a and -s are used together.
* 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);
memset(&re_buffer, 0, sizeof(re_buffer));
memset(re_regs, 0, sizeof(*re_regs));
if (regcomp(&re_buffer, pv->u.s, 0) != 0)
- bb_error_msg_and_die("Invalid regular expression");
+ bb_error_msg_and_die("invalid regular expression");
/* expr uses an anchored pattern match, so check that there was a
* 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)
umask(0);
/* Create directories
- * dont use bb_make_directory() as it cant change uid or gid
+ * don't use bb_make_directory() as it can't change uid or gid
* perhaps bb_make_directory() should be improved.
*/
if (flags & INSTALL_OPT_DIRECTORY) {
@@ -77,7 +77,7 @@ int install_main(int argc, char **argv)
}
if (mkdir(*argv, mode) == -1) {
if (errno != EEXIST) {
- bb_perror_msg("coulnt create %s", *argv);
+ bb_perror_msg("cannot create %s", *argv);
ret = EXIT_FAILURE;
break;
}
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)
* Else redirect to /dev/null.
*/
temp = isatty(STDERR_FILENO);
- if (temp) bb_error_msg("Appending to %s", nohupout);
+ if (temp) bb_error_msg("appending to %s", nohupout);
dup2(temp ? STDOUT_FILENO : nullfd, STDERR_FILENO);
close(nullfd);
signal (SIGHUP, SIG_IGN);
execvp(argv[1],argv+1);
if (00 && ENABLE_FEATURE_CLEAN_UP && home) free(nohupout);
- bb_perror_msg_and_die("%s",argv[1]);
+ bb_perror_msg_and_die("%s", argv[1]);
}
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 @@
/* Mar 16, 2003 Manuel Novoa III (mjn3@codepoet.org)
*
* Now does proper error checking on output and returns a failure exit code
- * if one or more paths can not be resolved.
+ * if one or more paths cannot be resolved.
*
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/