From owner-svn-src-head@FreeBSD.ORG  Fri Mar 15 20:29:32 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 3EC54804;
 Fri, 15 Mar 2013 20:29:32 +0000 (UTC)
 (envelope-from jilles@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 30D3DFC;
 Fri, 15 Mar 2013 20:29:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2FKTW7Z056395;
 Fri, 15 Mar 2013 20:29:32 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2FKTVrq056392;
 Fri, 15 Mar 2013 20:29:31 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <201303152029.r2FKTVrq056392@svn.freebsd.org>
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Fri, 15 Mar 2013 20:29:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r248349 - in head: bin/sh tools/regression/bin/sh/builtins
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 15 Mar 2013 20:29:32 -0000

Author: jilles
Date: Fri Mar 15 20:29:31 2013
New Revision: 248349
URL: http://svnweb.freebsd.org/changeset/base/248349

Log:
  sh: Recognize "--" and explicitly reject options in wait builtin.
  
  If syntactically invalid job identifiers are to be taken as jobs that exited
  with status 127, this should not apply to options, so that we can add
  options later if need be.

Added:
  head/tools/regression/bin/sh/builtins/wait6.0   (contents, props changed)
  head/tools/regression/bin/sh/builtins/wait7.0   (contents, props changed)
Modified:
  head/bin/sh/jobs.c

Modified: head/bin/sh/jobs.c
==============================================================================
--- head/bin/sh/jobs.c	Fri Mar 15 20:26:51 2013	(r248348)
+++ head/bin/sh/jobs.c	Fri Mar 15 20:29:31 2013	(r248349)
@@ -458,14 +458,15 @@ freejob(struct job *jp)
 
 
 int
-waitcmd(int argc, char **argv)
+waitcmd(int argc __unused, char **argv __unused)
 {
 	struct job *job;
 	int status, retval;
 	struct job *jp;
 
-	if (argc > 1) {
-		job = getjob(argv[1]);
+	nextopt("");
+	if (*argptr != NULL) {
+		job = getjob(*argptr);
 	} else {
 		job = NULL;
 	}

Added: head/tools/regression/bin/sh/builtins/wait6.0
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/tools/regression/bin/sh/builtins/wait6.0	Fri Mar 15 20:29:31 2013	(r248349)
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+wait --

Added: head/tools/regression/bin/sh/builtins/wait7.0
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/tools/regression/bin/sh/builtins/wait7.0	Fri Mar 15 20:29:31 2013	(r248349)
@@ -0,0 +1,4 @@
+# $FreeBSD$
+
+: &
+wait -- $!