From owner-svn-src-all@FreeBSD.ORG  Wed Jul  3 21:56:26 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id E28ECB98;
 Wed,  3 Jul 2013 21:56:26 +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 BB15D1AD5;
 Wed,  3 Jul 2013 21:56:26 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r63LuQgo031550;
 Wed, 3 Jul 2013 21:56:26 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r63LuQqi031547;
 Wed, 3 Jul 2013 21:56:26 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <201307032156.r63LuQqi031547@svn.freebsd.org>
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Wed, 3 Jul 2013 21:56:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r252617 - in stable/9: bin/sh
 tools/regression/bin/sh/builtins
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Jul 2013 21:56:27 -0000

Author: jilles
Date: Wed Jul  3 21:56:25 2013
New Revision: 252617
URL: http://svnweb.freebsd.org/changeset/base/252617

Log:
  MFC r248349: 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:
  stable/9/tools/regression/bin/sh/builtins/wait6.0
     - copied unchanged from r248349, head/tools/regression/bin/sh/builtins/wait6.0
  stable/9/tools/regression/bin/sh/builtins/wait7.0
     - copied unchanged from r248349, head/tools/regression/bin/sh/builtins/wait7.0
Modified:
  stable/9/bin/sh/jobs.c
Directory Properties:
  stable/9/bin/sh/   (props changed)
  stable/9/tools/regression/bin/sh/   (props changed)

Modified: stable/9/bin/sh/jobs.c
==============================================================================
--- stable/9/bin/sh/jobs.c	Wed Jul  3 21:53:54 2013	(r252616)
+++ stable/9/bin/sh/jobs.c	Wed Jul  3 21:56:25 2013	(r252617)
@@ -459,14 +459,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;
 	}

Copied: stable/9/tools/regression/bin/sh/builtins/wait6.0 (from r248349, head/tools/regression/bin/sh/builtins/wait6.0)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/9/tools/regression/bin/sh/builtins/wait6.0	Wed Jul  3 21:56:25 2013	(r252617, copy of r248349, head/tools/regression/bin/sh/builtins/wait6.0)
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+wait --

Copied: stable/9/tools/regression/bin/sh/builtins/wait7.0 (from r248349, head/tools/regression/bin/sh/builtins/wait7.0)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/9/tools/regression/bin/sh/builtins/wait7.0	Wed Jul  3 21:56:25 2013	(r252617, copy of r248349, head/tools/regression/bin/sh/builtins/wait7.0)
@@ -0,0 +1,4 @@
+# $FreeBSD$
+
+: &
+wait -- $!