Initial revision

From-SVN: r18731

contrib/fixinc/Makefile

+
+## # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+##
+##  Makefile for constructing the "best" include fixer we can
+##
+##  $Id: Makefile,v 1.1 1998/03/20 16:19:41 korbb Exp $
+##
+## # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+
+OBJ = fixincl.o server.o regex.o
+HDR = server.h regex.h
+## LIB = -lgen
+SH_TARGET  = inclhack.sh fixincl.sh
+BIN_TARGET = fixincl
+AG_TEXT    = $(SH_TARGET) fixincl.x \
+	inclhack.def inclhack.tpl hackshell.tpl fixincl.tpl
+TARGETS    = $(SH_TARGET) $(BIN_TARGET)
+
+default : fixincl.sh
+
+all : $(TARGETS)
+sh  : $(SH_TARGET)
+
+$(OBJ): $(HDR)
+fixincl.o: fixincl.x
+
+fixincl: $(OBJ)
+	if $(CC) -o $@ $(OBJ) $(LIB) ; then : ; else \
+	rm -f $@ ; echo false > $@ ; fi
+
+regex.o: regex.c
+	$(CC) -g -DSTDC_HEADERS=1 -c regex.c
+
+fixincl.x: fixincl.tpl inclhack.def
+	@if ( autogen --help > /dev/null 2>&1 ) ; then \
+		echo autogen -T fixincl.tpl -b fixincl inclhack.def ; \
+		autogen -T fixincl.tpl -b fixincl inclhack.def ; \
+	else echo You need to install autogen ; touch $@ ; fi
+
+inclhack.sh: inclhack.def inclhack.tpl hackshell.tpl
+	@if ( autogen --help > /dev/null 2>&1 ) ; then \
+		echo autogen inclhack.def ; \
+		autogen inclhack.def ; \
+	else echo You need to install autogen ; touch $@ ; fi
+
+fixincl.sh: inclhack.def inclhack.tpl fixincl inclhack.sh
+	@if ( ./fixincl -v > /dev/null 2>&1 ) ; then \
+		if ( autogen --help > /dev/null 2>&1 ) ; then \
+		echo autogen -DPROGRAM=1 -b fixincl inclhack.def ; \
+		autogen -DPROGRAM=1 -b fixincl inclhack.def ; touch $@ ; \
+		else echo You need to install autogen ; touch $@ ; fi ; \
+	else cp inclhack.sh $@ ; echo cp inclhack.sh $@ ; fi
+
+clean:
+	rm -f *.o fixincl
+
+install: fixincl.sh
+	@rm -f ../../gcc/fixincl.sh ; \
+		echo cp fixincl.sh ../../gcc ; \
+		cp fixincl.sh ../../gcc ; \
+		chmod +x ../../gcc/fixincl.sh
+	@echo check for fixincl copy...
+	@if ( ./fixincl -v > /dev/null 2>&1 ) ; then \
+		echo cp fixincl ../../gcc/fixincl ; \
+		cp fixincl ../../gcc/fixincl ; fi

contrib/fixinc/fixincl.tpl

+[= autogen template -*- Mode: C -*-
+x =]
+/*
+[= _eval "# * " _DNE =]
+ *
+ * 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.
+ *
+ * This script contains [=_eval fix _hilim 1 +=] fixup scripts.
+ *
+ * See README-fixinc for more information.
+ *
+[=_eval inclhack "# *  " _gpl=]
+ *[=
+
+
+_FOR fix =]
+ *
+ *  Description [=_eval _index 1 + "#%3d -" _printf=] [=hackname _Cap=] fix
+ */
+tSCC z[=hackname _cap=]Name[] =
+     [=hackname _cap _str=];
+/*
+ *  File name selection pattern
+ */[=
+
+  _IF files _exist=]
+tSCC z[=hackname _cap=]List[] =[=
+    _FOR files=]
+        "|" [=files _str=][=
+    /files=] "|";[=
+
+  _ELSE =]
+#define z[=hackname _cap=]List (char*)NULL[=
+  _ENDIF "files _exist" =][=
+
+  _IF exesel _exist=]
+
+/*
+ *  content selection pattern
+ */[=
+    _FOR exesel =]
+tSCC z[=hackname _cap=]Select[=_eval _index=][] =
+       [=exesel _str=];[=
+    /exesel =][=
+
+  _ELIF select _exist=]
+
+/*
+ *  content selection pattern
+ */[=
+    _FOR select =]
+tSCC z[=hackname _cap=]Select[=_eval _index=][] =
+       [=select _str=];[=
+    /select =][=
+  _ENDIF =][=
+
+  _IF bypass _exist=]
+
+/*
+ *  content bypass pattern
+ */[=
+    _FOR bypass =]
+tSCC z[=hackname _cap=]Bypass[=_eval _index=][] =
+       [=bypass _str=];[=
+    /bypass =][=
+  _ENDIF =][=
+
+  _IF test _exist=]
+
+/*
+ *  content test pattern.  A shell will deal with it later.
+ */[=
+    _FOR test =]
+tSCC z[=hackname _cap=]Test[=_eval _index=][] =
+       [=test _str=];[=
+    /test =][=
+  _ENDIF =][=
+
+  _IF exesel _exist select _exist bypass _exist test _exist | | |
+=]
+
+#define    [=hackname _up =]_TEST_CT  [=
+    _IF exesel _exist =][=
+       _eval test _count bypass _count exesel _count + + =][=
+    _ELSE =][=
+       _eval test _count bypass _count select _count + + =][=
+    _ENDIF =]
+tTestDesc a[=hackname _cap=]Tests[] = {[=
+
+    _IF test _exist =][=
+      _FOR test=]
+    { TT_TEST,   z[=hackname _cap=]Test[=_eval _index=], 0 /* unused */ },[=
+      /test =][=
+    _ENDIF =][=
+
+    _IF bypass _exist =][=
+      _FOR bypass=]
+    { TT_NEGREP, z[=hackname _cap=]Bypass[=_eval _index=], (regex_t*)NULL },[=
+      /bypass =][=
+    _ENDIF =][=
+
+    _IF exesel _exist =][=
+      _FOR exesel ,=]
+    { TT_EGREP,  z[=hackname _cap=]Select[=_eval _index=], (regex_t*)NULL }[=
+      /exesel =][=
+
+    _ELIF select _exist =][=
+      _FOR select ,=]
+    { TT_EGREP,  z[=hackname _cap=]Select[=_eval _index=], (regex_t*)NULL }[=
+      /select =][=
+    _ENDIF =] };[=
+  _ELSE =]
+#define [=hackname _up=]_TEST_CT  0
+#define a[=hackname _cap=]Tests   (tTestDesc*)NULL[=
+  _ENDIF =]
+
+/*
+ *  Fix Command Arguments for [=hackname _cap=]
+ */
+const char* apz[=hackname _cap=]Patch[] = {[=
+    _IF   sed         _exist =] "sed"[=_FOR sed=],
+    "-e" [=sed _str=][=/sed=][=
+    _ELIF replacement _exist =] "sed",
+    "s@[=select[]=]@[=replacement=]@"[=
+    _ELIF shell       _exist =] "sh", "-c",
+    [=shell _str=][=
+    _ELSE =][=_ERROR hackname _get "Error:  %s has two fixup specifications"
+                 _printf =][=
+    _ENDIF=],
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *[=
+/fix=]
+ *
+ *  List of all fixes
+ */
+#define  REGEX_COUNT  [=_eval fix.select _count
+                              fix.bypass _count + =]
+#define  FIX_COUNT    [=_eval fix _count =]
+tFixDesc fixDescList[ [=_eval fix _count =] ] = {[=
+
+
+_FOR fix ",\n" =]
+  {  z[=hackname _cap=]Name,    z[=hackname _cap=]List, (regex_t*)NULL,
+     [=hackname  _up=]_TEST_CT, a[=hackname _cap=]Tests,
+     apz[=hackname _cap=]Patch }[=
+
+/fix=]
+};

contrib/fixinc/hackshell.tpl

+[= autogen include 
+=]
+[=
+# $Id: hackshell.tpl,v 1.1 1998/03/20 16:19:41 korbb Exp $
+#
+#  This file contanes the shell template replacement for the
+#  fixincl program.  It is the repetitive guts of the fixincludes logic.
+#
+=]
+  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
+  for file in $files; do
+
+    if ( test ! -r $file -o \
+    -n "`fgrep 'This file is part of the GNU C Library' $file`" )
+    then continue ; fi
+
+    fixlist=""
+[=
+#
+#  FOR  every fix description,
+#  DO:  emit the shell text to apply the fix to the current file
+#
+# =][=
+
+_FOR fix "\n\n" =]
+    #
+    # Fix [=_eval _index 1 + #%3d _printf=]:  [=hackname _Cap=]
+    #[=
+    _IF files _exist=]
+    case "$file" in [=_FOR files " | \\\n\t"=]./[=files=][=/files=] )[=
+    _ENDIF=][=
+
+    _IF mach _exist=]
+    case "$target_canonical" in [=
+        _FOR mach " | \\\n\t" =][=
+            mach =][=
+        /mach =] )[=
+        _IF mach_unmatched _exist =] : ;;
+    * )[=
+        _ENDIF =][=
+
+    _ENDIF=][=
+
+    #  There are three conditional tests:  select, bypass and test.
+       They may appear as often as desired.  They must all pass for
+       the fix to be applied.  "select" and "bypass" are egrep expressions
+       that must each appear (or not appear) in the target file.
+       "test" is an arbitrary test program expression that must yield
+       true or false.  It is enclosed in parenthesis to avoid
+       precedence problems.  The output looks like this:
+
+       if ( test -n "`egrep 'find-expr' $file`" -a
+                 -z "`egrep 'not-find'  $file`" -a
+                 '(' <some-test-expression> ')'
+          ) > /dev/null 2>&1 ; then
+
+    #  =][=
+
+    _IF select _exist =]
+    if ( test [=
+        _FOR select " -a \\\n              "
+              =]-n [=select _shrstr "#`egrep %s $file`"
+                            _printf _shstr =][=
+        /select=][=
+
+        _IF bypass _exist =][=
+            _FOR bypass=] -a \
+              -z [=bypass _shrstr "#`egrep %s $file`"
+                            _printf _shstr =][=
+            /bypass=][=
+        _ENDIF=][=
+
+        _IF test _exist=][=
+            _FOR test=] -a \
+              '(' [=test=] ')'[=
+            /test=][=
+        _ENDIF=]
+       ) > /dev/null 2>&1 ; then[=
+
+
+    _ELIF test _exist =]
+    if ( test [=
+        _FOR test " -a \\\n              "
+              =]'(' [=test=] ')'[=
+        /test=][=
+
+        _IF bypass _exist=][=
+            _FOR bypass=] -a \
+              -z [=bypass _shrstr "#`egrep %s $file`"
+                            _printf _shstr=][=
+            /bypass=][=
+        _ENDIF=]
+       ) > /dev/null 2>&1 ; then[=
+
+
+    _ELIF bypass _exist =]
+    if ( test [=_FOR bypass " -a \\\n              "
+              =]-z [=bypass _shrstr "#`egrep %s $file`"
+                            _printf _shstr=][=/bypass=]
+       ) > /dev/null 2>&1 ; then[=
+
+      _ENDIF=]
+    fixlist="${fixlist}
+      [=hackname=]"
+    if [ ! -r ${DESTDIR}/$file ]
+    then infile=$file
+    else infile=${DESTDIR}/$file ; fi [=
+
+    _IF sed _exist=][=
+        _IF shell _exist =][=
+          _ERROR hackname _get
+          "fixincludes Error:  %s fix has multiple fixups" _printf=][=
+        _ENDIF=]
+
+    sed [=
+        _FOR sed =]-e [=sed _shrstr=] \
+        [=
+        /sed=]  < $infile > ${DESTDIR}/$file.[=
+
+
+    _ELIF shell _exist =]
+    ( [=shell=] ) < $infile > ${DESTDIR}/$file.
+
+    #  Shell scripts have the potential of removing the output
+    #  We interpret that to mean the file is not to be altered
+    #
+    if test ! -f ${DESTDIR}/$file.
+    then continue ; fi [=
+
+
+    _ELSE=][=
+        _ERROR hackname _get "ERROR:  %s has no fixup" _printf=][=
+
+    _ENDIF=]
+    
+    mv -f ${DESTDIR}/$file. ${DESTDIR}/$file[=
+
+    #  Close off any opened "if" or "case" statements in reverse order
+
+    # =][=
+
+    _IF select _exist test _exist | bypass _exist | =]
+    fi # end of selection 'if'[=
+    _ENDIF =][=
+
+    _IF mach _exist=]
+    ;; # case end for machine type test
+    esac[=
+    _ENDIF =][=
+
+    _IF files _exist=]
+    ;; # case end for file name test
+    esac[=
+    _ENDIF =][=
+
+/fix =][=
+#
+#  DONE with every fix for the current file
+#
+#=]
+    #  IF the output has been removed OR it is unchanged,
+    #  THEN ensure the output is gone
+    #  ELSE look for local directory include syntax
+    #
+    if ( test ! -f ${DESTDIR}/$file || \
+         cmp $file ${DESTDIR}/$file ) > /dev/null 2>&1
+    then
+      rm -f ${DESTDIR}/$file
+    else
+      echo "Fixed $file:${fixlist}"
+
+      # Find any include directives that use "file".
+      #
+      for include in `
+         egrep '^[ 	]*#[ 	]*include[ 	]*"[^/]' ${DESTDIR}/$file |
+     sed -e 's/^[ 	]*#[ 	]*include[ 	]*"\([^"]*\)".*$/\1/'`
+      do
+    dir=`echo $file | sed -e s'|/[^/]*$||'`
+    required="$required ${SRCDIR} $dir/$include ${DESTDIR}/$dir/$include"
+      done
+    fi
+  done # for file in $files

contrib/fixinc/server.h

+
+/*
+ *  $Id: server.h,v 1.1 1998/03/20 16:19:41 korbb Exp $
+ *
+ *  Server Handling copyright 1992-1998 Bruce Korb
+ *
+ *  Server Handling is free software.
+ *  You may redistribute it and/or modify it under the terms of the
+ *  GNU General Public License, as published by the Free Software
+ *  Foundation; either version 2, or (at your option) any later version.
+ *
+ *  Server Handling is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Server Handling.  See the file "COPYING".  If not,
+ *  write to:  The Free Software Foundation, Inc.,
+ *             59 Temple Place - Suite 330,
+ *             Boston,  MA  02111-1307, USA.
+ *
+ * As a special exception, Bruce Korb gives permission for additional
+ * uses of the text contained in his release of ServerHandler.
+ *
+ * The exception is that, if you link the ServerHandler library with other
+ * files to produce an executable, this does not by itself cause the
+ * resulting executable to be covered by the GNU General Public License.
+ * Your use of that executable is in no way restricted on account of
+ * linking the ServerHandler library code into it.
+ *
+ * This exception does not however invalidate any other reasons why
+ * the executable file might be covered by the GNU General Public License.
+ *
+ * This exception applies only to the code released by Bruce Korb under
+ * the name ServerHandler.  If you copy code from other sources under the
+ * General Public License into a copy of ServerHandler, as the General Public
+ * License permits, the exception does not apply to the code that you add
+ * in this way.  To avoid misleading anyone as to the status of such
+ * modified files, you must delete this exception notice from them.
+ *
+ * If you write modifications of your own for ServerHandler, it is your
+ * choice whether to permit this exception to apply to your modifications.
+ * If you do not wish that, delete this exception notice.
+ */
+
+#ifndef FIXINC_SERVER_H
+#define FIXINC_SERVER_H
+
+#include <stdio.h>
+#include <unistd.h>
+
+/*
+ *  Dual pipe opening of a child process
+ */
+
+typedef struct
+  {
+    int readFd;
+    int writeFd;
+  }
+tFdPair;
+
+typedef struct
+  {
+    FILE *pfRead;		/* parent read fp  */
+    FILE *pfWrite;		/* parent write fp */
+  }
+tpfPair;
+
+typedef char *tpChar;
+
+#define NOPROCESS   ((pid_t)-1)
+#define NULLPROCESS ((pid_t)0)
+
+#define EXIT_PANIC   99
+
+typedef enum
+  {
+    BOOL_FALSE, BOOL_TRUE
+  }
+bool;
+
+#define _P_(p) ()
+
+char *runShell _P_ ((const char *pzCmd));
+pid_t p2fopen _P_ ((tpfPair * pfPair, tpChar * ppArgs));
+pid_t p2open _P_ ((tFdPair * pPair, tpChar * ppArgs));
+int
+chainOpen _P_ ((int stdinFd,
+		tpChar * ppArgs,
+		pid_t * pChild));
+
+#endif /* FIXINC_SERVER_H */