Module Name:    src
Committed By:   christos
Date:           Wed Feb 24 14:38:40 UTC 2016

Modified Files:
        src/bin/sh: options.c

Log Message:
If we don't have shared address space vfork fail back to using fork since
we are depending on the shared address space feature (from kre)


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/bin/sh/options.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/bin/sh/options.c
diff -u src/bin/sh/options.c:1.43 src/bin/sh/options.c:1.44
--- src/bin/sh/options.c:1.43	Tue Mar 20 14:42:29 2012
+++ src/bin/sh/options.c	Wed Feb 24 09:38:40 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: options.c,v 1.43 2012/03/20 18:42:29 matt Exp $	*/
+/*	$NetBSD: options.c,v 1.44 2016/02/24 14:38:40 christos Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)options.c	8.2 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: options.c,v 1.43 2012/03/20 18:42:29 matt Exp $");
+__RCSID("$NetBSD: options.c,v 1.44 2016/02/24 14:38:40 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -103,6 +103,10 @@ procargs(int argc, char **argv)
 		iflag = 2;
 	if (mflag == 2)
 		mflag = iflag;
+#ifndef DO_SHAREDVFORK
+	if (usefork == 2)
+		usefork = 1;
+#endif
 	for (i = 0; i < NOPTS; i++)
 		if (optlist[i].val == 2)
 			optlist[i].val = 0;

Reply via email to