54 lines
1.5 KiB
Plaintext
54 lines
1.5 KiB
Plaintext
$OpenBSD: patch-tcl_tclCmdAH_c,v 1.2 2010/05/22 14:23:48 espie Exp $
|
||
--- tcl/tclCmdAH.c.orig Fri Feb 24 22:19:53 1995
|
||
+++ tcl/tclCmdAH.c Sat May 22 16:16:44 2010
|
||
@@ -38,9 +38,17 @@ static char rcsid[] = "$Header: /home/agamotto/mark/pk
|
||
#include <sys/wait.h>
|
||
#include "tclInt.h"
|
||
|
||
+#if (defined(__unix__) || defined(unix)) && !defined(USG)
|
||
+#include <sys/param.h>
|
||
+#endif
|
||
+
|
||
extern int errno;
|
||
+#if !(defined(BSD) && BSD >= 199306)
|
||
extern long lseek();
|
||
+#endif
|
||
+#ifndef BSD4_4
|
||
extern char *mktemp();
|
||
+#endif
|
||
|
||
/*
|
||
*----------------------------------------------------------------------
|
||
@@ -430,7 +438,7 @@ Tcl_ExecCmd(dummy, interp, argc, argv)
|
||
int pid = -1; /* -1 means child process doesn't
|
||
* exist (yet). Non-zero gives its
|
||
* id (0 only in child). */
|
||
- union wait status;
|
||
+ int status;
|
||
char *cmdName, *execName;
|
||
|
||
/*
|
||
@@ -501,8 +509,13 @@ Tcl_ExecCmd(dummy, interp, argc, argv)
|
||
} else {
|
||
char tmp[sizeof(TMP_FILE_NAME) + 1];
|
||
strcpy(tmp, TMP_FILE_NAME);
|
||
+#ifdef BSD4_4
|
||
+ mkstemp(tmp);
|
||
+ stdIn[0] = mkstemp(tmp);
|
||
+#else
|
||
mktemp(tmp);
|
||
stdIn[0] = open(tmp, O_RDWR|O_CREAT, 0);
|
||
+#endif
|
||
if (stdIn[0] < 0) {
|
||
sprintf(interp->result,
|
||
"couldn't create input file for \"%.50s\" command: %.50s",
|
||
@@ -642,7 +655,7 @@ Tcl_ExecCmd(dummy, interp, argc, argv)
|
||
sprintf(interp->result, "command terminated abnormally");
|
||
result = TCL_ERROR;
|
||
}
|
||
- result = status.w_retcode;
|
||
+ result = WEXITSTATUS(status);
|
||
}
|
||
if (stdIn[0] != -1) {
|
||
close(stdIn[0]);
|