From owner-svn-src-head@FreeBSD.ORG Sat Jun 4 15:05:53 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 19D311065701; Sat, 4 Jun 2011 15:05:53 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id F3CFF8FC16; Sat, 4 Jun 2011 15:05:52 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p54F5qQ2014833; Sat, 4 Jun 2011 15:05:52 GMT (envelope-from jilles@svn.freebsd.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p54F5qLO014827; Sat, 4 Jun 2011 15:05:52 GMT (envelope-from jilles@svn.freebsd.org) Message-Id: <201106041505.p54F5qLO014827@svn.freebsd.org> From: Jilles Tjoelker Date: Sat, 4 Jun 2011 15:05:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r222684 - in head: bin/sh tools/regression/bin/sh/builtins X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jun 2011 15:05:53 -0000 Author: jilles Date: Sat Jun 4 15:05:52 2011 New Revision: 222684 URL: http://svn.freebsd.org/changeset/base/222684 Log: sh: Reduce more needless differences between error messages. Modified: head/bin/sh/alias.c head/bin/sh/input.c head/bin/sh/jobs.c head/bin/sh/main.c head/tools/regression/bin/sh/builtins/alias.1.stderr Modified: head/bin/sh/alias.c ============================================================================== --- head/bin/sh/alias.c Sat Jun 4 15:05:32 2011 (r222683) +++ head/bin/sh/alias.c Sat Jun 4 15:05:52 2011 (r222684) @@ -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); Modified: head/bin/sh/input.c ============================================================================== --- head/bin/sh/input.c Sat Jun 4 15:05:32 2011 (r222683) +++ head/bin/sh/input.c Sat Jun 4 15:05:52 2011 (r222684) @@ -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); Modified: head/bin/sh/jobs.c ============================================================================== --- head/bin/sh/jobs.c Sat Jun 4 15:05:32 2011 (r222683) +++ head/bin/sh/jobs.c Sat Jun 4 15:05:52 2011 (r222684) @@ -820,7 +820,7 @@ forkshell(struct job *jp, union node *n, ! 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, ! 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)); } } Modified: head/bin/sh/main.c ============================================================================== --- head/bin/sh/main.c Sat Jun 4 15:05:32 2011 (r222683) +++ head/bin/sh/main.c Sat Jun 4 15:05:52 2011 (r222684) @@ -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(); Modified: head/tools/regression/bin/sh/builtins/alias.1.stderr ============================================================================== --- head/tools/regression/bin/sh/builtins/alias.1.stderr Sat Jun 4 15:05:32 2011 (r222683) +++ head/tools/regression/bin/sh/builtins/alias.1.stderr Sat Jun 4 15:05:52 2011 (r222684) @@ -1 +1 @@ -alias: foo not found +alias: foo: not found