From dafb9c663743c5c2fb309c65fe6e579d9af74256 Mon Sep 17 00:00:00 2001 From: "Kaveh R. Ghazi" Date: Tue, 1 Feb 2000 21:42:05 +0000 Subject: [PATCH] fixinc.irix: Use unique filenames for writing into /tmp, * fixinc.irix: Use unique filenames for writing into /tmp, * fixinc.ptx: Likewise. * fixinc.sco: Likewise. * fixinc.svr4: Likewise. * fixinc.winnt: Likewise. From-SVN: r31742 --- gcc/ChangeLog | 8 +++++ gcc/fixinc/fixinc.irix | 6 ++-- gcc/fixinc/fixinc.ptx | 4 +-- gcc/fixinc/fixinc.sco | 8 ++--- gcc/fixinc/fixinc.svr4 | 76 ++++++++++++++++++++--------------------- gcc/fixinc/fixinc.winnt | 6 ++-- 6 files changed, 58 insertions(+), 50 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2e1691505db..c78df4e25e3 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2000-02-01 Kaveh R. Ghazi + + * fixinc.irix: Use unique filenames for writing into /tmp, + * fixinc.ptx: Likewise. + * fixinc.sco: Likewise. + * fixinc.svr4: Likewise. + * fixinc.winnt: Likewise. + 2000-02-01 Kaveh R. Ghazi * tsystem.h: New file. diff --git a/gcc/fixinc/fixinc.irix b/gcc/fixinc/fixinc.irix index a6ddc0c5904..403c5441e83 100755 --- a/gcc/fixinc/fixinc.irix +++ b/gcc/fixinc/fixinc.irix @@ -142,7 +142,7 @@ fi # in float.h to avoid redefinition errors if float.h is included first. file=limits.h -base=`basename $file` +base=`basename $file`.$$ if [ -r ${LIB}/$file ]; then file_to_fix=${LIB}/$file else @@ -204,7 +204,7 @@ fi # The Irix unistd.h will introduce a call to __vfork in its libc, but the # function is never actually prototyped. file=unistd.h -base=`basename $file` +base=`basename $file`.$$ if [ -r ${LIB}/$file ]; then file_to_fix=${LIB}/$file else @@ -236,7 +236,7 @@ done # This is for ANSI and also to interoperate properly with gcc's varargs.h. # Arrange for stdio.h to use stdarg.h to define __gnuc_va_list file=stdio.h -base=`basename $file` +base=`basename $file`.$$ if [ -r ${LIB}/$file ]; then file_to_fix=${LIB}/$file else diff --git a/gcc/fixinc/fixinc.ptx b/gcc/fixinc/fixinc.ptx index 88518bebbcb..700a725bd35 100644 --- a/gcc/fixinc/fixinc.ptx +++ b/gcc/fixinc/fixinc.ptx @@ -118,7 +118,7 @@ fi # In pwd.h, PTX 1.x needs stdio.h included since FILE * was added in a # prototype later on in the file. file=pwd.h -base=`basename $file` +base=`basename $file`.$$ if [ -r ${LIB}/$file ]; then file_to_fix=${LIB}/$file else @@ -173,7 +173,7 @@ fi # include written out by the fixinc.svr4 script which has # these same routines written in an asm format supported by gcc. file=netinet/in.h -base=`basename $file` +base=`basename $file`.$$ if [ -r ${LIB}/$file ]; then file_to_fix=${LIB}/$file else diff --git a/gcc/fixinc/fixinc.sco b/gcc/fixinc/fixinc.sco index 11e78f727ca..a026a776683 100755 --- a/gcc/fixinc/fixinc.sco +++ b/gcc/fixinc/fixinc.sco @@ -185,7 +185,7 @@ cd ${INPUT} # Fix first broken decl of getcwd present on some svr4 systems. file=stdlib.h -base=`basename $file` +base=`basename $file`.$$ if [ -r ${LIB}/$file ]; then file_to_fix=${LIB}/$file else @@ -213,7 +213,7 @@ fi # fix the incorrect decl of profil present on some svr4 systems. file=unistd.h -base=`basename $file` +base=`basename $file`.$$ if [ -r ${LIB}/$file ]; then file_to_fix=${LIB}/$file else @@ -241,7 +241,7 @@ fi # Fix third broken decl of getcwd on SCO. Also fix incorrect decl of # link. file=prototypes.h -base=`basename $file` +base=`basename $file`.$$ if [ -r ${LIB}/$file ]; then file_to_fix=${LIB}/$file else @@ -313,7 +313,7 @@ fi # we blow over that one (with C++ linkage) and stick a new one in stdlib.h # with C linkage. So we eat the one out of math.h. file=math.h -base=`basename $file` +base=`basename $file`.$$ if [ -r ${LIB}/$file ]; then file_to_fix=${LIB}/$file else diff --git a/gcc/fixinc/fixinc.svr4 b/gcc/fixinc/fixinc.svr4 index fbec4bc4abb..342b1464541 100755 --- a/gcc/fixinc/fixinc.svr4 +++ b/gcc/fixinc/fixinc.svr4 @@ -267,7 +267,7 @@ done # Fix first broken decl of getcwd present on some svr4 systems. file=stdlib.h -base=`basename $file` +base=`basename $file`.$$ if [ -r ${LIB}/$file ]; then file_to_fix=${LIB}/$file else @@ -295,7 +295,7 @@ fi # fix the incorrect decl of profil present on some svr4 systems. file=unistd.h -base=`basename $file` +base=`basename $file`.$$ if [ -r ${LIB}/$file ]; then file_to_fix=${LIB}/$file else @@ -324,7 +324,7 @@ fi # and so that it is correct for both C and C++. file=sys/param.h -base=`basename $file` +base=`basename $file`.$$ if [ -r ${LIB}/$file ]; then file_to_fix=${LIB}/$file else @@ -363,7 +363,7 @@ fi # and so that it is correct for both C and C++. file=stdio.h -base=`basename $file` +base=`basename $file`.$$ if [ -r ${LIB}/$file ]; then file_to_fix=${LIB}/$file else @@ -399,7 +399,7 @@ fi # and so that it is correct for both C and C++. file=dbm.h -base=`basename $file` +base=`basename $file`.$$ if [ -r ${LIB}/$file ]; then file_to_fix=${LIB}/$file else @@ -436,7 +436,7 @@ fi # Add a prototyped declaration of mmap to . file=sys/mman.h -base=`basename $file` +base=`basename $file`.$$ if [ -r ${LIB}/$file ]; then file_to_fix=${LIB}/$file else @@ -476,7 +476,7 @@ fi # any of this stuff when on Solaris. file=ftw.h -base=`basename $file` +base=`basename $file`.$$ if [ -r ${LIB}/$file ]; then file_to_fix=${LIB}/$file else @@ -537,7 +537,7 @@ fi # Avoid the definition of the bool type in the Solaris 2.x curses.h when using # g++, since it's now an official type in the C++ language. file=curses.h -base=`basename $file` +base=`basename $file`.$$ if [ -r ${LIB}/$file ]; then file_to_fix=${LIB}/$file else @@ -573,7 +573,7 @@ fi # such a declaration. file=regexp.h -base=`basename $file` +base=`basename $file`.$$ if [ -r ${LIB}/$file ]; then file_to_fix=${LIB}/$file else @@ -611,7 +611,7 @@ fi # delete the lines that #define some string functions to internal forms. file=string.h -base=`basename $file` +base=`basename $file`.$$ if [ -r ${LIB}/$file ]; then file_to_fix=${LIB}/$file else @@ -644,7 +644,7 @@ fi # (guessing it is necessary for all of them). file=ieeefp.h -base=`basename $file` +base=`basename $file`.$$ if [ -r ${LIB}/$file ]; then file_to_fix=${LIB}/$file else @@ -677,7 +677,7 @@ fi # Also fix types of SIG_DFL, SIG_ERR, SIG_IGN, and SIG_HOLD. file=sys/signal.h -base=`basename $file` +base=`basename $file`.$$ if [ -r ${LIB}/$file ]; then file_to_fix=${LIB}/$file else @@ -709,7 +709,7 @@ fi # Fix declarations of `makedev', `major', and `minor' in . file=sys/mkdev.h -base=`basename $file` +base=`basename $file`.$$ if [ -r ${LIB}/$file ]; then file_to_fix=${LIB}/$file else @@ -749,7 +749,7 @@ fi # Fix reference to NMSZ in . file=sys/adv.h -base=`basename $file` +base=`basename $file`.$$ if [ -r ${LIB}/$file ]; then file_to_fix=${LIB}/$file else @@ -777,7 +777,7 @@ fi # array initializers. file=sys/netcspace.h -base=`basename $file` +base=`basename $file`.$$ if [ -r ${LIB}/$file ]; then file_to_fix=${LIB}/$file else @@ -805,7 +805,7 @@ fi # Conditionalize all of on _KERNEL being defined. file=fs/rfs/rf_cache.h -base=`basename $file` +base=`basename $file`.$$ if [ -r ${LIB}/$file ]; then file_to_fix=${LIB}/$file else @@ -834,7 +834,7 @@ fi # Conditionalize all of on _KERNEL being defined. file=sys/erec.h -base=`basename $file` +base=`basename $file`.$$ if [ -r ${LIB}/$file ]; then file_to_fix=${LIB}/$file else @@ -863,7 +863,7 @@ fi # Conditionalize all of on _KERNEL being defined. file=sys/err.h -base=`basename $file` +base=`basename $file`.$$ if [ -r ${LIB}/$file ]; then file_to_fix=${LIB}/$file else @@ -892,7 +892,7 @@ fi # Conditionalize all of on _KERNEL being defined. file=sys/char.h -base=`basename $file` +base=`basename $file`.$$ if [ -r ${LIB}/$file ]; then file_to_fix=${LIB}/$file else @@ -921,7 +921,7 @@ fi # Conditionalize all of on _KERNEL being defined. file=sys/getpages.h -base=`basename $file` +base=`basename $file`.$$ if [ -r ${LIB}/$file ]; then file_to_fix=${LIB}/$file else @@ -950,7 +950,7 @@ fi # Conditionalize all of on _KERNEL being defined. file=sys/map.h -base=`basename $file` +base=`basename $file`.$$ if [ -r ${LIB}/$file ]; then file_to_fix=${LIB}/$file else @@ -979,7 +979,7 @@ fi # Conditionalize all of on _KERNEL being defined. file=sys/cmn_err.h -base=`basename $file` +base=`basename $file`.$$ if [ -r ${LIB}/$file ]; then file_to_fix=${LIB}/$file else @@ -1008,7 +1008,7 @@ fi # Conditionalize all of on _KERNEL being defined. file=sys/kdebugger.h -base=`basename $file` +base=`basename $file`.$$ if [ -r ${LIB}/$file ]; then file_to_fix=${LIB}/$file else @@ -1038,7 +1038,7 @@ fi # This has been taken out because it breaks on some versions of # DYNIX/ptx, and it does not seem to do much good on any system. # file=netinet/in.h -# base=`basename $file` +# base=`basename $file`.$$ # if [ -r ${LIB}/$file ]; then # file_to_fix=${LIB}/$file # else @@ -1068,7 +1068,7 @@ fi # Conditionalize some of on __GNUC__ and __GNUG__. file=sys/endian.h -base=`basename $file` +base=`basename $file`.$$ if [ -r ${LIB}/$file ]; then file_to_fix=${LIB}/$file else @@ -1101,7 +1101,7 @@ fi ## In sys/types.h, don't name the enum for booleans. # #file=sys/types.h -#base=`basename $file` +#base=`basename $file`.$$ #if [ -r ${LIB}/$file ]; then # file_to_fix=${LIB}/$file #else @@ -1126,7 +1126,7 @@ fi # and file=sys/stream.h -base=`basename $file` +base=`basename $file`.$$ if [ -r ${LIB}/$file ]; then file_to_fix=${LIB}/$file else @@ -1154,7 +1154,7 @@ if [ \! -z "$file_to_fix" ]; then fi file=sys/strsubr.h -base=`basename $file` +base=`basename $file`.$$ if [ -r ${LIB}/$file ]; then file_to_fix=${LIB}/$file else @@ -1185,7 +1185,7 @@ fi # Put storage class at start of decl, to avoid warning. file=rpc/types.h -base=`basename $file` +base=`basename $file`.$$ if [ -r ${LIB}/$file ]; then file_to_fix=${LIB}/$file else @@ -1214,7 +1214,7 @@ fi # Convert functions to prototype form, and fix arg names in . file=sys/stat.h -base=`basename $file` +base=`basename $file`.$$ if [ -r ${LIB}/$file ]; then file_to_fix=${LIB}/$file else @@ -1282,7 +1282,7 @@ if [ -x /bin/sony ]; then # Change to not define __filbuf, __flsbuf, and __iob file=stdio.h - base=`basename $file` + base=`basename $file`.$$ if [ -r ${LIB}/$file ]; then file_to_fix=${LIB}/$file else @@ -1316,7 +1316,7 @@ if [ -x /bin/sony ]; then # Change to not define __ctype file=ctype.h - base=`basename $file` + base=`basename $file`.$$ if [ -r ${LIB}/$file ]; then file_to_fix=${LIB}/$file else @@ -1352,7 +1352,7 @@ fi # Solaris 2.1 has this problem. file=limits.h -base=`basename $file` +base=`basename $file`.$$ if [ -r ${LIB}/$file ]; then file_to_fix=${LIB}/$file else @@ -1437,7 +1437,7 @@ fi # specific math-*.h file. file=math.h -base=`basename $file` +base=`basename $file`.$$ if [ -r ${LIB}/$file ]; then file_to_fix=${LIB}/$file else @@ -1470,7 +1470,7 @@ fi # which conflicts with the fixproto definition. The fixproto # definition and the Solaris definition are used the same way. for file in math.h floatingpoint.h; do - base=`basename $file` + base=`basename $file`.$$ if [ -r ${LIB}/$file ]; then file_to_fix=${LIB}/$file else @@ -1505,7 +1505,7 @@ done # redefine it to __math_exception. This is not a great fix, but I # haven't been able to think of anything better. file=math.h -base=`basename $file` +base=`basename $file`.$$ if [ -r ${LIB}/$file ]; then file_to_fix=${LIB}/$file else @@ -1538,7 +1538,7 @@ fi # Similarly for struct queue in sys/stream.h. file=sys/stream.h -base=`basename $file` +base=`basename $file`.$$ if [ -r ${LIB}/$file ]; then file_to_fix=${LIB}/$file else @@ -1574,7 +1574,7 @@ fi # installed in , just remove the protos. set -x file=arpa/inet.h -base=`basename $file` +base=`basename $file`.$$ if [ -r ${LIB}/$file ]; then file_to_fix=${LIB}/$file else diff --git a/gcc/fixinc/fixinc.winnt b/gcc/fixinc/fixinc.winnt index 2e5750c5138..323b79a93b8 100644 --- a/gcc/fixinc/fixinc.winnt +++ b/gcc/fixinc/fixinc.winnt @@ -145,7 +145,7 @@ done # Fix first broken decl of getcwd present on some svr4 systems. file=direct.h -base=`basename $file` +base=`basename $file`.$$ if [ -r ${LIB}/$file ]; then file_to_fix=${LIB}/$file else @@ -170,7 +170,7 @@ if [ \! -z "$file_to_fix" ]; then fi file=rpcndr.h -base=`basename $file` +base=`basename $file`.$$ if [ -r ${LIB}/$file ]; then file_to_fix=${LIB}/$file else @@ -195,7 +195,7 @@ if [ \! -z "$file_to_fix" ]; then fi file=winnt.h -base=`basename $file` +base=`basename $file`.$$ if [ -r ${LIB}/$file ]; then file_to_fix=${LIB}/$file else -- 2.30.2