head 1.2; access; symbols pkgsrc-2013Q2:1.2.0.54 pkgsrc-2013Q2-base:1.2 pkgsrc-2012Q4:1.2.0.52 pkgsrc-2012Q4-base:1.2 pkgsrc-2011Q4:1.2.0.50 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q2:1.2.0.48 pkgsrc-2011Q2-base:1.2 pkgsrc-2009Q4:1.2.0.46 pkgsrc-2009Q4-base:1.2 pkgsrc-2008Q4:1.2.0.44 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.42 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.40 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.38 pkgsrc-2008Q2-base:1.2 pkgsrc-2008Q1:1.2.0.36 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.34 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.32 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.30 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.28 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.26 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.24 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.22 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.20 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.18 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.16 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.14 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.12 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.10 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.8 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.6 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.4 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.2 pkgsrc-2003Q4-base:1.2 buildlink2-base:1.2 netbsd-1-5-RELEASE:1.1 netbsd-1-4-PATCH003:1.1 netbsd-1-4-PATCH002:1.1; locks; strict; comment @# @; 1.2 date 2000.12.15.00.41.06; author wiz; state dead; branches; next 1.1; 1.1 date 99.11.26.22.12.38; author hubertf; state Exp; branches; next ; desc @@ 1.2 log @Move packages from 'net' into new 'chat' category. Add chat to main Makefile. @ text @$NetBSD: patch-ap,v 1.1 1999/11/26 22:12:38 hubertf Exp $ diff -x *.orig -urN ./tcl/tclCmdAH.c /usr/pkgsrc/net/icb/work.i386.unpatched/icb-5.0.9/tcl/tclCmdAH.c --- ./tcl/tclCmdAH.c Fri Feb 24 22:19:53 1995 +++ /usr/pkgsrc/net/icb/work.i386.unpatched/icb-5.0.9/tcl/tclCmdAH.c Fri Nov 26 22:56:28 1999 @@@@ -38,9 +38,22 @@@@ #include #include "tclInt.h" +#ifdef __NetBSD__ +#define unix +#endif + +#if (defined(__unix__) || defined(unix)) && !defined(USG) +#include +#include +#endif + extern int errno; +#if !(defined(BSD) && BSD >= 199306) extern long lseek(); +#endif +#ifndef BSD4_4 extern char *mktemp(); +#endif /* *---------------------------------------------------------------------- @@@@ -430,7 +443,7 @@@@ 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 +514,13 @@@@ } 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 +660,7 @@@@ sprintf(interp->result, "command terminated abnormally"); result = TCL_ERROR; } - result = status.w_retcode; + result = WEXITSTATUS(status); } if (stdIn[0] != -1) { close(stdIn[0]); @ 1.1 log @Split patches and add code to print time in front of each line. Needs to be switched on from .icbrc: oset printtime true. Bump version to 5.0.9pl1 for that. @ text @d1 1 a1 1 $NetBSD$ @