diff options
| -rw-r--r-- | bin/sh/alias.c | 2 | ||||
| -rw-r--r-- | bin/sh/input.c | 2 | ||||
| -rw-r--r-- | bin/sh/jobs.c | 4 | ||||
| -rw-r--r-- | bin/sh/main.c | 2 | ||||
| -rw-r--r-- | tools/regression/bin/sh/builtins/alias.1.stderr | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/bin/sh/alias.c b/bin/sh/alias.c index 4662519d5f0f..929c68e8798a 100644 --- a/bin/sh/alias.c +++ b/bin/sh/alias.c @@ -238,7 +238,7 @@ aliascmd(int argc, char **argv) while ((n = *++argv) != NULL) { if ((v = strchr(n+1, '=')) == NULL) /* n+1: funny ksh stuff */ if ((ap = lookupalias(n, 0)) == NULL) { - warning("%s not found", n); + warning("%s: not found", n); ret = 1; } else printalias(ap); diff --git a/bin/sh/input.c b/bin/sh/input.c index e7baed325d6d..c8b1a4533d14 100644 --- a/bin/sh/input.c +++ b/bin/sh/input.c @@ -403,7 +403,7 @@ setinputfile(const char *fname, int push) INTOFF; if ((fd = open(fname, O_RDONLY)) < 0) - error("Can't open %s: %s", fname, strerror(errno)); + error("cannot open %s: %s", fname, strerror(errno)); if (fd < 10) { fd2 = fcntl(fd, F_DUPFD, 10); close(fd); diff --git a/bin/sh/jobs.c b/bin/sh/jobs.c index f4f1dac59ef3..434af228d99e 100644 --- a/bin/sh/jobs.c +++ b/bin/sh/jobs.c @@ -820,7 +820,7 @@ forkshell(struct job *jp, union node *n, int mode) ! fd0_redirected_p ()) { close(0); if (open(_PATH_DEVNULL, O_RDONLY) != 0) - error("Can't open %s: %s", + error("cannot open %s: %s", _PATH_DEVNULL, strerror(errno)); } } @@ -832,7 +832,7 @@ forkshell(struct job *jp, union node *n, int mode) ! fd0_redirected_p ()) { close(0); if (open(_PATH_DEVNULL, O_RDONLY) != 0) - error("Can't open %s: %s", + error("cannot open %s: %s", _PATH_DEVNULL, strerror(errno)); } } diff --git a/bin/sh/main.c b/bin/sh/main.c index 408d37c1b11b..9cef1b0cde2e 100644 --- a/bin/sh/main.c +++ b/bin/sh/main.c @@ -264,7 +264,7 @@ readcmdfile(const char *name) if ((fd = open(name, O_RDONLY)) >= 0) setinputfd(fd, 1); else - error("Can't open %s: %s", name, strerror(errno)); + error("cannot open %s: %s", name, strerror(errno)); INTON; cmdloop(0); popfile(); diff --git a/tools/regression/bin/sh/builtins/alias.1.stderr b/tools/regression/bin/sh/builtins/alias.1.stderr index 5ea01d55bfd1..c9f4011bea00 100644 --- a/tools/regression/bin/sh/builtins/alias.1.stderr +++ b/tools/regression/bin/sh/builtins/alias.1.stderr @@ -1 +1 @@ -alias: foo not found +alias: foo: not found |