diff options
Diffstat (limited to 'parallel/glunix/patches/patch-bj')
| -rw-r--r-- | parallel/glunix/patches/patch-bj | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/parallel/glunix/patches/patch-bj b/parallel/glunix/patches/patch-bj index 9b18341354f..8a2efc99118 100644 --- a/parallel/glunix/patches/patch-bj +++ b/parallel/glunix/patches/patch-bj @@ -1,14 +1,25 @@ -$NetBSD: patch-bj,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $ +$NetBSD: patch-bj,v 1.2 2005/05/29 14:38:33 wiz Exp $ ---- glunix/src/part/mpart.cc~ Fri Sep 5 12:30:01 1997 -+++ glunix/src/part/mpart.cc Thu Apr 2 09:15:10 1998 -@@ -272,3 +272,5 @@ +--- glunix/src/part/mpart.cc.orig 1997-09-05 21:30:01.000000000 +0200 ++++ glunix/src/part/mpart.cc +@@ -46,6 +46,7 @@ + #define __THIS_MODULE MODULE_PART + + #include <stdio.h> ++#include <stdlib.h> + #include <errno.h> + #include <string.h> + #include <unistd.h> +@@ -270,13 +271,18 @@ Part_SpawnDaemon(char *path, char **argv + } + if (pid == 0) { // Child executes here +#ifndef __NetBSD__ close(pipeFds[1]); +#endif if (dup2(pipeFds[0], STDIN_FILENO) < 0) { -@@ -277,4 +279,7 @@ + DE("dup2(STDIN) failed: %s\n", strerror(errno)); + exit(-1); } - +#ifdef __NetBSD__ @@ -17,7 +28,11 @@ $NetBSD: patch-bj,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $ if (dup2(pipeFds[0], STDOUT_FILENO) < 0) { +#endif DE("dup2(STDOUT) failed: %s\n", strerror(errno)); -@@ -293,6 +298,11 @@ + exit(-1); + } +@@ -291,10 +297,15 @@ Part_SpawnDaemon(char *path, char **argv + DE("CloseOneExec(%d) failed, pipeFds[0,1] = (%d,%d): %s\n", + pipeFds[1], pipeFds[0], pipeFds[1], strerror(errno)); } +#ifndef __NetBSD__ close(pipeFds[0]); @@ -30,3 +45,5 @@ $NetBSD: patch-bj,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $ *fdPtr = pipeFds[1]; +#endif + return True; + } |