summaryrefslogtreecommitdiffstats
path: root/bin/sh
diff options
context:
space:
mode:
authorjilles <jilles@FreeBSD.org>2011-06-04 15:05:52 +0000
committerjilles <jilles@FreeBSD.org>2011-06-04 15:05:52 +0000
commite193bb76ce511e6a74e47db019bc03629d1c1f91 (patch)
tree8c953aa2c8ed195518e54c3fd1fb1e1c2e07f27c /bin/sh
parent1bcd9bb7cf6b2dd57876958e080cf61c0f09a7f1 (diff)
downloadFreeBSD-src-e193bb76ce511e6a74e47db019bc03629d1c1f91.zip
FreeBSD-src-e193bb76ce511e6a74e47db019bc03629d1c1f91.tar.gz
sh: Reduce more needless differences between error messages.
Diffstat (limited to 'bin/sh')
-rw-r--r--bin/sh/alias.c2
-rw-r--r--bin/sh/input.c2
-rw-r--r--bin/sh/jobs.c4
-rw-r--r--bin/sh/main.c2
4 files changed, 5 insertions, 5 deletions
diff --git a/bin/sh/alias.c b/bin/sh/alias.c
index 4662519..929c68e 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 e7baed3..c8b1a45 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 f4f1dac..434af22 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 408d37c..9cef1b0 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();
OpenPOWER on IntegriCloud