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 -- $!
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
