--- gcc/fixincludes	2018/04/24 18:01:44	1.1.1.4
+++ gcc/fixincludes	2018/04/24 18:07:46	1.1.1.5
@@ -14,17 +14,8 @@ SRCDIR=${3-${SRCDIR-.}}
 # (This was named INCLUDES, but that conflicts with a name in Makefile.in.)
 INPUT=${2-${INPUT-/usr/include}}
 
-# This prevents /bin/ex from failing if the current terminal type is
-# unrecognizable.
-TERM=unknown
-export TERM
-# This prevents two problems:
-# Either ex might find a .exrc file and get confused,
-# or ex might complain if the EXINIT variable is invalid. 
-# We know there is no .exrc in the GCC source.
-# `set' is a no-op ex command.
-EXINIT=set
-export EXINIT
+# 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.
@@ -36,16 +27,32 @@ case "`pwd`" in
 	;;
 esac
 
-# Directory in which to store the results.
-LIB=${1?"fixincludes: output directory not specified"}
+# Original directory.
+ORIGDIR=`${PWDCMD}`
 
 # Make sure it exists.
 if [ ! -d $LIB ]; then
   mkdir $LIB || exit 1
 fi
 
-# Make LIB absolute.
-cd $LIB; LIB=`${PWDCMD}`
+# 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 ]
@@ -177,6 +184,23 @@ if $LINKS; then
 	      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
 	  rm -fr ${LIB}/$file > /dev/null 2>&1
 	  ln -s ${LIB}/root$x ${LIB}/$file > /dev/null 2>&1
 	  treetops="$treetops $x ${LIB}/root$x"
@@ -187,7 +211,8 @@ if $LINKS; then
   done
 fi
 
-set - $treetops
+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}
@@ -217,48 +242,73 @@ while [ $# != 0 ]; do
 # 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.
-# rms: I removed `|#[el].*if.*[^/ 	]' because it made egrep fail.
-    if egrep '//|[ 	_]_IO|CTRL|#define.NULL|#[el]*if.*([0-9]|sparc|vax|sun|pyr)' $file > /dev/null; then
-      echo Fixing $file
+#
+# 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
-# Following two lines removed.
-#	  s%^\([ 	]*#[ 	]*endif[ 	]*\)\([^/ 	].*\)$%\1/* \2 */%
-#	  s%^\([ 	]*#[ 	]*else[ 	]*\)\([^/ 	].*\)$%\1/* \2 */%
-
+	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|//\(.*\)$|/*\1*/|
-	  /[ 	]_IO[A-Z]*[ 	]*(/	s/(\(.\),/('\''\1'\'',/
+	  s%^\([ 	]*#[ 	]*endif[ 	]*\)\([^/ 	].*\)$%\1/* \2 */%
+	  s%^\([ 	]*#[ 	]*else[ 	]*\)\([^/ 	].*\)$%\1/* \2 */%
+	  /\/\/[^*]/			s|//\(.*\)$|/*\1*/|
+	  /[ 	]_IO[A-Z]*[ 	]*(/	s/\(_IO[A-Z]*[ 	]*(\)\(.\),/\1'\''\2'\'',/
 	  /[ 	]BSD43__IO[A-Z]*[ 	]*(/	s/(\(.\),/('\''\1'\'',/
-	  /#define._IO/			s/'\''x'\''/x/g
-	  /#define.BSD43__IO/		s/'\''x'\''/x/g
-	  /[^A-Z]CTRL[ 	]*(/		s/\([^'\'']\))/'\''\1'\'')/
-	  /#define.CTRL/		s/'\''c'\''/c/g
-	  /#define._CTRL/		s/'\''c'\''/c/g
-	  /#define.BSD43_CTRL/		s/'\''c'\''/c/g
-	  /#[a-z]*if.*[	 (]m68k/	s/\([^_]\)m68k/\1__m68k__/g
-	  /#[a-z]*if.*[	 (]__i386/	s/__i386/__i386__/g
-	  /#[a-z]*if.*[	 (]i386/	s/\([^_]\)i386/\1__i386__/g
-	  /#[a-z]*if.*[	 (]sparc/	s/\([^_]\)sparc/\1__sparc__/g
-	  /#[a-z]*if.*[	 (]mc68000/	s/\([^_]\)mc68000/\1__mc68000__/g
-	  /#[a-z]*if.*[	 (]vax/		s/\([^_]\)vax/\1__vax__/g
-	  /#[a-z]*if.*[	 (]sun/		s/\([^_]\)\(sun[a-z0-9]*\)\([^a-z0-9_]\)/\1__\2__\3/g
-	  /#[a-z]*if.*[	 (]sun/		s/\([^_]\)\(sun[a-z0-9]*\)$/\1__\2__/g
-	  /#[a-z]*if.*[	 (]ns32000/	s/\([^_]\)ns32000/\1__ns32000__/g
-	  /#[a-z]*if.*[	 (]pyr/		s/\([^_]\)pyr/\1__pyr__/g
-	  /#[a-z]*if.*[	 (]is68k/	s/\([^_]\)is68k/\1__is68k__/g
+	  /#define._IO/			s/'\''\([cgx]\)'\''/\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.sed
-	mv $2/$file.sed $2/$file
+	' $2/$file > $2/$file.
+	mv $2/$file. $2/$file
 	if cmp $file $2/$file >/dev/null 2>&1; then
-	   echo Deleting $2/$file\; no fixes were needed.
 	   rm $2/$file
+	else
+	   echo Fixed $file
 	fi
       fi
     fi
@@ -268,22 +318,77 @@ done
 
 cd ${INPUT}
 
+# Install the proper definition of size_t in header files that it comes from.
+for file in sys/types.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
+    # Extract the definition of SIZE_TYPE, if any.
+    # (This file must be called something.c).
+    echo "#include \"tm.h\"
+gobblegobble SIZE_TYPE" > ${LIB}/types.c
+    foo=`cd ${LIB}; cc -E -I${ORIGDIR} -I${SRCDIR} -I${SRCDIR}/config types.c | grep gobblegobble | sed -e "s/gobblegobble[ 	]*//"`
+    rm -f ${LIB}/types.c
+    # Default to our preferred type.
+    if [ "$foo" = SIZE_TYPE ]; then foo="unsigned long int"; else foo=`echo $foo | sed -e 's/^.*"\(.*\)".*$/\1/'`; 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
-  ex ${LIB}/$file <<EOF
-  g/doesn't/s/doesn't/does not/
-  wq
-EOF
+  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
-    echo Deleting ${LIB}/$file\; no fixes were needed.
     rm ${LIB}/$file
   fi
 fi
@@ -293,42 +398,28 @@ 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
-  ex ${LIB}/$file <<EOF
-  /size_t.*;/
-  i
-#ifndef _GCC_SIZE_T
-#define _GCC_SIZE_T
-.
-  /size_t/+1
-  i
-#endif
-.
-  /ptrdiff_t.*;/
-  i
-#ifndef _GCC_PTRDIFF_T
-#define _GCC_PTRDIFF_T
-.
-  /ptrdiff_t/+1
-  i
-#endif
-.
-  /wchar_t.*;/
-  i
-#ifndef _GCC_WCHAR_T
-#define _GCC_WCHAR_T
-.
-  /wchar_t/+1
-  i
-#endif
-.
-  wq
-EOF
+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
-    echo Deleting ${LIB}/$file\; no fixes were needed.
     rm ${LIB}/$file
   fi
 fi
@@ -339,24 +430,18 @@ 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
-  ex ${LIB}/$file <<EOF
-  /typedef.*[ 	]size_t.*;/
-  i
-#ifndef _GCC_SIZE_T
-#define _GCC_SIZE_T
-.
-  /size_t/+1
-  i
-#endif
-.
-  wq
-EOF
+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
-    echo Deleting ${LIB}/$file\; no fixes were needed.
     rm ${LIB}/$file
   fi
 fi
@@ -368,6 +453,7 @@ if [ -r $file ] && [ ! -r ${LIB}/$file ]
   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
@@ -386,16 +472,14 @@ if [ -r $file ] && [ ! -r ${LIB}/$file ]
   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
-  ex ${LIB}/$file <<EOF
-  g/boottime$/s//&;/
-  wq
-EOF
+  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
-    echo Deleting ${LIB}/$file\; no fixes were needed.
     rm ${LIB}/$file
   fi
 fi
@@ -407,16 +491,14 @@ if [ -r $file ] && [ ! -r ${LIB}/$file ]
   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
-  ex ${LIB}/$file <<EOF
-  g/char.*na_addr *$/s//&;/
-  wq
-EOF
+  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
-    echo Deleting ${LIB}/$file\; no fixes were needed.
     rm ${LIB}/$file
   fi
 fi
@@ -426,38 +508,35 @@ 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
-  ex ${LIB}/$file <<EOF
-  g/^#ifdef KERNEL && !defined/
-  s/#ifdef KERNEL && !defined/#if defined(KERNEL) \&\& !defined/
-  wq
-EOF
+  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
-    echo Deleting ${LIB}/$file\; no fixes were needed.
     rm ${LIB}/$file
   fi
 fi
 
 # Remove nested comments created by #endifs in a comment (Ultrix 4.1)
 # Only needed if commenting out junk after #endif.
-#file=signal.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 ]; then
-#  echo Fixing $file, nested comments
-#  sed -e 's/#endif.*/#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
+file=signal.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, nested comments
+  sed -e 's/^[ 	]*#endif.*/#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 superfluous `static' (in Ultrix 4.2)
 file=machine/cpu.h
@@ -465,17 +544,14 @@ if [ -r $file ] && [ ! -r ${LIB}/$file ]
   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
-  ex ${LIB}/$file <<EOF
-  g/^static struct tlb_pid_state/
-  s/static//
-  wq
-EOF
+  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
-    echo Deleting ${LIB}/$file\; no fixes were needed.
     rm ${LIB}/$file
   else
 # This file has an alternative name, mips/cpu.h.  Fix that name, too.
@@ -492,20 +568,16 @@ if [ -r $file ] && [ ! -r ${LIB}/$file ]
   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
-  ex ${LIB}/$file <<EOF
-  /^extern char \*	sprintf();$/c
-#ifndef __STDC__
-extern char *	sprintf();
-#endif /* !defined __STDC__ */
-.
-  wq
-EOF
+  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
-    echo Deleting ${LIB}/$file\; no fixes were needed.
     rm ${LIB}/$file
   fi
 fi
@@ -517,20 +589,16 @@ if [ -r $file ] && [ ! -r ${LIB}/$file ]
   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
-  ex ${LIB}/$file <<EOF
-  /^extern char \*	sprintf();$/c
-#ifndef __STDC__
-extern char *	sprintf();
-#endif /* !defined __STDC__ */
-.
-  wq
-EOF
+  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
-    echo Deleting ${LIB}/$file\; no fixes were needed.
     rm ${LIB}/$file
   fi
 fi
@@ -541,6 +609,7 @@ if [ -r $file ] && [ ! -r ${LIB}/$file ]
   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
@@ -548,7 +617,6 @@ if [ -r ${LIB}/$file ]; then
   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
-    echo Deleting ${LIB}/$file\; no fixes were needed.
     rm -f ${LIB}/$file
   fi
 fi
@@ -559,6 +627,7 @@ if [ -r $file ] && [ ! -r ${LIB}/$file ]
   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
@@ -572,7 +641,6 @@ if [ -r ${LIB}/$file ]; then
 ' ${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
@@ -583,6 +651,7 @@ if [ -r $file ] && [ ! -r ${LIB}/$file ]
   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
@@ -590,7 +659,6 @@ if [ -r ${LIB}/$file ]; then
   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
-    echo Deleting ${LIB}/$file\; no fixes were needed.
     rm -f ${LIB}/$file
   fi
 fi
@@ -600,6 +668,7 @@ 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
@@ -612,7 +681,6 @@ if [ -r ${LIB}/$file ]; then
   -e 's/int	exit/void	exit/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
-    echo Deleting ${LIB}/$file\; no fixes were needed.
     rm -f ${LIB}/$file
   fi
 fi
@@ -622,6 +690,7 @@ 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
@@ -631,7 +700,6 @@ if [ -r ${LIB}/$file ]; then
   ${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
@@ -642,6 +710,7 @@ file=locale.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
@@ -649,7 +718,6 @@ if [ -r ${LIB}/$file ]; then
   sed -e 's%#endif / \*%#endif /\* %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
-    echo Deleting ${LIB}/$file\; no fixes were needed.
     rm -f ${LIB}/$file
   fi
 fi
@@ -660,15 +728,15 @@ if [ -r $file ] && [ ! -r ${LIB}/$file ]
   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
+    ${LIB}/$file > ${LIB}/${file}.
+  rm -f ${LIB}/$file; mv ${LIB}/${file}. ${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
@@ -679,6 +747,7 @@ if [ -r $file ] && [ ! -r ${LIB}/$file ]
   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
@@ -687,7 +756,6 @@ if [ -r ${LIB}/$file ]; then
     ${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
@@ -698,6 +766,7 @@ if [ -r $file ] && [ ! -r ${LIB}/$file ]
   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
@@ -706,7 +775,6 @@ if [ -r ${LIB}/$file ]; then
     ${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
@@ -717,15 +785,15 @@ if [ -r $file ] && [ ! -r ${LIB}/$file ]
   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"@<machine/endian.h>@' \
-    ${LIB}/$file > ${LIB}/${file}.sed
-  rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
+    ${LIB}/$file > ${LIB}/${file}.
+  rm -f ${LIB}/$file; mv ${LIB}/${file}. ${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
@@ -736,6 +804,7 @@ if [ -r $file ] && [ ! -r ${LIB}/$file ]
   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
@@ -745,7 +814,46 @@ if [ -r ${LIB}/$file ]; then
     ${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
+
+# Fix line in IRIX 4.0.1 header file.  The sed script turns
+# #define EM_CTRL		(CUTIOC|0x1)
+# into
+# #define EM_CTRL		(CUTIOC|0x'1')
+file=sys/t3270reg.h
+if [ -r ${LIB}/$file ]; then
+  echo Fixing $file, overeager sed script
+  sed -e "s/0x'1'/0x1/" ${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
@@ -755,10 +863,11 @@ fi
 # 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 egrep '/\*	@\(#\)memory\.h 1\.[2-4] 8./../.. SMI; from S5R2 1\.2	\*/' $file > /dev/null; then
-  if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
+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
@@ -781,7 +890,7 @@ extern char *memset();
 
 extern int memcmp();
 
-#endif __memory_h__
+#endif /* __memory_h__ */
 EOF
   fi
 fi
@@ -791,6 +900,7 @@ 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
@@ -805,7 +915,23 @@ if [ -r ${LIB}/$file ]; then
     ${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
+
+# parameters conflict with C++ new on rs/6000 
+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
+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
@@ -816,6 +942,7 @@ 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
@@ -824,9 +951,13 @@ if [ -r ${LIB}/$file ]; then
   (echo "#define __need___va_list"
    echo "#include <stdarg.h>") > ${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@VA_LIST@DUMMY_VA_LIST@' \
@@ -834,7 +965,6 @@ if [ -r ${LIB}/$file ]; then
   
   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
@@ -853,6 +983,7 @@ 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
@@ -863,6 +994,57 @@ if [ -r ${LIB}/$file ]; then
     ${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
@@ -880,6 +1062,52 @@ 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 <sys/limits.h>"
+  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 on Ultrix 4.2 put comments around instances of #endif
+# __mips.  When the sed expression turns that into #endif /* __mips */
+# the comment ends prematurely.
+for file in sys/audit.h sys/signal.h; do
+  if [ -r ${LIB}/${file} ]; then
+    echo Fixing $file, early comment termination
+    sed -e 's|^#endif /\*.*\*/|#endif|g' ${LIB}/${file} > ${LIB}/${file}.sed
+    rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
+  fi
+done
+
 echo 'Removing unneeded directories:'
 cd $LIB
 files=`find . -type d -print | sort -r`
@@ -902,4 +1130,8 @@ if $LINKS; then
   done
 fi
 
+echo 'Cleaning up DONE files.'
+cd $LIB
+find . -name DONE -exec rm -f {} ';'
+
 exit 0