From 7c3b7390cf4e423512fe39f238d3891bec7325fb Mon Sep 17 00:00:00 2001 From: dgp Date: Thu, 18 Oct 2007 17:52:17 +0000 Subject: * compat/tmpnam.c (removed): The routine tmpnam() is no longer * unix/Makefile.in: called by Tcl source code. Remove autogoo * unix/configure.in: the supplied a replacement version on * win/tcl.dsp: systems where the routine was not available. [RFE 1811848]. * unix/configure: autoconf-2.59 --- ChangeLog | 8 ++++++++ compat/tmpnam.c | 42 ------------------------------------------ unix/Makefile.in | 5 +---- unix/configure | 3 +-- unix/configure.in | 4 ++-- win/tcl.dsp | 4 ---- 6 files changed, 12 insertions(+), 54 deletions(-) delete mode 100644 compat/tmpnam.c diff --git a/ChangeLog b/ChangeLog index d545565..d2f83a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2007-10-18 Don Porter + * compat/tmpnam.c (removed): The routine tmpnam() is no longer + * unix/Makefile.in: called by Tcl source code. Remove autogoo + * unix/configure.in: the supplied a replacement version on + * win/tcl.dsp: systems where the routine was not available. + [RFE 1811848]. + + * unix/configure: autoconf-2.59 + * generic/tcl.h: Remove TCL_LL_MODIFIER_SIZE. [RFE 1811837] 2007-10-17 David Gravereaux diff --git a/compat/tmpnam.c b/compat/tmpnam.c deleted file mode 100644 index 6faf8de..0000000 --- a/compat/tmpnam.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 1988 Regents of the University of California. - * All rights reserved. - * - * Redistribution and use in source and binary forms are permitted provided - * that this notice is preserved and that due credit is given to the - * University of California at Berkeley. The name of the University may not be - * used to endorse or promote products derived from this software without - * specific written prior permission. This software is provided ``as is'' - * without express or implied warranty. - * - * RCS: @(#) $Id: tmpnam.c,v 1.3 2007/04/16 13:36:34 dkf Exp $ - */ - -#include -#include -#include -#include - -/* - * Use /tmp instead of /usr/tmp, because L_tmpname is only 14 chars on some - * machines (like NeXT machines) and /usr/tmp will cause buffer overflows. - */ - -#ifdef P_tmpdir -# undef P_tmpdir -#endif -#define P_tmpdir "/tmp" - -char * -tmpnam( - char *s) -{ - static char name[50]; - char *mktemp(char *); - - if (!s) { - s = name; - } - (void) sprintf(s, "%s/XXXXXX", P_tmpdir); - return mktemp(s); -} diff --git a/unix/Makefile.in b/unix/Makefile.in index 5dd78a1..1b4ad7f 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -4,7 +4,7 @@ # "./configure", which is a configuration script generated by the "autoconf" # program (constructs like "@foo@" will get replaced in the actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.222 2007/10/11 21:35:01 dgp Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.223 2007/10/18 17:52:18 dgp Exp $ VERSION = @TCL_VERSION@ MAJOR_VERSION = @TCL_MAJOR_VERSION@ @@ -1504,9 +1504,6 @@ strtol.o: $(COMPAT_DIR)/strtol.c strtoul.o: $(COMPAT_DIR)/strtoul.c $(CC) -c $(STUB_CC_SWITCHES) $(COMPAT_DIR)/strtoul.c -tmpnam.o: $(COMPAT_DIR)/tmpnam.c - $(CC) -c $(STUB_CC_SWITCHES) $(COMPAT_DIR)/tmpnam.c - waitpid.o: $(COMPAT_DIR)/waitpid.c $(CC) -c $(STUB_CC_SWITCHES) $(COMPAT_DIR)/waitpid.c diff --git a/unix/configure b/unix/configure index 629e4df..62eafc1 100755 --- a/unix/configure +++ b/unix/configure @@ -9653,8 +9653,7 @@ done - -for ac_func in opendir strtol tmpnam waitpid +for ac_func in opendir strtol waitpid do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_func" >&5 diff --git a/unix/configure.in b/unix/configure.in index 2ce4f9e..9916420 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -3,7 +3,7 @@ dnl This file is an input file used by the GNU "autoconf" program to dnl generate the file "configure", which is run during Tcl installation dnl to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.164 2007/10/11 21:35:02 dgp Exp $ +# RCS: @(#) $Id: configure.in,v 1.165 2007/10/18 17:52:19 dgp Exp $ AC_INIT([tcl],[8.5]) AC_PREREQ(2.59) @@ -151,7 +151,7 @@ AC_CHECK_FUNCS(getcwd, , [AC_DEFINE(USEGETWD, 1, [Is getcwd Posix-compliant?])]) # Nb: if getcwd uses popen and pwd(1) (like SunOS 4) we should really # define USEGETWD even if the posix getcwd exists. Add a test ? -AC_REPLACE_FUNCS(opendir strtol tmpnam waitpid) +AC_REPLACE_FUNCS(opendir strtol waitpid) AC_CHECK_FUNC(strerror, , [AC_DEFINE(NO_STRERROR, 1, [Do we have strerror()])]) AC_CHECK_FUNC(getwd, , [AC_DEFINE(NO_GETWD, 1, [Do we have getwd()])]) AC_CHECK_FUNC(wait3, , [AC_DEFINE(NO_WAIT3, 1, [Do we have wait3()])]) diff --git a/win/tcl.dsp b/win/tcl.dsp index 7f9f06c..b3de0ff 100644 --- a/win/tcl.dsp +++ b/win/tcl.dsp @@ -208,10 +208,6 @@ SOURCE=..\compat\tclErrno.h # End Source File # Begin Source File -SOURCE=..\compat\tmpnam.c -# End Source File -# Begin Source File - SOURCE=..\compat\unistd.h # End Source File # Begin Source File -- cgit v0.12