[src/netbsd-3]: src/usr.sbin/pkg_install/create Pullup rev 1.42 (requested by...

[jmc <jmc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1a5f29b4cca7
branches:  netbsd-3
changeset: 577464:1a5f29b4cca7
user:      jmc <jmc%NetBSD.org@localhost>
date:      Tue Nov 08 18:17:24 2005 +0000

description:
Pullup rev 1.42 (requested by wiz in ticket #940)
 Sync with pkgsrc: wrap some headers in #ifs.
 Replace wait(2) with equivalent waitpid(2); for Linux.

diffstat:

 usr.sbin/pkg_install/create/perform.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 1bb99abf14d7 -r 1a5f29b4cca7 usr.sbin/pkg_install/create/perform.c
--- a/usr.sbin/pkg_install/create/perform.c     Tue Nov 08 18:17:21 2005 +0000
+++ b/usr.sbin/pkg_install/create/perform.c     Tue Nov 08 18:17:24 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: perform.c,v 1.40.2.1 2005/11/06 13:43:18 tron Exp $    */
+/*     $NetBSD: perform.c,v 1.40.2.2 2005/11/08 18:17:24 jmc Exp $     */
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -11,7 +11,7 @@
 #if 0
 static const char *rcsid = "from FreeBSD Id: perform.c,v 1.38 1997/10/13 15:03:51 jkh Exp";
 #else
-__RCSID("$NetBSD: perform.c,v 1.40.2.1 2005/11/06 13:43:18 tron Exp $");
+__RCSID("$NetBSD: perform.c,v 1.40.2.2 2005/11/08 18:17:24 jmc Exp $");
 #endif
 #endif
 
@@ -174,7 +174,7 @@
        }
 
        fclose(totar);
-       wait(&ret);
+       waitpid(-1, &ret, 0);
        /* assume either signal or bad exit is enough for us */
        if (ret) {
                cleanup(0);