#! /bin/sh # Install modified versions of certain ANSI-incompatible system header files # which are fixed to work correctly with ANSI C # and placed in a directory that GNU C will search. # See README-fixinc for more information. # Command to run gcc. GCCCMD=${4-${GCCCMD-gcc}} # Directory where gcc sources (and sometimes special include files) live. # fixincludes doesn't use this, but fixinc.svr4 does, and I want to make # sure somebody doesn't try to use arg3 for something incompatible. -- gumby SRCDIR=${3-${SRCDIR-.}} # Directory containing the original header files. # (This was named INCLUDES, but that conflicts with a name in Makefile.in.) INPUT=${2-${INPUT-/usr/include}} # Directory in which to store the results. LIB=${1?"fixincludes: output directory not specified"} # Define PWDCMD as a command to use to get the working dir # in the form that we want. PWDCMD=pwd case "`pwd`" in //*) # On an Apollo, discard everything before `/usr'. PWDCMD="eval pwd | sed -e 's,.*/usr/,/usr/,'" ;; esac # Original directory. ORIGDIR=`${PWDCMD}` # Make sure it exists. if [ ! -d $LIB ]; then mkdir $LIB || exit 1 fi # Make LIB absolute only if needed to avoid problems with the amd. case $LIB in /*) ;; *) cd $LIB; LIB=`${PWDCMD}` ;; esac # Make SRCDIR absolute only if needed to avoid problems with the amd. cd $ORIGDIR case $SRCDIR in /*) ;; *) cd $SRCDIR; SRCDIR=`${PWDCMD}` ;; esac # Fail if no arg to specify a directory for the output. if [ x$1 = x ] then echo fixincludes: no output directory specified exit 1 fi echo Building fixed headers in ${LIB} # Determine whether this system has symbolic links. if ln -s X $LIB/ShouldNotExist 2>/dev/null; then rm -f $LIB/ShouldNotExist LINKS=true elif ln -s X /tmp/ShouldNotExist 2>/dev/null; then rm -f /tmp/ShouldNotExist LINKS=true else LINKS=false fi echo Finding directories and links to directories cd ${INPUT} # Find all directories and all symlinks that point to directories. # Put the list in $files. # Each time we find a symlink, add it to newdirs # so that we do another find within the dir the link points to. # Note that $files may have duplicates in it; # later parts of this file are supposed to ignore them. dirs="." levels=2 while [ -n "$dirs" ] && [ $levels -gt 0 ] do levels=`expr $levels - 1` newdirs= for d in $dirs do echo " Searching $INPUT/$d" if [ "$d" != . ] then d=$d/. fi # Find all directories under $d, relative to $d, excluding $d itself. files="$files `find $d -type d -print | \ sed -e '/\/\.$/d' -e '/^\.$/d'`" # Find all links to directories. # Using `-exec test -d' in find fails on some systems, # and trying to run test via sh fails on others, # so this is the simplest alternative left. # First find all the links, then test each one. theselinks= $LINKS && \ theselinks=`find $d -type l -print` for d1 in $theselinks --dummy-- do # If the link points to a directory, # add that dir to $newdirs if [ -d $d1 ] then newdirs="$newdirs $d1" fi done done files="$files $newdirs" dirs="$newdirs" done dirs= echo "All directories (including links to directories):" echo $files for file in $files; do rm -rf $LIB/$file if [ ! -d $LIB/$file ] then mkdir $LIB/$file fi done mkdir $LIB/root # treetops gets an alternating list # of old directories to copy # and the new directories to copy to. treetops="${INPUT} ${LIB}" if $LINKS; then echo 'Making symbolic directory links' for file in $files; do dest=`ls -ld $file | sed -n 's/.*-> //p'` if [ "$dest" ]; then cwd=`${PWDCMD}` # In case $dest is relative, get to $file's dir first. cd ${INPUT} cd `echo ./$file | sed -n 's&[^/]*$&&p'` # Check that the target directory exists. # Redirections changed to avoid bug in sh on Ultrix. (cd $dest) > /dev/null 2>&1 if [ $? = 0 ]; then cd $dest # X gets the dir that the link actually leads to. x=`${PWDCMD}` # If a link points to ., make a similar link to . if [ $x = $INPUT ]; then echo $file '->' . ': Making link' rm -fr ${LIB}/$file > /dev/null 2>&1 ln -s . ${LIB}/$file > /dev/null 2>&1 # If link leads back into ${INPUT}, # make a similar link here. elif expr $x : "${INPUT}/.*" > /dev/null; then # Y gets the actual target dir name, relative to ${INPUT}. y=`echo $x | sed -n "s&${INPUT}/&&p"` # DOTS is the relative path from ${LIB}/$file's dir back to ${LIB}. dots=`echo "$file" | sed -e 's@^./@@' -e 's@[^/][^/]*@..@g' -e 's@..$@@'` echo $file '->' $dots$y ': Making link' rm -fr ${LIB}/$file > /dev/null 2>&1 ln -s $dots$y ${LIB}/$file > /dev/null 2>&1 else # If the link is to a dir $target outside ${INPUT}, # repoint the link at ${INPUT}/root$target # and process $target into ${INPUT}/root$target # treat this directory as if it actually contained the files. echo $file '->' root$x ': Making link' if [ -d $LIB/root$x ] then true else dirname=root$x/ dirmade=. cd $LIB while [ x$dirname != x ]; do component=`echo $dirname | sed -e 's|/.*$||'` mkdir $component >/dev/null 2>&1 cd $component dirmade=$dirmade/$component dirname=`echo $dirname | sed -e 's|[^/]*/||'` done fi # Duplicate directory structure created in ${LIB}/$file in new # root area. for file2 in $files; do case $file2 in $file/./*) dupdir=${LIB}/root$x/`echo $file2 | sed -n "s|^${file}/||p"` echo "Duplicating ${file}'s ${dupdir}" if [ -d ${dupdir} ] then true else mkdir ${dupdir} fi ;; *) ;; esac done # DOTS is the relative path from ${LIB}/$file's dir back to ${LIB}. dots=`echo "$file" | sed -e 's@^./@@' -e 's@[^/][^/]*@..@g' -e 's@..$@@'` rm -fr ${LIB}/$file > /dev/null 2>&1 ln -s ${dots}root$x ${LIB}/$file > /dev/null 2>&1 treetops="$treetops $x ${LIB}/root$x" fi fi cd $cwd fi done fi set x $treetops shift while [ $# != 0 ]; do # $1 is an old directory to copy, and $2 is the new directory to copy to. cd ${INPUT} cd $1 # The same dir can appear more than once in treetops. # There's no need to scan it more than once. if [ -f $2/DONE ] then files= else touch $2/DONE echo Fixing directory $1 into $2 # Check .h files which are symlinks as well as those which are files. # A link to a header file will not be processed by anything but this. if $LINKS; then files=`find . -name '*.h' \( -type f -o -type l \) -print` else files=`find . -name '*.h' -type f -print` fi echo Checking header files fi # Note that BSD43_* are used on recent MIPS systems. for file in $files; do # This call to egrep is essential, since checking a file with egrep # is much faster than actually trying to fix it. # It is also essential that most files *not* match! # Thus, matching every #endif is unacceptable. # But the argument to egrep must be kept small, or many versions of egrep # won't be able to handle it. # # We use the pattern [!-.0-~] instead of [^/ ] to match a noncomment # following #else or #endif because some buggy egreps think [^/] matches # newline, and they thus think `#else ' matches `#e[ndiflse]*[ ]+[^/ ]'. # # We use the pattern [^a-zA-Z0-9_][_a-ce-km-z][a-z0-9] to match an identifier # following #if or #elif that is not surrounded by __. The `a-ce-km-z' # in this pattern lacks `d' and `l'; this means we don't worry about # identifiers starting with `d' or `l'. This is OK, since none of the # identifiers below start with `d' or `l'. It also greatly improves # performance, since many files contain lines of the form `#if ... defined ...' # or `#if lint'. if egrep '//|[ _]_IO|CTRL|^#define.NULL|^#e[nl][ds][ief]*[ ]+[!-.0-~]|^#[el]*if.*[^a-zA-Z0-9_][_a-ce-km-z][a-z0-9]' $file >/dev/null; then if [ -r $file ]; then cp $file $2/$file >/dev/null 2>&1 \ || echo "Can't copy $file" chmod +w $2/$file chmod a+r $2/$file # Here is how the sed commands in braces work. # (It doesn't work to put the comments inside the sed commands.) # Surround each word with spaces, to simplify matching below. # ANSIfy each pre-ANSI machine-dependent symbol # by surrounding it with __ __. # Remove the spaces that we inserted around each word. sed -e ' :loop /\\$/ N /\\$/ b loop s%^\([ ]*#[ ]*else\)[ ]*/[^*].*%\1% s%^\([ ]*#[ ]*else\)[ ]*[^/ ].*%\1% s%^\([ ]*#[ ]*endif\)[ ]*/[^*].*%\1% s%^\([ ]*#[ ]*endif\)[ ]*\*[^/].*%\1% s%^\([ ]*#[ ]*endif\)[ ]*[^/* ].*%\1% /\/\/[^*]/ s|//\(.*\)$|/*\1*/| /[ ]_IO[A-Z]*[ ]*(/ s/\(_IO[A-Z]*[ ]*(\)\(.\),/\1'\''\2'\'',/ /[ ]BSD43__IO[A-Z]*[ ]*(/ s/(\(.\),/('\''\1'\'',/ /#define._IO/ s/'\''\([cgxt]\)'\''/\1/g /#define.BSD43__IO/ s/'\''\([cgx]\)'\''/\1/g /[^A-Z0-9_]CTRL[ ]*(/ s/\([^'\'']\))/'\''\1'\'')/ /[^A-Z0-9]_CTRL[ ]*(/ s/\([^'\'']\))/'\''\1'\'')/ /#define[ ]*[ ]CTRL/ s/'\''\([cgx]\)'\''/\1/g /#define[ ]*[ ]_CTRL/ s/'\''\([cgx]\)'\''/\1/g /#define.BSD43_CTRL/ s/'\''\([cgx]\)'\''/\1/g /#[el]*if/{ s/[a-zA-Z0-9_][a-zA-Z0-9_]*/ & /g s/ bsd4\([0-9]\) / __bsd4\1__ /g s/ _*i386 / __i386__ /g s/ is68k / __is68k__ /g s/ m68k / __m68k__ /g s/ mc680\([0-9]\)0 / __mc680\10__ /g s/ news\([0-9]*\) / __news\1__ /g s/ ns32000 / __ns32000__ /g s/ pyr / __pyr__ /g s/ sony_news / __sony_news__ /g s/ sparc / __sparc__ /g s/ sun\([a-z0-9]*\) / __sun\1__ /g s/ unix / __unix__ /g s/ vax / __vax__ /g s/ \([a-zA-Z0-9_][a-zA-Z0-9_]*\) /\1/g } /^#define.NULL[ ]/ i\ #undef NULL ' $2/$file > $2/$file. mv $2/$file. $2/$file if cmp $file $2/$file >/dev/null 2>&1; then rm $2/$file else echo Fixed $file fi fi fi done shift; shift done cd ${INPUT} # Install the proper definition of size_t in header files that it comes from. for file in sys/types.h stdlib.h sys/stdtypes.h; do if [ -r $file ] && [ ! -r ${LIB}/$file ]; then cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file" chmod +w ${LIB}/$file 2>/dev/null chmod a+r ${LIB}/$file 2>/dev/null fi if [ -r ${LIB}/$file ]; then echo Fixing $file comment # Get the definition of __SIZE_TYPE__, if any. # (This file must be called something.c). echo "__SIZE_TYPE__" > ${LIB}/types.c foo=`${GCCCMD} -E -P ${LIB}/types.c` rm -f ${LIB}/types.c # Default to our preferred type. if [ "$foo" = __SIZE_TYPE__ ]; then foo="unsigned long int"; fi sed -e "s/typedef[ a-z_]*[ ]size_t/typedef $foo size_t/" ${LIB}/$file > ${LIB}/${file}.sed rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file if cmp $file ${LIB}/$file >/dev/null 2>&1; then rm ${LIB}/$file fi fi done # Fix one other error in this file: a mismatched quote not inside a C comment. file=sundev/vuid_event.h if [ -r $file ] && [ ! -r ${LIB}/$file ]; then mkdir ${LIB}/sundev 2>/dev/null cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file" chmod +w ${LIB}/$file 2>/dev/null chmod a+r ${LIB}/$file 2>/dev/null fi if [ -r ${LIB}/$file ]; then echo Fixing $file comment sed -e "s/doesn't/does not/" ${LIB}/$file > ${LIB}/${file}.sed rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file if cmp $file ${LIB}/$file >/dev/null 2>&1; then rm ${LIB}/$file fi fi # Fix these Sun OS files to avoid an invalid identifier in an #ifdef. file=sunwindow/win_cursor.h if [ -r $file ] && [ ! -r ${LIB}/$file ]; then # mkdir ${LIB}/sunwindow 2>/dev/null cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file" chmod +w ${LIB}/$file 2>/dev/null fi if [ -r ${LIB}/$file ]; then echo Fixing $file sed -e "s/ecd.cursor/ecd_cursor/" ${LIB}/$file > ${LIB}/${file}.sed rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file if cmp $file ${LIB}/$file >/dev/null 2>&1; then rm ${LIB}/$file fi fi file=sunwindow/win_lock.h if [ -r $file ] && [ ! -r ${LIB}/$file ]; then # mkdir ${LIB}/sunwindow 2>/dev/null cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file" chmod +w ${LIB}/$file 2>/dev/null fi if [ -r ${LIB}/$file ]; then echo Fixing $file sed -e "s/ecd.cursor/ecd_cursor/" ${LIB}/$file > ${LIB}/${file}.sed rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file if cmp $file ${LIB}/$file >/dev/null 2>&1; then rm ${LIB}/$file fi fi # Fix this Sun file to avoid interfering with stddef.h. file=sys/stdtypes.h if [ -r $file ] && [ ! -r ${LIB}/$file ]; then cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file" chmod +w ${LIB}/$file 2>/dev/null chmod a+r ${LIB}/$file 2>/dev/null fi if [ -r ${LIB}/$file ]; then echo Fixing $file sed -e '/[ ]size_t.*;/i\ #ifndef _GCC_SIZE_T\ #define _GCC_SIZE_T' \ -e '/[ ]size_t.*;/a\ #endif' \ -e '/[ ]ptrdiff_t.*;/i\ #ifndef _GCC_PTRDIFF_T\ #define _GCC_PTRDIFF_T' \ -e '/[ ]ptrdiff_t.*;/a\ #endif' \ -e '/[ ]wchar_t.*;/i\ #ifndef _GCC_WCHAR_T\ #define _GCC_WCHAR_T' \ -e '/[ ]wchar_t.*;/a\ #endif' ${LIB}/$file > ${LIB}/${file}.sed rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file if cmp $file ${LIB}/$file >/dev/null 2>&1; then rm ${LIB}/$file fi fi # Fix this file to avoid interfering with stddef.h, but don't mistakenly # match e.g. ssize_t present in AIX for the ps/2. file=sys/types.h if [ -r $file ] && [ ! -r ${LIB}/$file ]; then cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file" chmod +w ${LIB}/$file 2>/dev/null chmod a+r ${LIB}/$file 2>/dev/null fi if [ -r ${LIB}/$file ]; then echo Fixing $file sed -e '/[ ]size_t.*;/i\ #ifndef _GCC_SIZE_T\ #define _GCC_SIZE_T' \ -e '/[ ]size_t.*;/a\ #endif' ${LIB}/$file > ${LIB}/${file}.sed rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file if cmp $file ${LIB}/$file >/dev/null 2>&1; then rm ${LIB}/$file fi fi # Fix HP's use of ../machine/inline.h to refer to # /usr/include/machine/inline.h file=sys/spinlock.h if [ -r $file ] && [ ! -r ${LIB}/$file ]; then cp $file ${LIB}/$file fi if [ -r ${LIB}/$file ] ; then echo Fixing $file sed -e 's,"../machine/inline.h",,' \ -e 's,"../machine/psl.h",,' \ ${LIB}/$file > ${LIB}/${file}.sed rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file if cmp $file ${LIB}/$file >/dev/null 2>&1; then rm ${LIB}/$file fi fi # Fix AIX use of "XDPS.h" to refer to file=DPS/XDPSlib.h if [-r $file] && [ ! -r ${LIB}/$file ] ; then cp $file ${LIB}/$file fi if [ -r ${LIB}/$file ] ; then echo Fixing $file sed -e 's,"XDPS.h",,' ${LIB}/$file > ${LIB}/${file}.sed rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file if cmp $file ${LIB}/$file >/dev/null 2>&1; then rm ${LIB}/$file fi fi # Fix an error in this file: the #if says _cplusplus, not the double # underscore __cplusplus that it should be file=tinfo.h if [ -r $file ] && [ ! -r ${LIB}/$file ]; then mkdir ${LIB}/rpcsvc 2>/dev/null cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file" chmod +w ${LIB}/$file 2>/dev/null chmod a+r ${LIB}/$file 2>/dev/null fi if [ -r ${LIB}/$file ]; then echo Fixing $file, __cplusplus macro sed -e 's/[ ]_cplusplus/ __cplusplus/' ${LIB}/$file > ${LIB}/${file}.sed rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file if cmp $file ${LIB}/$file >/dev/null 2>&1; then rm ${LIB}/$file fi fi # Fix an error in this file: a missing semi-colon at the end of the statsswtch # structure definition. file=rpcsvc/rstat.h if [ -r $file ] && [ ! -r ${LIB}/$file ]; then mkdir ${LIB}/rpcsvc 2>/dev/null cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file" chmod +w ${LIB}/$file 2>/dev/null chmod a+r ${LIB}/$file 2>/dev/null fi if [ -r ${LIB}/$file ]; then echo Fixing $file, definition of statsswtch sed -e 's/boottime$/boottime;/' ${LIB}/$file > ${LIB}/${file}.sed rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file if cmp $file ${LIB}/$file >/dev/null 2>&1; then rm ${LIB}/$file fi fi # Fix an error in this file: a missing semi-colon at the end of the nodeent # structure definition. file=netdnet/dnetdb.h if [ -r $file ] && [ ! -r ${LIB}/$file ]; then mkdir ${LIB}/netdnet 2>/dev/null cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file" chmod +w ${LIB}/$file 2>/dev/null chmod a+r ${LIB}/$file 2>/dev/null fi if [ -r ${LIB}/$file ]; then echo Fixing $file, definition of nodeent sed -e 's/char.*na_addr *$/char *na_addr;/' ${LIB}/$file > ${LIB}/${file}.sed rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file if cmp $file ${LIB}/$file >/dev/null 2>&1; then rm ${LIB}/$file fi fi # Check for bad #ifdef line (in Ultrix 4.1) file=sys/file.h if [ -r $file ] && [ ! -r ${LIB}/$file ]; then cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file" chmod +w ${LIB}/$file 2>/dev/null chmod a+r ${LIB}/$file 2>/dev/null fi if [ -r ${LIB}/$file ]; then echo Fixing $file, bad \#ifdef line sed -e 's/#ifdef KERNEL/#if defined(KERNEL)/' ${LIB}/$file > ${LIB}/${file}.sed rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file if cmp $file ${LIB}/$file >/dev/null 2>&1; then rm ${LIB}/$file fi fi # Check for superfluous `static' (in Ultrix 4.2) file=machine/cpu.h if [ -r $file ] && [ ! -r ${LIB}/$file ]; then mkdir ${LIB}/machine 2>/dev/null cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file" chmod +w ${LIB}/$file 2>/dev/null chmod a+r ${LIB}/$file 2>/dev/null fi if [ -r ${LIB}/$file ]; then echo Fixing $file, superfluous static sed -e 's/^static struct tlb_pid_state/struct tlb_pid_state/' ${LIB}/$file > ${LIB}/${file}.sed rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file if cmp $file ${LIB}/$file >/dev/null 2>&1; then rm ${LIB}/$file else # This file has an alternative name, mips/cpu.h. Fix that name, too. if cmp machine/cpu.h mips/cpu.h > /dev/null 2>&1; then mkdir ${LIB}/mips 2>&- ln ${LIB}/$file ${LIB}/mips/cpu.h fi fi fi # Incorrect sprintf declaration in X11/Xmu.h file=X11/Xmu.h if [ -r $file ] && [ ! -r ${LIB}/$file ]; then mkdir ${LIB}/X11 2>/dev/null cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file" chmod +w ${LIB}/$file 2>/dev/null chmod a+r ${LIB}/$file 2>/dev/null fi if [ -r ${LIB}/$file ]; then echo Fixing $file sprintf declaration sed -e 's,^extern char \* sprintf();$,#ifndef __STDC__\ extern char * sprintf();\ #endif /* !defined __STDC__ */,' ${LIB}/$file > ${LIB}/${file}.sed rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file if cmp $file ${LIB}/$file >/dev/null 2>&1; then rm ${LIB}/$file fi fi # Incorrect sprintf declaration in X11/Xmu/Xmu.h # (It's not clear whether the right file name is this or X11/Xmu.h.) file=X11/Xmu/Xmu.h if [ -r $file ] && [ ! -r ${LIB}/$file ]; then mkdir ${LIB}/X11/Xmu 2>/dev/null cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file" chmod +w ${LIB}/$file 2>/dev/null chmod a+r ${LIB}/$file 2>/dev/null fi if [ -r ${LIB}/$file ]; then echo Fixing $file sprintf declaration sed -e 's,^extern char \* sprintf();$,#ifndef __STDC__\ extern char * sprintf();\ #endif /* !defined __STDC__ */,' ${LIB}/$file > ${LIB}/${file}.sed rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file if cmp $file ${LIB}/$file >/dev/null 2>&1; then rm ${LIB}/$file fi fi # Check for missing ';' in struct file=netinet/ip.h if [ -r $file ] && [ ! -r ${LIB}/$file ]; then mkdir ${LIB}/netinet 2>/dev/null cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file" chmod +w ${LIB}/$file 2>/dev/null chmod a+r ${LIB}/$file 2>/dev/null fi if [ -r ${LIB}/$file ]; then echo Fixing $file sed -e '/^struct/,/^};/s/}$/};/' ${LIB}/$file > ${LIB}/${file}.sed rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file if cmp $file ${LIB}/$file >/dev/null 2>&1; then rm -f ${LIB}/$file fi fi # Fix the CAT macro in SunOS memvar.h. file=pixrect/memvar.h if [ -r $file ] && [ ! -r ${LIB}/$file ]; then mkdir ${LIB}/pixrect 2>/dev/null cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file" chmod +w ${LIB}/$file 2>/dev/null chmod a+r ${LIB}/$file 2>/dev/null fi if [ -r ${LIB}/$file ]; then echo Fixing $file sed -e '/^#define.CAT(a,b)/ i\ #ifdef __STDC__ \ #define CAT(a,b) a##b\ #else /^#define.CAT(a,b)/ a\ #endif ' ${LIB}/$file > ${LIB}/${file}.sed rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file if cmp $file ${LIB}/$file >/dev/null 2>&1; then rm -f ${LIB}/$file fi fi # Check for yet more missing ';' in struct (in SunOS 4.0.x) file=rpcsvc/rusers.h if [ -r $file ] && [ ! -r ${LIB}/$file ]; then mkdir ${LIB}/rpcsvc 2>/dev/null cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file" chmod +w ${LIB}/$file 2>/dev/null chmod a+r ${LIB}/$file 2>/dev/null fi if [ -r ${LIB}/$file ]; then echo Fixing $file sed -e '/^struct/,/^};/s/_cnt$/_cnt;/' ${LIB}/$file > ${LIB}/${file}.sed rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file if cmp $file ${LIB}/$file >/dev/null 2>&1; then rm -f ${LIB}/$file fi fi # Fix return type of exit and abort in on SunOS 4.1. # Also wrap protection around size_t for m88k-sysv3 systems. file=stdlib.h if [ -r $file ] && [ ! -r ${LIB}/$file ]; then cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file" chmod +w ${LIB}/$file 2>/dev/null chmod a+r ${LIB}/$file 2>/dev/null fi if [ -r ${LIB}/$file ]; then echo Fixing $file sed -e 's/int abort/void abort/g' \ -e 's/int free/void free/g' \ -e 's/char \* calloc/void \* calloc/g' \ -e 's/char \* malloc/void \* malloc/g' \ -e 's/char \* realloc/void \* realloc/g' \ -e 's/int exit/void exit/g' \ -e '/typedef[ a-zA-Z_]*[ ]size_t[ ]*;/i\ #ifndef _GCC_SIZE_T\ #define _GCC_SIZE_T' \ -e '/typedef[ a-zA-Z_]*[ ]size_t[ ]*;/a\ #endif' \ ${LIB}/$file > ${LIB}/${file}.sed rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file if cmp $file ${LIB}/$file >/dev/null 2>&1; then rm -f ${LIB}/$file fi fi # Fix return type of free and {c,m,re}alloc in on SunOS 4.1. file=malloc.h if [ -r $file ] && [ ! -r ${LIB}/$file ]; then cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file" chmod +w ${LIB}/$file 2>/dev/null chmod a+r ${LIB}/$file 2>/dev/null fi if [ -r ${LIB}/$file ]; then echo Fixing $file sed -e 's/typedef[ ]char \* malloc_t/typedef void \* malloc_t/g' \ -e 's/int[ ][ ]*free/void free/g' \ ${LIB}/$file > ${LIB}/${file}.sed rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file if cmp $file ${LIB}/$file >/dev/null 2>&1; then rm -f ${LIB}/$file fi fi # Fix bogus #ifdef in on SunOS 4.1. file=hsfs/hsfs_spec.h if [ -r $file ] && [ ! -r ${LIB}/$file ]; then mkdir ${LIB}/hsfs 2>/dev/null cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file" chmod +w ${LIB}/$file 2>/dev/null chmod a+r ${LIB}/$file 2>/dev/null fi if [ -r ${LIB}/$file ]; then echo Fixing $file sed -e 's/\#ifdef __i386__ || __vax__/\#if __i386__ || __vax__/g' \ ${LIB}/$file > ${LIB}/${file}. rm -f ${LIB}/$file; mv ${LIB}/${file}. ${LIB}/$file if cmp $file ${LIB}/$file >/dev/null 2>&1; then rm -f ${LIB}/$file fi fi # Fix bogus #ifdef in on SunOS 4.1. file=hsfs/hsnode.h if [ -r $file ] && [ ! -r ${LIB}/$file ]; then mkdir ${LIB}/hsfs 2>/dev/null cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file" chmod +w ${LIB}/$file 2>/dev/null chmod a+r ${LIB}/$file 2>/dev/null fi if [ -r ${LIB}/$file ]; then echo Fixing $file sed -e 's/\#ifdef __i386__ || __sun4c__/\#if __i386__ || __sun4c__/g' \ ${LIB}/$file > ${LIB}/${file}.sed rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file if cmp $file ${LIB}/$file >/dev/null 2>&1; then rm -f ${LIB}/$file fi fi # Fix bogus #ifdef in on SunOS 4.1. file=hsfs/iso_spec.h if [ -r $file ] && [ ! -r ${LIB}/$file ]; then mkdir ${LIB}/hsfs 2>/dev/null cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file" chmod +w ${LIB}/$file 2>/dev/null chmod a+r ${LIB}/$file 2>/dev/null fi if [ -r ${LIB}/$file ]; then echo Fixing $file sed -e 's/\#ifdef __i386__ || __vax__/\#if __i386__ || __vax__/g' \ ${LIB}/$file > ${LIB}/${file}.sed rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file if cmp $file ${LIB}/$file >/dev/null 2>&1; then rm -f ${LIB}/$file fi fi # Incorrect #include in Sony News-OS 3.2. file=machine/machparam.h if [ -r $file ] && [ ! -r ${LIB}/$file ]; then mkdir ${LIB}/machine 2>/dev/null cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file" chmod +w ${LIB}/$file 2>/dev/null chmod a+r ${LIB}/$file 2>/dev/null fi if [ -r ${LIB}/$file ]; then echo Fixing $file, incorrect \#include sed -e 's@"../machine/endian.h"@@' \ ${LIB}/$file > ${LIB}/${file}. rm -f ${LIB}/$file; mv ${LIB}/${file}. ${LIB}/$file if cmp $file ${LIB}/$file >/dev/null 2>&1; then rm -f ${LIB}/$file fi fi # Multiline comment after typedef on IRIX 4.0.1. file=sys/types.h if [ -r $file ] && [ ! -r ${LIB}/$file ]; then mkdir ${LIB}/sys 2>/dev/null cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file" chmod +w ${LIB}/$file 2>/dev/null chmod a+r ${LIB}/$file 2>/dev/null fi if [ -r ${LIB}/$file ]; then echo Fixing $file, comment in the middle of \#ifdef sed -e 's@type of the result@type of the result */@' \ -e 's@of the sizeof@/* of the sizeof@' \ ${LIB}/$file > ${LIB}/${file}.sed rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file if cmp $file ${LIB}/$file >/dev/null 2>&1; then rm -f ${LIB}/$file fi fi # Turning // comments into /* */ comments trashes this IRIX 4.0.1 # header file, which embeds // comments inside multi-line /* */ # comments. If this looks like the IRIX header file, we refix it by # just throwing away the // comments. file=fam.h if [ -r ${LIB}/$file ]; then if egrep indigo.esd ${LIB}/$file > /dev/null; then echo Fixing $file, overeager sed script rm ${LIB}/$file sed -e 's|//.*$||g' $file > ${LIB}/$file chmod +w ${LIB}/$file 2>/dev/null chmod a+r ${LIB}/$file 2>/dev/null fi fi # Another IRIX 4.0.1 header file contains the string "//" file=elf_abi.h if [ -r ${LIB}/$file ]; then echo Fixing $file, overeager sed script sed -e 's|"/\*"\*/|"//"|' ${LIB}/$file > ${LIB}/${file}.sed rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file if cmp $file ${LIB}/$file >/dev/null 2>&1; then rm -f ${LIB}/$file fi fi # Same problem with a file from SunOS 4.1.3 : a header file containing # the string "//" embedded in "/**/" file=sbusdev/audiovar.h if [ -r ${LIB}/$file ]; then echo Fixing $file, overeager sed script rm ${LIB}/$file sed -e 's|//.*$||g' $file > ${LIB}/$file chmod +w ${LIB}/$file 2>/dev/null chmod a+r ${LIB}/$file 2>/dev/null fi # Fix non-ANSI memcpy declaration that conflicts with gcc's builtin # declaration on Sun OS 4.x. We must only fix this on Sun OS 4.x, because # many other systems have similar text but correct versions of the file. # To ensure only Sun's is fixed, we grep for a likely unique string. file=memory.h if [ -r $file ] && egrep '/\* @\(#\)memory\.h 1\.[2-4] 8./../.. SMI; from S5R2 1\.2 \*/' $file > /dev/null; then if [ ! -r ${LIB}/$file ]; then cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file" chmod +w ${LIB}/$file 2>/dev/null chmod a+r ${LIB}/$file 2>/dev/null fi if [ -r ${LIB}/$file ]; then echo Replacing $file cat > ${LIB}/$file << EOF /* This file was generated by fixincludes */ #ifndef __memory_h__ #define __memory_h__ #ifdef __STDC__ extern void *memccpy(); extern void *memchr(); extern void *memcpy(); extern void *memset(); #else extern char *memccpy(); extern char *memchr(); extern char *memcpy(); extern char *memset(); #endif /* __STDC__ */ extern int memcmp(); #endif /* __memory_h__ */ EOF fi fi # parameters not const on DECstation Ultrix V4.0. file=stdio.h if [ -r $file ] && [ ! -r ${LIB}/$file ]; then cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file" chmod +w ${LIB}/$file 2>/dev/null chmod a+r ${LIB}/$file 2>/dev/null fi if [ -r ${LIB}/$file ]; then echo Fixing $file, non-const arg sed -e 's@perror( char \*__s );@perror( const char *__s );@' \ -e 's@fputs( char \*__s,@fputs( const char *__s,@' \ -e 's@fopen( char \*__filename, char \*__type );@fopen( const char *__filename, const char *__type );@' \ -e 's@fwrite( void \*__ptr,@fwrite( const void *__ptr,@' \ -e 's@fscanf( FILE \*__stream, char \*__format,@fscanf( FILE *__stream, const char *__format,@' \ -e 's@scanf( char \*__format,@scanf( const char *__format,@' \ -e 's@sscanf( char \*__s, char \*__format,@sscanf( const char *__s, const char *__format,@' \ ${LIB}/$file > ${LIB}/${file}.sed rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file if cmp $file ${LIB}/$file >/dev/null 2>&1; then rm -f ${LIB}/$file fi fi # parameters conflict with C++ new on rs/6000 for file in stdio.h unistd.h ; do if [ -r $file ] && [ ! -r ${LIB}/$file ]; then cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file" chmod +w ${LIB}/$file 2>/dev/null fi if [ -r ${LIB}/$file ]; then echo Fixing $file, parameter name conflicts sed -e 's@rename(const char \*old, const char \*new)@rename(const char *_old, const char *_new)@' \ ${LIB}/$file > ${LIB}/${file}.sed rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file if cmp $file ${LIB}/$file >/dev/null 2>&1; then rm -f ${LIB}/$file fi fi done # function class(double x) conflicts with C++ keyword on rs/6000 file=math.h if [ -r $file ] && [ ! -r ${LIB}/$file ]; then cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file" chmod +w ${LIB}/$file 2>/dev/null chmod a+r ${LIB}/$file 2>/dev/null fi if [ -r ${LIB}/$file ]; then if grep 'class[(]' ${LIB}/$file >/dev/null; then echo Fixing $file sed -e '/class[(]/i\ #ifndef __cplusplus' \ -e '/class[(]/a\ #endif' ${LIB}/$file > ${LIB}/${file}.sed rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file if cmp $file ${LIB}/$file >/dev/null 2>&1; then rm ${LIB}/$file fi fi fi # NeXT defines 'int wait(union wait*)', which conflicts with Posix.1. file=sys/wait.h if [ -r $file ] && [ ! -r ${LIB}/$file ]; then cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file" chmod +w ${LIB}/$file 2>/dev/null fi if [ -r ${LIB}/$file ] \ && grep 'wait[(]union wait' ${LIB}/$file >/dev/null; then echo Fixing $file, bad wait formal sed -e 's@wait(union wait@wait(void@' ${LIB}/$file > ${LIB}/${file}.sed rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file if cmp $file ${LIB}/$file >/dev/null 2>&1; then rm -f ${LIB}/$file fi fi # Don't use or define the name va_list in stdio.h. # This is for ANSI and also to interoperate properly with gvarargs.h. file=stdio.h if [ -r $file ] && [ ! -r ${LIB}/$file ]; then cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file" chmod +w ${LIB}/$file 2>/dev/null chmod a+r ${LIB}/$file 2>/dev/null fi if [ -r ${LIB}/$file ]; then echo Fixing $file, use of va_list # Arrange for stdio.h to use stdarg.h to define __gnuc_va_list (echo "#define __need___va_list" echo "#include ") > ${LIB}/${file}.sed # Use __gnuc_va_list in arg types in place of va_list. # On 386BSD use __gnuc_va_list instead of _VA_LIST_. We're hoping the # trailing parentheses and semicolon save all other systems from this. # Define __va_list__ (something harmless and unused) instead of va_list. # Don't claim to have defined va_list. sed -e 's@ va_list @ __gnuc_va_list @' \ -e 's@ va_list)@ __gnuc_va_list)@' \ -e 's@ _VA_LIST_));@ __gnuc_va_list));@' \ -e 's@ va_list@ __va_list__@' \ -e 's@\*va_list@*__va_list__@' \ -e 's@_NEED___VA_LIST@_NEED___Va_LIST@' \ -e 's@VA_LIST@DUMMY_VA_LIST@' \ -e 's@_NEED___Va_LIST@_NEED___VA_LIST@' \ ${LIB}/$file >> ${LIB}/${file}.sed rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file if cmp $file ${LIB}/$file >/dev/null 2>&1; then rm -f ${LIB}/$file fi fi # Cancel out ansi_compat.h on Ultrix. Replace it with empty file. file=ansi_compat.h if [ -r $file ] && [ ! -r ${LIB}/$file ]; then if grep -s ULTRIX $file; then echo "/* This file intentionally left blank. */" > $LIB/$file fi fi # parameter to atof not const on DECstation Ultrix V4.0. # also get rid of bogus inline definitions in HP-UX 8.0 file=math.h if [ -r $file ] && [ ! -r ${LIB}/$file ]; then cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file" chmod +w ${LIB}/$file 2>/dev/null chmod a+r ${LIB}/$file 2>/dev/null fi if [ -r ${LIB}/$file ]; then echo Fixing $file, non-const arg sed -e 's@atof( char \*__nptr );@atof( const char *__nptr );@' \ -e 's@inline int abs(int d) { return (d>0)?d:-d; }@@' \ -e 's@inline double abs(double d) { return fabs(d); }@@' \ ${LIB}/$file > ${LIB}/${file}.sed rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file if cmp $file ${LIB}/$file >/dev/null 2>&1; then rm -f ${LIB}/$file fi fi # In limits.h, put #ifndefs around things that are supposed to be defined # in float.h to avoid redefinition errors if float.h is included first. # On HP/UX this patch does not work, because on HP/UX limits.h uses # multi line comments and the inserted #endif winds up inside the # comment. Fortunately, HP/UX already uses #ifndefs in limits.h; if # we find a #ifndef FLT_MIN we assume that all the required #ifndefs # are there, and we do not add them ourselves. file=limits.h if [ -r $file ] && [ ! -r ${LIB}/$file ]; then cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file" chmod +w ${LIB}/$file 2>/dev/null chmod a+r ${LIB}/$file 2>/dev/null fi if [ -r ${LIB}/$file ]; then if egrep 'ifndef[ ]+FLT_MIN' ${LIB}/$file >/dev/null; then true else echo Fixing $file sed -e '/[ ]FLT_MIN[ ]/i\ #ifndef FLT_MIN'\ -e '/[ ]FLT_MIN[ ]/a\ #endif'\ -e '/[ ]FLT_MAX[ ]/i\ #ifndef FLT_MAX'\ -e '/[ ]FLT_MAX[ ]/a\ #endif'\ -e '/[ ]FLT_DIG[ ]/i\ #ifndef FLT_DIG'\ -e '/[ ]FLT_DIG[ ]/a\ #endif'\ -e '/[ ]DBL_MIN[ ]/i\ #ifndef DBL_MIN'\ -e '/[ ]DBL_MIN[ ]/a\ #endif'\ -e '/[ ]DBL_MAX[ ]/i\ #ifndef DBL_MAX'\ -e '/[ ]DBL_MAX[ ]/a\ #endif'\ -e '/[ ]DBL_DIG[ ]/i\ #ifndef DBL_DIG'\ -e '/[ ]DBL_DIG[ ]/a\ #endif'\ ${LIB}/$file > ${LIB}/${file}.sed rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file fi if cmp $file ${LIB}/$file >/dev/null 2>&1; then echo Deleting ${LIB}/$file\; no fixes were needed. rm -f ${LIB}/$file fi fi # In math.h, put #ifndefs around things that might be defined in a gcc # specific math-*.h file. file=math.h if [ -r $file ] && [ ! -r ${LIB}/$file ]; then cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file" chmod +w ${LIB}/$file 2>/dev/null chmod a+r ${LIB}/$file 2>/dev/null fi if [ -r ${LIB}/$file ]; then echo Fixing $file sed -e '/define[ ]HUGE_VAL[ ]/i\ #ifndef HUGE_VAL'\ -e '/define[ ]HUGE_VAL[ ]/a\ #endif'\ ${LIB}/$file > ${LIB}/${file}.sed rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file if cmp $file ${LIB}/$file >/dev/null 2>&1; then echo Deleting ${LIB}/$file\; no fixes were needed. rm -f ${LIB}/$file fi fi # These two files on SunOS 4 are included by other files # in the same directory, using "...". So we must make sure they exist # in the same directory as the other fixed files. if [ -r ${INPUT}/multimedia/audio_errno.h ] then ln -s ${INPUT}/multimedia/audio_errno.h ${LIB}/multimedia 2>/dev/null fi if [ -r ${INPUT}/multimedia/audio_hdr.h ] then ln -s ${INPUT}/multimedia/audio_hdr.h ${LIB}/multimedia 2>/dev/null fi # Determine if we're on Interactive Unix 2.2 or later, in which case we # need to fix some additional files. This is the same test for ISC that # Autoconf uses. if test -d /etc/conf/kconfig.d \ && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1; then echo "Fixing ISC __STDC__ goof in several files..." for name in stdio.h math.h ctype.h sys/limits.h sys/fcntl.h sys/dirent.h; do echo $name if test -r ${LIB}/$name; then file=${LIB}/$name else file=${INPUT}/$name fi # On Interactive 2.2, certain traditional Unix definitions # (notably getc and putc in stdio.h) are omitted if __STDC__ is # defined, not just if _POSIX_SOURCE is defined. This makes it # impossible to compile any nontrivial program except with -posix. sed \ 's/!defined(__STDC__) && !defined(_POSIX_SOURCE)/!defined(_POSIX_SOURCE)/' \ < $file > ${LIB}/$name. mv ${LIB}/$name. ${LIB}/$name done echo "Fixing ISC fmod declaration" # This one's already been fixed for other things. file=${LIB}/math.h sed 's/fmod(double)/fmod(double, double)/' <$file >$file. mv $file. $file echo "Fixing nested comments in ISC " file=sys/limits.h sed '/CHILD_MAX/s,/\* Max, Max,' < ${INPUT}/$file >${LIB}/$file. sed '/OPEN_MAX/s,/\* Max, Max,' < ${LIB}/$file. >${LIB}/$file fi # These files in Sun OS 4.x use /**/ to concatenate tokens. for file in sparc/asm_linkage.h sun3/asm_linkage.h sun3x/asm_linkage.h \ sun4/asm_linkage.h sun4c/asm_linkage.h sun4m/asm_linkage.h \ sun4c/debug/asm_linkage.h sun4m/debug/asm_linkage.h; do if [ -r $file ] && [ ! -r ${LIB}/$file ]; then cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file" chmod +w ${LIB}/$file 2>/dev/null chmod a+r ${LIB}/$file 2>/dev/null fi if [ -r ${LIB}/$file ]; then sed -e 's|/\*\*/|##|g' ${LIB}/$file > ${LIB}/${file}.sed rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file if cmp $file ${LIB}/$file >/dev/null 2>&1; then rm -f ${LIB}/$file fi fi done echo 'Removing unneeded directories:' cd $LIB files=`find . -type d -print | sort -r` for file in $files; do rmdir $LIB/$file > /dev/null 2>&1 done if $LINKS; then echo 'Making internal symbolic non-directory links' cd ${INPUT} files=`find . -type l -print` for file in $files; do dest=`ls -ld $file | sed -n 's/.*-> //p'` if expr "$dest" : '[^/].*' > /dev/null; then target=${LIB}/`echo file | sed "s|[^/]*\$|$dest|"` if [ -f $target ]; then ln -s $dest ${LIB}/$file >/dev/null 2>&1 fi fi done fi echo 'Cleaning up DONE files.' cd $LIB find . -name DONE -exec rm -f {} ';' exit 0