summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlaw <law@138bc75d-0d04-0410-961f-82ee72b054a4>1999-04-02 15:13:30 +0000
committerlaw <law@138bc75d-0d04-0410-961f-82ee72b054a4>1999-04-02 15:13:30 +0000
commit45ad68bc3eca2107f59d2d7c88a4ec4942b23235 (patch)
treee1b57ad2d0e4cd0be33f534d59313d98afc365b9
parent66c431c54c6b80aeac8baa5518d25e61b9e0baa9 (diff)
downloadppe42-gcc-45ad68bc3eca2107f59d2d7c88a4ec4942b23235.tar.gz
ppe42-gcc-45ad68bc3eca2107f59d2d7c88a4ec4942b23235.zip
* fixinc/*: Delete obsolete files.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@26131 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat
-rw-r--r--contrib/ChangeLog4
-rw-r--r--contrib/fixinc/Makefile81
-rw-r--r--contrib/fixinc/fixincl.c810
-rwxr-xr-xcontrib/fixinc/fixincl.sh364
-rw-r--r--contrib/fixinc/fixincl.tpl169
-rw-r--r--contrib/fixinc/fixincl.x4275
-rw-r--r--contrib/fixinc/hackshell.tpl187
-rw-r--r--contrib/fixinc/inclhack.def2326
-rwxr-xr-xcontrib/fixinc/inclhack.sh3050
-rw-r--r--contrib/fixinc/inclhack.tpl366
-rwxr-xr-xcontrib/fixinc/mkfixinc.sh119
-rw-r--r--contrib/fixinc/regex.c5059
-rw-r--r--contrib/fixinc/regex.h504
-rw-r--r--contrib/fixinc/server.c464
-rw-r--r--contrib/fixinc/server.h94
15 files changed, 4 insertions, 17868 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 63d2130abeb..0c1bcabbba9 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,7 @@
+Fri Apr 2 16:09:02 1999 Jeffrey A Law (law@cygnus.com)
+
+ * fixinc/*: Delete obsolete files.
+
1999-02-04 Robert Lipe <robertlipe@usa.net>
* egcs_update: Test return values of 'cvs update'. Propogate
diff --git a/contrib/fixinc/Makefile b/contrib/fixinc/Makefile
deleted file mode 100644
index 484ab0aa38e..00000000000
--- a/contrib/fixinc/Makefile
+++ /dev/null
@@ -1,81 +0,0 @@
-
-## # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-##
-## Makefile for constructing the "best" include fixer we can
-##
-## $Id: Makefile,v 1.4 1998/08/05 10:20:10 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 : gen
-
-all : $(TARGETS)
-sh : $(SH_TARGET)
-gen : $(SH_TARGET) fixincl.x
-
-$(OBJ): $(HDR)
-
-fixincl: $(OBJ)
- @echo $(CC) -o $@ $(OBJ) $(LIB) ; \
- if $(CC) -o $@ $(OBJ) $(LIB) ; then : ; else \
- rm -f $@ ; (echo "#! /bin/sh" ; echo exit 1 ) > $@ ; \
- chmod 777 $@ ; fi
-
-regex.o: regex.c
- -$(CC) -g -DSTDC_HEADERS=1 -c regex.c
-
-fixincl.o : fixincl.x fixincl.c
- -$(CC) $(CFLAGS) '-DTARGET_MACHINE="$(TARGET)"' -o $@ -c fixincl.c
-
-server.o : server.c server.h
- -$(CC) $(CFLAGS) -o $@ -c server.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
- @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 ; \
-
-clean:
- rm -f *.o $(TARGETS) fixincl.x
-
-# Ensure all the targets are built. If the program "fixincl"
-# failed to compile, link or load, then we install the
-# "inclhack.sh" script. Otherwise, we install that program
-# plus the wrapper script, "fixincl.sh".
-#
-install: $(TARGETS)
- @rm -f $(DESTDIR)/fixinc.sh ; \
- if ( ./fixincl -v > /dev/null 2>&1 ) ; then \
- echo cp fixincl.sh $(DESTDIR)/fixinc.sh ; \
- cp fixincl.sh $(DESTDIR)/fixinc.sh ; \
- chmod 555 $(DESTDIR)/fixinc.sh ; \
- rm -f $(DESTDIR)/fixincl ; \
- echo cp fixincl $(DESTDIR) ; \
- cp fixincl $(DESTDIR) ; \
- chmod 555 $(DESTDIR)/fixincl ; \
- else \
- echo cp inclhack.sh $(DESTDIR)/fixinc.sh ; \
- cp inclhack.sh $(DESTDIR)/fixinc.sh ; \
- fi
diff --git a/contrib/fixinc/fixincl.c b/contrib/fixinc/fixincl.c
deleted file mode 100644
index b7372d81da9..00000000000
--- a/contrib/fixinc/fixincl.c
+++ /dev/null
@@ -1,810 +0,0 @@
-/*
- * $Id: fixincl.c,v 1.4 1998/08/05 10:20:11 korbb Exp $
- *
- * 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.
- *
- * fixincl 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.
- *
- * fixincl 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 fixincl. See the file "COPYING". If not,
- * write to: The Free Software Foundation, Inc.,
- * 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <sys/param.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <signal.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
-#include <fcntl.h>
-#include <ctype.h>
-
-#include "regex.h"
-#include "server.h"
-
-#define tSCC static const char
-#define tCC const char
-#define tSC static char
-
-typedef int tSuccess;
-
-#define FAILURE ((tSuccess)-1)
-#define SUCCESS ((tSuccess) 0)
-#define PROBLEM ((tSuccess) 1)
-
-#define SUCCEEDED( p ) ((p) == SUCCESS)
-#define SUCCESSFUL( p ) SUCCEEDED( p )
-#define FAILED( p ) ((p) < SUCCESS)
-#define HADGLITCH( p ) ((p) > SUCCESS)
-
-#define NUL '\0'
-
-typedef enum
- {
- TT_TEST, TT_EGREP, TT_NEGREP
- }
-teTestType;
-
-typedef struct test_desc tTestDesc;
-
-struct test_desc
- {
- teTestType type;
- const char *pzTest;
- regex_t *pTestRegex;
- };
-
-typedef struct patch_desc tPatchDesc;
-
-#define FD_MACH_ONLY 0x0000
-#define FD_MACH_IFNOT 0x0001
-#define FD_SKIP_TEST 0x8000
-
-typedef struct fix_desc tFixDesc;
-struct fix_desc
- {
- const char* pzFixName; /* Name of the fix */
- const char* pzFileList; /* List of files it applies to */
- const char** papzMachs; /* List of machine/os-es it applies to */
- regex_t* pListRegex;
- int testCt;
- int fdFlags;
- tTestDesc* pTestDesc;
- const char** papzPatchArgs;
- };
-
-char *pzDestDir = (char *) NULL;
-char *pzSrcDir = (char *) NULL;
-char zMachine[] = TARGET_MACHINE;
-
-pid_t chainHead = (pid_t) - 1;
-
-const char zInclQuote[] = "^[ \t]*#[ \t]*include[ \t]*\"[^/]";
-regex_t inclQuoteRegex;
-
-char zFileNameBuf[0x8000];
-
-char *loadFile (const char *pzFile);
-void process (char *data, const char *dir, const char *file);
-void runCompiles (void);
-
-#include "fixincl.x"
-
-
-int
-main (argc, argv)
- int argc;
- char **argv;
-{
- static const char zGnuLib[] =
- "This file is part of the GNU C Library";
-
-#ifndef NO_BOGOSITY_LIMITS
- size_t loopCt;
-#endif
-
- char *apzNames[128];
- size_t fileNameCt;
-
- if (argc != 1)
- {
- if (argc != 2)
- {
- fputs ("fixincl ERROR: files specified on command line (not stdin)\n",
- stderr);
- exit (EXIT_FAILURE);
- }
-
- if (strcmp (argv[1], "-v") == 0)
- {
- fputs ("$Id: fixincl.c,v 1.4 1998/08/05 10:20:11 korbb Exp $\n", stderr);
- exit (EXIT_SUCCESS);
- }
-
- freopen (argv[1], "r", stdin);
- }
-
- pzDestDir = getenv ("DESTDIR");
- if (pzDestDir == (char *) NULL)
- {
- fprintf (stderr, "fixincl ERROR: %s cannot find destination dir\n"
- "\t(`DESTDIR' must be an environment variable)\n", *argv);
- exit (EXIT_FAILURE);
- }
-
- pzSrcDir = getenv ("SRCDIR");
- if (pzSrcDir == (char *) NULL)
- {
- fprintf (stderr, "fixincl ERROR: %s cannot find source dir\n"
- "\t(`SRCDIR' must be an environment variable)\n", *argv);
- exit (EXIT_FAILURE);
- }
-
- runCompiles ();
-
-#ifndef NO_BOGOSITY_LIMITS
- for (;;)
- {
- char *pzBuf;
- pid_t child;
-
- /*
- * Only the parent process can read from stdin without
- * confusing the world. (How does the child tell the
- * parent to skip forward? Pipes and files behave differently.)
- */
- for (fileNameCt = 0, pzBuf = zFileNameBuf;
- (fileNameCt < 128)
- && (pzBuf
- < (zFileNameBuf + sizeof (zFileNameBuf) - MAXPATHLEN));
- )
- {
-
- if (fgets (pzBuf, MAXPATHLEN, stdin) == (char *) NULL)
- break;
- while (isspace (*pzBuf))
- pzBuf++;
- apzNames[fileNameCt++] = pzBuf;
- pzBuf += strlen (pzBuf);
- while (isspace (pzBuf[-1]))
- pzBuf--;
- *pzBuf++ = '\0';
- }
-
- if (fileNameCt == 0)
- return EXIT_SUCCESS;
-
- child = fork ();
- if (child == NULLPROCESS)
- break;
-
- if (child == NOPROCESS)
- {
- fprintf (stderr, "Error %d (%s) forking in main\n",
- errno, strerror (errno));
- exit (EXIT_FAILURE);
- }
-
- waitpid (child, (int *) NULL, 0);
- }
-#else
-#error "NON-BOGUS LIMITS NOT SUPPORTED?!?!"
-#endif
-
- /*
- * For every file specified in stdandard in
- * (except as throttled for bogus reasons)...
- */
- for (loopCt = 0; loopCt < fileNameCt; loopCt++)
- {
- char *pzData;
- char *pzFile = apzNames[loopCt];
-
- if (access (pzFile, R_OK) != 0)
- {
- int erno = errno;
- fprintf (stderr, "Cannot access %s from %s\n\terror %d (%s)\n",
- pzFile, getcwd ((char *) NULL, MAXPATHLEN),
- erno, strerror (erno));
- }
- else if (pzData = loadFile (pzFile),
- (pzData != (char *) NULL))
- {
-
- if (strstr (pzData, zGnuLib) == (char *) NULL)
- process (pzData, pzDestDir, pzFile);
-
- free ((void *) pzData);
- }
- }
-
- return EXIT_SUCCESS;
-}
-
-
-char *
-loadFile (pzFile)
- const char *pzFile;
-{
- char *pzDta;
- size_t fileSize;
-
- {
- struct stat stbf;
- if (stat (pzFile, &stbf) != 0)
- {
- fprintf (stderr, "error %d (%s) stat-ing %s\n",
- errno, strerror (errno), pzFile);
- return (char *) NULL;
- }
- fileSize = stbf.st_size;
- }
- if (fileSize == 0)
- return (char *) NULL;
-
- pzDta = (char *) malloc ((fileSize + 16) & ~0x00F);
- if (pzDta == (char *) NULL)
- {
- fprintf (stderr, "error: could not malloc %d bytes\n",
- fileSize);
- exit (EXIT_FAILURE);
- }
-
- {
- FILE *fp = fopen (pzFile, "r");
- size_t sizeLeft = fileSize;
- char *readPtr = pzDta;
-
- if (fp == (FILE *) NULL)
- {
- fprintf (stderr, "error %d (%s) opening %s\n", errno,
- strerror (errno), pzFile);
- free ((void *) pzDta);
- return (char *) NULL;
- }
-
- do
- {
- size_t sizeRead = fread ((void *) readPtr, 1, sizeLeft, fp);
-
- if (sizeRead == 0)
- {
- if (feof (fp))
- break;
-
- if (ferror (fp))
- {
- fprintf (stderr, "error %d (%s) reading %s\n", errno,
- strerror (errno), pzFile);
- free ((void *) pzDta);
- fclose (fp);
- return (char *) NULL;
- }
- }
-
- readPtr += sizeRead;
- sizeLeft -= sizeRead;
- }
- while (sizeLeft != 0);
-
- *readPtr = '\0';
- fclose (fp);
- return pzDta;
- }
-}
-
-
-void
-runCompiles ()
-{
- tSCC zBadComp[] = "fixincl ERROR: cannot compile %s regex for %s\n"
- "\texpr = `%s'\n" "\terror %s\n";
- tFixDesc *pFD = fixDescList;
- int fixCt = FIX_COUNT;
- tTestDesc *pTD;
- int tstCt;
- int reCt = REGEX_COUNT;
- const char *pzErr;
- regex_t *pRegex = (regex_t *) malloc (REGEX_COUNT * sizeof (regex_t));
-
- if (pRegex == (regex_t *) NULL)
- {
- fprintf (stderr, "fixincl ERROR: cannot allocate %d bytes for regex\n",
- REGEX_COUNT * sizeof (regex_t));
- exit (EXIT_FAILURE);
- }
-
- re_set_syntax (RE_SYNTAX_EGREP);
- pzErr = re_compile_pattern (zInclQuote, strlen (zInclQuote),
- &inclQuoteRegex);
- if (pzErr != (char *) NULL)
- {
- fprintf (stderr, zBadComp, "quoted include", "runCompiles",
- zInclQuote, pzErr);
- exit (EXIT_FAILURE);
- }
-
- /*
- * FOR every fixup, ...
- */
- do
- {
- pTD = pFD->pTestDesc;
- tstCt = pFD->testCt;
-
- if (pFD->papzMachs != (const char**)NULL) {
- const char** papzMachs = pFD->papzMachs;
- char* pz = zFileNameBuf;
- char* pzSep = "";
- tCC* pzIfTrue;
- tCC* pzIfFalse;
- tSCC zSkip[] = "skip";
- tSCC zRun[] = "run";
-
- sprintf( pz, "case %s in\n", zMachine );
- pz += strlen( pz );
-
- if (pFD->fdFlags & FD_MACH_IFNOT) {
- pzIfTrue = zSkip;
- pzIfFalse = zRun;
- } else {
- pzIfTrue = zRun;
- pzIfFalse = zSkip;
- }
-
- for (;;) {
- const char* pzMach = *(papzMachs++);
- if (pzMach == (const char*)NULL)
- break;
- sprintf( pz, "%s %s", pzSep, pzMach );
- pz += strlen( pz );
- pzSep = " | \\\n";
- }
- sprintf( pz, " )\n echo %s ;;\n * )\n echo %s ;;\nesac",
- pzIfTrue, pzIfFalse );
- pz = runShell( zFileNameBuf );
- if (*pz == 's') {
- pFD->fdFlags |= FD_SKIP_TEST;
- continue;
- }
- }
-
- /*
- * FOR every test for the fixup, ...
- */
- while (--tstCt >= 0)
- {
- switch (pTD->type)
- {
- case TT_EGREP:
- case TT_NEGREP:
- if (--reCt < 0)
- {
- fputs ("out of RE's\n", stderr);
- exit (EXIT_FAILURE);
- }
-
- pTD->pTestRegex = pRegex++;
- pzErr = re_compile_pattern (pTD->pzTest,
- strlen (pTD->pzTest),
- pTD->pTestRegex);
- if (pzErr != (char *) NULL)
- {
- fprintf (stderr, zBadComp, "select test", pFD->pzFixName,
- pTD->pzTest, pzErr);
- exit (EXIT_FAILURE);
- }
- }
- pTD++;
- }
- }
- while (pFD++, --fixCt > 0);
-}
-
-
-FILE *
-createFile (pzFile)
- const char *pzFile;
-{
- int fd;
- FILE *pf;
- char fname[MAXPATHLEN];
-
- sprintf (fname, "%s/%s", pzDestDir, pzFile);
- unlink (fname);
-
- fd = open (fname, O_WRONLY | O_CREAT);
-
- if ((fd < 0) && (errno == ENOENT))
- {
- char *pzDir = strchr (fname + 1, '/');
- struct stat stbf;
-
- while (pzDir != (char *) NULL)
- {
- *pzDir = NUL;
- if (stat (fname, &stbf) < 0)
- {
- mkdir (fname, S_IFDIR | S_IRWXU | S_IRGRP | S_IXGRP
- | S_IROTH | S_IXOTH);
- }
-
- *pzDir = '/';
- pzDir = strchr (pzDir + 1, '/');
- }
- fd = open (fname, O_WRONLY | O_CREAT);
- }
- if (fd < 0)
- {
- fprintf (stderr, "Error %d (%s) creating %s\n",
- errno, strerror (errno), fname);
- exit (EXIT_FAILURE);
- }
- fprintf (stderr, "Fixed: %s\n", pzFile);
- pf = fdopen (fd, "w");
-
-#ifdef LATER
- {
- static const char zHdr[] =
- "/*\n"
- " * DO NOT EDIT THIS FILE.\n"
- " *\n"
- " * It has been auto-edited by fixincludes from /usr/include/%s\n"
- " * This had to be done to correct non-standard usages in the\n"
- " * original, manufacturer supplied header file.\n"
- " */\n\n";
-
- fprintf (pf, zHdr, pzFile);
- }
-#endif
- return pf;
-}
-
-tSuccess
-testTest (pTest, pzFile)
- tTestDesc *pTest;
- char* pzFile;
-{
- char *pzRes;
- tSuccess res = FAILURE;
-
- static char zCmdBuf[4096];
- tSCC zCmdFmt[] = "file=%s\nif ( test %s ) > /dev/null 2>&1\n"
- "then echo TRUE\n" "else echo FALSE\n" "fi";
-
- sprintf (zCmdBuf, zCmdFmt, pzFile, pTest->pzTest);
- pzRes = runShell (zCmdBuf);
- if (*pzRes == 'T')
- res = SUCCESS;
- free ((void *) pzRes);
- return res;
-}
-
-
-tSuccess
-egrepTest (pzDta, pTest)
- char *pzDta;
- tTestDesc *pTest;
-{
- regmatch_t match;
-#ifndef NO_BOGOSITY
- if (pTest->pTestRegex == 0)
- fprintf (stderr, "fixincl ERROR RE not compiled: `%s'\n", pTest->pzTest);
-#endif
- if (regexec (pTest->pTestRegex, pzDta, 1, &match, 0) == 0)
- return SUCCESS;
- return FAILURE;
-}
-
-
-
-void
-extractQuotedFiles (pzDta, pzFile, pMatch)
- char *pzDta;
- const char *pzFile;
- regmatch_t *pMatch;
-{
- char *pzDirEnd = strrchr (pzFile, '/');
- char *pzInclQuot = pzDta;
-
- fprintf (stderr, "Quoted includes in %s\n", pzFile);
-
- /*
- * Set "pzFile" to point to the containing subdirectory of the source
- * If there is none, then it is in our current direcory, ".".
- */
- if (pzDirEnd == (char *) NULL)
- pzFile = ".";
- else
- *pzDirEnd = '\0';
-
- for (;;)
- {
- pzInclQuot += pMatch->rm_so;
-
- /*
- * Skip forward to the included file name
- */
- while (isspace (*pzInclQuot))
- pzInclQuot++;
- while (isspace (*++pzInclQuot));
- pzInclQuot += sizeof ("include") - 1;
- while (*pzInclQuot++ != '"');
-
- /*
- * Print the source directory and the subdirectory of the file
- * in question.
- */
- printf ("%s %s/", pzSrcDir, pzFile);
- pzDirEnd = pzInclQuot;
-
- /*
- * Append to the directory the relative path of the desired file
- */
- while (*pzInclQuot != '"')
- putc (*pzInclQuot++, stdout);
-
- /*
- * Now print the destination directory appended with the relative
- * path of the desired file
- */
- printf (" %s/%s/", pzDestDir, pzFile);
- while (*pzDirEnd != '"')
- putc (*pzDirEnd++, stdout);
-
- /*
- * End of entry
- */
- putc ('\n', stdout);
-
- /*
- * Find the next entry
- */
- if (regexec (&inclQuoteRegex, pzInclQuot, 1, pMatch, 0) != 0)
- break;
- }
-}
-
-
-/*
- * Process the potential fixes for a particular include file
- */
-void
-process (pzDta, pzDir, pzFile)
- char *pzDta;
- const char *pzDir;
- const char *pzFile;
-{
- static char zEnvFile[1024] =
- {"file="};
- tFixDesc *pFD = fixDescList;
- int todoCt = FIX_COUNT;
- tFdPair fdp =
- {-1, -1};
-
- /*
- * IF this is the first time through,
- * THEN put the 'file' environment variable into the environment.
- * This is used by some of the subject shell scripts and tests.
- */
- if (zEnvFile[5] == NUL)
- putenv (zEnvFile);
-
- /*
- * Ghastly as it is, this actually updates the value of the variable:
- *
- * putenv(3C) C Library Functions putenv(3C)
- *
- * DESCRIPTION
- * putenv() makes the value of the environment variable name
- * equal to value by altering an existing variable or creating
- * a new one. In either case, the string pointed to by string
- * becomes part of the environment, so altering the string will
- * change the environment. string points to a string of the
- * form ``name=value.'' The space used by string is no longer
- * used once a new string-defining name is passed to putenv().
- */
- strcpy (zEnvFile + 5, pzFile);
- chainHead = NOPROCESS;
-
- /*
- * For every fix in our fix list, ...
- */
- for (; todoCt > 0; pFD++, todoCt--)
- {
- tTestDesc *pTD;
- int tstCt;
- tSuccess egrepRes;
-
- if (pFD->fdFlags & FD_SKIP_TEST)
- continue;
-
- /*
- * IF there is a file name restriction,
- * THEN ensure the current file name matches one in the pattern
- */
- if (pFD->pzFileList != (char *) NULL)
- {
- const char *pzFil = pzFile;
- const char *pzScn = pFD->pzFileList;
- size_t nmLen;
-
- while ((pzFil[0] == '.') && (pzFil[1] == '/'))
- pzFil += 2;
- nmLen = strlen (pzFil);
-
- for (;;)
- {
- pzScn = strstr (pzScn + 1, pzFil);
- if (pzScn == (char *) NULL)
- goto nextFix;
- if ((pzScn[-1] == '|') && (pzScn[nmLen] == '|'))
- break;
- }
- }
-
- egrepRes = PROBLEM;
-
- /*
- * IF there are no tests
- * THEN we always run the fixup
- */
- for (pTD = pFD->pTestDesc, tstCt = pFD->testCt;
- tstCt-- > 0;
- pTD++)
- {
- switch (pTD->type)
- {
- case TT_TEST:
- /*
- * IF *any* of the shell tests fail,
- * THEN do not process the fix.
- */
- if (!SUCCESSFUL (testTest (pTD, pzFile)))
- goto nextFix;
- break;
-
- case TT_EGREP:
- /*
- * IF we have not had a successful egrep test
- * *AND* this test does not pass,
- * THEN mark the egrep test as failing. It starts
- * out as a "PROBLEM", meaning that if we do not
- * encounter any egrep tests, then we will let it pass.
- */
- if ((!SUCCESSFUL (egrepRes))
- && (!SUCCESSFUL (egrepTest (pzDta, pTD))))
-
- egrepRes = FAILURE;
-
- break;
-
- case TT_NEGREP:
- /*
- * IF *any* of the negative egrep tests fail,
- * THEN do not process the fix.
- */
- if (SUCCESSFUL (egrepTest (pzDta, pTD)))
- goto nextFix;
- break;
- }
- }
-
- /*
- * IF there were no egrep tests *OR* at least one passed, ...
- */
- if (!FAILED (egrepRes))
- {
- fprintf (stderr, "Applying %-32s to %s\n",
- pFD->pzFixName, pzFile);
-
- if (fdp.readFd == -1)
- {
- fdp.readFd = open (pzFile, O_RDONLY);
- if (fdp.readFd < 0)
- {
- fprintf (stderr, "Error %d (%s) opening %s\n", errno,
- strerror (errno), pzFile);
- exit (EXIT_FAILURE);
- }
- }
-
- for (;;)
- {
- int newFd = chainOpen (fdp.readFd,
- (tpChar *) pFD->papzPatchArgs,
- (chainHead == -1)
- ? &chainHead : (pid_t *) NULL);
- if (newFd != -1)
- {
- fdp.readFd = newFd;
- break;
- }
-
- fprintf (stderr, "Error %d (%s) starting filter process "
- "for %s\n", errno, strerror (errno),
- pFD->pzFixName);
-
- if (errno != EAGAIN)
- exit (EXIT_FAILURE);
- sleep (1);
- }
- }
-
- nextFix:;
- }
-
- /*
- * IF after all the tests we did not start any patch programs,
- * THEN quit now.
- */
- if (fdp.readFd < 0)
- return;
-
- {
- FILE *inFp = fdopen (fdp.readFd, "r");
- FILE *oFp = (FILE *) NULL;
- char *pzCmp = pzDta;
-
- for (;;)
- {
- int ch;
-
- ch = getc (inFp);
- if (ch == EOF)
- break;
-
- if (oFp != (FILE *) NULL)
- putc (ch, oFp);
-
- else if (ch != *pzCmp)
- {
- oFp = createFile (pzFile);
- if (pzCmp != pzDta)
- {
- char c = *pzCmp;
- *pzCmp = NUL;
- fputs (pzDta, oFp);
- *pzCmp = c;
- }
- putc (ch, oFp);
-
- }
- else
- pzCmp++;
- }
-
- if (oFp != (FILE *) NULL)
- {
- regmatch_t match;
-
- fchmod (fileno (oFp), S_IRUSR | S_IRGRP | S_IROTH);
- fclose (oFp);
- if (regexec (&inclQuoteRegex, pzDta, 1, &match, 0) == 0)
- extractQuotedFiles (pzDta, pzFile, &match);
- }
-
- fclose (inFp);
- }
-
- close (fdp.readFd);
-}
diff --git a/contrib/fixinc/fixincl.sh b/contrib/fixinc/fixincl.sh
deleted file mode 100755
index 8108a0bf0fa..00000000000
--- a/contrib/fixinc/fixincl.sh
+++ /dev/null
@@ -1,364 +0,0 @@
-#!/bin/sh
-#
-# DO NOT EDIT THIS FILE (fixincl.sh)
-#
-# It has been autogen-ed Tuesday September 22, 1998 at 07:22:35 AM PDT
-# From the definitions inclhack.def
-# and the template file inclhack.tpl
-#
-# 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 104 fixup scripts.
-#
-# See README-fixinc for more information.
-#
-# fixincludes 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.
-#
-# fixincludes 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 fixincludes. See the file "COPYING". If not,
-# write to: The Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-#
-# # # # # # # # # # # # # # # # # # # # #
-#
-# Directory containing the original header files.
-# (This was named INCLUDES, but that conflicts with a name in Makefile.in.)
-#
-INPUT=${2-${INPUT-/usr/include}}
-
-( \cd ${INPUT} > /dev/null 2>&1 ) || {
- echo 'fixincludes: input dir `'$INPUT"' is an invalid directory"
- exit 1
-}
-
-# # # # # # # # # # # # # # # # # # # # #
-#
-# Directory in which to store the results.
-# 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
-
-LIB=${1}
-
-# Make sure it exists.
-if [ ! -d $LIB ]; then
- mkdir $LIB || {
- echo fixincludes: output dir '`'$LIB"' cannot be created"
- exit 1
- }
-else
- ( \cd $LIB && touch DONE && rm DONE ) || {
- echo fixincludes: output dir '`'$LIB"' is an invalid directory"
- exit 1
- }
-fi
-
-# Define what target system we're fixing.
-#
-if test -r ./Makefile; then
- target_canonical="`sed -n -e 's,^target[ ]*=[ ]*\(.*\)$,\1,p' < Makefile`"
-fi
-
-# If not from the Makefile, then try config.guess
-#
-if test -z "${target_canonical}" ; then
- if test -x ./config.guess ; then
- target_canonical="`config.guess`" ; fi
- test -z "${target_canonical}" && target_canonical=unknown
-fi
-export target_canonical
-
-# # # # # # # # # # # # # # # # # # # # #
-#
-# Define PWDCMD as a command to use to get the working dir
-# in the form that we want.
-PWDCMD=pwd
-
-case "`$PWDCMD`" in
-//*)
- # On an Apollo, discard everything before `/usr'.
- PWDCMD="eval pwd | sed -e 's,.*/usr/,/usr/,'"
- ;;
-esac
-
-# Original directory.
-ORIGDIR=`${PWDCMD}`
-FIXINCL=${ORIGDIR}/fixincl
-export FIXINCL
-
-# Make LIB absolute only if needed to avoid problems with the amd.
-case $LIB in
-/*)
- ;;
-*)
- cd $LIB; LIB=`${PWDCMD}`
- ;;
-esac
-
-echo Fixing headers into ${LIB} for ${target_canonical} target
-
-# 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"
-
- # Find all directories under $d, relative to $d, excluding $d itself.
- # (The /. is needed after $d in case $d is a symlink.)
- files="$files `find $d/. -type d -print | \
- sed -e '/\/\.$/d' -e 's@/./@/@g'`"
- # 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 | sed -e 's@/./@/@g'`
- for d1 in $theselinks --dummy--
- do
- # If the link points to a directory,
- # add that dir to $newdirs
- if [ -d $d1 ]
- then
- files="$files $d1"
- if [ "`ls -ld $d1 | sed -n 's/.*-> //p'`" != "." ]
- then
- newdirs="$newdirs $d1"
- fi
- fi
- done
- done
-
- 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}`
- # Canonicalize ${INPUT} now to minimize the time an
- # automounter has to change the result of ${PWDCMD}.
- cinput=`cd ${INPUT}; ${PWDCMD}`
- # If a link points to ., make a similar link to .
- if [ $x = ${cinput} ]; 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 : "${cinput}/.*" > /dev/null; then
- # Y gets the actual target dir name, relative to ${INPUT}.
- y=`echo $x | sed -n "s&${cinput}/&&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@[^/][^/]*@..@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
- # Get the path from ${LIB} to $file, accounting for symlinks.
- parent=`echo "$file" | sed -e 's@/[^/]*$@@'`
- libabs=`cd ${LIB}; ${PWDCMD}`
- file2=`cd ${LIB}; cd $parent; ${PWDCMD} | sed -e "s@^${libabs}@@"`
- # DOTS is the relative path from ${LIB}/$file's dir back to ${LIB}.
- dots=`echo "$file2" | sed -e 's@/[^/]*@../@g'`
- 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
-
-# # # # # # # # # # # # # # # # # # # # #
-#
-required=
-set x $treetops
-shift
-while [ $# != 0 ]; do
- # $1 is an old directory to copy, and $2 is the new directory to copy to.
- #
- SRCDIR=`cd ${INPUT} ; cd $1 ; ${PWDCMD}`
- export SRCDIR
- shift
-
- DESTDIR=`cd $1;${PWDCMD}`
- export DESTDIR
- shift
-
- # The same dir can appear more than once in treetops.
- # There's no need to scan it more than once.
- #
- if [ -f ${DESTDIR}/DONE ]
- then continue ; fi
-
- touch ${DESTDIR}/DONE
- echo Fixing directory ${SRCDIR} into ${DESTDIR}
-
- # 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.
- #
- cd ${SRCDIR}
-
- required="$required `if $LINKS; then
- find . -name '*.h' \( -type f -o -type l \) -print
- else
- find . -name '*.h' -type f -print
- fi | ${FIXINCL}`"
-done
-
-## Make sure that any include files referenced using double quotes
-## exist in the fixed directory. This comes last since otherwise
-## we might end up deleting some of these files "because they don't
-## need any change."
-set x `echo $required`
-shift
-while [ $# != 0 ]; do
- newreq=
- while [ $# != 0 ]; do
- # $1 is the directory to copy from,
- # $2 is the unfixed file,
- # $3 is the fixed file name.
- #
- cd ${INPUT}
- cd $1
- if [ -r $2 ] && [ ! -r $3 ]; then
- cp $2 $3 >/dev/null 2>&1 || echo "Can't copy $2" >&2
- chmod +w $3 2>/dev/null
- chmod a+r $3 2>/dev/null
- echo Copied $2
- for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' $3 |
- sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`
- do
- dir=`echo $2 | sed -e s'|/[^/]*$||'`
- dir2=`echo $3 | sed -e s'|/[^/]*$||'`
- newreq="$newreq $1 $dir/$include $dir2/$include"
- done
- fi
- shift; shift; shift
- done
- set x $newreq
- shift
-done
-
-echo 'Cleaning up DONE files.'
-cd $LIB
-find . -name DONE -exec rm -f '{}' ';'
-
-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
diff --git a/contrib/fixinc/fixincl.tpl b/contrib/fixinc/fixincl.tpl
deleted file mode 100644
index 04b67ab5377..00000000000
--- a/contrib/fixinc/fixincl.tpl
+++ /dev/null
@@ -1,169 +0,0 @@
-[= 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" =]
-/*
- * Machine/OS name selection pattern
- */[=
-
- _IF mach _exist=]
-tSCC* apz[=hackname _cap=]Machs[] = {[=
- _FOR mach =]
- [=mach _str=],[=
- /mach=]
- (const char*)NULL };[=
-
- _ELSE =]
-#define apz[=hackname _cap=]Machs (const 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,
- apz[=hackname _cap=]Machs, (regex_t*)NULL,
- [=hackname _up=]_TEST_CT, [=
- _IF not_machine _exist =]FD_MACH_IFNOT[=
- _ELSE =]FD_MACH_ONLY[=
- _ENDIF =],
- a[=hackname _cap=]Tests, apz[=hackname _cap=]Patch }[=
-
-/fix=]
-};
diff --git a/contrib/fixinc/fixincl.x b/contrib/fixinc/fixincl.x
deleted file mode 100644
index 00e05faf251..00000000000
--- a/contrib/fixinc/fixincl.x
+++ /dev/null
@@ -1,4275 +0,0 @@
-/*
- * DO NOT EDIT THIS FILE (fixincl.x)
- *
- * It has been autogen-ed Tuesday September 22, 1998 at 07:22:34 AM PDT
- * From the definitions inclhack.def
- * and the template file fixincl.tpl
- *
- * 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 104 fixup scripts.
- *
- * See README-fixinc for more information.
- *
- * inclhack 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.
- *
- * inclhack 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 inclhack. See the file "COPYING". If not,
- * write to: The Free Software Foundation, Inc.,
- * 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- *
- * Description 1 - Aix_Syswait fix
- */
-tSCC zAix_SyswaitName[] =
- "Aix_Syswait";
-/*
- * File name selection pattern
- */
-tSCC zAix_SyswaitList[] =
- "|" "sys/wait.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzAix_SyswaitMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zAix_SyswaitSelect0[] =
- "bos325,";
-
-#define AIX_SYSWAIT_TEST_CT 1
-tTestDesc aAix_SyswaitTests[] = {
- { TT_EGREP, zAix_SyswaitSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Aix_Syswait
- */
-const char* apzAix_SyswaitPatch[] = { "sed",
- "-e" "/^extern pid_t wait3();$/i\\\n"
- "struct rusage;\n",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 2 - Aix_Volatile fix
- */
-tSCC zAix_VolatileName[] =
- "Aix_Volatile";
-/*
- * File name selection pattern
- */
-tSCC zAix_VolatileList[] =
- "|" "sys/signal.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzAix_VolatileMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zAix_VolatileSelect0[] =
- "typedef volatile int sig_atomic_t";
-
-#define AIX_VOLATILE_TEST_CT 1
-tTestDesc aAix_VolatileTests[] = {
- { TT_EGREP, zAix_VolatileSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Aix_Volatile
- */
-const char* apzAix_VolatilePatch[] = { "sed",
- "-e" "s/typedef volatile int sig_atomic_t/typedef int sig_atomic_t/",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 3 - Alpha_Getopt fix
- */
-tSCC zAlpha_GetoptName[] =
- "Alpha_Getopt";
-/*
- * File name selection pattern
- */
-tSCC zAlpha_GetoptList[] =
- "|" "stdio.h"
- "|" "stdlib.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzAlpha_GetoptMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zAlpha_GetoptSelect0[] =
- "getopt\\(int, char \\*\\[";
-
-#define ALPHA_GETOPT_TEST_CT 1
-tTestDesc aAlpha_GetoptTests[] = {
- { TT_EGREP, zAlpha_GetoptSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Alpha_Getopt
- */
-const char* apzAlpha_GetoptPatch[] = { "sed",
- "-e" "s/getopt(int, char \\*\\[\\],[ ]*char \\*)/getopt(int, char *const[], const char *)/",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 4 - Alpha_Parens fix
- */
-tSCC zAlpha_ParensName[] =
- "Alpha_Parens";
-/*
- * File name selection pattern
- */
-tSCC zAlpha_ParensList[] =
- "|" "sym.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzAlpha_ParensMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zAlpha_ParensSelect0[] =
- "#ifndef\\(__mips64\\)";
-
-#define ALPHA_PARENS_TEST_CT 1
-tTestDesc aAlpha_ParensTests[] = {
- { TT_EGREP, zAlpha_ParensSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Alpha_Parens
- */
-const char* apzAlpha_ParensPatch[] = { "sed",
- "-e" "s/#ifndef(__mips64)/#ifndef __mips64/",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 5 - Alpha_Sbrk fix
- */
-tSCC zAlpha_SbrkName[] =
- "Alpha_Sbrk";
-/*
- * File name selection pattern
- */
-tSCC zAlpha_SbrkList[] =
- "|" "unistd.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzAlpha_SbrkMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zAlpha_SbrkSelect0[] =
- "char[ \t]*\\*[\t ]*sbrk[ \t]*\\(";
-
-#define ALPHA_SBRK_TEST_CT 1
-tTestDesc aAlpha_SbrkTests[] = {
- { TT_EGREP, zAlpha_SbrkSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Alpha_Sbrk
- */
-const char* apzAlpha_SbrkPatch[] = { "sed",
- "-e" "s/char\\([ \t]*\\*[\t ]*sbrk[ \t]*(\\)/void\\1/",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 6 - Arm_Norcroft_Hint fix
- */
-tSCC zArm_Norcroft_HintName[] =
- "Arm_Norcroft_Hint";
-/*
- * File name selection pattern
- */
-tSCC zArm_Norcroft_HintList[] =
- "|" "X11/Intrinsic.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzArm_Norcroft_HintMachs (const char**)NULL
-#define ARM_NORCROFT_HINT_TEST_CT 0
-#define aArm_Norcroft_HintTests (tTestDesc*)NULL
-
-/*
- * Fix Command Arguments for Arm_Norcroft_Hint
- */
-const char* apzArm_Norcroft_HintPatch[] = { "sed",
- "-e" "s/___type p_type/p_type/",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 7 - Arm_Wchar fix
- */
-tSCC zArm_WcharName[] =
- "Arm_Wchar";
-/*
- * File name selection pattern
- */
-tSCC zArm_WcharList[] =
- "|" "stdlib.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzArm_WcharMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zArm_WcharSelect0[] =
- "#[ \t]*define[ \t]*__wchar_t";
-
-#define ARM_WCHAR_TEST_CT 1
-tTestDesc aArm_WcharTests[] = {
- { TT_EGREP, zArm_WcharSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Arm_Wchar
- */
-const char* apzArm_WcharPatch[] = { "sed",
- "-e" "s/\\(#[ \t]*ifndef[ \t]*\\)__wchar_t/\\1_GCC_WCHAR_T/",
- "-e" "s/\\(#[ \t]*define[ \t]*\\)__wchar_t/\\1_GCC_WCHAR_T/",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 8 - Aux_Asm fix
- */
-tSCC zAux_AsmName[] =
- "Aux_Asm";
-/*
- * File name selection pattern
- */
-tSCC zAux_AsmList[] =
- "|" "sys/param.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzAux_AsmMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zAux_AsmSelect0[] =
- "#ifndef NOINLINE";
-
-#define AUX_ASM_TEST_CT 1
-tTestDesc aAux_AsmTests[] = {
- { TT_EGREP, zAux_AsmSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Aux_Asm
- */
-const char* apzAux_AsmPatch[] = { "sed",
- "-e" "s|#ifndef NOINLINE|#if !defined(NOINLINE) \\&\\& !defined(__GNUC__)|",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 9 - Avoid_Bool fix
- */
-tSCC zAvoid_BoolName[] =
- "Avoid_Bool";
-/*
- * File name selection pattern
- */
-tSCC zAvoid_BoolList[] =
- "|" "curses.h"
- "|" "term.h"
- "|" "tinfo.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzAvoid_BoolMachs (const char**)NULL
-#define AVOID_BOOL_TEST_CT 0
-#define aAvoid_BoolTests (tTestDesc*)NULL
-
-/*
- * Fix Command Arguments for Avoid_Bool
- */
-const char* apzAvoid_BoolPatch[] = { "sed",
- "-e" "/^#[ \t]*define[ \t][ \t]*bool[ \t][ \t]*char[ \t]*$/i\\\n"
- "#ifndef __cplusplus\n",
- "-e" "/^#[ \t]*define[ \t][ \t]*bool[ \t][ \t]*char[ \t]*$/a\\\n"
- "#endif\n",
- "-e" "/^typedef[ \t][ \t]*char[ \t][ \t]*bool[ \t]*;/i\\\n"
- "#ifndef __cplusplus\n",
- "-e" "/^typedef[ \t][ \t]*char[ \t][ \t]*bool[ \t]*;/a\\\n"
- "#endif\n",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 10 - Bad_Malloc_Decl fix
- */
-tSCC zBad_Malloc_DeclName[] =
- "Bad_Malloc_Decl";
-/*
- * File name selection pattern
- */
-tSCC zBad_Malloc_DeclList[] =
- "|" "rpc/types.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzBad_Malloc_DeclMachs (const char**)NULL
-
-/*
- * content bypass pattern
- */
-tSCC zBad_Malloc_DeclBypass0[] =
- "\"C\"";
-
-#define BAD_MALLOC_DECL_TEST_CT 1
-tTestDesc aBad_Malloc_DeclTests[] = {
- { TT_NEGREP, zBad_Malloc_DeclBypass0, (regex_t*)NULL }, };
-
-/*
- * Fix Command Arguments for Bad_Malloc_Decl
- */
-const char* apzBad_Malloc_DeclPatch[] = { "sed",
- "-e" "1i\\\n"
- "#ifdef __cplusplus\\\n"
- "extern \"C\" {\\\n"
- "#endif\\\n"
- "\n",
- "-e" "$a\\\n"
- "#ifdef __cplusplus\\\n"
- "}\\\n"
- "#endif\n",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 11 - Bad_Struct_Term fix
- */
-tSCC zBad_Struct_TermName[] =
- "Bad_Struct_Term";
-/*
- * File name selection pattern
- */
-tSCC zBad_Struct_TermList[] =
- "|" "curses.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzBad_Struct_TermMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zBad_Struct_TermSelect0[] =
- "^[ \t]*typedef[ \t]+struct[ \t]+term[ \t]*;";
-
-#define BAD_STRUCT_TERM_TEST_CT 1
-tTestDesc aBad_Struct_TermTests[] = {
- { TT_EGREP, zBad_Struct_TermSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Bad_Struct_Term
- */
-const char* apzBad_Struct_TermPatch[] = { "sed",
- "-e" "s/^[ \t]*typedef[ \t][ \t]*\\(struct[ \t][ \t]*term[ \t]*;[ \t]*\\)$/\\1/",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 12 - Badquote fix
- */
-tSCC zBadquoteName[] =
- "Badquote";
-/*
- * File name selection pattern
- */
-tSCC zBadquoteList[] =
- "|" "sundev/vuid_event.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzBadquoteMachs (const char**)NULL
-#define BADQUOTE_TEST_CT 0
-#define aBadquoteTests (tTestDesc*)NULL
-
-/*
- * Fix Command Arguments for Badquote
- */
-const char* apzBadquotePatch[] = { "sed",
- "-e" "s/doesn't/does not/",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 13 - Bad_Lval fix
- */
-tSCC zBad_LvalName[] =
- "Bad_Lval";
-/*
- * File name selection pattern
- */
-tSCC zBad_LvalList[] =
- "|" "libgen.h"
- "|" "dirent.h"
- "|" "ftw.h"
- "|" "grp.h"
- "|" "ndbm.h"
- "|" "pthread.h"
- "|" "pwd.h"
- "|" "signal.h"
- "|" "standards.h"
- "|" "stdlib.h"
- "|" "string.h"
- "|" "stropts.h"
- "|" "time.h"
- "|" "unistd.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzBad_LvalMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zBad_LvalSelect0[] =
- "^[ \t]*#[ \t]*pragma[ \t]extern_prefix";
-
-#define BAD_LVAL_TEST_CT 1
-tTestDesc aBad_LvalTests[] = {
- { TT_EGREP, zBad_LvalSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Bad_Lval
- */
-const char* apzBad_LvalPatch[] = { "sed",
- "-e" "s/^[ \t]*#[ \t]*define[ \t]*\\([^(]*\\)\\(([^)]*)\\)[ \t]*\\(_.\\)\\1\\2[ \t]*$/#define \\1 \\3\\1/",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 14 - Broken_Assert_Stdio fix
- */
-tSCC zBroken_Assert_StdioName[] =
- "Broken_Assert_Stdio";
-/*
- * File name selection pattern
- */
-tSCC zBroken_Assert_StdioList[] =
- "|" "assert.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzBroken_Assert_StdioMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zBroken_Assert_StdioSelect0[] =
- "stderr";
-
-/*
- * content bypass pattern
- */
-tSCC zBroken_Assert_StdioBypass0[] =
- "include.*stdio.h";
-
-#define BROKEN_ASSERT_STDIO_TEST_CT 2
-tTestDesc aBroken_Assert_StdioTests[] = {
- { TT_NEGREP, zBroken_Assert_StdioBypass0, (regex_t*)NULL },
- { TT_EGREP, zBroken_Assert_StdioSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Broken_Assert_Stdio
- */
-const char* apzBroken_Assert_StdioPatch[] = { "sed",
- "-e" "1i\\\n"
- "#include <stdio.h>\n",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 15 - Broken_Assert_Stdlib fix
- */
-tSCC zBroken_Assert_StdlibName[] =
- "Broken_Assert_Stdlib";
-/*
- * File name selection pattern
- */
-tSCC zBroken_Assert_StdlibList[] =
- "|" "assert.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzBroken_Assert_StdlibMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zBroken_Assert_StdlibSelect0[] =
- "exit *\\(|abort *\\(";
-
-/*
- * content bypass pattern
- */
-tSCC zBroken_Assert_StdlibBypass0[] =
- "include.*stdlib.h";
-
-#define BROKEN_ASSERT_STDLIB_TEST_CT 2
-tTestDesc aBroken_Assert_StdlibTests[] = {
- { TT_NEGREP, zBroken_Assert_StdlibBypass0, (regex_t*)NULL },
- { TT_EGREP, zBroken_Assert_StdlibSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Broken_Assert_Stdlib
- */
-const char* apzBroken_Assert_StdlibPatch[] = { "sed",
- "-e" "1i\\\n"
- "#ifdef __cplusplus\\\n"
- "#include <stdlib.h>\\\n"
- "#endif\n",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 16 - Bsd43_Io_Macros fix
- */
-tSCC zBsd43_Io_MacrosName[] =
- "Bsd43_Io_Macros";
-/*
- * File name selection pattern
- */
-#define zBsd43_Io_MacrosList (char*)NULL
-/*
- * Machine/OS name selection pattern
- */
-#define apzBsd43_Io_MacrosMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zBsd43_Io_MacrosSelect0[] =
- "BSD43__IO";
-
-#define BSD43_IO_MACROS_TEST_CT 1
-tTestDesc aBsd43_Io_MacrosTests[] = {
- { TT_EGREP, zBsd43_Io_MacrosSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Bsd43_Io_Macros
- */
-const char* apzBsd43_Io_MacrosPatch[] = { "sed",
- "-e" "/[ \t]BSD43__IO[A-Z]*[ \t]*(/s/(\\(.\\),/('\\1',/",
- "-e" "/#[ \t]*define[ \t]*[ \t]BSD43__IO/s/'\\([cgx]\\)'/\\1/g",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 17 - No_Double_Slash fix
- */
-tSCC zNo_Double_SlashName[] =
- "No_Double_Slash";
-/*
- * File name selection pattern
- */
-#define zNo_Double_SlashList (char*)NULL
-/*
- * Machine/OS name selection pattern
- */
-#define apzNo_Double_SlashMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zNo_Double_SlashSelect0[] =
- "//[^*]";
-
-/*
- * content test pattern. A shell will deal with it later.
- */
-tSCC zNo_Double_SlashTest0[] =
- "-z \"`echo ${file}|egrep '++$|\\.hh$|\\.H$'`\"";
-
-#define NO_DOUBLE_SLASH_TEST_CT 2
-tTestDesc aNo_Double_SlashTests[] = {
- { TT_TEST, zNo_Double_SlashTest0, 0 /* unused */ },
- { TT_EGREP, zNo_Double_SlashSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for No_Double_Slash
- */
-const char* apzNo_Double_SlashPatch[] = { "sed",
- "-e" "/\\/\\/[^*]/s|//.*$||g",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 18 - Irix_Bogus_Cxx_Cmnt fix
- */
-tSCC zIrix_Bogus_Cxx_CmntName[] =
- "Irix_Bogus_Cxx_Cmnt";
-/*
- * File name selection pattern
- */
-tSCC zIrix_Bogus_Cxx_CmntList[] =
- "|" "elf_abi.h"
- "|" "elf.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzIrix_Bogus_Cxx_CmntMachs (const char**)NULL
-#define IRIX_BOGUS_CXX_CMNT_TEST_CT 0
-#define aIrix_Bogus_Cxx_CmntTests (tTestDesc*)NULL
-
-/*
- * Fix Command Arguments for Irix_Bogus_Cxx_Cmnt
- */
-const char* apzIrix_Bogus_Cxx_CmntPatch[] = { "sed",
- "-e" "s@\"/\\*\"\\*/@\"//\"@",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 19 - Ecd_Cursor fix
- */
-tSCC zEcd_CursorName[] =
- "Ecd_Cursor";
-/*
- * File name selection pattern
- */
-tSCC zEcd_CursorList[] =
- "|" "sunwindow/win_lock.h"
- "|" "sunwindow/win_cursor.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzEcd_CursorMachs (const char**)NULL
-#define ECD_CURSOR_TEST_CT 0
-#define aEcd_CursorTests (tTestDesc*)NULL
-
-/*
- * Fix Command Arguments for Ecd_Cursor
- */
-const char* apzEcd_CursorPatch[] = { "sed",
- "-e" "s/ecd.cursor/ecd_cursor/",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 20 - Else_Label fix
- */
-tSCC zElse_LabelName[] =
- "Else_Label";
-/*
- * File name selection pattern
- */
-#define zElse_LabelList (char*)NULL
-/*
- * Machine/OS name selection pattern
- */
-#define apzElse_LabelMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zElse_LabelSelect0[] =
- "^[ \t]*#[ \t]*else[ \t]+[!-.0-~]";
-
-#define ELSE_LABEL_TEST_CT 1
-tTestDesc aElse_LabelTests[] = {
- { TT_EGREP, zElse_LabelSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Else_Label
- */
-const char* apzElse_LabelPatch[] = { "sed",
- "-e" ":loop\n"
- "/\\\\$/N\n"
- "s/\\\\$/\\\\+++fixinc_eol+++/\n"
- "/\\\\$/b loop\n"
- "s/\\\\+++fixinc_eol+++/\\\\/g\n"
- "s%^\\([ \t]*#[ \t]*else\\)[ \t]*/[^*].*%\\1%\n"
- "s%^\\([ \t]*#[ \t]*else\\)[ \t]*[^/ \t].*%\\1%",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 21 - Endif_Label fix
- */
-tSCC zEndif_LabelName[] =
- "Endif_Label";
-/*
- * File name selection pattern
- */
-#define zEndif_LabelList (char*)NULL
-/*
- * Machine/OS name selection pattern
- */
-#define apzEndif_LabelMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zEndif_LabelSelect0[] =
- "^[ \t]*#[ \t]*endif[ \t]+[!-.0-z{|}~]";
-
-#define ENDIF_LABEL_TEST_CT 1
-tTestDesc aEndif_LabelTests[] = {
- { TT_EGREP, zEndif_LabelSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Endif_Label
- */
-const char* apzEndif_LabelPatch[] = { "sed",
- "-e" ":loop\n"
- "/\\\\$/N\n"
- "s/\\\\$/\\\\+++fixinc_eol+++/\n"
- "/\\\\$/b loop\n"
- "s/\\\\+++fixinc_eol+++/\\\\/g\n"
- "s%^\\([ \t]*#[ \t]*endif\\)[ \t]*/[^*].*%\\1%\n"
- "s%^\\([ \t]*#[ \t]*endif\\)[ \t]*\\*[^/].*%\\1%\n"
- "s%^\\([ \t]*#[ \t]*endif\\)[ \t]*[^/* \t].*%\\1%",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 22 - Hp_Inline fix
- */
-tSCC zHp_InlineName[] =
- "Hp_Inline";
-/*
- * File name selection pattern
- */
-tSCC zHp_InlineList[] =
- "|" "sys/spinlock.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzHp_InlineMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zHp_InlineSelect0[] =
- "include.*\"\\.\\./machine/";
-
-#define HP_INLINE_TEST_CT 1
-tTestDesc aHp_InlineTests[] = {
- { TT_EGREP, zHp_InlineSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Hp_Inline
- */
-const char* apzHp_InlinePatch[] = { "sed",
- "-e" "s,\"../machine/inline.h\",<machine/inline.h>,",
- "-e" "s,\"../machine/psl.h\",<machine/psl.h>,",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 23 - Hp_Sysfile fix
- */
-tSCC zHp_SysfileName[] =
- "Hp_Sysfile";
-/*
- * File name selection pattern
- */
-tSCC zHp_SysfileList[] =
- "|" "sys/file.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzHp_SysfileMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zHp_SysfileSelect0[] =
- "HPUX_SOURCE";
-
-#define HP_SYSFILE_TEST_CT 1
-tTestDesc aHp_SysfileTests[] = {
- { TT_EGREP, zHp_SysfileSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Hp_Sysfile
- */
-const char* apzHp_SysfilePatch[] = { "sed",
- "-e" "s/(\\.\\.\\.)/(struct file * ...)/",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 24 - Hpux_Cxx_Unready fix
- */
-tSCC zHpux_Cxx_UnreadyName[] =
- "Hpux_Cxx_Unready";
-/*
- * File name selection pattern
- */
-tSCC zHpux_Cxx_UnreadyList[] =
- "|" "sys/mman.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzHpux_Cxx_UnreadyMachs (const char**)NULL
-
-/*
- * content bypass pattern
- */
-tSCC zHpux_Cxx_UnreadyBypass0[] =
- "\"C\"|__BEGIN_DECLS";
-
-#define HPUX_CXX_UNREADY_TEST_CT 1
-tTestDesc aHpux_Cxx_UnreadyTests[] = {
- { TT_NEGREP, zHpux_Cxx_UnreadyBypass0, (regex_t*)NULL }, };
-
-/*
- * Fix Command Arguments for Hpux_Cxx_Unready
- */
-const char* apzHpux_Cxx_UnreadyPatch[] = { "sed",
- "-e" "1i\\\n"
- "#ifdef __cplusplus\\\n"
- "extern \"C\" {\\\n"
- "#endif\\\n"
- "\n",
- "-e" "$a\\\n"
- "#ifdef __cplusplus\\\n"
- "}\\\n"
- "#endif\n",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 25 - Hpux_Maxint fix
- */
-tSCC zHpux_MaxintName[] =
- "Hpux_Maxint";
-/*
- * File name selection pattern
- */
-tSCC zHpux_MaxintList[] =
- "|" "sys/param.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzHpux_MaxintMachs (const char**)NULL
-#define HPUX_MAXINT_TEST_CT 0
-#define aHpux_MaxintTests (tTestDesc*)NULL
-
-/*
- * Fix Command Arguments for Hpux_Maxint
- */
-const char* apzHpux_MaxintPatch[] = { "sed",
- "-e" "/^#[ \t]*define[ \t]*MAXINT[ \t]/i\\\n"
- "#ifndef MAXINT\n",
- "-e" "/^#[ \t]*define[ \t]*MAXINT[ \t]/a\\\n"
- "#endif\n",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 26 - Hpux_Systime fix
- */
-tSCC zHpux_SystimeName[] =
- "Hpux_Systime";
-/*
- * File name selection pattern
- */
-tSCC zHpux_SystimeList[] =
- "|" "sys/time.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzHpux_SystimeMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zHpux_SystimeSelect0[] =
- "^extern struct sigevent;";
-
-#define HPUX_SYSTIME_TEST_CT 1
-tTestDesc aHpux_SystimeTests[] = {
- { TT_EGREP, zHpux_SystimeSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Hpux_Systime
- */
-const char* apzHpux_SystimePatch[] = { "sed",
- "-e" "s/^extern struct sigevent;/struct sigevent;/",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 27 - Interactv_Add1 fix
- */
-tSCC zInteractv_Add1Name[] =
- "Interactv_Add1";
-/*
- * File name selection pattern
- */
-tSCC zInteractv_Add1List[] =
- "|" "stdio.h"
- "|" "math.h"
- "|" "ctype.h"
- "|" "sys/limits.h"
- "|" "sys/fcntl.h"
- "|" "sys/dirent.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzInteractv_Add1Machs (const char**)NULL
-
-/*
- * content test pattern. A shell will deal with it later.
- */
-tSCC zInteractv_Add1Test0[] =
- "-d /etc/conf/kconfig.d";
-tSCC zInteractv_Add1Test1[] =
- "-n \"`grep _POSIX_VERSION /usr/include/sys/unistd.h`\"";
-
-#define INTERACTV_ADD1_TEST_CT 2
-tTestDesc aInteractv_Add1Tests[] = {
- { TT_TEST, zInteractv_Add1Test0, 0 /* unused */ },
- { TT_TEST, zInteractv_Add1Test1, 0 /* unused */ }, };
-
-/*
- * Fix Command Arguments for Interactv_Add1
- */
-const char* apzInteractv_Add1Patch[] = { "sed",
- "-e" "s/!defined(__STDC__) && !defined(_POSIX_SOURCE)/!defined(_POSIX_SOURCE)/",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 28 - Interactv_Add2 fix
- */
-tSCC zInteractv_Add2Name[] =
- "Interactv_Add2";
-/*
- * File name selection pattern
- */
-tSCC zInteractv_Add2List[] =
- "|" "math.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzInteractv_Add2Machs (const char**)NULL
-
-/*
- * content test pattern. A shell will deal with it later.
- */
-tSCC zInteractv_Add2Test0[] =
- "-d /etc/conf/kconfig.d";
-tSCC zInteractv_Add2Test1[] =
- "-n \"`grep _POSIX_VERSION /usr/include/sys/unistd.h`\"";
-
-#define INTERACTV_ADD2_TEST_CT 2
-tTestDesc aInteractv_Add2Tests[] = {
- { TT_TEST, zInteractv_Add2Test0, 0 /* unused */ },
- { TT_TEST, zInteractv_Add2Test1, 0 /* unused */ }, };
-
-/*
- * Fix Command Arguments for Interactv_Add2
- */
-const char* apzInteractv_Add2Patch[] = { "sed",
- "-e" "s/fmod(double)/fmod(double, double)/",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 29 - Interactv_Add3 fix
- */
-tSCC zInteractv_Add3Name[] =
- "Interactv_Add3";
-/*
- * File name selection pattern
- */
-tSCC zInteractv_Add3List[] =
- "|" "sys/limits.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzInteractv_Add3Machs (const char**)NULL
-
-/*
- * content test pattern. A shell will deal with it later.
- */
-tSCC zInteractv_Add3Test0[] =
- "-d /etc/conf/kconfig.d";
-tSCC zInteractv_Add3Test1[] =
- "-n \"`grep _POSIX_VERSION /usr/include/sys/unistd.h`\"";
-
-#define INTERACTV_ADD3_TEST_CT 2
-tTestDesc aInteractv_Add3Tests[] = {
- { TT_TEST, zInteractv_Add3Test0, 0 /* unused */ },
- { TT_TEST, zInteractv_Add3Test1, 0 /* unused */ }, };
-
-/*
- * Fix Command Arguments for Interactv_Add3
- */
-const char* apzInteractv_Add3Patch[] = { "sed",
- "-e" "/CHILD_MAX/s,/\\* Max, Max,",
- "-e" "/OPEN_MAX/s,/\\* Max, Max,",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 30 - Io_Def_Quotes fix
- */
-tSCC zIo_Def_QuotesName[] =
- "Io_Def_Quotes";
-/*
- * File name selection pattern
- */
-#define zIo_Def_QuotesList (char*)NULL
-/*
- * Machine/OS name selection pattern
- */
-#define apzIo_Def_QuotesMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zIo_Def_QuotesSelect0[] =
- "[ \t]_IO[A-Z]*[ \t]*\\([A-Za-z]";
-
-#define IO_DEF_QUOTES_TEST_CT 1
-tTestDesc aIo_Def_QuotesTests[] = {
- { TT_EGREP, zIo_Def_QuotesSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Io_Def_Quotes
- */
-const char* apzIo_Def_QuotesPatch[] = { "sed",
- "-e" "s/\\([ \t]_IO[A-Z]*[ \t]*(\\)\\([A-Za-z]\\),/\\1'\\2',/",
- "-e" "/#[ \t]*define[ \t]*[ \t]_IO/s/'\\([cgxtf]\\)'/\\1/g",
- "-e" "/#[ \t]*define[ \t]*[ \t]DESIOC/s/'\\([cdgx]\\)'/\\1/g",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 31 - Ioctl_Fix_Ctrl fix
- */
-tSCC zIoctl_Fix_CtrlName[] =
- "Ioctl_Fix_Ctrl";
-/*
- * File name selection pattern
- */
-#define zIoctl_Fix_CtrlList (char*)NULL
-/*
- * Machine/OS name selection pattern
- */
-#define apzIoctl_Fix_CtrlMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zIoctl_Fix_CtrlSelect0[] =
- "CTRL[ \t]";
-
-#define IOCTL_FIX_CTRL_TEST_CT 1
-tTestDesc aIoctl_Fix_CtrlTests[] = {
- { TT_EGREP, zIoctl_Fix_CtrlSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Ioctl_Fix_Ctrl
- */
-const char* apzIoctl_Fix_CtrlPatch[] = { "sed",
- "-e" "/[^A-Z0-9_]CTRL[ \t]*(/s/\\([^']\\))/'\\1')/",
- "-e" "/[^A-Z0-9]_CTRL[ \t]*(/s/\\([^']\\))/'\\1')/",
- "-e" "/#[ \t]*define[ \t]*[ \t]CTRL/s/'\\([cgx]\\)'/\\1/g",
- "-e" "/#[ \t]*define[ \t]*[ \t]_CTRL/s/'\\([cgx]\\)'/\\1/g",
- "-e" "/#[ \t]*define[ \t]*[ \t]BSD43_CTRL/s/'\\([cgx]\\)'/\\1/g",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 32 - Ip_Missing_Semi fix
- */
-tSCC zIp_Missing_SemiName[] =
- "Ip_Missing_Semi";
-/*
- * File name selection pattern
- */
-tSCC zIp_Missing_SemiList[] =
- "|" "netinet/ip.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzIp_Missing_SemiMachs (const char**)NULL
-#define IP_MISSING_SEMI_TEST_CT 0
-#define aIp_Missing_SemiTests (tTestDesc*)NULL
-
-/*
- * Fix Command Arguments for Ip_Missing_Semi
- */
-const char* apzIp_Missing_SemiPatch[] = { "sed",
- "-e" "/^struct/,/^};/s/}$/};/",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 33 - Irix_Multiline_Cmnt fix
- */
-tSCC zIrix_Multiline_CmntName[] =
- "Irix_Multiline_Cmnt";
-/*
- * File name selection pattern
- */
-tSCC zIrix_Multiline_CmntList[] =
- "|" "sys/types.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzIrix_Multiline_CmntMachs (const char**)NULL
-#define IRIX_MULTILINE_CMNT_TEST_CT 0
-#define aIrix_Multiline_CmntTests (tTestDesc*)NULL
-
-/*
- * Fix Command Arguments for Irix_Multiline_Cmnt
- */
-const char* apzIrix_Multiline_CmntPatch[] = { "sed",
- "-e" "s@type of the result@type of the result */@",
- "-e" "s@of the sizeof@/* of the sizeof@",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 34 - Irix_Sockaddr fix
- */
-tSCC zIrix_SockaddrName[] =
- "Irix_Sockaddr";
-/*
- * File name selection pattern
- */
-tSCC zIrix_SockaddrList[] =
- "|" "rpc/auth.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzIrix_SockaddrMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zIrix_SockaddrSelect0[] =
- "authdes_create.*struct sockaddr";
-
-#define IRIX_SOCKADDR_TEST_CT 1
-tTestDesc aIrix_SockaddrTests[] = {
- { TT_EGREP, zIrix_SockaddrSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Irix_Sockaddr
- */
-const char* apzIrix_SockaddrPatch[] = { "sed",
- "-e" "/authdes_create.*struct sockaddr/i\\\n"
- "struct sockaddr;\n",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 35 - Irix_Struct__File fix
- */
-tSCC zIrix_Struct__FileName[] =
- "Irix_Struct__File";
-/*
- * File name selection pattern
- */
-tSCC zIrix_Struct__FileList[] =
- "|" "rpc/xdr.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzIrix_Struct__FileMachs (const char**)NULL
-#define IRIX_STRUCT__FILE_TEST_CT 0
-#define aIrix_Struct__FileTests (tTestDesc*)NULL
-
-/*
- * Fix Command Arguments for Irix_Struct__File
- */
-const char* apzIrix_Struct__FilePatch[] = { "sed",
- "-e" "/xdrstdio_create.*struct __file_s/i\\\n"
- "struct __file_s;\n",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 36 - Isc_Fmod fix
- */
-tSCC zIsc_FmodName[] =
- "Isc_Fmod";
-/*
- * File name selection pattern
- */
-tSCC zIsc_FmodList[] =
- "|" "math.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzIsc_FmodMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zIsc_FmodSelect0[] =
- "fmod\\(double\\)";
-
-#define ISC_FMOD_TEST_CT 1
-tTestDesc aIsc_FmodTests[] = {
- { TT_EGREP, zIsc_FmodSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Isc_Fmod
- */
-const char* apzIsc_FmodPatch[] = { "sed",
- "-e" "s/fmod(double)/fmod(double, double)/",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 37 - Motorola_Nested fix
- */
-tSCC zMotorola_NestedName[] =
- "Motorola_Nested";
-/*
- * File name selection pattern
- */
-tSCC zMotorola_NestedList[] =
- "|" "limits.h"
- "|" "sys/limits.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzMotorola_NestedMachs (const char**)NULL
-#define MOTOROLA_NESTED_TEST_CT 0
-#define aMotorola_NestedTests (tTestDesc*)NULL
-
-/*
- * Fix Command Arguments for Motorola_Nested
- */
-const char* apzMotorola_NestedPatch[] = { "sed",
- "-e" "s@^\\(#undef[ \t][ \t]*PIPE_BUF[ \t]*/\\* max # bytes atomic in write to a\\)$@\\1 */@",
- "-e" "s@\\(/\\*#define\tHUGE_VAL\t3.40282346638528860e+38 \\)\\(/\\*error value returned by Math lib\\*/\\)$@\\1*/ \\2@",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 38 - Isc_Sys_Limits fix
- */
-tSCC zIsc_Sys_LimitsName[] =
- "Isc_Sys_Limits";
-/*
- * File name selection pattern
- */
-tSCC zIsc_Sys_LimitsList[] =
- "|" "sys/limits.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzIsc_Sys_LimitsMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zIsc_Sys_LimitsSelect0[] =
- "CHILD_MAX";
-
-#define ISC_SYS_LIMITS_TEST_CT 1
-tTestDesc aIsc_Sys_LimitsTests[] = {
- { TT_EGREP, zIsc_Sys_LimitsSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Isc_Sys_Limits
- */
-const char* apzIsc_Sys_LimitsPatch[] = { "sed",
- "-e" "/CHILD_MAX/s,/\\* Max, Max,",
- "-e" "/OPEN_MAX/s,/\\* Max, Max,",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 39 - Kandr_Concat fix
- */
-tSCC zKandr_ConcatName[] =
- "Kandr_Concat";
-/*
- * File name selection pattern
- */
-tSCC zKandr_ConcatList[] =
- "|" "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"
- "|" "arm/as_support.h"
- "|" "arm/mc_type.h"
- "|" "arm/xcb.h"
- "|" "dev/chardefmac.h"
- "|" "dev/ps_irq.h"
- "|" "dev/screen.h"
- "|" "dev/scsi.h"
- "|" "sys/tty.h"
- "|" "Xm.acorn/XmP.h"
- "|" "bsd43/bsd43_.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzKandr_ConcatMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zKandr_ConcatSelect0[] =
- "/\\*\\*/";
-
-#define KANDR_CONCAT_TEST_CT 1
-tTestDesc aKandr_ConcatTests[] = {
- { TT_EGREP, zKandr_ConcatSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Kandr_Concat
- */
-const char* apzKandr_ConcatPatch[] = { "sed",
- "-e" "s|/\\*\\*/| ## |g",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 40 - Limits_Ifndefs fix
- */
-tSCC zLimits_IfndefsName[] =
- "Limits_Ifndefs";
-/*
- * File name selection pattern
- */
-tSCC zLimits_IfndefsList[] =
- "|" "limits.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzLimits_IfndefsMachs (const char**)NULL
-
-/*
- * content bypass pattern
- */
-tSCC zLimits_IfndefsBypass0[] =
- "ifndef[ \t]+FLT_MIN";
-
-#define LIMITS_IFNDEFS_TEST_CT 1
-tTestDesc aLimits_IfndefsTests[] = {
- { TT_NEGREP, zLimits_IfndefsBypass0, (regex_t*)NULL }, };
-
-/*
- * Fix Command Arguments for Limits_Ifndefs
- */
-const char* apzLimits_IfndefsPatch[] = { "sed",
- "-e" "/[ \t]FLT_MIN[ \t]/i\\\n"
- "#ifndef FLT_MIN\n",
- "-e" "/[ \t]FLT_MIN[ \t]/a\\\n"
- "#endif\n",
- "-e" "/[ \t]FLT_MAX[ \t]/i\\\n"
- "#ifndef FLT_MAX\n",
- "-e" "/[ \t]FLT_MAX[ \t]/a\\\n"
- "#endif\n",
- "-e" "/[ \t]FLT_DIG[ \t]/i\\\n"
- "#ifndef FLT_DIG\n",
- "-e" "/[ \t]FLT_DIG[ \t]/a\\\n"
- "#endif\n",
- "-e" "/[ \t]DBL_MIN[ \t]/i\\\n"
- "#ifndef DBL_MIN\n",
- "-e" "/[ \t]DBL_MIN[ \t]/a\\\n"
- "#endif\n",
- "-e" "/[ \t]DBL_MAX[ \t]/i\\\n"
- "#ifndef DBL_MAX\n",
- "-e" "/[ \t]DBL_MAX[ \t]/a\\\n"
- "#endif\n",
- "-e" "/[ \t]DBL_DIG[ \t]/i\\\n"
- "#ifndef DBL_DIG\n",
- "-e" "/[ \t]DBL_DIG[ \t]/a\\\n"
- "#endif\n",
- "-e" "/^\\(\\/\\*#define\tHUGE_VAL\t3\\.[0-9e+]* *\\)\\/\\*/s//\\1/",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 41 - Lynx_Void_Int fix
- */
-tSCC zLynx_Void_IntName[] =
- "Lynx_Void_Int";
-/*
- * File name selection pattern
- */
-tSCC zLynx_Void_IntList[] =
- "|" "curses.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzLynx_Void_IntMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zLynx_Void_IntSelect0[] =
- "#[ \t]*define[ \t]+void[ \t]+int";
-
-#define LYNX_VOID_INT_TEST_CT 1
-tTestDesc aLynx_Void_IntTests[] = {
- { TT_EGREP, zLynx_Void_IntSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Lynx_Void_Int
- */
-const char* apzLynx_Void_IntPatch[] = { "sed",
- "-e" "/#[ \t]*define[ \t][ \t]*void[ \t]int/d",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 42 - Lynxos_Fcntl_Proto fix
- */
-tSCC zLynxos_Fcntl_ProtoName[] =
- "Lynxos_Fcntl_Proto";
-/*
- * File name selection pattern
- */
-tSCC zLynxos_Fcntl_ProtoList[] =
- "|" "fcntl.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzLynxos_Fcntl_ProtoMachs (const char**)NULL
-#define LYNXOS_FCNTL_PROTO_TEST_CT 0
-#define aLynxos_Fcntl_ProtoTests (tTestDesc*)NULL
-
-/*
- * Fix Command Arguments for Lynxos_Fcntl_Proto
- */
-const char* apzLynxos_Fcntl_ProtoPatch[] = { "sed",
- "-e" "s/\\(fcntl.*(int, int, \\)int)/\\1...)/",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 43 - M88k_Bad_Hypot_Opt fix
- */
-tSCC zM88k_Bad_Hypot_OptName[] =
- "M88k_Bad_Hypot_Opt";
-/*
- * File name selection pattern
- */
-tSCC zM88k_Bad_Hypot_OptList[] =
- "|" "math.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-tSCC* apzM88k_Bad_Hypot_OptMachs[] = {
- "m88k-motorola-sysv3*",
- (const char*)NULL };
-#define M88K_BAD_HYPOT_OPT_TEST_CT 0
-#define aM88k_Bad_Hypot_OptTests (tTestDesc*)NULL
-
-/*
- * Fix Command Arguments for M88k_Bad_Hypot_Opt
- */
-const char* apzM88k_Bad_Hypot_OptPatch[] = { "sed",
- "-e" "s/extern double floor(), ceil(), fmod(), fabs();/extern double floor(), ceil(), fmod(), fabs _PARAMS((double));/",
- "-e" "/^extern double hypot();$/a\\\n"
- "\\/* Workaround a stupid Motorola optimization if one\\\n"
- " of x or y is 0.0 and the other is negative! *\\/\\\n"
- "#ifdef __STDC__\\\n"
- "static __inline__ double fake_hypot (double x, double y)\\\n"
- "#else\\\n"
- "static __inline__ double fake_hypot (x, y)\\\n"
- "\tdouble x, y;\\\n"
- "#endif\\\n"
- "{\\\n"
- "\treturn fabs (hypot (x, y));\\\n"
- "}\\\n"
- "#define hypot\tfake_hypot\n",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 44 - M88k_Bad_S_If fix
- */
-tSCC zM88k_Bad_S_IfName[] =
- "M88k_Bad_S_If";
-/*
- * File name selection pattern
- */
-tSCC zM88k_Bad_S_IfList[] =
- "|" "sys/stat.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-tSCC* apzM88k_Bad_S_IfMachs[] = {
- "m88k-*-sysv3*",
- (const char*)NULL };
-
-/*
- * content selection pattern
- */
-tSCC zM88k_Bad_S_IfSelect0[] =
- "#define[ \t]+S_IS[A-Z]*(m)[ \t]";
-
-#define M88K_BAD_S_IF_TEST_CT 1
-tTestDesc aM88k_Bad_S_IfTests[] = {
- { TT_EGREP, zM88k_Bad_S_IfSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for M88k_Bad_S_If
- */
-const char* apzM88k_Bad_S_IfPatch[] = { "sed",
- "-e" "s/^\\(#define[ \t]*S_IS[A-Z]*(m)\\)[ \t]*(m[ \t]*&[ \t]*\\(S_IF[A-Z][A-Z][A-Z][A-Z]*\\)[ \t]*)/\\1 (((m)\\&S_IFMT)==\\2)/",
- "-e" "s/^\\(#define[ \t]*S_IS[A-Z]*(m)\\)[ \t]*(m[ \t]*&[ \t]*\\(0[0-9]*\\)[ \t]*)/\\1 (((m)\\&S_IFMT)==\\2)/",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 45 - M88k_Multi_Incl fix
- */
-tSCC zM88k_Multi_InclName[] =
- "M88k_Multi_Incl";
-/*
- * File name selection pattern
- */
-tSCC zM88k_Multi_InclList[] =
- "|" "time.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-tSCC* apzM88k_Multi_InclMachs[] = {
- "m88k-tektronix-sysv3*",
- (const char*)NULL };
-
-/*
- * content bypass pattern
- */
-tSCC zM88k_Multi_InclBypass0[] =
- "#ifndef";
-
-#define M88K_MULTI_INCL_TEST_CT 1
-tTestDesc aM88k_Multi_InclTests[] = {
- { TT_NEGREP, zM88k_Multi_InclBypass0, (regex_t*)NULL }, };
-
-/*
- * Fix Command Arguments for M88k_Multi_Incl
- */
-const char* apzM88k_Multi_InclPatch[] = { "sh", "-c",
- "echo Fixing $file, to protect against multiple inclusion. >&2\n"
- " cpp_wrapper=`echo $file | sed -e 's,\\.,_,g' -e 's,/,_,g'`\n"
- " sed -e \"1i\\\n"
- "#ifndef __GCC_GOT_${cpp_wrapper}_\\\n"
- "#define __GCC_GOT_${cpp_wrapper}_\\\n"
- "\" \\\n"
- "\t-e \"$a\\\n"
- "#endif /* ! __GCC_GOT_${cpp_wrapper}_ */\n"
- "\"",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 46 - Machine_Name fix
- */
-tSCC zMachine_NameName[] =
- "Machine_Name";
-/*
- * File name selection pattern
- */
-#define zMachine_NameList (char*)NULL
-/*
- * Machine/OS name selection pattern
- */
-#define apzMachine_NameMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zMachine_NameSelect0[] =
- "^#[ \t]*(if|elif).*[^a-zA-Z0-9_](M32|_*(MIPSE[LB]|SYSTYPE_[A-Z0-9]|[Rr][34]000|host_mips|i386|mips)($|[^a-zA-Z0-9_])|bsd4|is68k|m[68]8k|mc680|news|ns32000|pdp11|pyr|sel|sony_news|sparc|sun|tahoe|tower|u370|u3b|unix|vax)";
-
-#define MACHINE_NAME_TEST_CT 1
-tTestDesc aMachine_NameTests[] = {
- { TT_EGREP, zMachine_NameSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Machine_Name
- */
-const char* apzMachine_NamePatch[] = { "sed",
- "-e" ":loop\n"
- "/\\\\$/N\n"
- "s/\\\\$/\\\\+++fixinc_eol+++/\n"
- "/\\\\$/b loop\n"
- "s/\\\\+++fixinc_eol+++/\\\\/g\n"
- "/#[\t ]*[el]*if/ {\n"
- "\ts/[a-zA-Z0-9_][a-zA-Z0-9_]*/ & /g\n"
- "\ts/ M32 / __M32__ /g\n"
- "\ts/ _*MIPSE\\([LB]\\) / __MIPSE\\1__ /g\n"
- "\ts/ _*SYSTYPE_\\([A-Z0-9]*\\) / __SYSTYPE_\\1__ /g\n"
- "\ts/ _*\\([Rr][34]\\)000 / __\\1000__ /g\n"
- "\ts/ _*host_mips / __host_mips__ /g\n"
- "\ts/ _*i386 / __i386__ /g\n"
- "\ts/ _*mips / __mips__ /g\n"
- "\ts/ bsd4\\([0-9]\\) / __bsd4\\1__ /g\n"
- "\ts/ is68k / __is68k__ /g\n"
- "\ts/ m68k / __m68k__ /g\n"
- "\ts/ m88k / __m88k__ /g\n"
- "\ts/ mc680\\([0-9]\\)0 / __mc680\\10__ /g\n"
- "\ts/ news\\([0-9]*\\) / __news\\1__ /g\n"
- "\ts/ ns32000 / __ns32000__ /g\n"
- "\ts/ pdp11 / __pdp11__ /g\n"
- "\ts/ pyr / __pyr__ /g\n"
- "\ts/ sel / __sel__ /g\n"
- "\ts/ sony_news / __sony_news__ /g\n"
- "\ts/ sparc / __sparc__ /g\n"
- "\ts/ sun\\([a-z0-9]*\\) / __sun\\1__ /g\n"
- "\ts/ tahoe / __tahoe__ /g\n"
- "\ts/ tower\\([_0-9]*\\) / __tower\\1__ /g\n"
- "\ts/ u370 / __u370__ /g\n"
- "\ts/ u3b\\([0-9]*\\) / __u3b\\1__ /g\n"
- "\ts/ unix / __unix__ /g\n"
- "\ts/ vax / __vax__ /g\n"
- "\ts/ \\([a-zA-Z0-9_][a-zA-Z0-9_]*\\) /\\1/g\n"
- "\t}",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 47 - Math_Exception fix
- */
-tSCC zMath_ExceptionName[] =
- "Math_Exception";
-/*
- * File name selection pattern
- */
-tSCC zMath_ExceptionList[] =
- "|" "math.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzMath_ExceptionMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zMath_ExceptionSelect0[] =
- "struct exception";
-
-#define MATH_EXCEPTION_TEST_CT 1
-tTestDesc aMath_ExceptionTests[] = {
- { TT_EGREP, zMath_ExceptionSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Math_Exception
- */
-const char* apzMath_ExceptionPatch[] = { "sed",
- "-e" "/struct exception/i\\\n"
- "#ifdef __cplusplus\\\n"
- "#define exception __math_exception\\\n"
- "#endif\n",
- "-e" "/struct exception/a\\\n"
- "#ifdef __cplusplus\\\n"
- "#undef exception\\\n"
- "#endif\n",
- "-e" "/matherr/i\\\n"
- "#ifdef __cplusplus\\\n"
- "#define exception __math_exception\\\n"
- "#endif\n",
- "-e" "/matherr/a\\\n"
- "#ifdef __cplusplus\\\n"
- "#undef exception\\\n"
- "#endif\n",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 48 - Math_Gcc_Ifndefs fix
- */
-tSCC zMath_Gcc_IfndefsName[] =
- "Math_Gcc_Ifndefs";
-/*
- * File name selection pattern
- */
-tSCC zMath_Gcc_IfndefsList[] =
- "|" "math.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzMath_Gcc_IfndefsMachs (const char**)NULL
-#define MATH_GCC_IFNDEFS_TEST_CT 0
-#define aMath_Gcc_IfndefsTests (tTestDesc*)NULL
-
-/*
- * Fix Command Arguments for Math_Gcc_Ifndefs
- */
-const char* apzMath_Gcc_IfndefsPatch[] = { "sh", "-c",
- " dbl_max_def=\"`egrep 'define[ \t]+DBL_MAX[ \t]+.*' ${SRCDIR}/float.h 2>/dev/null`\"\n"
- "\n"
- "\tif ( test -n \"${dbl_max_def}\" \\\n"
- "\t\t-a -n \"`egrep '#define[ \t]*HUGE_VAL[ \t]+DBL_MAX' $file`\" \\\n"
- "\t\t-a -z \"`egrep '#define[ \t]+DBL_MAX[ \t]+' $file`\"\n"
- "\t ) > /dev/null 2>&1\n"
- "\tthen sed -e '/define[ \t]HUGE_VAL[ \t]/i\\\n"
- "#ifndef HUGE_VAL\n"
- "' \\\n"
- "\t-e '/define[ \t]HUGE_VAL[ \t]/a\\\n"
- "#endif\n"
- "'\\\n"
- "\t-e \"/define[ \t]HUGE_VAL[ \t]DBL_MAX/s/DBL_MAX/$dbl_max_def/\"\n"
- "\telse sed -e '/define[ \t]HUGE_VAL[ \t]/i\\\n"
- "#ifndef HUGE_VAL\n"
- "' \\\n"
- "\t-e '/define[ \t]HUGE_VAL[ \t]/a\\\n"
- "#endif\n"
- "'\n"
- "\tfi",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 49 - Motorola_Stupid_Opt fix
- */
-tSCC zMotorola_Stupid_OptName[] =
- "Motorola_Stupid_Opt";
-/*
- * File name selection pattern
- */
-tSCC zMotorola_Stupid_OptList[] =
- "|" "math.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-tSCC* apzMotorola_Stupid_OptMachs[] = {
- "m88k-motorola-sysv3*",
- (const char*)NULL };
-
-/*
- * content selection pattern
- */
-tSCC zMotorola_Stupid_OptSelect0[] =
- "^extern double hypot();$";
-
-#define MOTOROLA_STUPID_OPT_TEST_CT 1
-tTestDesc aMotorola_Stupid_OptTests[] = {
- { TT_EGREP, zMotorola_Stupid_OptSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Motorola_Stupid_Opt
- */
-const char* apzMotorola_Stupid_OptPatch[] = { "sed",
- "-e" "/^extern double hypot();$/a\\\n"
- "\\/* Workaround a stupid Motorola optimization if one\\\n"
- " of x or y is 0.0 and the other is negative! *\\/\\\n"
- "#ifdef __STDC__\\\n"
- "static __inline__ double fake_hypot (double x, double y)\\\n"
- "#else\\\n"
- "static __inline__ double fake_hypot (x, y)\\\n"
- "\tdouble x, y;\\\n"
- "#endif\\\n"
- "{\\\n"
- "\treturn fabs (hypot (x, y));\\\n"
- "}\\\n"
- "#define hypot\tfake_hypot\n",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 50 - Nested_Comment fix
- */
-tSCC zNested_CommentName[] =
- "Nested_Comment";
-/*
- * File name selection pattern
- */
-tSCC zNested_CommentList[] =
- "|" "rpc/rpc.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzNested_CommentMachs (const char**)NULL
-#define NESTED_COMMENT_TEST_CT 0
-#define aNested_CommentTests (tTestDesc*)NULL
-
-/*
- * Fix Command Arguments for Nested_Comment
- */
-const char* apzNested_CommentPatch[] = { "sed",
- "-e" "s@^\\(/\\*.*rpc/auth_des.h>.*\\)/\\*@\\1*/ /*@",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 51 - News_Os_Recursion fix
- */
-tSCC zNews_Os_RecursionName[] =
- "News_Os_Recursion";
-/*
- * File name selection pattern
- */
-tSCC zNews_Os_RecursionList[] =
- "|" "stdlib.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzNews_Os_RecursionMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zNews_Os_RecursionSelect0[] =
- "#include <stdlib.h>";
-
-#define NEWS_OS_RECURSION_TEST_CT 1
-tTestDesc aNews_Os_RecursionTests[] = {
- { TT_EGREP, zNews_Os_RecursionSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for News_Os_Recursion
- */
-const char* apzNews_Os_RecursionPatch[] = { "sed",
- "-e" "/^#include <stdlib.h>/i\\\n"
- "#ifdef BOGUS_RECURSION\n",
- "-e" "/^#include <stdlib.h>/a\\\n"
- "#endif\n",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 52 - Next_Math_Prefix fix
- */
-tSCC zNext_Math_PrefixName[] =
- "Next_Math_Prefix";
-/*
- * File name selection pattern
- */
-tSCC zNext_Math_PrefixList[] =
- "|" "ansi/math.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzNext_Math_PrefixMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zNext_Math_PrefixSelect0[] =
- "^extern.*double.*__const__.*";
-
-#define NEXT_MATH_PREFIX_TEST_CT 1
-tTestDesc aNext_Math_PrefixTests[] = {
- { TT_EGREP, zNext_Math_PrefixSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Next_Math_Prefix
- */
-const char* apzNext_Math_PrefixPatch[] = { "sed",
- "-e" "/^extern.*double.*__const__.*sqrt(/s/__const__//",
- "-e" "/^extern.*double.*__const__.*fabs(/s/__const__//",
- "-e" "/^extern.*double.*__const__.*cos(/s/__const__//",
- "-e" "/^extern.*double.*__const__.*hypot(/s/__const__//",
- "-e" "/^extern.*double.*__const__.*sin(/s/__const__//",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 53 - Next_Template fix
- */
-tSCC zNext_TemplateName[] =
- "Next_Template";
-/*
- * File name selection pattern
- */
-tSCC zNext_TemplateList[] =
- "|" "bsd/libc.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzNext_TemplateMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zNext_TemplateSelect0[] =
- "template";
-
-#define NEXT_TEMPLATE_TEST_CT 1
-tTestDesc aNext_TemplateTests[] = {
- { TT_EGREP, zNext_TemplateSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Next_Template
- */
-const char* apzNext_TemplatePatch[] = { "sed",
- "-e" "/\\(.*template\\)/s/template//",
- "-e" "/extern.*volatile.*void.*abort/s/volatile//",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 54 - Next_Volitile fix
- */
-tSCC zNext_VolitileName[] =
- "Next_Volitile";
-/*
- * File name selection pattern
- */
-tSCC zNext_VolitileList[] =
- "|" "ansi/stdlib.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzNext_VolitileMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zNext_VolitileSelect0[] =
- "volatile";
-
-#define NEXT_VOLITILE_TEST_CT 1
-tTestDesc aNext_VolitileTests[] = {
- { TT_EGREP, zNext_VolitileSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Next_Volitile
- */
-const char* apzNext_VolitilePatch[] = { "sed",
- "-e" "/extern.*volatile.*void.*exit/s/volatile//",
- "-e" "/extern.*volatile.*void.*abort/s/volatile//",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 55 - Next_Wait_Union fix
- */
-tSCC zNext_Wait_UnionName[] =
- "Next_Wait_Union";
-/*
- * File name selection pattern
- */
-tSCC zNext_Wait_UnionList[] =
- "|" "sys/wait.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzNext_Wait_UnionMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zNext_Wait_UnionSelect0[] =
- "wait\\(union wait";
-
-#define NEXT_WAIT_UNION_TEST_CT 1
-tTestDesc aNext_Wait_UnionTests[] = {
- { TT_EGREP, zNext_Wait_UnionSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Next_Wait_Union
- */
-const char* apzNext_Wait_UnionPatch[] = { "sed",
- "-e" "s@wait(union wait@wait(void@",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 56 - Nodeent_Syntax fix
- */
-tSCC zNodeent_SyntaxName[] =
- "Nodeent_Syntax";
-/*
- * File name selection pattern
- */
-tSCC zNodeent_SyntaxList[] =
- "|" "netdnet/dnetdb.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzNodeent_SyntaxMachs (const char**)NULL
-#define NODEENT_SYNTAX_TEST_CT 0
-#define aNodeent_SyntaxTests (tTestDesc*)NULL
-
-/*
- * Fix Command Arguments for Nodeent_Syntax
- */
-const char* apzNodeent_SyntaxPatch[] = { "sed",
- "-e" "s/char.*na_addr *$/char *na_addr;/",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 57 - Osf_Namespace_A fix
- */
-tSCC zOsf_Namespace_AName[] =
- "Osf_Namespace_A";
-/*
- * File name selection pattern
- */
-tSCC zOsf_Namespace_AList[] =
- "|" "reg_types.h"
- "|" "sys/lc_core.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzOsf_Namespace_AMachs (const char**)NULL
-
-/*
- * content test pattern. A shell will deal with it later.
- */
-tSCC zOsf_Namespace_ATest0[] =
- "-r reg_types.h-a -r sys/lc_core.h-a -n \"`grep '} regex_t;' reg_types.h`\"-a -z \"`grep __regex_t regex.h`\"";
-
-#define OSF_NAMESPACE_A_TEST_CT 1
-tTestDesc aOsf_Namespace_ATests[] = {
- { TT_TEST, zOsf_Namespace_ATest0, 0 /* unused */ }, };
-
-/*
- * Fix Command Arguments for Osf_Namespace_A
- */
-const char* apzOsf_Namespace_APatch[] = { "sed",
- "-e" "s/regex_t/__regex_t/g",
- "-e" "s/regoff_t/__regoff_t/g",
- "-e" "s/regmatch_t/__regmatch_t/g",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 58 - Osf_Namespace_B fix
- */
-tSCC zOsf_Namespace_BName[] =
- "Osf_Namespace_B";
-/*
- * File name selection pattern
- */
-tSCC zOsf_Namespace_BList[] =
- "|" "regex.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzOsf_Namespace_BMachs (const char**)NULL
-
-/*
- * content test pattern. A shell will deal with it later.
- */
-tSCC zOsf_Namespace_BTest0[] =
- "-r reg_types.h-a -r sys/lc_core.h-a -n \"`grep '} regex_t;' reg_types.h`\"-a -z \"`grep __regex_t regex.h`\"";
-
-#define OSF_NAMESPACE_B_TEST_CT 1
-tTestDesc aOsf_Namespace_BTests[] = {
- { TT_TEST, zOsf_Namespace_BTest0, 0 /* unused */ }, };
-
-/*
- * Fix Command Arguments for Osf_Namespace_B
- */
-const char* apzOsf_Namespace_BPatch[] = { "sed",
- "-e" "/#include <reg_types.h>/a\\\n"
- "typedef __regex_t\tregex_t;\\\n"
- "typedef __regoff_t\tregoff_t;\\\n"
- "typedef __regmatch_t\tregmatch_t;\n",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 59 - Pthread_Page_Size fix
- */
-tSCC zPthread_Page_SizeName[] =
- "Pthread_Page_Size";
-/*
- * File name selection pattern
- */
-tSCC zPthread_Page_SizeList[] =
- "|" "pthread.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzPthread_Page_SizeMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zPthread_Page_SizeSelect0[] =
- "^int __page_size";
-
-#define PTHREAD_PAGE_SIZE_TEST_CT 1
-tTestDesc aPthread_Page_SizeTests[] = {
- { TT_EGREP, zPthread_Page_SizeSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Pthread_Page_Size
- */
-const char* apzPthread_Page_SizePatch[] = { "sed",
- "-e" "s/^int __page_size/extern int __page_size/",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 60 - Rs6000_Double fix
- */
-tSCC zRs6000_DoubleName[] =
- "Rs6000_Double";
-/*
- * File name selection pattern
- */
-tSCC zRs6000_DoubleList[] =
- "|" "math.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzRs6000_DoubleMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zRs6000_DoubleSelect0[] =
- "[^a-zA-Z_]class\\(";
-
-#define RS6000_DOUBLE_TEST_CT 1
-tTestDesc aRs6000_DoubleTests[] = {
- { TT_EGREP, zRs6000_DoubleSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Rs6000_Double
- */
-const char* apzRs6000_DoublePatch[] = { "sed",
- "-e" "/class[(]/i\\\n"
- "#ifndef __cplusplus\n",
- "-e" "/class[(]/a\\\n"
- "#endif\n",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 61 - Rs6000_Fchmod fix
- */
-tSCC zRs6000_FchmodName[] =
- "Rs6000_Fchmod";
-/*
- * File name selection pattern
- */
-tSCC zRs6000_FchmodList[] =
- "|" "sys/stat.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzRs6000_FchmodMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zRs6000_FchmodSelect0[] =
- "fchmod\\(char";
-
-#define RS6000_FCHMOD_TEST_CT 1
-tTestDesc aRs6000_FchmodTests[] = {
- { TT_EGREP, zRs6000_FchmodSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Rs6000_Fchmod
- */
-const char* apzRs6000_FchmodPatch[] = { "sed",
- "-e" "s/fchmod(char \\*/fchmod(int/",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 62 - Rs6000_Param fix
- */
-tSCC zRs6000_ParamName[] =
- "Rs6000_Param";
-/*
- * File name selection pattern
- */
-tSCC zRs6000_ParamList[] =
- "|" "stdio.h"
- "|" "unistd.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzRs6000_ParamMachs (const char**)NULL
-#define RS6000_PARAM_TEST_CT 0
-#define aRs6000_ParamTests (tTestDesc*)NULL
-
-/*
- * Fix Command Arguments for Rs6000_Param
- */
-const char* apzRs6000_ParamPatch[] = { "sed",
- "-e" "s@rename(const char \\*old, const char \\*new)@rename(const char *_old, const char *_new)@",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 63 - Sony_Include fix
- */
-tSCC zSony_IncludeName[] =
- "Sony_Include";
-/*
- * File name selection pattern
- */
-tSCC zSony_IncludeList[] =
- "|" "machine/machparam.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzSony_IncludeMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zSony_IncludeSelect0[] =
- "\"\\.\\./machine/endian.h\"";
-
-#define SONY_INCLUDE_TEST_CT 1
-tTestDesc aSony_IncludeTests[] = {
- { TT_EGREP, zSony_IncludeSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Sony_Include
- */
-const char* apzSony_IncludePatch[] = { "sed",
- "-e" "s@\"../machine/endian.h\"@<machine/endian.h>@",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 64 - Statsswtch fix
- */
-tSCC zStatsswtchName[] =
- "Statsswtch";
-/*
- * File name selection pattern
- */
-tSCC zStatsswtchList[] =
- "|" "rpcsvc/rstat.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzStatsswtchMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zStatsswtchSelect0[] =
- "boottime$";
-
-#define STATSSWTCH_TEST_CT 1
-tTestDesc aStatsswtchTests[] = {
- { TT_EGREP, zStatsswtchSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Statsswtch
- */
-const char* apzStatsswtchPatch[] = { "sed",
- "-e" "s/boottime$/boottime;/",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 65 - Stdio_Va_List fix
- */
-tSCC zStdio_Va_ListName[] =
- "Stdio_Va_List";
-/*
- * File name selection pattern
- */
-tSCC zStdio_Va_ListList[] =
- "|" "stdio.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzStdio_Va_ListMachs (const char**)NULL
-#define STDIO_VA_LIST_TEST_CT 0
-#define aStdio_Va_ListTests (tTestDesc*)NULL
-
-/*
- * Fix Command Arguments for Stdio_Va_List
- */
-const char* apzStdio_Va_ListPatch[] = { "sh", "-c",
- "if ( egrep \"__need___va_list\" $file ) > /dev/null 2>&1 ; then\n"
- " :\n"
- " else\n"
- " echo \"#define __need___va_list\"\n"
- " echo \"#include <stdarg.h>\"\n"
- " fi\n"
- "\n"
- " sed -e 's@ va_list @ __gnuc_va_list @' \\\n"
- " -e 's@ va_list)@ __gnuc_va_list)@' \\\n"
- " -e 's@ _BSD_VA_LIST_));@ __gnuc_va_list));@' \\\n"
- " -e 's@ _VA_LIST_));@ __gnuc_va_list));@' \\\n"
- " -e 's@ va_list@ __va_list__@' \\\n"
- " -e 's@\\*va_list@*__va_list__@' \\\n"
- " -e 's@ __va_list)@ __gnuc_va_list)@' \\\n"
- " -e 's@GNUC_VA_LIST@GNUC_Va_LIST@' \\\n"
- " -e 's@_NEED___VA_LIST@_NEED___Va_LIST@' \\\n"
- " -e 's@VA_LIST@DUMMY_VA_LIST@' \\\n"
- " -e 's@_Va_LIST@_VA_LIST@'",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 66 - Sun_Bogus_Ifdef fix
- */
-tSCC zSun_Bogus_IfdefName[] =
- "Sun_Bogus_Ifdef";
-/*
- * File name selection pattern
- */
-tSCC zSun_Bogus_IfdefList[] =
- "|" "hsfs/hsfs_spec.h"
- "|" "hsfs/iso_spec.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzSun_Bogus_IfdefMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zSun_Bogus_IfdefSelect0[] =
- "#ifdef __i386__ || __vax__";
-
-#define SUN_BOGUS_IFDEF_TEST_CT 1
-tTestDesc aSun_Bogus_IfdefTests[] = {
- { TT_EGREP, zSun_Bogus_IfdefSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Sun_Bogus_Ifdef
- */
-const char* apzSun_Bogus_IfdefPatch[] = { "sed",
- "-e" "s/\\#ifdef __i386__ || __vax__/\\#if __i386__ || __vax__/g",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 67 - Sun_Bogus_Ifdef_Sun4c fix
- */
-tSCC zSun_Bogus_Ifdef_Sun4cName[] =
- "Sun_Bogus_Ifdef_Sun4c";
-/*
- * File name selection pattern
- */
-tSCC zSun_Bogus_Ifdef_Sun4cList[] =
- "|" "hsfs/hsnode.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzSun_Bogus_Ifdef_Sun4cMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zSun_Bogus_Ifdef_Sun4cSelect0[] =
- "#ifdef __i386__ || __sun4c__";
-
-#define SUN_BOGUS_IFDEF_SUN4C_TEST_CT 1
-tTestDesc aSun_Bogus_Ifdef_Sun4cTests[] = {
- { TT_EGREP, zSun_Bogus_Ifdef_Sun4cSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Sun_Bogus_Ifdef_Sun4c
- */
-const char* apzSun_Bogus_Ifdef_Sun4cPatch[] = { "sed",
- "-e" "s/\\#ifdef __i386__ || __sun4c__/\\#if __i386__ || __sun4c__/g",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 68 - Sun_Catmacro fix
- */
-tSCC zSun_CatmacroName[] =
- "Sun_Catmacro";
-/*
- * File name selection pattern
- */
-tSCC zSun_CatmacroList[] =
- "|" "pixrect/memvar.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzSun_CatmacroMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zSun_CatmacroSelect0[] =
- "^#define[ \t]+CAT(a,b)";
-
-#define SUN_CATMACRO_TEST_CT 1
-tTestDesc aSun_CatmacroTests[] = {
- { TT_EGREP, zSun_CatmacroSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Sun_Catmacro
- */
-const char* apzSun_CatmacroPatch[] = { "sed",
- "-e" "/^#define[ \t]CAT(a,b)/ i\\\n"
- "#ifdef __STDC__ \\\n"
- "#define CAT(a,b) a##b\\\n"
- "#else\n",
- "-e" "/^#define[ \t]CAT(a,b)/ a\\\n"
- "#endif\n",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 69 - Sun_Malloc fix
- */
-tSCC zSun_MallocName[] =
- "Sun_Malloc";
-/*
- * File name selection pattern
- */
-tSCC zSun_MallocList[] =
- "|" "malloc.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzSun_MallocMachs (const char**)NULL
-#define SUN_MALLOC_TEST_CT 0
-#define aSun_MallocTests (tTestDesc*)NULL
-
-/*
- * Fix Command Arguments for Sun_Malloc
- */
-const char* apzSun_MallocPatch[] = { "sed",
- "-e" "s/typedef[ \t]char \\*\tmalloc_t/typedef void \\*\tmalloc_t/g",
- "-e" "s/int[ \t][ \t]*free/void\tfree/g",
- "-e" "s/char\\([ \t]*\\*[ \t]*malloc\\)/void\\1/g",
- "-e" "s/char\\([ \t]*\\*[ \t]*realloc\\)/void\\1/g",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 70 - Sun_Memcpy fix
- */
-tSCC zSun_MemcpyName[] =
- "Sun_Memcpy";
-/*
- * File name selection pattern
- */
-tSCC zSun_MemcpyList[] =
- "|" "memory.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzSun_MemcpyMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zSun_MemcpySelect0[] =
- "/\\*\t@\\(#\\)(head/memory.h\t50.1\t |memory\\.h 1\\.[2-4] 8./../.. SMI; from S5R2 1\\.2\t)\\*/";
-
-#define SUN_MEMCPY_TEST_CT 1
-tTestDesc aSun_MemcpyTests[] = {
- { TT_EGREP, zSun_MemcpySelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Sun_Memcpy
- */
-const char* apzSun_MemcpyPatch[] = { "sed",
- "-e" "1i\\\n"
- "/* This file was generated by fixincludes */\\\n"
- "#ifndef __memory_h__\\\n"
- "#define __memory_h__\\\n"
- "\\\n"
- "#ifdef __STDC__\\\n"
- "extern void *memccpy();\\\n"
- "extern void *memchr();\\\n"
- "extern void *memcpy();\\\n"
- "extern void *memset();\\\n"
- "#else\\\n"
- "extern char *memccpy();\\\n"
- "extern char *memchr();\\\n"
- "extern char *memcpy();\\\n"
- "extern char *memset();\\\n"
- "#endif /* __STDC__ */\\\n"
- "\\\n"
- "extern int memcmp();\\\n"
- "\\\n"
- "#endif /* __memory_h__ */\n",
- "-e" "1,$d",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 71 - Sun_Rusers_Semi fix
- */
-tSCC zSun_Rusers_SemiName[] =
- "Sun_Rusers_Semi";
-/*
- * File name selection pattern
- */
-tSCC zSun_Rusers_SemiList[] =
- "|" "rpcsvc/rusers.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzSun_Rusers_SemiMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zSun_Rusers_SemiSelect0[] =
- "_cnt$";
-
-#define SUN_RUSERS_SEMI_TEST_CT 1
-tTestDesc aSun_Rusers_SemiTests[] = {
- { TT_EGREP, zSun_Rusers_SemiSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Sun_Rusers_Semi
- */
-const char* apzSun_Rusers_SemiPatch[] = { "sed",
- "-e" "/^struct/,/^};/s/_cnt$/_cnt;/",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 72 - Sun_Signal fix
- */
-tSCC zSun_SignalName[] =
- "Sun_Signal";
-/*
- * File name selection pattern
- */
-tSCC zSun_SignalList[] =
- "|" "sys/signal.h"
- "|" "signal.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzSun_SignalMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zSun_SignalSelect0[] =
- "^void\t\\(\\*signal\\(\\)\\)\\(\\);";
-
-#define SUN_SIGNAL_TEST_CT 1
-tTestDesc aSun_SignalTests[] = {
- { TT_EGREP, zSun_SignalSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Sun_Signal
- */
-const char* apzSun_SignalPatch[] = { "sed",
- "-e" "/^void\t(\\*signal())();$/i\\\n"
- "#ifdef __cplusplus\\\n"
- "void\t(*signal(...))(...);\\\n"
- "#else\n",
- "-e" "/^void\t(\\*signal())();$/a\\\n"
- "#endif\n",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 73 - Sun_Xdr_Proto fix
- */
-tSCC zSun_Xdr_ProtoName[] =
- "Sun_Xdr_Proto";
-/*
- * File name selection pattern
- */
-tSCC zSun_Xdr_ProtoList[] =
- "|" "rpc/xdr.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzSun_Xdr_ProtoMachs (const char**)NULL
-#define SUN_XDR_PROTO_TEST_CT 0
-#define aSun_Xdr_ProtoTests (tTestDesc*)NULL
-
-/*
- * Fix Command Arguments for Sun_Xdr_Proto
- */
-const char* apzSun_Xdr_ProtoPatch[] = { "sed",
- "-e" "s/^\\(.*\\)\\*\\(x_.*\\)();\\(.*\\)/\\\n"
- "#ifdef __cplusplus\\\n"
- "\\1*\\2(...);\\3\\\n"
- "#else\\\n"
- "\\1*\\2();\\3\\\n"
- "#endif/g",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 74 - Sunos_Large_Macro fix
- */
-tSCC zSunos_Large_MacroName[] =
- "Sunos_Large_Macro";
-/*
- * File name selection pattern
- */
-tSCC zSunos_Large_MacroList[] =
- "|" "sundev/ipi_error.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzSunos_Large_MacroMachs (const char**)NULL
-#define SUNOS_LARGE_MACRO_TEST_CT 0
-#define aSunos_Large_MacroTests (tTestDesc*)NULL
-
-/*
- * Fix Command Arguments for Sunos_Large_Macro
- */
-const char* apzSunos_Large_MacroPatch[] = { "sh", "-c",
- "echo \"Removing incorrect fix to SunOS <sundev/ipi_error.h>\" >&2\n"
- "rm -f ${DESTDIR}/$file ${DESTDIR}/$file.\n"
- "cat > /dev/null",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 75 - Sunos_Matherr_Decl fix
- */
-tSCC zSunos_Matherr_DeclName[] =
- "Sunos_Matherr_Decl";
-/*
- * File name selection pattern
- */
-tSCC zSunos_Matherr_DeclList[] =
- "|" "math.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzSunos_Matherr_DeclMachs (const char**)NULL
-
-/*
- * content test pattern. A shell will deal with it later.
- */
-tSCC zSunos_Matherr_DeclTest0[] =
- "\"`fgrep 'struct exception' $file | line`\" != 'struct exception {'";
-
-#define SUNOS_MATHERR_DECL_TEST_CT 1
-tTestDesc aSunos_Matherr_DeclTests[] = {
- { TT_TEST, zSunos_Matherr_DeclTest0, 0 /* unused */ }, };
-
-/*
- * Fix Command Arguments for Sunos_Matherr_Decl
- */
-const char* apzSunos_Matherr_DeclPatch[] = { "sed",
- "-e" "/matherr/i\\\n"
- "struct exception;\n",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 76 - Sunos_Strlen fix
- */
-tSCC zSunos_StrlenName[] =
- "Sunos_Strlen";
-/*
- * File name selection pattern
- */
-tSCC zSunos_StrlenList[] =
- "|" "strings.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzSunos_StrlenMachs (const char**)NULL
-#define SUNOS_STRLEN_TEST_CT 0
-#define aSunos_StrlenTests (tTestDesc*)NULL
-
-/*
- * Fix Command Arguments for Sunos_Strlen
- */
-const char* apzSunos_StrlenPatch[] = { "sed",
- "-e" "s/int[ \t]*strlen();/__SIZE_TYPE__ strlen();/",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 77 - Systypes fix
- */
-tSCC zSystypesName[] =
- "Systypes";
-/*
- * File name selection pattern
- */
-tSCC zSystypesList[] =
- "|" "sys/types.h"
- "|" "stdlib.h"
- "|" "sys/stdtypes.h"
- "|" "stddef.h"
- "|" "memory.h"
- "|" "unistd.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzSystypesMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zSystypesSelect0[] =
- "typedef[ \t]+[a-z_][ \ta-z_]*[ \t](size|ptrdiff|wchar)_t";
-
-#define SYSTYPES_TEST_CT 1
-tTestDesc aSystypesTests[] = {
- { TT_EGREP, zSystypesSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Systypes
- */
-const char* apzSystypesPatch[] = { "sed",
- "-e" "/^[ \t]*\\*[ \t]*typedef unsigned int size_t;/N",
- "-e" "s/^\\([ \t]*\\*[ \t]*typedef unsigned int size_t;\\n[ \t]*\\*\\/\\)/\\1\\\n"
- "#ifndef __SIZE_TYPE__\\\n"
- "#define __SIZE_TYPE__ long unsigned int\\\n"
- "#endif\\\n"
- "typedef __SIZE_TYPE__ size_t;\\\n"
- "/",
- "-e" "/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]size_t/i\\\n"
- "#ifndef __SIZE_TYPE__\\\n"
- "#define __SIZE_TYPE__ long unsigned int\\\n"
- "#endif\n",
- "-e" "s/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]size_t/typedef __SIZE_TYPE__ size_t/",
- "-e" "/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]ptrdiff_t/i\\\n"
- "#ifndef __PTRDIFF_TYPE__\\\n"
- "#define __PTRDIFF_TYPE__ long int\\\n"
- "#endif\n",
- "-e" "s/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]ptrdiff_t/typedef __PTRDIFF_TYPE__ ptrdiff_t/",
- "-e" "/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]wchar_t/i\\\n"
- "#ifndef __WCHAR_TYPE__\\\n"
- "#define __WCHAR_TYPE__ int\\\n"
- "#endif\\\n"
- "#ifndef __cplusplus\n",
- "-e" "/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]wchar_t/a\\\n"
- "#endif\n",
- "-e" "s/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]wchar_t/typedef __WCHAR_TYPE__ wchar_t/",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 78 - Systypes_For_Aix fix
- */
-tSCC zSystypes_For_AixName[] =
- "Systypes_For_Aix";
-/*
- * File name selection pattern
- */
-tSCC zSystypes_For_AixList[] =
- "|" "sys/types.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzSystypes_For_AixMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zSystypes_For_AixSelect0[] =
- "typedef[ \t][ \t]*[A-Za-z_][ \tA-Za-z_]*[ \t]size_t";
-
-/*
- * content bypass pattern
- */
-tSCC zSystypes_For_AixBypass0[] =
- "_GCC_SIZE_T";
-
-#define SYSTYPES_FOR_AIX_TEST_CT 2
-tTestDesc aSystypes_For_AixTests[] = {
- { TT_NEGREP, zSystypes_For_AixBypass0, (regex_t*)NULL },
- { TT_EGREP, zSystypes_For_AixSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Systypes_For_Aix
- */
-const char* apzSystypes_For_AixPatch[] = { "sed",
- "-e" "/typedef[ \t][ \t]*[A-Za-z_][ \tA-Za-z_]*[ \t]size_t/i\\\n"
- "#ifndef _GCC_SIZE_T\\\n"
- "#define _GCC_SIZE_T\n",
- "-e" "/typedef[ \t][ \t]*[A-Za-z_][ \tA-Za-z_]*[ \t]size_t/a\\\n"
- "#endif\n",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 79 - Sysv68_String fix
- */
-tSCC zSysv68_StringName[] =
- "Sysv68_String";
-/*
- * File name selection pattern
- */
-tSCC zSysv68_StringList[] =
- "|" "string.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzSysv68_StringMachs (const char**)NULL
-#define SYSV68_STRING_TEST_CT 0
-#define aSysv68_StringTests (tTestDesc*)NULL
-
-/*
- * Fix Command Arguments for Sysv68_String
- */
-const char* apzSysv68_StringPatch[] = { "sed",
- "-e" "s/extern[ \t]*int[ \t]*strlen();/extern unsigned int strlen();/",
- "-e" "s/extern[ \t]*int[ \t]*ffs[ \t]*(long);/extern int ffs(int);/",
- "-e" "s/strdup(char \\*s1);/strdup(const char *s1);/",
- "-e" "/^extern char$/N",
- "-e" "s/^extern char\\(\\n\t\\*memccpy(),\\)$/extern void\\1/",
- "-e" "/^\tstrncmp(),$/N",
- "-e" "s/^\\(\tstrncmp()\\),\\n\\(\tstrlen(),\\)$/\\1;\\\n"
- "extern unsigned int\\\n"
- "\\2/",
- "-e" "/^extern int$/N",
- "-e" "s/^extern int\\(\\n\tstrlen(),\\)/extern size_t\\1/",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 80 - Sysz_Stdlib_For_Sun fix
- */
-tSCC zSysz_Stdlib_For_SunName[] =
- "Sysz_Stdlib_For_Sun";
-/*
- * File name selection pattern
- */
-tSCC zSysz_Stdlib_For_SunList[] =
- "|" "stdlib.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-tSCC* apzSysz_Stdlib_For_SunMachs[] = {
- "*-sun-*",
- "m88k-*-sysv3*",
- (const char*)NULL };
-#define SYSZ_STDLIB_FOR_SUN_TEST_CT 0
-#define aSysz_Stdlib_For_SunTests (tTestDesc*)NULL
-
-/*
- * Fix Command Arguments for Sysz_Stdlib_For_Sun
- */
-const char* apzSysz_Stdlib_For_SunPatch[] = { "sed",
- "-e" "s/int\tabort/void\tabort/g",
- "-e" "s/int\tfree/void\tfree/g",
- "-e" "s/char[ \t]*\\*[ \t]*calloc/void \\*\tcalloc/g",
- "-e" "s/char[ \t]*\\*[ \t]*malloc/void \\*\tmalloc/g",
- "-e" "s/char[ \t]*\\*[ \t]*realloc/void \\*\trealloc/g",
- "-e" "s/int[ \t][ \t]*exit/void\texit/g",
- "-e" "/typedef[ \ta-zA-Z_]*[ \t]size_t[ \t]*;/i\\\n"
- "#ifndef _GCC_SIZE_T\\\n"
- "#define _GCC_SIZE_T\n",
- "-e" "/typedef[ \ta-zA-Z_]*[ \t]size_t[ \t]*;/a\\\n"
- "#endif\n",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 81 - Sysz_Stdtypes_For_Sun fix
- */
-tSCC zSysz_Stdtypes_For_SunName[] =
- "Sysz_Stdtypes_For_Sun";
-/*
- * File name selection pattern
- */
-tSCC zSysz_Stdtypes_For_SunList[] =
- "|" "sys/stdtypes.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzSysz_Stdtypes_For_SunMachs (const char**)NULL
-#define SYSZ_STDTYPES_FOR_SUN_TEST_CT 0
-#define aSysz_Stdtypes_For_SunTests (tTestDesc*)NULL
-
-/*
- * Fix Command Arguments for Sysz_Stdtypes_For_Sun
- */
-const char* apzSysz_Stdtypes_For_SunPatch[] = { "sed",
- "-e" "/[\t ]size_t.*;/i\\\n"
- "#ifndef _GCC_SIZE_T\\\n"
- "#define _GCC_SIZE_T\n",
- "-e" "/[\t ]size_t.*;/a\\\n"
- "#endif\n",
- "-e" "/[\t ]ptrdiff_t.*;/i\\\n"
- "#ifndef _GCC_PTRDIFF_T\\\n"
- "#define _GCC_PTRDIFF_T\n",
- "-e" "/[\t ]ptrdiff_t.*;/a\\\n"
- "#endif\n",
- "-e" "/[\t ]wchar_t.*;/i\\\n"
- "#ifndef _GCC_WCHAR_T\\\n"
- "#define _GCC_WCHAR_T\n",
- "-e" "/[\t ]wchar_t.*;/a\\\n"
- "#endif\n",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 82 - Tinfo_Cplusplus fix
- */
-tSCC zTinfo_CplusplusName[] =
- "Tinfo_Cplusplus";
-/*
- * File name selection pattern
- */
-tSCC zTinfo_CplusplusList[] =
- "|" "tinfo.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzTinfo_CplusplusMachs (const char**)NULL
-#define TINFO_CPLUSPLUS_TEST_CT 0
-#define aTinfo_CplusplusTests (tTestDesc*)NULL
-
-/*
- * Fix Command Arguments for Tinfo_Cplusplus
- */
-const char* apzTinfo_CplusplusPatch[] = { "sed",
- "-e" "s/[ \t]_cplusplus/ __cplusplus/",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 83 - Ultrix_Ansi_Compat fix
- */
-tSCC zUltrix_Ansi_CompatName[] =
- "Ultrix_Ansi_Compat";
-/*
- * File name selection pattern
- */
-tSCC zUltrix_Ansi_CompatList[] =
- "|" "ansi_compat.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzUltrix_Ansi_CompatMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zUltrix_Ansi_CompatSelect0[] =
- "ULTRIX";
-
-#define ULTRIX_ANSI_COMPAT_TEST_CT 1
-tTestDesc aUltrix_Ansi_CompatTests[] = {
- { TT_EGREP, zUltrix_Ansi_CompatSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Ultrix_Ansi_Compat
- */
-const char* apzUltrix_Ansi_CompatPatch[] = { "sed",
- "-e" "1i\\\n"
- "/* This file intentionally left blank. */\n",
- "-e" "1,$d",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 84 - Ultrix_Atof_Param fix
- */
-tSCC zUltrix_Atof_ParamName[] =
- "Ultrix_Atof_Param";
-/*
- * File name selection pattern
- */
-tSCC zUltrix_Atof_ParamList[] =
- "|" "math.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzUltrix_Atof_ParamMachs (const char**)NULL
-#define ULTRIX_ATOF_PARAM_TEST_CT 0
-#define aUltrix_Atof_ParamTests (tTestDesc*)NULL
-
-/*
- * Fix Command Arguments for Ultrix_Atof_Param
- */
-const char* apzUltrix_Atof_ParamPatch[] = { "sed",
- "-e" "s@atof(\\([ \t]*char[ \t]*\\*[^)]*\\))@atof(const \\1)@",
- "-e" "s@inline int abs(int [a-z][a-z]*) {.*}@extern \"C\" int abs(int);@",
- "-e" "s@inline double abs(double [a-z][a-z]*) {.*}@@",
- "-e" "s@inline int sqr(int [a-z][a-z]*) {.*}@@",
- "-e" "s@inline double sqr(double [a-z][a-z]*) {.*}@@",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 85 - Ultrix_Const fix
- */
-tSCC zUltrix_ConstName[] =
- "Ultrix_Const";
-/*
- * File name selection pattern
- */
-tSCC zUltrix_ConstList[] =
- "|" "stdio.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzUltrix_ConstMachs (const char**)NULL
-#define ULTRIX_CONST_TEST_CT 0
-#define aUltrix_ConstTests (tTestDesc*)NULL
-
-/*
- * Fix Command Arguments for Ultrix_Const
- */
-const char* apzUltrix_ConstPatch[] = { "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,@",
- "-e" "s@popen(char \\*, char \\*);@popen(const char *, const char *);@",
- "-e" "s@tempnam(char\\*,char\\*);@tempnam(const char*,const char*);@",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 86 - Ultrix_Ifdef fix
- */
-tSCC zUltrix_IfdefName[] =
- "Ultrix_Ifdef";
-/*
- * File name selection pattern
- */
-tSCC zUltrix_IfdefList[] =
- "|" "sys/file.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzUltrix_IfdefMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zUltrix_IfdefSelect0[] =
- "#ifdef KERNEL";
-
-#define ULTRIX_IFDEF_TEST_CT 1
-tTestDesc aUltrix_IfdefTests[] = {
- { TT_EGREP, zUltrix_IfdefSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Ultrix_Ifdef
- */
-const char* apzUltrix_IfdefPatch[] = { "sed",
- "-e" "s/#ifdef KERNEL/#if defined(KERNEL)/",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 87 - Ultrix_Nested_Cmnt fix
- */
-tSCC zUltrix_Nested_CmntName[] =
- "Ultrix_Nested_Cmnt";
-/*
- * File name selection pattern
- */
-tSCC zUltrix_Nested_CmntList[] =
- "|" "rpc/svc.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzUltrix_Nested_CmntMachs (const char**)NULL
-#define ULTRIX_NESTED_CMNT_TEST_CT 0
-#define aUltrix_Nested_CmntTests (tTestDesc*)NULL
-
-/*
- * Fix Command Arguments for Ultrix_Nested_Cmnt
- */
-const char* apzUltrix_Nested_CmntPatch[] = { "sed",
- "-e" "s@^\\( \\*\tint protocol; \\)/\\*@\\1*/ /*@",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 88 - Ultrix_Static fix
- */
-tSCC zUltrix_StaticName[] =
- "Ultrix_Static";
-/*
- * File name selection pattern
- */
-tSCC zUltrix_StaticList[] =
- "|" "machine/cpu.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzUltrix_StaticMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zUltrix_StaticSelect0[] =
- "#include \"r[34]_cpu";
-
-#define ULTRIX_STATIC_TEST_CT 1
-tTestDesc aUltrix_StaticTests[] = {
- { TT_EGREP, zUltrix_StaticSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Ultrix_Static
- */
-const char* apzUltrix_StaticPatch[] = { "sed",
- "-e" "s/^static struct tlb_pid_state/struct tlb_pid_state/",
- "-e" "s/^#include \"r3_cpu\\.h\"$/#include <machine\\/r3_cpu\\.h>/",
- "-e" "s/^#include \"r4_cpu\\.h\"$/#include <machine\\/r4_cpu\\.h>/",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 89 - Undefine_Null fix
- */
-tSCC zUndefine_NullName[] =
- "Undefine_Null";
-/*
- * File name selection pattern
- */
-#define zUndefine_NullList (char*)NULL
-/*
- * Machine/OS name selection pattern
- */
-#define apzUndefine_NullMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zUndefine_NullSelect0[] =
- "^#[ \t]*define[ \t]*[ \t]NULL[ \t]";
-
-/*
- * content bypass pattern
- */
-tSCC zUndefine_NullBypass0[] =
- "#[ \t]*(ifn|un)def[ \t]*[ \t]NULL($|[ \t])";
-
-#define UNDEFINE_NULL_TEST_CT 2
-tTestDesc aUndefine_NullTests[] = {
- { TT_NEGREP, zUndefine_NullBypass0, (regex_t*)NULL },
- { TT_EGREP, zUndefine_NullSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Undefine_Null
- */
-const char* apzUndefine_NullPatch[] = { "sed",
- "-e" "/^#[ \t]*define[ \t][ \t]*NULL[ \t]/i\\\n"
- "#undef NULL\n",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 90 - Va_I960_Macro fix
- */
-tSCC zVa_I960_MacroName[] =
- "Va_I960_Macro";
-/*
- * File name selection pattern
- */
-tSCC zVa_I960_MacroList[] =
- "|" "arch/i960/archI960.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzVa_I960_MacroMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zVa_I960_MacroSelect0[] =
- "__(vsiz|vali|vpad|alignof__)";
-
-#define VA_I960_MACRO_TEST_CT 1
-tTestDesc aVa_I960_MacroTests[] = {
- { TT_EGREP, zVa_I960_MacroSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Va_I960_Macro
- */
-const char* apzVa_I960_MacroPatch[] = { "sed",
- "-e" "s/__vsiz/__vxvsiz/",
- "-e" "s/__vali/__vxvali/",
- "-e" "s/__vpad/__vxvpad/",
- "-e" "s/__alignof__/__vxalignof__/",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 91 - Void_Null fix
- */
-tSCC zVoid_NullName[] =
- "Void_Null";
-/*
- * File name selection pattern
- */
-tSCC zVoid_NullList[] =
- "|" "curses.h"
- "|" "dbm.h"
- "|" "locale.h"
- "|" "stdio.h"
- "|" "stdlib.h"
- "|" "string.h"
- "|" "time.h"
- "|" "unistd.h"
- "|" "sys/dir.h"
- "|" "sys/param.h"
- "|" "sys/types.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzVoid_NullMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zVoid_NullSelect0[] =
- "#[ \t]*define[ \t][ \t]*NULL[ \t].*void";
-
-#define VOID_NULL_TEST_CT 1
-tTestDesc aVoid_NullTests[] = {
- { TT_EGREP, zVoid_NullSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Void_Null
- */
-const char* apzVoid_NullPatch[] = { "sed",
- "-e" "s/^#[ \t]*define[ \t]*NULL[ \t]*((void[ \t]*\\*)0)/#define NULL 0/",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 92 - Vxworks_Gcc_Problem fix
- */
-tSCC zVxworks_Gcc_ProblemName[] =
- "Vxworks_Gcc_Problem";
-/*
- * File name selection pattern
- */
-tSCC zVxworks_Gcc_ProblemList[] =
- "|" "types/vxTypesBase.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzVxworks_Gcc_ProblemMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zVxworks_Gcc_ProblemSelect0[] =
- "__GNUC_TYPEOF_FEATURE_BROKEN_USE_DEFAULT_UNTIL_FIXED__";
-
-#define VXWORKS_GCC_PROBLEM_TEST_CT 1
-tTestDesc aVxworks_Gcc_ProblemTests[] = {
- { TT_EGREP, zVxworks_Gcc_ProblemSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Vxworks_Gcc_Problem
- */
-const char* apzVxworks_Gcc_ProblemPatch[] = { "sed",
- "-e" "s/#ifdef __GNUC_TYPEOF_FEATURE_BROKEN_USE_DEFAULT_UNTIL_FIXED__/#if 1/",
- "-e" "/[ \t]size_t/i\\\n"
- "#ifndef _GCC_SIZE_T\\\n"
- "#define _GCC_SIZE_T\n",
- "-e" "/[ \t]size_t/a\\\n"
- "#endif\n",
- "-e" "/[ \t]ptrdiff_t/i\\\n"
- "#ifndef _GCC_PTRDIFF_T\\\n"
- "#define _GCC_PTRDIFF_T\n",
- "-e" "/[ \t]ptrdiff_t/a\\\n"
- "#endif\n",
- "-e" "/[ \t]wchar_t/i\\\n"
- "#ifndef _GCC_WCHAR_T\\\n"
- "#define _GCC_WCHAR_T\n",
- "-e" "/[ \t]wchar_t/a\\\n"
- "#endif\n",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 93 - Vxworks_Needs_Vxtypes fix
- */
-tSCC zVxworks_Needs_VxtypesName[] =
- "Vxworks_Needs_Vxtypes";
-/*
- * File name selection pattern
- */
-tSCC zVxworks_Needs_VxtypesList[] =
- "|" "time.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzVxworks_Needs_VxtypesMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zVxworks_Needs_VxtypesSelect0[] =
- "uint_t[ \t][ \t]*_clocks_per_sec";
-
-#define VXWORKS_NEEDS_VXTYPES_TEST_CT 1
-tTestDesc aVxworks_Needs_VxtypesTests[] = {
- { TT_EGREP, zVxworks_Needs_VxtypesSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Vxworks_Needs_Vxtypes
- */
-const char* apzVxworks_Needs_VxtypesPatch[] = { "sed",
- "-e" "s/uint_t/unsigned int/",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 94 - Vxworks_Needs_Vxworks fix
- */
-tSCC zVxworks_Needs_VxworksName[] =
- "Vxworks_Needs_Vxworks";
-/*
- * File name selection pattern
- */
-tSCC zVxworks_Needs_VxworksList[] =
- "|" "sys/stat.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzVxworks_Needs_VxworksMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zVxworks_Needs_VxworksSelect0[] =
- "#[ \t]define[ \t][ \t]*__INCstath";
-
-/*
- * content test pattern. A shell will deal with it later.
- */
-tSCC zVxworks_Needs_VxworksTest0[] =
- "-r types/vxTypesOld.h";
-tSCC zVxworks_Needs_VxworksTest1[] =
- "-n \"`fgrep '#include' $file`\"";
-tSCC zVxworks_Needs_VxworksTest2[] =
- "-n \"`fgrep ULONG $file`\"";
-
-#define VXWORKS_NEEDS_VXWORKS_TEST_CT 4
-tTestDesc aVxworks_Needs_VxworksTests[] = {
- { TT_TEST, zVxworks_Needs_VxworksTest0, 0 /* unused */ },
- { TT_TEST, zVxworks_Needs_VxworksTest1, 0 /* unused */ },
- { TT_TEST, zVxworks_Needs_VxworksTest2, 0 /* unused */ },
- { TT_EGREP, zVxworks_Needs_VxworksSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Vxworks_Needs_Vxworks
- */
-const char* apzVxworks_Needs_VxworksPatch[] = { "sed",
- "-e" "/#[ \t]define[ \t][ \t]*__INCstath/a\\\n"
- "#include <types/vxTypesOld.h>\n",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 95 - Vxworks_Time fix
- */
-tSCC zVxworks_TimeName[] =
- "Vxworks_Time";
-/*
- * File name selection pattern
- */
-tSCC zVxworks_TimeList[] =
- "|" "time.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzVxworks_TimeMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zVxworks_TimeSelect0[] =
- "VOIDFUNCPTR";
-
-/*
- * content test pattern. A shell will deal with it later.
- */
-tSCC zVxworks_TimeTest0[] =
- "-r vxWorks.h";
-
-#define VXWORKS_TIME_TEST_CT 2
-tTestDesc aVxworks_TimeTests[] = {
- { TT_TEST, zVxworks_TimeTest0, 0 /* unused */ },
- { TT_EGREP, zVxworks_TimeSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Vxworks_Time
- */
-const char* apzVxworks_TimePatch[] = { "sed",
- "-e" "/VOIDFUNCPTR/i\\\n"
- "#ifndef __gcc_VOIDFUNCPTR_defined\\\n"
- "#ifdef __cplusplus\\\n"
- "typedef void (*__gcc_VOIDFUNCPTR) (...);\\\n"
- "#else\\\n"
- "typedef void (*__gcc_VOIDFUNCPTR) ();\\\n"
- "#endif\\\n"
- "#define __gcc_VOIDFUNCPTR_defined\\\n"
- "#endif\n",
- "-e" "s/VOIDFUNCPTR/__gcc_VOIDFUNCPTR/g",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 96 - X11_Class fix
- */
-tSCC zX11_ClassName[] =
- "X11_Class";
-/*
- * File name selection pattern
- */
-tSCC zX11_ClassList[] =
- "|" "X11/ShellP.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzX11_ClassMachs (const char**)NULL
-
-/*
- * content bypass pattern
- */
-tSCC zX11_ClassBypass0[] =
- "__cplusplus";
-
-#define X11_CLASS_TEST_CT 1
-tTestDesc aX11_ClassTests[] = {
- { TT_NEGREP, zX11_ClassBypass0, (regex_t*)NULL }, };
-
-/*
- * Fix Command Arguments for X11_Class
- */
-const char* apzX11_ClassPatch[] = { "sed",
- "-e" "/char \\*class;/i\\\n"
- "#ifdef __cplusplus\\\n"
- "\tchar *c_class;\\\n"
- "#else\n",
- "-e" "/char \\*class;/a\\\n"
- "#endif\n",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 97 - X11_Class_Usage fix
- */
-tSCC zX11_Class_UsageName[] =
- "X11_Class_Usage";
-/*
- * File name selection pattern
- */
-tSCC zX11_Class_UsageList[] =
- "|" "Xm/BaseClassI.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzX11_Class_UsageMachs (const char**)NULL
-
-/*
- * content bypass pattern
- */
-tSCC zX11_Class_UsageBypass0[] =
- "__cplusplus";
-
-#define X11_CLASS_USAGE_TEST_CT 1
-tTestDesc aX11_Class_UsageTests[] = {
- { TT_NEGREP, zX11_Class_UsageBypass0, (regex_t*)NULL }, };
-
-/*
- * Fix Command Arguments for X11_Class_Usage
- */
-const char* apzX11_Class_UsagePatch[] = { "sed",
- "-e" "s/ class[)]/ c_class)/g",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 98 - X11_New fix
- */
-tSCC zX11_NewName[] =
- "X11_New";
-/*
- * File name selection pattern
- */
-tSCC zX11_NewList[] =
- "|" "Xm/Traversal.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzX11_NewMachs (const char**)NULL
-
-/*
- * content bypass pattern
- */
-tSCC zX11_NewBypass0[] =
- "__cplusplus";
-
-#define X11_NEW_TEST_CT 1
-tTestDesc aX11_NewTests[] = {
- { TT_NEGREP, zX11_NewBypass0, (regex_t*)NULL }, };
-
-/*
- * Fix Command Arguments for X11_New
- */
-const char* apzX11_NewPatch[] = { "sed",
- "-e" "/Widget\told, new;/i\\\n"
- "#ifdef __cplusplus\\\n"
- "\tWidget\told, c_new;\\\n"
- "#else\n",
- "-e" "/Widget\told, new;/a\\\n"
- "#endif\n",
- "-e" "s/Widget new,/Widget c_new,/g",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 99 - X11_Sprintf fix
- */
-tSCC zX11_SprintfName[] =
- "X11_Sprintf";
-/*
- * File name selection pattern
- */
-tSCC zX11_SprintfList[] =
- "|" "X11*/Xmu.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzX11_SprintfMachs (const char**)NULL
-#define X11_SPRINTF_TEST_CT 0
-#define aX11_SprintfTests (tTestDesc*)NULL
-
-/*
- * Fix Command Arguments for X11_Sprintf
- */
-const char* apzX11_SprintfPatch[] = { "sed",
- "-e" "s,^extern char \\*\tsprintf();$,#ifndef __STDC__\\\n"
- "extern char *\tsprintf();\\\n"
- "#endif /* !defined __STDC__ */,",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 100 - Zzz_Ki_Iface fix
- */
-tSCC zZzz_Ki_IfaceName[] =
- "Zzz_Ki_Iface";
-/*
- * File name selection pattern
- */
-tSCC zZzz_Ki_IfaceList[] =
- "|" "sys/ki_iface.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzZzz_Ki_IfaceMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zZzz_Ki_IfaceSelect0[] =
- "These definitions are for HP Internal developers";
-
-#define ZZZ_KI_IFACE_TEST_CT 1
-tTestDesc aZzz_Ki_IfaceTests[] = {
- { TT_EGREP, zZzz_Ki_IfaceSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Zzz_Ki_Iface
- */
-const char* apzZzz_Ki_IfacePatch[] = { "sh", "-c",
- "echo \"Removing incorrect fix to HP-UX <$file>\" >&2\n"
- "rm -f ${DESTDIR}/$file ${DESTDIR}/$file.\n"
- "cat > /dev/null",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 101 - Zzz_Ki fix
- */
-tSCC zZzz_KiName[] =
- "Zzz_Ki";
-/*
- * File name selection pattern
- */
-tSCC zZzz_KiList[] =
- "|" "sys/ki.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzZzz_KiMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zZzz_KiSelect0[] =
- "11.00 HP-UX LP64";
-
-#define ZZZ_KI_TEST_CT 1
-tTestDesc aZzz_KiTests[] = {
- { TT_EGREP, zZzz_KiSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Zzz_Ki
- */
-const char* apzZzz_KiPatch[] = { "sh", "-c",
- "echo \"Removing incorrect fix to HP-UX <$file>\" >&2\n"
- "rm -f ${DESTDIR}/$file ${DESTDIR}/$file.\n"
- "cat > /dev/null",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 102 - Zzz_Ki_Calls fix
- */
-tSCC zZzz_Ki_CallsName[] =
- "Zzz_Ki_Calls";
-/*
- * File name selection pattern
- */
-tSCC zZzz_Ki_CallsList[] =
- "|" "sys/ki_calls.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzZzz_Ki_CallsMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zZzz_Ki_CallsSelect0[] =
- "KI_MAX_PROCS is an arbitrary number";
-
-#define ZZZ_KI_CALLS_TEST_CT 1
-tTestDesc aZzz_Ki_CallsTests[] = {
- { TT_EGREP, zZzz_Ki_CallsSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Zzz_Ki_Calls
- */
-const char* apzZzz_Ki_CallsPatch[] = { "sh", "-c",
- "echo \"Removing incorrect fix to HP-UX <$file>\" >&2\n"
- "rm -f ${DESTDIR}/$file ${DESTDIR}/$file.\n"
- "cat > /dev/null",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 103 - Zzz_Ki_Defs fix
- */
-tSCC zZzz_Ki_DefsName[] =
- "Zzz_Ki_Defs";
-/*
- * File name selection pattern
- */
-tSCC zZzz_Ki_DefsList[] =
- "|" "sys/ki_defs.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzZzz_Ki_DefsMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zZzz_Ki_DefsSelect0[] =
- "Kernel Instrumentation Definitions";
-
-#define ZZZ_KI_DEFS_TEST_CT 1
-tTestDesc aZzz_Ki_DefsTests[] = {
- { TT_EGREP, zZzz_Ki_DefsSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Zzz_Ki_Defs
- */
-const char* apzZzz_Ki_DefsPatch[] = { "sh", "-c",
- "echo \"Removing incorrect fix to HP-UX <$file>\" >&2\n"
- "rm -f ${DESTDIR}/$file ${DESTDIR}/$file.\n"
- "cat > /dev/null",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 104 - Zzz_Time fix
- */
-tSCC zZzz_TimeName[] =
- "Zzz_Time";
-/*
- * File name selection pattern
- */
-tSCC zZzz_TimeList[] =
- "|" "sys/time.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzZzz_TimeMachs (const char**)NULL
-
-/*
- * content selection pattern
- */
-tSCC zZzz_TimeSelect0[] =
- "For CASPEC, look in";
-
-#define ZZZ_TIME_TEST_CT 1
-tTestDesc aZzz_TimeTests[] = {
- { TT_EGREP, zZzz_TimeSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Zzz_Time
- */
-const char* apzZzz_TimePatch[] = { "sh", "-c",
- "echo \"Removing incorrect fix to HP-UX <$file>\" >&2\n"
- "rm -f ${DESTDIR}/$file ${DESTDIR}/$file.\n"
- "cat > /dev/null",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * List of all fixes
- */
-#define REGEX_COUNT 73
-#define FIX_COUNT 104
-tFixDesc fixDescList[ 104 ] = {
- { zAix_SyswaitName, zAix_SyswaitList,
- apzAix_SyswaitMachs, (regex_t*)NULL,
- AIX_SYSWAIT_TEST_CT, FD_MACH_ONLY,
- aAix_SyswaitTests, apzAix_SyswaitPatch },
-
- { zAix_VolatileName, zAix_VolatileList,
- apzAix_VolatileMachs, (regex_t*)NULL,
- AIX_VOLATILE_TEST_CT, FD_MACH_ONLY,
- aAix_VolatileTests, apzAix_VolatilePatch },
-
- { zAlpha_GetoptName, zAlpha_GetoptList,
- apzAlpha_GetoptMachs, (regex_t*)NULL,
- ALPHA_GETOPT_TEST_CT, FD_MACH_ONLY,
- aAlpha_GetoptTests, apzAlpha_GetoptPatch },
-
- { zAlpha_ParensName, zAlpha_ParensList,
- apzAlpha_ParensMachs, (regex_t*)NULL,
- ALPHA_PARENS_TEST_CT, FD_MACH_ONLY,
- aAlpha_ParensTests, apzAlpha_ParensPatch },
-
- { zAlpha_SbrkName, zAlpha_SbrkList,
- apzAlpha_SbrkMachs, (regex_t*)NULL,
- ALPHA_SBRK_TEST_CT, FD_MACH_ONLY,
- aAlpha_SbrkTests, apzAlpha_SbrkPatch },
-
- { zArm_Norcroft_HintName, zArm_Norcroft_HintList,
- apzArm_Norcroft_HintMachs, (regex_t*)NULL,
- ARM_NORCROFT_HINT_TEST_CT, FD_MACH_ONLY,
- aArm_Norcroft_HintTests, apzArm_Norcroft_HintPatch },
-
- { zArm_WcharName, zArm_WcharList,
- apzArm_WcharMachs, (regex_t*)NULL,
- ARM_WCHAR_TEST_CT, FD_MACH_ONLY,
- aArm_WcharTests, apzArm_WcharPatch },
-
- { zAux_AsmName, zAux_AsmList,
- apzAux_AsmMachs, (regex_t*)NULL,
- AUX_ASM_TEST_CT, FD_MACH_ONLY,
- aAux_AsmTests, apzAux_AsmPatch },
-
- { zAvoid_BoolName, zAvoid_BoolList,
- apzAvoid_BoolMachs, (regex_t*)NULL,
- AVOID_BOOL_TEST_CT, FD_MACH_ONLY,
- aAvoid_BoolTests, apzAvoid_BoolPatch },
-
- { zBad_Malloc_DeclName, zBad_Malloc_DeclList,
- apzBad_Malloc_DeclMachs, (regex_t*)NULL,
- BAD_MALLOC_DECL_TEST_CT, FD_MACH_ONLY,
- aBad_Malloc_DeclTests, apzBad_Malloc_DeclPatch },
-
- { zBad_Struct_TermName, zBad_Struct_TermList,
- apzBad_Struct_TermMachs, (regex_t*)NULL,
- BAD_STRUCT_TERM_TEST_CT, FD_MACH_ONLY,
- aBad_Struct_TermTests, apzBad_Struct_TermPatch },
-
- { zBadquoteName, zBadquoteList,
- apzBadquoteMachs, (regex_t*)NULL,
- BADQUOTE_TEST_CT, FD_MACH_ONLY,
- aBadquoteTests, apzBadquotePatch },
-
- { zBad_LvalName, zBad_LvalList,
- apzBad_LvalMachs, (regex_t*)NULL,
- BAD_LVAL_TEST_CT, FD_MACH_ONLY,
- aBad_LvalTests, apzBad_LvalPatch },
-
- { zBroken_Assert_StdioName, zBroken_Assert_StdioList,
- apzBroken_Assert_StdioMachs, (regex_t*)NULL,
- BROKEN_ASSERT_STDIO_TEST_CT, FD_MACH_ONLY,
- aBroken_Assert_StdioTests, apzBroken_Assert_StdioPatch },
-
- { zBroken_Assert_StdlibName, zBroken_Assert_StdlibList,
- apzBroken_Assert_StdlibMachs, (regex_t*)NULL,
- BROKEN_ASSERT_STDLIB_TEST_CT, FD_MACH_ONLY,
- aBroken_Assert_StdlibTests, apzBroken_Assert_StdlibPatch },
-
- { zBsd43_Io_MacrosName, zBsd43_Io_MacrosList,
- apzBsd43_Io_MacrosMachs, (regex_t*)NULL,
- BSD43_IO_MACROS_TEST_CT, FD_MACH_ONLY,
- aBsd43_Io_MacrosTests, apzBsd43_Io_MacrosPatch },
-
- { zNo_Double_SlashName, zNo_Double_SlashList,
- apzNo_Double_SlashMachs, (regex_t*)NULL,
- NO_DOUBLE_SLASH_TEST_CT, FD_MACH_ONLY,
- aNo_Double_SlashTests, apzNo_Double_SlashPatch },
-
- { zIrix_Bogus_Cxx_CmntName, zIrix_Bogus_Cxx_CmntList,
- apzIrix_Bogus_Cxx_CmntMachs, (regex_t*)NULL,
- IRIX_BOGUS_CXX_CMNT_TEST_CT, FD_MACH_ONLY,
- aIrix_Bogus_Cxx_CmntTests, apzIrix_Bogus_Cxx_CmntPatch },
-
- { zEcd_CursorName, zEcd_CursorList,
- apzEcd_CursorMachs, (regex_t*)NULL,
- ECD_CURSOR_TEST_CT, FD_MACH_ONLY,
- aEcd_CursorTests, apzEcd_CursorPatch },
-
- { zElse_LabelName, zElse_LabelList,
- apzElse_LabelMachs, (regex_t*)NULL,
- ELSE_LABEL_TEST_CT, FD_MACH_ONLY,
- aElse_LabelTests, apzElse_LabelPatch },
-
- { zEndif_LabelName, zEndif_LabelList,
- apzEndif_LabelMachs, (regex_t*)NULL,
- ENDIF_LABEL_TEST_CT, FD_MACH_ONLY,
- aEndif_LabelTests, apzEndif_LabelPatch },
-
- { zHp_InlineName, zHp_InlineList,
- apzHp_InlineMachs, (regex_t*)NULL,
- HP_INLINE_TEST_CT, FD_MACH_ONLY,
- aHp_InlineTests, apzHp_InlinePatch },
-
- { zHp_SysfileName, zHp_SysfileList,
- apzHp_SysfileMachs, (regex_t*)NULL,
- HP_SYSFILE_TEST_CT, FD_MACH_ONLY,
- aHp_SysfileTests, apzHp_SysfilePatch },
-
- { zHpux_Cxx_UnreadyName, zHpux_Cxx_UnreadyList,
- apzHpux_Cxx_UnreadyMachs, (regex_t*)NULL,
- HPUX_CXX_UNREADY_TEST_CT, FD_MACH_ONLY,
- aHpux_Cxx_UnreadyTests, apzHpux_Cxx_UnreadyPatch },
-
- { zHpux_MaxintName, zHpux_MaxintList,
- apzHpux_MaxintMachs, (regex_t*)NULL,
- HPUX_MAXINT_TEST_CT, FD_MACH_ONLY,
- aHpux_MaxintTests, apzHpux_MaxintPatch },
-
- { zHpux_SystimeName, zHpux_SystimeList,
- apzHpux_SystimeMachs, (regex_t*)NULL,
- HPUX_SYSTIME_TEST_CT, FD_MACH_ONLY,
- aHpux_SystimeTests, apzHpux_SystimePatch },
-
- { zInteractv_Add1Name, zInteractv_Add1List,
- apzInteractv_Add1Machs, (regex_t*)NULL,
- INTERACTV_ADD1_TEST_CT, FD_MACH_ONLY,
- aInteractv_Add1Tests, apzInteractv_Add1Patch },
-
- { zInteractv_Add2Name, zInteractv_Add2List,
- apzInteractv_Add2Machs, (regex_t*)NULL,
- INTERACTV_ADD2_TEST_CT, FD_MACH_ONLY,
- aInteractv_Add2Tests, apzInteractv_Add2Patch },
-
- { zInteractv_Add3Name, zInteractv_Add3List,
- apzInteractv_Add3Machs, (regex_t*)NULL,
- INTERACTV_ADD3_TEST_CT, FD_MACH_ONLY,
- aInteractv_Add3Tests, apzInteractv_Add3Patch },
-
- { zIo_Def_QuotesName, zIo_Def_QuotesList,
- apzIo_Def_QuotesMachs, (regex_t*)NULL,
- IO_DEF_QUOTES_TEST_CT, FD_MACH_ONLY,
- aIo_Def_QuotesTests, apzIo_Def_QuotesPatch },
-
- { zIoctl_Fix_CtrlName, zIoctl_Fix_CtrlList,
- apzIoctl_Fix_CtrlMachs, (regex_t*)NULL,
- IOCTL_FIX_CTRL_TEST_CT, FD_MACH_ONLY,
- aIoctl_Fix_CtrlTests, apzIoctl_Fix_CtrlPatch },
-
- { zIp_Missing_SemiName, zIp_Missing_SemiList,
- apzIp_Missing_SemiMachs, (regex_t*)NULL,
- IP_MISSING_SEMI_TEST_CT, FD_MACH_ONLY,
- aIp_Missing_SemiTests, apzIp_Missing_SemiPatch },
-
- { zIrix_Multiline_CmntName, zIrix_Multiline_CmntList,
- apzIrix_Multiline_CmntMachs, (regex_t*)NULL,
- IRIX_MULTILINE_CMNT_TEST_CT, FD_MACH_ONLY,
- aIrix_Multiline_CmntTests, apzIrix_Multiline_CmntPatch },
-
- { zIrix_SockaddrName, zIrix_SockaddrList,
- apzIrix_SockaddrMachs, (regex_t*)NULL,
- IRIX_SOCKADDR_TEST_CT, FD_MACH_ONLY,
- aIrix_SockaddrTests, apzIrix_SockaddrPatch },
-
- { zIrix_Struct__FileName, zIrix_Struct__FileList,
- apzIrix_Struct__FileMachs, (regex_t*)NULL,
- IRIX_STRUCT__FILE_TEST_CT, FD_MACH_ONLY,
- aIrix_Struct__FileTests, apzIrix_Struct__FilePatch },
-
- { zIsc_FmodName, zIsc_FmodList,
- apzIsc_FmodMachs, (regex_t*)NULL,
- ISC_FMOD_TEST_CT, FD_MACH_ONLY,
- aIsc_FmodTests, apzIsc_FmodPatch },
-
- { zMotorola_NestedName, zMotorola_NestedList,
- apzMotorola_NestedMachs, (regex_t*)NULL,
- MOTOROLA_NESTED_TEST_CT, FD_MACH_ONLY,
- aMotorola_NestedTests, apzMotorola_NestedPatch },
-
- { zIsc_Sys_LimitsName, zIsc_Sys_LimitsList,
- apzIsc_Sys_LimitsMachs, (regex_t*)NULL,
- ISC_SYS_LIMITS_TEST_CT, FD_MACH_ONLY,
- aIsc_Sys_LimitsTests, apzIsc_Sys_LimitsPatch },
-
- { zKandr_ConcatName, zKandr_ConcatList,
- apzKandr_ConcatMachs, (regex_t*)NULL,
- KANDR_CONCAT_TEST_CT, FD_MACH_ONLY,
- aKandr_ConcatTests, apzKandr_ConcatPatch },
-
- { zLimits_IfndefsName, zLimits_IfndefsList,
- apzLimits_IfndefsMachs, (regex_t*)NULL,
- LIMITS_IFNDEFS_TEST_CT, FD_MACH_ONLY,
- aLimits_IfndefsTests, apzLimits_IfndefsPatch },
-
- { zLynx_Void_IntName, zLynx_Void_IntList,
- apzLynx_Void_IntMachs, (regex_t*)NULL,
- LYNX_VOID_INT_TEST_CT, FD_MACH_ONLY,
- aLynx_Void_IntTests, apzLynx_Void_IntPatch },
-
- { zLynxos_Fcntl_ProtoName, zLynxos_Fcntl_ProtoList,
- apzLynxos_Fcntl_ProtoMachs, (regex_t*)NULL,
- LYNXOS_FCNTL_PROTO_TEST_CT, FD_MACH_ONLY,
- aLynxos_Fcntl_ProtoTests, apzLynxos_Fcntl_ProtoPatch },
-
- { zM88k_Bad_Hypot_OptName, zM88k_Bad_Hypot_OptList,
- apzM88k_Bad_Hypot_OptMachs, (regex_t*)NULL,
- M88K_BAD_HYPOT_OPT_TEST_CT, FD_MACH_ONLY,
- aM88k_Bad_Hypot_OptTests, apzM88k_Bad_Hypot_OptPatch },
-
- { zM88k_Bad_S_IfName, zM88k_Bad_S_IfList,
- apzM88k_Bad_S_IfMachs, (regex_t*)NULL,
- M88K_BAD_S_IF_TEST_CT, FD_MACH_ONLY,
- aM88k_Bad_S_IfTests, apzM88k_Bad_S_IfPatch },
-
- { zM88k_Multi_InclName, zM88k_Multi_InclList,
- apzM88k_Multi_InclMachs, (regex_t*)NULL,
- M88K_MULTI_INCL_TEST_CT, FD_MACH_ONLY,
- aM88k_Multi_InclTests, apzM88k_Multi_InclPatch },
-
- { zMachine_NameName, zMachine_NameList,
- apzMachine_NameMachs, (regex_t*)NULL,
- MACHINE_NAME_TEST_CT, FD_MACH_ONLY,
- aMachine_NameTests, apzMachine_NamePatch },
-
- { zMath_ExceptionName, zMath_ExceptionList,
- apzMath_ExceptionMachs, (regex_t*)NULL,
- MATH_EXCEPTION_TEST_CT, FD_MACH_ONLY,
- aMath_ExceptionTests, apzMath_ExceptionPatch },
-
- { zMath_Gcc_IfndefsName, zMath_Gcc_IfndefsList,
- apzMath_Gcc_IfndefsMachs, (regex_t*)NULL,
- MATH_GCC_IFNDEFS_TEST_CT, FD_MACH_ONLY,
- aMath_Gcc_IfndefsTests, apzMath_Gcc_IfndefsPatch },
-
- { zMotorola_Stupid_OptName, zMotorola_Stupid_OptList,
- apzMotorola_Stupid_OptMachs, (regex_t*)NULL,
- MOTOROLA_STUPID_OPT_TEST_CT, FD_MACH_ONLY,
- aMotorola_Stupid_OptTests, apzMotorola_Stupid_OptPatch },
-
- { zNested_CommentName, zNested_CommentList,
- apzNested_CommentMachs, (regex_t*)NULL,
- NESTED_COMMENT_TEST_CT, FD_MACH_ONLY,
- aNested_CommentTests, apzNested_CommentPatch },
-
- { zNews_Os_RecursionName, zNews_Os_RecursionList,
- apzNews_Os_RecursionMachs, (regex_t*)NULL,
- NEWS_OS_RECURSION_TEST_CT, FD_MACH_ONLY,
- aNews_Os_RecursionTests, apzNews_Os_RecursionPatch },
-
- { zNext_Math_PrefixName, zNext_Math_PrefixList,
- apzNext_Math_PrefixMachs, (regex_t*)NULL,
- NEXT_MATH_PREFIX_TEST_CT, FD_MACH_ONLY,
- aNext_Math_PrefixTests, apzNext_Math_PrefixPatch },
-
- { zNext_TemplateName, zNext_TemplateList,
- apzNext_TemplateMachs, (regex_t*)NULL,
- NEXT_TEMPLATE_TEST_CT, FD_MACH_ONLY,
- aNext_TemplateTests, apzNext_TemplatePatch },
-
- { zNext_VolitileName, zNext_VolitileList,
- apzNext_VolitileMachs, (regex_t*)NULL,
- NEXT_VOLITILE_TEST_CT, FD_MACH_ONLY,
- aNext_VolitileTests, apzNext_VolitilePatch },
-
- { zNext_Wait_UnionName, zNext_Wait_UnionList,
- apzNext_Wait_UnionMachs, (regex_t*)NULL,
- NEXT_WAIT_UNION_TEST_CT, FD_MACH_ONLY,
- aNext_Wait_UnionTests, apzNext_Wait_UnionPatch },
-
- { zNodeent_SyntaxName, zNodeent_SyntaxList,
- apzNodeent_SyntaxMachs, (regex_t*)NULL,
- NODEENT_SYNTAX_TEST_CT, FD_MACH_ONLY,
- aNodeent_SyntaxTests, apzNodeent_SyntaxPatch },
-
- { zOsf_Namespace_AName, zOsf_Namespace_AList,
- apzOsf_Namespace_AMachs, (regex_t*)NULL,
- OSF_NAMESPACE_A_TEST_CT, FD_MACH_ONLY,
- aOsf_Namespace_ATests, apzOsf_Namespace_APatch },
-
- { zOsf_Namespace_BName, zOsf_Namespace_BList,
- apzOsf_Namespace_BMachs, (regex_t*)NULL,
- OSF_NAMESPACE_B_TEST_CT, FD_MACH_ONLY,
- aOsf_Namespace_BTests, apzOsf_Namespace_BPatch },
-
- { zPthread_Page_SizeName, zPthread_Page_SizeList,
- apzPthread_Page_SizeMachs, (regex_t*)NULL,
- PTHREAD_PAGE_SIZE_TEST_CT, FD_MACH_ONLY,
- aPthread_Page_SizeTests, apzPthread_Page_SizePatch },
-
- { zRs6000_DoubleName, zRs6000_DoubleList,
- apzRs6000_DoubleMachs, (regex_t*)NULL,
- RS6000_DOUBLE_TEST_CT, FD_MACH_ONLY,
- aRs6000_DoubleTests, apzRs6000_DoublePatch },
-
- { zRs6000_FchmodName, zRs6000_FchmodList,
- apzRs6000_FchmodMachs, (regex_t*)NULL,
- RS6000_FCHMOD_TEST_CT, FD_MACH_ONLY,
- aRs6000_FchmodTests, apzRs6000_FchmodPatch },
-
- { zRs6000_ParamName, zRs6000_ParamList,
- apzRs6000_ParamMachs, (regex_t*)NULL,
- RS6000_PARAM_TEST_CT, FD_MACH_ONLY,
- aRs6000_ParamTests, apzRs6000_ParamPatch },
-
- { zSony_IncludeName, zSony_IncludeList,
- apzSony_IncludeMachs, (regex_t*)NULL,
- SONY_INCLUDE_TEST_CT, FD_MACH_ONLY,
- aSony_IncludeTests, apzSony_IncludePatch },
-
- { zStatsswtchName, zStatsswtchList,
- apzStatsswtchMachs, (regex_t*)NULL,
- STATSSWTCH_TEST_CT, FD_MACH_ONLY,
- aStatsswtchTests, apzStatsswtchPatch },
-
- { zStdio_Va_ListName, zStdio_Va_ListList,
- apzStdio_Va_ListMachs, (regex_t*)NULL,
- STDIO_VA_LIST_TEST_CT, FD_MACH_ONLY,
- aStdio_Va_ListTests, apzStdio_Va_ListPatch },
-
- { zSun_Bogus_IfdefName, zSun_Bogus_IfdefList,
- apzSun_Bogus_IfdefMachs, (regex_t*)NULL,
- SUN_BOGUS_IFDEF_TEST_CT, FD_MACH_ONLY,
- aSun_Bogus_IfdefTests, apzSun_Bogus_IfdefPatch },
-
- { zSun_Bogus_Ifdef_Sun4cName, zSun_Bogus_Ifdef_Sun4cList,
- apzSun_Bogus_Ifdef_Sun4cMachs, (regex_t*)NULL,
- SUN_BOGUS_IFDEF_SUN4C_TEST_CT, FD_MACH_ONLY,
- aSun_Bogus_Ifdef_Sun4cTests, apzSun_Bogus_Ifdef_Sun4cPatch },
-
- { zSun_CatmacroName, zSun_CatmacroList,
- apzSun_CatmacroMachs, (regex_t*)NULL,
- SUN_CATMACRO_TEST_CT, FD_MACH_ONLY,
- aSun_CatmacroTests, apzSun_CatmacroPatch },
-
- { zSun_MallocName, zSun_MallocList,
- apzSun_MallocMachs, (regex_t*)NULL,
- SUN_MALLOC_TEST_CT, FD_MACH_ONLY,
- aSun_MallocTests, apzSun_MallocPatch },
-
- { zSun_MemcpyName, zSun_MemcpyList,
- apzSun_MemcpyMachs, (regex_t*)NULL,
- SUN_MEMCPY_TEST_CT, FD_MACH_ONLY,
- aSun_MemcpyTests, apzSun_MemcpyPatch },
-
- { zSun_Rusers_SemiName, zSun_Rusers_SemiList,
- apzSun_Rusers_SemiMachs, (regex_t*)NULL,
- SUN_RUSERS_SEMI_TEST_CT, FD_MACH_ONLY,
- aSun_Rusers_SemiTests, apzSun_Rusers_SemiPatch },
-
- { zSun_SignalName, zSun_SignalList,
- apzSun_SignalMachs, (regex_t*)NULL,
- SUN_SIGNAL_TEST_CT, FD_MACH_ONLY,
- aSun_SignalTests, apzSun_SignalPatch },
-
- { zSun_Xdr_ProtoName, zSun_Xdr_ProtoList,
- apzSun_Xdr_ProtoMachs, (regex_t*)NULL,
- SUN_XDR_PROTO_TEST_CT, FD_MACH_ONLY,
- aSun_Xdr_ProtoTests, apzSun_Xdr_ProtoPatch },
-
- { zSunos_Large_MacroName, zSunos_Large_MacroList,
- apzSunos_Large_MacroMachs, (regex_t*)NULL,
- SUNOS_LARGE_MACRO_TEST_CT, FD_MACH_ONLY,
- aSunos_Large_MacroTests, apzSunos_Large_MacroPatch },
-
- { zSunos_Matherr_DeclName, zSunos_Matherr_DeclList,
- apzSunos_Matherr_DeclMachs, (regex_t*)NULL,
- SUNOS_MATHERR_DECL_TEST_CT, FD_MACH_ONLY,
- aSunos_Matherr_DeclTests, apzSunos_Matherr_DeclPatch },
-
- { zSunos_StrlenName, zSunos_StrlenList,
- apzSunos_StrlenMachs, (regex_t*)NULL,
- SUNOS_STRLEN_TEST_CT, FD_MACH_ONLY,
- aSunos_StrlenTests, apzSunos_StrlenPatch },
-
- { zSystypesName, zSystypesList,
- apzSystypesMachs, (regex_t*)NULL,
- SYSTYPES_TEST_CT, FD_MACH_ONLY,
- aSystypesTests, apzSystypesPatch },
-
- { zSystypes_For_AixName, zSystypes_For_AixList,
- apzSystypes_For_AixMachs, (regex_t*)NULL,
- SYSTYPES_FOR_AIX_TEST_CT, FD_MACH_ONLY,
- aSystypes_For_AixTests, apzSystypes_For_AixPatch },
-
- { zSysv68_StringName, zSysv68_StringList,
- apzSysv68_StringMachs, (regex_t*)NULL,
- SYSV68_STRING_TEST_CT, FD_MACH_ONLY,
- aSysv68_StringTests, apzSysv68_StringPatch },
-
- { zSysz_Stdlib_For_SunName, zSysz_Stdlib_For_SunList,
- apzSysz_Stdlib_For_SunMachs, (regex_t*)NULL,
- SYSZ_STDLIB_FOR_SUN_TEST_CT, FD_MACH_ONLY,
- aSysz_Stdlib_For_SunTests, apzSysz_Stdlib_For_SunPatch },
-
- { zSysz_Stdtypes_For_SunName, zSysz_Stdtypes_For_SunList,
- apzSysz_Stdtypes_For_SunMachs, (regex_t*)NULL,
- SYSZ_STDTYPES_FOR_SUN_TEST_CT, FD_MACH_ONLY,
- aSysz_Stdtypes_For_SunTests, apzSysz_Stdtypes_For_SunPatch },
-
- { zTinfo_CplusplusName, zTinfo_CplusplusList,
- apzTinfo_CplusplusMachs, (regex_t*)NULL,
- TINFO_CPLUSPLUS_TEST_CT, FD_MACH_ONLY,
- aTinfo_CplusplusTests, apzTinfo_CplusplusPatch },
-
- { zUltrix_Ansi_CompatName, zUltrix_Ansi_CompatList,
- apzUltrix_Ansi_CompatMachs, (regex_t*)NULL,
- ULTRIX_ANSI_COMPAT_TEST_CT, FD_MACH_ONLY,
- aUltrix_Ansi_CompatTests, apzUltrix_Ansi_CompatPatch },
-
- { zUltrix_Atof_ParamName, zUltrix_Atof_ParamList,
- apzUltrix_Atof_ParamMachs, (regex_t*)NULL,
- ULTRIX_ATOF_PARAM_TEST_CT, FD_MACH_ONLY,
- aUltrix_Atof_ParamTests, apzUltrix_Atof_ParamPatch },
-
- { zUltrix_ConstName, zUltrix_ConstList,
- apzUltrix_ConstMachs, (regex_t*)NULL,
- ULTRIX_CONST_TEST_CT, FD_MACH_ONLY,
- aUltrix_ConstTests, apzUltrix_ConstPatch },
-
- { zUltrix_IfdefName, zUltrix_IfdefList,
- apzUltrix_IfdefMachs, (regex_t*)NULL,
- ULTRIX_IFDEF_TEST_CT, FD_MACH_ONLY,
- aUltrix_IfdefTests, apzUltrix_IfdefPatch },
-
- { zUltrix_Nested_CmntName, zUltrix_Nested_CmntList,
- apzUltrix_Nested_CmntMachs, (regex_t*)NULL,
- ULTRIX_NESTED_CMNT_TEST_CT, FD_MACH_ONLY,
- aUltrix_Nested_CmntTests, apzUltrix_Nested_CmntPatch },
-
- { zUltrix_StaticName, zUltrix_StaticList,
- apzUltrix_StaticMachs, (regex_t*)NULL,
- ULTRIX_STATIC_TEST_CT, FD_MACH_ONLY,
- aUltrix_StaticTests, apzUltrix_StaticPatch },
-
- { zUndefine_NullName, zUndefine_NullList,
- apzUndefine_NullMachs, (regex_t*)NULL,
- UNDEFINE_NULL_TEST_CT, FD_MACH_ONLY,
- aUndefine_NullTests, apzUndefine_NullPatch },
-
- { zVa_I960_MacroName, zVa_I960_MacroList,
- apzVa_I960_MacroMachs, (regex_t*)NULL,
- VA_I960_MACRO_TEST_CT, FD_MACH_ONLY,
- aVa_I960_MacroTests, apzVa_I960_MacroPatch },
-
- { zVoid_NullName, zVoid_NullList,
- apzVoid_NullMachs, (regex_t*)NULL,
- VOID_NULL_TEST_CT, FD_MACH_ONLY,
- aVoid_NullTests, apzVoid_NullPatch },
-
- { zVxworks_Gcc_ProblemName, zVxworks_Gcc_ProblemList,
- apzVxworks_Gcc_ProblemMachs, (regex_t*)NULL,
- VXWORKS_GCC_PROBLEM_TEST_CT, FD_MACH_ONLY,
- aVxworks_Gcc_ProblemTests, apzVxworks_Gcc_ProblemPatch },
-
- { zVxworks_Needs_VxtypesName, zVxworks_Needs_VxtypesList,
- apzVxworks_Needs_VxtypesMachs, (regex_t*)NULL,
- VXWORKS_NEEDS_VXTYPES_TEST_CT, FD_MACH_ONLY,
- aVxworks_Needs_VxtypesTests, apzVxworks_Needs_VxtypesPatch },
-
- { zVxworks_Needs_VxworksName, zVxworks_Needs_VxworksList,
- apzVxworks_Needs_VxworksMachs, (regex_t*)NULL,
- VXWORKS_NEEDS_VXWORKS_TEST_CT, FD_MACH_ONLY,
- aVxworks_Needs_VxworksTests, apzVxworks_Needs_VxworksPatch },
-
- { zVxworks_TimeName, zVxworks_TimeList,
- apzVxworks_TimeMachs, (regex_t*)NULL,
- VXWORKS_TIME_TEST_CT, FD_MACH_ONLY,
- aVxworks_TimeTests, apzVxworks_TimePatch },
-
- { zX11_ClassName, zX11_ClassList,
- apzX11_ClassMachs, (regex_t*)NULL,
- X11_CLASS_TEST_CT, FD_MACH_ONLY,
- aX11_ClassTests, apzX11_ClassPatch },
-
- { zX11_Class_UsageName, zX11_Class_UsageList,
- apzX11_Class_UsageMachs, (regex_t*)NULL,
- X11_CLASS_USAGE_TEST_CT, FD_MACH_ONLY,
- aX11_Class_UsageTests, apzX11_Class_UsagePatch },
-
- { zX11_NewName, zX11_NewList,
- apzX11_NewMachs, (regex_t*)NULL,
- X11_NEW_TEST_CT, FD_MACH_ONLY,
- aX11_NewTests, apzX11_NewPatch },
-
- { zX11_SprintfName, zX11_SprintfList,
- apzX11_SprintfMachs, (regex_t*)NULL,
- X11_SPRINTF_TEST_CT, FD_MACH_ONLY,
- aX11_SprintfTests, apzX11_SprintfPatch },
-
- { zZzz_Ki_IfaceName, zZzz_Ki_IfaceList,
- apzZzz_Ki_IfaceMachs, (regex_t*)NULL,
- ZZZ_KI_IFACE_TEST_CT, FD_MACH_ONLY,
- aZzz_Ki_IfaceTests, apzZzz_Ki_IfacePatch },
-
- { zZzz_KiName, zZzz_KiList,
- apzZzz_KiMachs, (regex_t*)NULL,
- ZZZ_KI_TEST_CT, FD_MACH_ONLY,
- aZzz_KiTests, apzZzz_KiPatch },
-
- { zZzz_Ki_CallsName, zZzz_Ki_CallsList,
- apzZzz_Ki_CallsMachs, (regex_t*)NULL,
- ZZZ_KI_CALLS_TEST_CT, FD_MACH_ONLY,
- aZzz_Ki_CallsTests, apzZzz_Ki_CallsPatch },
-
- { zZzz_Ki_DefsName, zZzz_Ki_DefsList,
- apzZzz_Ki_DefsMachs, (regex_t*)NULL,
- ZZZ_KI_DEFS_TEST_CT, FD_MACH_ONLY,
- aZzz_Ki_DefsTests, apzZzz_Ki_DefsPatch },
-
- { zZzz_TimeName, zZzz_TimeList,
- apzZzz_TimeMachs, (regex_t*)NULL,
- ZZZ_TIME_TEST_CT, FD_MACH_ONLY,
- aZzz_TimeTests, apzZzz_TimePatch }
-};
diff --git a/contrib/fixinc/hackshell.tpl b/contrib/fixinc/hackshell.tpl
deleted file mode 100644
index 6ba7437d3ef..00000000000
--- a/contrib/fixinc/hackshell.tpl
+++ /dev/null
@@ -1,187 +0,0 @@
-[= 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
diff --git a/contrib/fixinc/inclhack.def b/contrib/fixinc/inclhack.def
deleted file mode 100644
index 6c04a4800c0..00000000000
--- a/contrib/fixinc/inclhack.def
+++ /dev/null
@@ -1,2326 +0,0 @@
-/* -*- Mode: C -*- $Id: inclhack.def,v 1.6 1998/09/22 07:22:00 korbb Exp $ */
-
-autogen definitions inclhack;
-
-/*
- * Define all the fixes we know about for repairing damaged headers
- */
-
-/*
- * sys/wait.h on AIX 3.2.5 puts the declaration of wait3 before the definition
- * of struct rusage, so the prototype (added by fixproto) causes havoc.
- */
-fix = {
- hackname = aix_syswait;
- files = sys/wait.h;
- select = "bos325,";
- sed = "/^extern pid_t wait3();$/i\\\n"
- "struct rusage;\n";
-};
-
-
-/*
- * sys/signal.h on some versions of AIX uses volatile in the typedef of
- * sig_atomic_t, which causes gcc to generate a warning about duplicate
- * volatile when a sig_atomic_t variable is declared volatile, as
- * required by ANSI C.
- */
-fix = {
- hackname = aix_volatile;
- files = sys/signal.h;
- select = "typedef volatile int sig_atomic_t";
- sed = "s/typedef volatile int sig_atomic_t"
- "/typedef int sig_atomic_t/";
-};
-
-
-/*
- * Fix getopt declarations in stdio.h and stdlib.h on Alpha OSF/1 and AIX.
- */
-fix = {
- hackname = alpha_getopt;
- files = "stdio.h";
- files = "stdlib.h";
- select = 'getopt\(int, char \*\[';
- sed = 's/getopt(int, char \*\[\],[ ]*char \*)/'
- 'getopt(int, char *const[], const char *)/';
-};
-
-
-/*
- * 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. 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.
- */
-fix = {
- hackname = alpha_parens;
- files = sym.h;
- select = '#ifndef\(__mips64\)';
- sed = "s/#ifndef(__mips64)/#ifndef __mips64/";
-};
-
-
-/*
- * Fix return value of sbrk in unistd.h on Alpha OSF/1 V2.0
- */
-fix = {
- hackname = alpha_sbrk;
- files = unistd.h;
- select = "char[ \t]*\\*[\t ]*sbrk[ \t]*\\(";
- sed = "s/char\\([ \t]*\\*[\t ]*sbrk[ \t]*(\\)/void\\1/";
-};
-
-
-/*
- * Fix this ARM/RISCiX file where ___type is a Compiler
- * hint that is specific to the Norcroft compiler.
- */
-fix = {
- hackname = arm_norcroft_hint;
- files = "X11/Intrinsic.h";
- sed = "s/___type p_type/p_type/";
-};
-
-
-/*
- * Fix this ARM/RISCiX file to avoid interfering
- * with the use of __wchar_t in cc1plus.
- */
-fix = {
- hackname = arm_wchar;
- files = stdlib.h;
- select = "#[ \t]*define[ \t]*__wchar_t";
- sed = "s/\\(#[ \t]*ifndef[ \t]*\\)__wchar_t/\\1_GCC_WCHAR_T/";
- sed = "s/\\(#[ \t]*define[ \t]*\\)__wchar_t/\\1_GCC_WCHAR_T/";
-};
-
-
-/*
- * This file in A/UX 3.0.x/3.1.x contains an __asm directive for c89;
- * gcc doesn't understand it.
- */
-fix = {
- hackname = aux_asm;
- files = sys/param.h;
- select = "#ifndef NOINLINE";
- sed = "s|#ifndef NOINLINE"
- "|#if !defined(NOINLINE) \\&\\& !defined(__GNUC__)|";
-};
-
-
-/*
- * For C++, avoid any typedef or macro definition of bool,
- * and use the built in type instead.
- */
-fix = {
- hackname = avoid_bool;
- files = curses.h;
- files = term.h;
- files = tinfo.h;
-
- sed = "/^#[ \t]*define[ \t][ \t]*bool[ \t][ \t]*char[ \t]*$/i\\\n"
- "#ifndef __cplusplus\n";
-
- sed = "/^#[ \t]*define[ \t][ \t]*bool[ \t][ \t]*char[ \t]*$/a\\\n"
- "#endif\n";
-
- sed = "/^typedef[ \t][ \t]*char[ \t][ \t]*bool[ \t]*;/i\\\n"
- "#ifndef __cplusplus\n";
-
- sed = "/^typedef[ \t][ \t]*char[ \t][ \t]*bool[ \t]*;/a\\\n"
- "#endif\n";
-};
-
-
-/*
- * rpc/types.h on OSF1/2.0 is not C++ ready, even though NO_IMPLICIT_EXTERN_C
- * is defined for the alpha. The problem is the declaration of malloc.
- */
-fix = {
- hackname = bad_malloc_decl;
- files = rpc/types.h;
- bypass = '"C"';
- sed = "1i\\\n"
- "#ifdef __cplusplus\\\n"
- "extern \"C\" {\\\n"
- "#endif\\\n\n";
- sed = "$a\\\n"
- "#ifdef __cplusplus\\\n"
- "}\\\n"
- "#endif\n";
-};
-
-
-/*
- * Fix `typedef struct term;' on hppa1.1-hp-hpux9.
- */
-fix = {
- hackname = bad_struct_term;
- files = curses.h;
- select = "^[ \t]*typedef[ \t]+struct[ \t]+term[ \t]*;";
- sed = "s/^[ \t]*typedef[ \t][ \t]*"
- "\\(struct[ \t][ \t]*term[ \t]*;[ \t]*\\)$/\\1/";
-};
-
-
-/*
- * Fix one other error in this file:
- * a mismatched quote not inside a C comment.
- */
-fix = {
- hackname = badquote;
- files = sundev/vuid_event.h;
- sed = "s/doesn't/does not/";
-};
-
-
-/*
- * Fix #defines under Alpha OSF/1:
- * The following files contain '#pragma extern_prefix "_FOO"' followed by
- * a '#define something(x,y,z) _FOOsomething(x,y,z)'. The intent of these
- * statements is to reduce namespace pollution. While these macros work
- * properly in most cases, they don't allow you to take a pointer to the
- * "something" being modified. To get around this limitation, change these
- * statements to be of the form '#define something _FOOsomething'.
- */
-fix = {
- hackname = bad_lval;
- select = "^[ \t]*#[ \t]*pragma[ \t]extern_prefix";
- files = libgen.h;
- files = dirent.h;
- files = ftw.h;
- files = grp.h;
- files = ndbm.h;
- files = pthread.h;
- files = pwd.h;
- files = signal.h;
- files = standards.h;
- files = stdlib.h;
- files = string.h;
- files = stropts.h;
- files = time.h;
- files = unistd.h;
- sed =
- "s/^[ \t]*#[ \t]*define[ \t]*\\([^(]*\\)\\(([^)]*)\\)[ \t]*"
- "\\(_.\\)\\1\\2[ \t]*$/#define \\1 \\3\\1/";
-};
-
-
-/*
- * check for broken assert.h that needs stdio.h
- */
-fix = {
- hackname = broken_assert_stdio;
- files = assert.h;
- select = stderr;
- bypass = "include.*stdio.h";
- sed = "1i\\\n"
- "#include <stdio.h>\n";
-};
-
-
-/*
- * check for broken assert.h that needs stdlib.h
- */
-fix = {
- hackname = broken_assert_stdlib;
- files = assert.h;
- select = 'exit *\(|abort *\(';
- bypass = "include.*stdlib.h";
- sed = "1i\\\n"
- "#ifdef __cplusplus\\\n"
- "#include <stdlib.h>\\\n"
- "#endif\n";
-};
-
-
-/*
- * Note that BSD43_* are used on recent MIPS systems.
- */
-fix = {
- hackname = bsd43_io_macros;
- select = "BSD43__IO";
- /*
- * Put single quotes aroung the character that appears after '('
- * and before ',', UNLESS it is a 'c' or 'g' or 'x'.
- */
- sed = "/[ \t]BSD43__IO[A-Z]*[ \t]*(/" 's/(\(.\),/(\'\1\',/';
- sed = "/#[ \t]*define[ \t]*[ \t]BSD43__IO/" 's/\'\([cgx]\)\'/\1/g';
-};
-
-#IFDEF no_more
-/*
- * And also with the HP-UX 10 and HP-UX 11 sys/pci.h file
- */
-fix = {
- hackname = cxx_cmnt_hpux;
- files = sys/pci.h;
- select = "System Private Structures";
- sed = "s|//.*$||g";
-};
-
-
-/*
- * Turning // comments into normal 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.
- */
-fix = {
- hackname = cxx_cmnt_irix;
- files = fam.h;
- select = indigo.esd;
- sed = "s|//.*$||g";
-};
-
-
-/*
- * Same problem with a file from SunOS 4.1.3 : a header file containing
- * the string "//" embedded in "/ * * /"
- */
-fix = {
- hackname = cxx_cmnt_sunos;
- files = sbusdev/audiovar.h;
- files = sys/audiovar.h;
- sed = "s|//.*$||g";
-};
-
-
-/*
- * There is a similar problem with the VxWorks drv/netif/if_med.h file.
- */
-fix = {
- hackname = cxx_cmnt_vxworks;
- files = drv/netif/if_med.h;
- select = "Wind River";
- sed = "s|//.*$||g";
-};
-#endif
-
-/*
- * Remove the double-slash comments
- * They *must* be removed so it will not create nested comments!!
- * However, they will *not* be removed if '++' is in any part of
- * the file name, or if the name ends with ".hh" or ".H".
- *
- * There *used* to be a number of similar problems in various OSes:
-
- * Turning // comments into normal 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.
-
- * Same problem with a file from SunOS 4.1.3 : a header file containing
- * the string "//" embedded in "/ * * /"
-
- * There is a similar problem with the VxWorks drv/netif/if_med.h file.
-
- * And also with the HP-UX 10 and HP-UX 11 sys/pci.h file
- */
-fix = {
- hackname = no_double_slash;
- test = '-z "`echo ${file}|egrep \'++$|\.hh$|\.H$\'`"';
- select = '//[^*]';
- sed = '/\/\/[^*]/' "s|//.*$||g";
-};
-
-
-/*
- * Multiline comment after typedef on IRIX 4.0.1.
- */
-fix = {
- hackname = irix_bogus_cxx_cmnt;
- files = "elf_abi.h";
- files = "elf.h";
- /*
- * This really looks like it is replacing "/ * * /" with "//"
- * Shouldn't the replacement really be " ## "?
- */
- sed = 's@"/\*"\*/@"//"@';
-};
-
-
-/*
- * Fix these Sun OS files to avoid an invalid identifier in an #ifdef.
- */
-fix = {
- hackname = ecd_cursor;
- files = "sunwindow/win_lock.h";
- files = "sunwindow/win_cursor.h";
- sed = "s/ecd.cursor/ecd_cursor/";
-};
-
-
-
-/*
- * Fix else directives that contain non-commentary text
- *
- * The fixinc_eol stuff is to work around a bug in the sed
- */
-fix = {
- hackname = else_label;
- select = "^[ \t]*#[ \t]*else[ \t]+[!-.0-~]";
- sed = ":loop\n"
- '/\\\\$/' "N\n"
- 's/\\\\$/\\\\+++fixinc_eol+++/' "\n"
- '/\\\\$/' "b loop\n"
- 's/\\\\+++fixinc_eol+++/\\\\/g' "\n"
-
- "s%^\\([ \t]*#[ \t]*else\\)[ \t]*/[^*].*%\\1%\n"
- "s%^\\([ \t]*#[ \t]*else\\)[ \t]*[^/ \t].*%\\1%";
-};
-
-
-/*
- * Fix endif directives that contain non-commentary text
- */
-fix = {
- hackname = endif_label;
- /*
- * Select files that contain '#endif' directives with
- * some sort of following junk. (Between the ascii '.'
- * and '0' lies the character '/'. This will *NOT*
- * match '#endif / * foo * /', but it also wont match
- * '#endif / done' either.
- *
- * We use the pattern [!-.0-z{|}~] instead of [^/ \t] to match a noncomment
- * following #else or #endif because some buggy egreps think [^/] matches
- * newline, and they thus think `#else ' matches
- * `#e[ndiflse]*[ \t]+[^/ \t]'.
- * [!-.0-~] does not work properly on AIX 4.1.
- */
- select = "^[ \t]*#[ \t]*endif[ \t]+[!-.0-z\{\|\}\~]";
-
- /*
- * First, join the continued input lines.
- * IF the resulting line is an endif preprocessing directive,
- * then trim off the following patterns:
- * 1. sequences that start with '/' and is *NOT* followed by '*'
- * 2. Sequences that start with '*' and is *NOT* followed by '/'
- * 3. sequences that do not start with any of '/', '*', '\t' or ' '.
- *
- * The fixinc_eol stuff is to work around a bug in the sed
- */
- sed = ":loop\n"
- '/\\\\$/' "N\n"
- 's/\\\\$/\\\\+++fixinc_eol+++/' "\n"
- '/\\\\$/' "b loop\n"
- 's/\\\\+++fixinc_eol+++/\\\\/g' "\n"
-
- "s%^\\([ \t]*#[ \t]*endif\\)[ \t]*/[^*].*%\\1%\n"
- "s%^\\([ \t]*#[ \t]*endif\\)[ \t]*\\*[^/].*%\\1%\n"
- "s%^\\([ \t]*#[ \t]*endif\\)[ \t]*[^/* \t].*%\\1%";
-};
-
-
-/*
- * Fix HP's use of ../machine/inline.h to refer to
- * /usr/include/machine/inline.h
- */
-fix = {
- hackname = hp_inline;
- files = sys/spinlock.h;
- select = 'include.*"\.\./machine/';
- sed = "s,\"../machine/inline.h\",<machine/inline.h>,";
- sed = "s,\"../machine/psl.h\",<machine/psl.h>,";
-};
-
-
-/*
- * Check for (...) in C++ code in HP/UX sys/file.h.
- */
-fix = {
- hackname = hp_sysfile;
- files = sys/file.h;
- select = "HPUX_SOURCE";
- sed = 's/(\.\.\.)/(struct file * ...)/';
-};
-
-
-/*
- * sys/mman.h on HP/UX is not C++ ready,
- * even though NO_IMPLICIT_EXTERN_C is defined on HP/UX.
- */
-fix = {
- hackname = hpux_cxx_unready;
- files = sys/mman.h;
- bypass = '"C"|__BEGIN_DECLS';
-
- sed = "1i\\\n"
- "#ifdef __cplusplus\\\n"
- "extern \"C\" {\\\n"
- "#endif\\\n\n";
- sed = "$a\\\n"
- "#ifdef __cplusplus\\\n"
- "}\\\n"
- "#endif\n";
-};
-
-
-/*
- * HPUX 10.x sys/param.h defines MAXINT which clashes with values.h
- */
-fix = {
- hackname = hpux_maxint;
- files = sys/param.h;
- sed = "/^#[ \t]*define[ \t]*MAXINT[ \t]/i\\\n"
- "#ifndef MAXINT\n";
-
- sed = "/^#[ \t]*define[ \t]*MAXINT[ \t]/a\\\n"
- "#endif\n";
-};
-
-
-/*
- * Fix hpux10.20 <sys/time.h> to avoid invalid forward decl
- */
-fix = {
- hackname = hpux_systime;
- files = sys/time.h;
- select = "^extern struct sigevent;";
- sed = "s/^extern struct sigevent;/struct sigevent;/";
-};
-
-
-/*
- * Fix various _IO* defines, but do *not* quote the characters cgxtf.
- */
-fix = {
- hackname = interactv_add1;
-
- test = "-d /etc/conf/kconfig.d";
- test = '-n "`grep _POSIX_VERSION /usr/include/sys/unistd.h`"';
-
- files = "stdio.h";
- files = "math.h";
- files = "ctype.h";
- files = "sys/limits.h";
- files = "sys/fcntl.h";
- files = "sys/dirent.h";
-
- sed = "s/!defined(__STDC__) && !defined(_POSIX_SOURCE)/"
- "!defined(_POSIX_SOURCE)/";
-};
-
-fix = {
- hackname = interactv_add2;
-
- test = "-d /etc/conf/kconfig.d";
- test = '-n "`grep _POSIX_VERSION /usr/include/sys/unistd.h`"';
-
- files = math.h;
- sed = "s/fmod(double)/fmod(double, double)/";
-};
-
-fix = {
- hackname = interactv_add3;
-
- test = "-d /etc/conf/kconfig.d";
- test = '-n "`grep _POSIX_VERSION /usr/include/sys/unistd.h`"';
-
- files = sys/limits.h;
-
- sed = "/CHILD_MAX/s,/\\* Max, Max,";
- sed = "/OPEN_MAX/s,/\\* Max, Max,";
-};
-
-
-/*
- * Remove erroneous parentheses in sym.h on Alpha OSF/1.
- */
-fix = {
- hackname = io_def_quotes;
- select = "[ \t]_IO[A-Z]*[ \t]*\\([A-Za-z]";
- sed = "s/\\([ \t]_IO[A-Z]*[ \t]*(\\)\\([A-Za-z]\\),/\\1'\\2',/";
- sed = "/#[ \t]*define[ \t]*[ \t]_IO/"
- "s/'\\([cgxtf]\\)'/\\1/g";
- sed = "/#[ \t]*define[ \t]*[ \t]DESIOC/" 's/\'\([cdgx]\)\'/\1/g';
-};
-
-
-/*
- * Fix CTRL macros
- */
-fix = {
- hackname = ioctl_fix_ctrl;
- select = "CTRL[ \t]";
-
- sed = "/[^A-Z0-9_]CTRL[ \t]*(/"
- "s/\\([^']\\))/'\\1')/";
-
- sed = "/[^A-Z0-9]_CTRL[ \t]*(/"
- "s/\\([^']\\))/'\\1')/";
-
- sed = "/#[ \t]*define[ \t]*[ \t]CTRL/"
- "s/'\\([cgx]\\)'/\\1/g";
-
- sed = "/#[ \t]*define[ \t]*[ \t]_CTRL/"
- "s/'\\([cgx]\\)'/\\1/g";
-
- sed = "/#[ \t]*define[ \t]*[ \t]BSD43_CTRL/"
- "s/'\\([cgx]\\)'/\\1/g";
-};
-
-
-/*
- * Check for missing ';' in struct
- */
-fix = {
- hackname = ip_missing_semi;
- files = netinet/ip.h;
- sed = "/^struct/,/^};/s/}$/};/";
-};
-
-
-/*
- * IRIX 4.0.5 <rpc/auth.h> uses struct sockaddr
- * in prototype without previous definition.
- */
-fix = {
- hackname = irix_multiline_cmnt;
- files = sys/types.h;
-
- sed = "s@type of the result@type of the result */@";
- sed = "s@of the sizeof@/* of the sizeof@";
-};
-
-
-/*
- * Some IRIX header files contain the string "//"
- */
-fix = {
- hackname = irix_sockaddr;
- files = rpc/auth.h;
- select = "authdes_create.*struct sockaddr";
- sed = "/authdes_create.*struct sockaddr/i\\\n"
- "struct sockaddr;\n";
-};
-
-
-/*
- * IRIX 4.0.5 <rpc/xdr.h> uses struct __file_s
- * in prototype without previous definition.
- */
-fix = {
- hackname = irix_struct__file;
- files = rpc/xdr.h;
- sed = "/xdrstdio_create.*struct __file_s/i\\\n"
- "struct __file_s;\n";
-};
-
-
-/*
- * Fixing ISC fmod declaration
- */
-fix = {
- hackname = isc_fmod;
- files = math.h;
- select = 'fmod\(double\)';
- sed = "s/fmod(double)/fmod(double, double)/";
-};
-
-
-/*
- * Fix nested comments in Motorola's <limits.h> and <sys/limits.h>
- */
-fix = {
- hackname = motorola_nested;
- files = limits.h;
- files = sys/limits.h;
- sed = "s@^\\(#undef[ \t][ \t]*PIPE_BUF[ \t]*"
- "/\\* max # bytes atomic in write to a\\)$@\\1 */@";
- sed = "s@\\(/\\*#define\tHUGE_VAL\t3.40282346638528860e+38 \\)"
- "\\(/\\*error value returned by Math lib\\*/\\)$@\\1*/ \\2@";
-};
-
-
-/*
- * Fixing nested comments in ISC <sys/limits.h>
- */
-fix = {
- hackname = isc_sys_limits;
- files = sys/limits.h;
- select = CHILD_MAX;
- sed = "/CHILD_MAX/s,/\\* Max, Max,";
- sed = "/OPEN_MAX/s,/\\* Max, Max,";
-};
-
-
-/*
- * These files in Sun OS 4.x and ARM/RISCiX and BSD4.3
- * use / * * / to concatenate tokens.
- */
-fix = {
- hackname = kandr_concat;
- files = "sparc/asm_linkage.h";
- files = "sun3/asm_linkage.h";
- files = "sun3x/asm_linkage.h";
- files = "sun4/asm_linkage.h";
- files = "sun4c/asm_linkage.h";
- files = "sun4m/asm_linkage.h";
- files = "sun4c/debug/asm_linkage.h";
- files = "sun4m/debug/asm_linkage.h";
- files = "arm/as_support.h";
- files = "arm/mc_type.h";
- files = "arm/xcb.h";
- files = "dev/chardefmac.h";
- files = "dev/ps_irq.h";
- files = "dev/screen.h";
- files = "dev/scsi.h";
- files = "sys/tty.h";
- files = "Xm.acorn/XmP.h";
- files = bsd43/bsd43_.h;
- select = '/\*\*/';
- sed = 's|/\*\*/| ## |g';
-};
-
-
-/*
- * 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.
- * Also fix a nested comment problem in sys/limits.h on Motorola sysV68 R3V7.1
- */
-fix = {
- hackname = limits_ifndefs;
- files = "limits.h";
- bypass = "ifndef[ \t]+FLT_MIN";
-
- sed = "/[ \t]FLT_MIN[ \t]/i\\\n#ifndef FLT_MIN\n";
- sed = "/[ \t]FLT_MIN[ \t]/a\\\n#endif\n";
- sed = "/[ \t]FLT_MAX[ \t]/i\\\n#ifndef FLT_MAX\n";
- sed = "/[ \t]FLT_MAX[ \t]/a\\\n#endif\n";
- sed = "/[ \t]FLT_DIG[ \t]/i\\\n#ifndef FLT_DIG\n";
- sed = "/[ \t]FLT_DIG[ \t]/a\\\n#endif\n";
- sed = "/[ \t]DBL_MIN[ \t]/i\\\n#ifndef DBL_MIN\n";
- sed = "/[ \t]DBL_MIN[ \t]/a\\\n#endif\n";
- sed = "/[ \t]DBL_MAX[ \t]/i\\\n#ifndef DBL_MAX\n";
- sed = "/[ \t]DBL_MAX[ \t]/a\\\n#endif\n";
- sed = "/[ \t]DBL_DIG[ \t]/i\\\n#ifndef DBL_DIG\n";
- sed = "/[ \t]DBL_DIG[ \t]/a\\\n#endif\n";
- sed = "/^\\(\\/\\*#define\tHUGE_VAL\t3\\.[0-9e+]* *\\)\\/\\*/s//\\1/";
-};
-
-
-/*
- * Delete the '#define void int' line from curses.h on Lynx
- */
-fix = {
- hackname = lynx_void_int;
- files = curses.h;
- select = "#[ \t]*define[ \t]+void[ \t]+int";
- sed = "/#[ \t]*define[ \t][ \t]*void[ \t]int/d";
-};
-
-
-/*
- * Fix fcntl prototype in fcntl.h on LynxOS.
- */
-fix = {
- hackname = lynxos_fcntl_proto;
- files = fcntl.h;
-
- sed = 's/\(fcntl.*(int, int, \)int)/\1...)/';
-};
-
-
-/*
- * Fix incorrect S_IF* definitions on m88k-sysv3.
- */
-fix = {
- hackname = m88k_bad_hypot_opt;
- mach = "m88k-motorola-sysv3*";
- files = "math.h";
-
- sed = "s/extern double floor(), ceil(), fmod(), fabs();/"
- "extern double floor(), ceil(), fmod(), fabs _PARAMS((double));/";
-
- sed = "/^extern double hypot();$/a\\\n"
- "\\/* Workaround a stupid Motorola optimization if one\\\n"
- " of x or y is 0.0 and the other is negative! *\\/\\\n"
- "#ifdef __STDC__\\\n"
- "static __inline__ double fake_hypot (double x, double y)\\\n"
- "#else\\\n"
- "static __inline__ double fake_hypot (x, y)\\\n"
- "\tdouble x, y;\\\n"
- "#endif\\\n"
- "{\\\n"
- "\treturn fabs (hypot (x, y));\\\n"
- "}\\\n"
- "#define hypot\tfake_hypot\n";
-};
-
-
-/*
- * Fix non-ansi machine name defines
- * This is split into two parts: the shell version as a single
- * patch, and the program version with each patch separate.
- * Each is substantially faster for the particular environment.
- * You have a dual maintenance problem here. */
-fix = {
- hackname = m88k_bad_s_if;
- mach = "m88k-*-sysv3*";
- files = sys/stat.h;
- select = "#define[ \t]+S_IS[A-Z]*(m)[ \t]";
-
- sed = "s/^\\(#define[ \t]*S_IS[A-Z]*(m)\\)[ \t]*"
- "(m[ \t]*&[ \t]*\\(S_IF[A-Z][A-Z][A-Z][A-Z]*\\)[ \t]*)/"
- "\\1 (((m)\\&S_IFMT)==\\2)/";
-
- sed = "s/^\\(#define[ \t]*S_IS[A-Z]*(m)\\)[ \t]*"
- "(m[ \t]*&[ \t]*\\(0[0-9]*\\)[ \t]*)/"
- "\\1 (((m)\\&S_IFMT)==\\2)/";
-};
-
-
-/*
- * Put cpp wrappers around these include files to avoid redeclaration
- * errors during multiple inclusion on m88k-tektronix-sysv3.
- */
-fix = {
- hackname = m88k_multi_incl;
- mach = "m88k-tektronix-sysv3*";
- files = "time.h";
- bypass = "#ifndef";
- shell =
- "echo Fixing $file, to protect against multiple inclusion. >&2
- cpp_wrapper=`echo $file | sed -e 's,\\.,_,g' -e 's,/,_,g'`
- sed -e \"1i\\\n"
- "#ifndef __GCC_GOT_${cpp_wrapper}_\\\n"
- "#define __GCC_GOT_${cpp_wrapper}_\\\n\" \\\n"
- "\t-e \"$a\\\n"
- "#endif /* ! __GCC_GOT_${cpp_wrapper}_ */\n\"";
-};
-
-
-/*
- * libm.a on m88k-motorola-sysv3 contains a stupid optimization for
- * function hypot(), which returns the second argument without even
- * looking at its value if the other is 0.0 Another drawback is that
- * fix-header doesn't fix fabs' prototype, and I have no idea why.
- */
-fix = {
- hackname = machine_name;
- /*
- * Select '#if.*' and '#elif" with possible non-ansi symbols
- * The only non-ansi symbols we know about start with one of:
- * MRS_bhimnprstuv
- * If any are added to the substitution list, then add it to
- * the selection list as well. Hopefully we can avoid names
- * starting with "d" and "l", because this pattern would then
- * match "defined" and "lint" as well. I suppose we could add
- * a "bypass = lint" if we had to though.
- *
- * The fixinc_eol stuff is to work around a bug in the sed
- */
- select = "^#[ \t]*(if|elif).*"
- "[^a-zA-Z0-9_](_*[MSRrhim]|[Mbimnpstuv])[a-zA-Z0-9_]";
- exesel = "^#[ \t]*(if|elif).*[^a-zA-Z0-9_]"
- "("
- "M32"
- "|_*("
- "MIPSE[LB]"
- "|SYSTYPE_[A-Z0-9]"
- "|[Rr][34]000"
- "|host_mips"
- "|i386"
- "|mips"
- ")($|[^a-zA-Z0-9_])"
- "|bsd4"
- "|is68k"
- "|m[68]8k"
- "|mc680"
- "|news"
- "|ns32000"
- "|pdp11"
- "|pyr"
- "|sel"
- "|sony_news"
- "|sparc"
- "|sun"
- "|tahoe"
- "|tower"
- "|u370"
- "|u3b"
- "|unix"
- "|vax"
- ")";
-
- sed = ":loop\n"
- '/\\\\$/' "N\n"
- 's/\\\\$/\\\\+++fixinc_eol+++/' "\n"
- '/\\\\$/' "b loop\n"
- 's/\\\\+++fixinc_eol+++/\\\\/g' "\n"
-
- "/#[\t ]*[el]*if/ {\n"
- "\ts/[a-zA-Z0-9_][a-zA-Z0-9_]*/ & /g\n"
-
- "\ts/ M32 / __M32__ /g\n"
- "\ts/ _*MIPSE\\([LB]\\) / __MIPSE\\1__ /g\n"
- "\ts/ _*SYSTYPE_\\([A-Z0-9]*\\) / __SYSTYPE_\\1__ /g\n"
- "\ts/ _*\\([Rr][34]\\)000 / __\\1000__ /g\n"
- "\ts/ _*host_mips / __host_mips__ /g\n"
- "\ts/ _*i386 / __i386__ /g\n"
- "\ts/ _*mips / __mips__ /g\n"
- "\ts/ bsd4\\([0-9]\\) / __bsd4\\1__ /g\n"
- "\ts/ is68k / __is68k__ /g\n"
- "\ts/ m68k / __m68k__ /g\n"
- "\ts/ m88k / __m88k__ /g\n"
- "\ts/ mc680\\([0-9]\\)0 / __mc680\\10__ /g\n"
- "\ts/ news\\([0-9]*\\) / __news\\1__ /g\n"
- "\ts/ ns32000 / __ns32000__ /g\n"
- "\ts/ pdp11 / __pdp11__ /g\n"
- "\ts/ pyr / __pyr__ /g\n"
- "\ts/ sel / __sel__ /g\n"
- "\ts/ sony_news / __sony_news__ /g\n"
- "\ts/ sparc / __sparc__ /g\n"
- "\ts/ sun\\([a-z0-9]*\\) / __sun\\1__ /g\n"
- "\ts/ tahoe / __tahoe__ /g\n"
- "\ts/ tower\\([_0-9]*\\) / __tower\\1__ /g\n"
- "\ts/ u370 / __u370__ /g\n"
- "\ts/ u3b\\([0-9]*\\) / __u3b\\1__ /g\n"
- "\ts/ unix / __unix__ /g\n"
- "\ts/ vax / __vax__ /g\n"
-
- "\ts/ \\([a-zA-Z0-9_][a-zA-Z0-9_]*\\) /\\1/g\n\t}";
-};
-
-
-/*
- * Some math.h files define struct exception, which conflicts with
- * the class exception defined in the C++ file std/stdexcept.h. We
- * redefine it to __math_exception. This is not a great fix, but I
- * haven't been able to think of anything better.
- */
-fix = {
- hackname = math_exception;
- files = math.h;
- select = "struct exception";
- sed = "/struct exception/i\\\n"
- "#ifdef __cplusplus\\\n"
- "#define exception __math_exception\\\n"
- "#endif\n";
- sed = "/struct exception/a\\\n"
- "#ifdef __cplusplus\\\n"
- "#undef exception\\\n"
- "#endif\n";
-
- sed = "/matherr/i\\\n"
- "#ifdef __cplusplus\\\n"
- "#define exception __math_exception\\\n"
- "#endif\n";
-
- sed = "/matherr/a\\\n"
- "#ifdef __cplusplus\\\n"
- "#undef exception\\\n"
- "#endif\n";
-};
-
-
-/*
- * In math.h, put #ifndefs around things that might be defined
- * in a gcc specific math-*.h file.
- */
-fix = {
- hackname = math_gcc_ifndefs;
- files = math.h;
- shell = " dbl_max_def="
- "\"`egrep 'define[ \t]+DBL_MAX[ \t]+.*' ${SRCDIR}/float.h "
- "2>/dev/null`\"\n\n"
-
- "\tif ( test -n \"${dbl_max_def}\" \\\n"
- "\t\t-a -n \"`egrep '#define[ \t]*HUGE_VAL[ \t]+DBL_MAX' $file`\" \\\n"
- "\t\t-a -z \"`egrep '#define[ \t]+DBL_MAX[ \t]+' $file`\"\n"
- "\t ) > /dev/null 2>&1\n"
-
- "\tthen sed -e '/define[ \t]HUGE_VAL[ \t]/i\\\n"
- "#ifndef HUGE_VAL\n' \\\n"
- "\t-e '/define[ \t]HUGE_VAL[ \t]/a\\\n#endif\n'\\\n"
- "\t-e \"/define[ \t]HUGE_VAL[ \t]DBL_MAX/s/DBL_MAX/$dbl_max_def/\"\n"
-
- "\telse sed -e '/define[ \t]HUGE_VAL[ \t]/i\\\n"
- "#ifndef HUGE_VAL\n' \\\n"
- "\t-e '/define[ \t]HUGE_VAL[ \t]/a\\\n#endif\n'\n"
- "\tfi";
-};
-
-
-/*
- * libm.a on m88k-motorola-sysv3 contains a stupid optimization for
- * function hypot(), which returns the second argument without even
- * looking at its value
- */
-fix = {
- hackname = motorola_stupid_opt;
- mach = "m88k-motorola-sysv3*";
- files = math.h;
- select = "^extern double hypot();$";
- sed =
- '/^extern double hypot();$/a' "\\\n"
- '\/* Workaround a stupid Motorola optimization if one' "\\\n"
- ' of x or y is 0.0 and the other is negative! *\/' "\\\n"
- '#ifdef __STDC__' "\\\n"
- 'static __inline__ double fake_hypot (double x, double y)' "\\\n"
- '#else' "\\\n"
- 'static __inline__ double fake_hypot (x, y)' "\\\n"
- "\tdouble x, y;\\\n"
- '#endif' "\\\n"
- '{' "\\\n"
- "\treturn fabs (hypot (x, y));\\\n"
- '}' "\\\n"
- "#define hypot\tfake_hypot\n";
-};
-
-
-/*
- * nested comment
- */
-fix = {
- hackname = nested_comment;
- files = rpc/rpc.h;
- sed = 's@^\(/\*.*rpc/auth_des.h>.*\)/\*@\1*/ /*@';
-};
-
-
-/*
- * fix bogus recursive stdlib.h in NEWS-OS 4.0C
- */
-fix = {
- hackname = news_os_recursion;
- files = stdlib.h;
- select = "#include <stdlib.h>";
- sed = "/^#include <stdlib.h>/i\\\n"
- "#ifdef BOGUS_RECURSION\n";
- sed = "/^#include <stdlib.h>/a\\\n"
- "#endif\n";
-};
-
-
-/*
- * NeXT 3.2 adds const prefix to some math functions.
- * These conflict with the built-in functions.
- */
-fix = {
- hackname = next_math_prefix;
- files = ansi/math.h;
- select = "^extern.*double.*__const__.*";
-
- sed = "/^extern.*double.*__const__.*sqrt(/s/__const__//";
- sed = "/^extern.*double.*__const__.*fabs(/s/__const__//";
- sed = "/^extern.*double.*__const__.*cos(/s/__const__//";
- sed = "/^extern.*double.*__const__.*hypot(/s/__const__//";
- sed = "/^extern.*double.*__const__.*sin(/s/__const__//";
-};
-
-
-/*
- * NeXT 3.2 uses the word "template" as a parameter for some
- * functions. GCC reports an invalid use of a reserved key word
- * with the built-in functions. NeXT 3.2 includes the keyword
- * volatile in the prototype for abort(). This conflicts with
- * the built-in definition.
- */
-fix = {
- hackname = next_template;
- files = bsd/libc.h;
- select = template;
-
- sed = '/\(.*template\)/s/template//';
- sed = "/extern.*volatile.*void.*abort/s/volatile//";
-};
-
-
-/*
- * NeXT 3.2 includes the keyword volatile in the abort() and exit()
- * function prototypes. That conflicts with the built-in functions.
- */
-fix = {
- hackname = next_volitile;
- files = ansi/stdlib.h;
- select = volatile;
-
- sed = "/extern.*volatile.*void.*exit/s/volatile//";
- sed = "/extern.*volatile.*void.*abort/s/volatile//";
-};
-
-
-/*
- * NeXT 2.0 defines 'int wait(union wait*)', which conflicts with Posix.1.
- * Note that version 3 of the NeXT system has wait.h in a different directory,
- * so that this code won't do anything. But wait.h in version 3 has a
- * conditional, so it doesn't need this fix. So everything is okay.
- */
-fix = {
- hackname = next_wait_union;
- files = sys/wait.h;
-
- select = 'wait\(union wait';
-
- sed = "s@wait(union wait@wait(void@";
-};
-
-
-/*
- * a missing semi-colon at the end of the nodeent structure definition.
- */
-fix = {
- hackname = nodeent_syntax;
- files = netdnet/dnetdb.h;
- sed = "s/char.*na_addr *$/char *na_addr;/";
-};
-
-
-/*
- * sys/lc_core.h on some versions of OSF1/4.x pollutes the namespace by
- * defining regex.h related types. This causes libg++ build and usage
- * failures. Fixing this correctly requires checking and modifying 3 files.
- */
-fix = {
- hackname = osf_namespace_a;
- files = reg_types.h;
- files = sys/lc_core.h;
- test = "-r reg_types.h"
- "-a -r sys/lc_core.h"
- "-a -n \"`grep '} regex_t;' reg_types.h`\""
- "-a -z \"`grep __regex_t regex.h`\"";
-
- sed = "s/regex_t/__regex_t/g";
- sed = "s/regoff_t/__regoff_t/g";
- sed = "s/regmatch_t/__regmatch_t/g";
-};
-
-fix = {
- hackname = osf_namespace_b;
- files = regex.h;
- test = "-r reg_types.h"
- "-a -r sys/lc_core.h"
- "-a -n \"`grep '} regex_t;' reg_types.h`\""
- "-a -z \"`grep __regex_t regex.h`\"";
- sed = "/#include <reg_types.h>/a\\\n"
- "typedef __regex_t\tregex_t;\\\n"
- "typedef __regoff_t\tregoff_t;\\\n"
- "typedef __regmatch_t\tregmatch_t;\n";
-};
-
-
-/*
- * Fix __page_size* declarations in pthread.h AIX 4.1.[34].
- * The original ones fail if uninitialized externs are not common.
- * This is the default for all ANSI standard C++ compilers.
- */
-fix = {
- hackname = pthread_page_size;
- files = pthread.h;
- select = "^int __page_size";
- sed = "s/^int __page_size/extern int __page_size/";
-};
-
-
-/*
- * Fix return type of fread and fwrite on sysV68
- */
-#ifdef LATER
-fix = {
- hackname = read_ret_type;
- files = stdio.h;
- sed = "s/^\\(extern int\tfclose(), fflush()\\), "
- "\\(fread(), fwrite()\\)\\(.*\\)$"
- "/extern unsigned int\t\\2;\\\n\\1\\3/";
-};
-#endif
-
-
-/*
- * function class(double x) conflicts with C++ keyword on rs/6000
- */
-fix = {
- hackname = rs6000_double;
- files = math.h;
- select = '[^a-zA-Z_]class\(';
-
- sed = "/class[(]/i\\\n#ifndef __cplusplus\n";
- sed = "/class[(]/a\\\n#endif\n";
-};
-
-
-/*
- * Wrong fchmod prototype on RS/6000.
- */
-fix = {
- hackname = rs6000_fchmod;
- files = sys/stat.h;
- select = 'fchmod\(char';
- sed = 's/fchmod(char \*/fchmod(int/';
-};
-
-
-/*
- * parameters conflict with C++ new on rs/6000
- */
-fix = {
- hackname = rs6000_param;
- files = "stdio.h";
- files = "unistd.h";
-
- sed = 's@rename(const char \*old, const char \*new)@'
- 'rename(const char *_old, const char *_new)@';
-};
-
-
-/*
- * Sony NEWSOS 5.0 does not support the complete ANSI C standard.
- */
-#ifdef SONY
-fix = {
- hackname = sony_ctype;
- files = ctype.h;
- test = "-x /bin/sony";
- test = "! -z \"`if /bin/sony ; then echo true ; fi`\"";
- sed = "s/__ctype/_ctype/g";
-};
-#endif
-
-/*
- * Incorrect #include in Sony News-OS 3.2.
- */
-fix = {
- hackname = sony_include;
- files = machine/machparam.h;
- select = '"\.\./machine/endian.h"';
- sed = 's@"../machine/endian.h"@<machine/endian.h>@';
-};
-
-
-/*
- * Sony NEWSOS 5.0 does not support the complete ANSI C standard.
- */
-#ifdef SONY
-fix = {
- hackname = sony_stdio;
- files = stdio.h;
- test = "-x /bin/sony";
- test = "! -z \"`if /bin/sony ; then echo true ; fi`\"";
- sed = "s/__filbuf/_filbuf/g\n"
- "s/__flsbuf/_flsbuf/g\n"
- "s/__iob/_iob/g";
-};
-#endif
-
-/*
- * Add a `static' declaration of `getrnge' into <regexp.h>.
- *
- * Don't do this if there is already a `static void getrnge' declaration
- * present, since this would cause a redeclaration error. Solaris 2.x has
- * such a declaration.
- */
-#ifdef SVR4
-fix = {
- hackname = static_getrnge;
- files = regexp.h;
- bypass = "static void getrnge";
- sed = "/^static int[ \t]*size;/c\\\n"
- "static int size ;\\\n\\\n"
- "static int getrnge ();";
-};
-#endif
-
-/*
- * a missing semi-colon at the end of the statsswtch structure definition.
- */
-fix = {
- hackname = statsswtch;
- files = rpcsvc/rstat.h;
- select = "boottime$";
- sed = "s/boottime$/boottime;/";
-};
-
-
-/*
- * Don't use or define the name va_list in stdio.h.
- * 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
- */
-fix = {
- hackname = stdio_va_list;
- files = stdio.h;
-
- /*
- * 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.
- */
- shell =
- "if ( egrep \"__need___va_list\" $file ) > /dev/null 2>&1 ; then
- :
- else
- echo \"#define __need___va_list\"
- echo \"#include <stdarg.h>\"
- fi
-
- sed -e 's@ va_list @ __gnuc_va_list @' \\
- -e 's@ va_list)@ __gnuc_va_list)@' \\
- -e 's@ _BSD_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)@ __gnuc_va_list)@' \\
- -e 's@GNUC_VA_LIST@GNUC_Va_LIST@' \\
- -e 's@_NEED___VA_LIST@_NEED___Va_LIST@' \\
- -e 's@VA_LIST@DUMMY_VA_LIST@' \\
- -e 's@_Va_LIST@_VA_LIST@'";
-};
-
-
-/*
- * Check for strict ansi compliance
- */
-#ifdef STRICT_ANSI
-fix = {
- hackname = strict_ansi;
- select = "__STDC__[ \t]*[=!]=[ \t]*[01]";
- sed = "s/__STDC__[ \t]*==[ \t]*0/!defined (__STRICT_ANSI__)/g";
- sed = "s/__STDC__[ \t]*!=[ \t]*0/defined (__STRICT_ANSI__)/g";
- sed = "s/__STDC__[ \t]*==[ \t]*1/defined (__STRICT_ANSI__)/g";
- sed = "s/__STDC__[ \t]*!=[ \t]*1/!defined (__STRICT_ANSI__)/g";
-};
-#endif
-
-/*
- * Fix bogus #ifdef on SunOS 4.1.
- */
-fix = {
- hackname = sun_bogus_ifdef;
- files = "hsfs/hsfs_spec.h";
- files = "hsfs/iso_spec.h";
- select = '#ifdef __i386__ || __vax__';
- sed = "s/\\#ifdef __i386__ || __vax__/\\#if __i386__ || __vax__/g";
-};
-
-
-/*
- * Fix bogus #ifdef on SunOS 4.1.
- */
-fix = {
- hackname = sun_bogus_ifdef_sun4c;
- files = "hsfs/hsnode.h";
- select = '#ifdef __i386__ || __sun4c__';
- sed = "s/\\#ifdef __i386__ || __sun4c__/\\#if __i386__ || __sun4c__/g";
-};
-
-
-/*
- * Fix the CAT macro in SunOS memvar.h.
- */
-fix = {
- hackname = sun_catmacro;
- files = pixrect/memvar.h;
- select = "^#define[ \t]+CAT(a,b)";
- sed = "/^#define[ \t]CAT(a,b)/ i\\\n"
- "#ifdef __STDC__ \\\n"
- "#define CAT(a,b) a##b\\\n"
- "#else\n";
-
- sed = "/^#define[ \t]CAT(a,b)/ a\\\n"
- "#endif\n";
-};
-
-
-/*
- * Fix return type of free and {c,m,re}alloc in <malloc.h> on SunOS 4.1.
- * Also fix return type of {m,re}alloc in <malloc.h> on sysV68
- */
-fix = {
- hackname = sun_malloc;
- files = malloc.h;
-
- sed = "s/typedef[ \t]char \\*\tmalloc_t/typedef void \\*\tmalloc_t/g";
- sed = "s/int[ \t][ \t]*free/void\tfree/g";
- sed = "s/char\\([ \t]*\\*[ \t]*malloc\\)/void\\1/g";
- sed = "s/char\\([ \t]*\\*[ \t]*realloc\\)/void\\1/g";
-};
-
-
-/*
- * 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.
- * Fix also on sysV68 R3V7.1 (head/memory.h\t50.1\t )
- */
-fix = {
- hackname = sun_memcpy;
- files = memory.h;
- select = "/\\*\t@\\(#\\)"
- "(head/memory.h\t50.1\t "
- "|memory\\.h 1\\.[2-4] 8./../.. SMI; from S5R2 1\\.2\t)\\*/";
-
- sed = "1i\\\n/* This file was generated by fixincludes */\\\n"
- "#ifndef __memory_h__\\\n"
- "#define __memory_h__\\\n\\\n"
- "#ifdef __STDC__\\\n"
- "extern void *memccpy();\\\n"
- "extern void *memchr();\\\n"
- "extern void *memcpy();\\\n"
- "extern void *memset();\\\n"
- "#else\\\n"
- "extern char *memccpy();\\\n"
- "extern char *memchr();\\\n"
- "extern char *memcpy();\\\n"
- "extern char *memset();\\\n"
- "#endif /* __STDC__ */\\\n\\\n"
- "extern int memcmp();\\\n\\\n"
- "#endif /* __memory_h__ */\n";
-
- sed = "1,$d";
-};
-
-
-/*
- * Check for yet more missing ';' in struct (in SunOS 4.0.x)
- */
-fix = {
- hackname = sun_rusers_semi;
- files = rpcsvc/rusers.h;
- select = "_cnt$";
- sed = "/^struct/,/^};/s/_cnt$/_cnt;/";
-};
-
-
-/*
- * signal.h on SunOS defines signal using (),
- * which causes trouble when compiling with g++ -pedantic.
- */
-fix = {
- hackname = sun_signal;
- files = sys/signal.h;
- files = signal.h;
- select = "^void\t" '\(\*signal\(\)\)\(\);';
-
- sed = "/^void\t" '(\*signal())();$/i' "\\\n"
- "#ifdef __cplusplus" "\\\n"
- "void\t(*signal(...))(...);" "\\\n"
- "#else" "\n";
-
- sed = "/^void\t" '(\*signal())();$/a' "\\\n"
- '#endif' "\n";
-};
-
-
-/*
- * rpc/xdr.h on SunOS needs prototypes for
- * its XDR->xdr_ops function pointers.
- */
-fix = {
- hackname = sun_xdr_proto;
- files = rpc/xdr.h;
- sed = 's/^\(.*\)\*\(x_.*\)();\(.*\)' "/\\\n"
- "#ifdef __cplusplus\\\n"
- '\1*\2(...);\3' "\\\n"
- "#else\\\n"
- '\1*\2();\3' "\\\n"
- "#endif/g";
-};
-
-
-/*
- * This file on SunOS 4 has a very large macro. When the sed loop
- * tries pull it in, it overflows the pattern space size of the SunOS
- * sed (GNU sed does not have this problem). Since the file does not
- * require fixing, we remove it from the fixed directory.
- */
-fix = {
- hackname = sunos_large_macro;
- files = sundev/ipi_error.h;
- shell =
- "echo \"Removing incorrect fix to SunOS <sundev/ipi_error.h>\" >&2\n"
- "rm -f ${DESTDIR}/$file ${DESTDIR}/$file.\ncat > /dev/null";
-};
-
-
-/*
- * math.h on SunOS 4 puts the declaration of matherr before the definition
- * of struct exception, so the prototype (added by fixproto) causes havoc.
- */
-fix = {
- hackname = sunos_matherr_decl;
- files = math.h;
- /*
- * Find the first occurrance of 'struct exception'.
- * If it is the definition, then the file is okay.
- * If it is a usage, then the order is wrong and we
- * must insert a forward reference.
- */
- test = "\"`fgrep 'struct exception' $file | line`\""
- " != 'struct exception {'";
-
- sed = "/matherr/i\\\nstruct exception;\n";
-};
-
-
-/*
- * Correct the return type for strlen in strings.h in SunOS 4.
- */
-fix = {
- hackname = sunos_strlen;
- files = strings.h;
- sed = "s/int[ \t]*strlen();/__SIZE_TYPE__ strlen();/";
-};
-
-
-/*
- * Solaris math.h and floatingpoint.h define __P without protection,
- * which conflicts with the fixproto definition. The fixproto
- * definition and the Solaris definition are used the same way.
- */
-#ifdef SVR4
-fix = {
- hackname = svr4__p;
- files = math.h;
- files = floatingpoint.h;
- select = "^#define[ \t]*__P";
- sed = "/^#define[ \t]*__P/i\\\n#ifndef __P\n";
- sed = "/^#define[ \t]*__P/a\\\n#endif\n";
-};
-#endif
-
-/*
- * Disable apparent native compiler optimization cruft in SVR4.2 <string.h>
- * that is visible to any ANSI compiler using this include. Simply
- * delete the lines that #define some string functions to internal forms.
- */
-#ifdef SVR4
-fix = {
- hackname = svr4_disable_opt;
- files = string.h;
- select = '#define.*__std_hdr_';
- sed = '/#define.*__std_hdr_/d';
-};
-#endif
-
-/*
- * Conditionalize some of <sys/endian.h> on __GNUC__ and __GNUG__.
- */
-#ifdef SVR4
-fix = {
- hackname = svr4_endian;
- files = sys/endian.h;
- bypass = '__GNUC__';
-
- sed = "/#\tifdef\t__STDC__/i\\\n"
- "# if !defined (__GNUC__) && !defined (__GNUG__)\n";
-
- sed = "/#\t\tinclude\t<sys\\/byteorder.h>/s/\t\t/ /";
-
- sed = "/# include\t<sys\\/byteorder.h>/i\\\n"
- "# endif /* !defined (__GNUC__) && !defined (__GNUG__) */\n";
-};
-#endif
-
-/*
- * Remove useless extern keyword from struct forward declarations
- * in <sys/stream.h> and <sys/strsubr.h>
- */
-#ifdef SVR4
-fix = {
- hackname = svr4_extern_struct;
- files = sys/stream.h;
- files = sys/strsubr.h;
- select = 'extern struct [a-z_]*;';
- sed = 's/extern struct \([a-z][a-z_]*\)/struct \1/';
-};
-#endif
-
-/*
- * Fix declarations of `ftw' and `nftw' in <ftw.h>. On some/most SVR4
- * systems the file <ftw.h> contains extern declarations of these
- * functions followed by explicitly `static' definitions of these
- * functions... and that's not allowed according to ANSI C. (Note
- * however that on Solaris, this header file glitch has been pre-fixed by
- * Sun. In the Solaris version of <ftw.h> there are no static
- * definitions of any function so we don't need to do any of this stuff
- * when on Solaris.
- */
-#ifdef SVR4
-#ifndef SOLARIS
-fix = {
- hackname = svr4_ftw;
- files = ftw.h;
- select = '^extern int ftw\(const';
-
- sed = '/^extern int ftw(const/i' "\\\n"
- "#if !defined(_STYPES)\\\n"
- "static\\\n"
- "#else\\\n"
- "extern\\\n"
- "#endif";
- sed = 's/extern \(int ftw(const.*\)$/\1/';
- sed = "/^extern int nftw/i\\\n"
- "#if defined(_STYPES)\\\n"
- "static\\\n"
- "#else\\\n"
- "extern\\\n"
- "#endif";
- sed = 's/extern \(int nftw.*\)$/\1/';
- sed = "/^extern int ftw(),/c\\\n"
- "#if !defined(_STYPES)\\\n"
- "static\\\n"
- "#else\\\n"
- "extern\\\n"
- "#endif\\\n"
- " int ftw();\\\n"
- "#if defined(_STYPES)\\\n"
- "static\\\n"
- "#else\\\n"
- "extern\\\n"
- "#endif\\\n"
- " int nftw();";
-};
-#endif
-#endif
-
-
-/*
- * Fix broken decl of getcwd present on some svr4 systems.
- */
-#ifdef SVR4
-fix = {
- hackname = svr4_getcwd;
- files = stdlib.h;
- files = unistd.h;
- select = 'getcwd\(char \*, int\)';
-
- sed = 's/getcwd(char \*, int)/getcwd(char *, size_t)/';
-};
-#endif
-
-/*
- * set ifdef _KERNEL
- */
-#ifdef SVR4
-fix = {
- hackname = svr4_kernel;
- files = fs/rfs/rf_cache.h;
- files = sys/erec.h;
- files = sys/err.h;
- files = sys/char.h;
- files = sys/getpages.h;
- files = sys/map.h;
- files = sys/cmn_err.h;
- files = sys/kdebugger.h;
- bypass = '_KERNEL';
- sed = "1i\\\n#ifdef _KERNEL";
- sed = "$a\\\n#endif /* _KERNEL */";
-};
-#endif
-
-/*
- * Delete any #defines of `__i386' which may be present in <ieeefp.h>. They
- * tend to conflict with the compiler's own definition of this symbol. (We
- * will use the compiler's definition.)
- * Likewise __sparc, for Solaris, and __i860, and a few others
- * (guessing it is necessary for all of them).
- */
-#ifdef SVR4
-fix = {
- hackname = svr4_mach_defines;
- files = ieeefp.h;
- select = "#define[ \t]*__(i386|i860|mips|sparc|m88k|m68k)[ \t]";
- sed = "/#define[ \t]*__\\(i386|i860|mips|sparc|m88k|m68k\\)[ \t]/d";
-};
-#endif
-
-/*
- * Fix declarations of `makedev', `major', and `minor' in <sys/mkdev.h>.
- */
-#ifdef SVR4
-fix = {
- hackname = svr4_mkdev;
- files = sys/mkdev.h;
-
- sed = "/^dev_t makedev(const/c\\\n"
- "static dev_t makedev(const major_t, const minor_t);";
-
- sed = "/^dev_t makedev()/c\\\n"
- "static dev_t makedev();";
-
- sed = "/^major_t major(const/c\\\n"
- "static major_t major(const dev_t);";
-
- sed = "/^major_t major()/c\\\n"
- "static major_t major();";
-
- sed = "/^minor_t minor(const/c\\\n"
- "static minor_t minor(const dev_t);";
-
- sed = "/^minor_t minor()/c\\\n"
- "static minor_t minor();";
-};
-#endif
-
-/*
- * Fix reference to NC_NPI_RAW in <sys/netcspace.h>.
- * Also fix types of array initializers.
- */
-#ifdef SVR4
-fix = {
- hackname = svr4_netcspace;
- files = sys/netcspace.h;
- select = 'NC_NPI_RAW';
- sed = 's/NC_NPI_RAW/NC_TPI_RAW/g';
- sed = 's/NC_/(unsigned long) NC_/';
-};
-#endif
-
-/*
- * Fix reference to NMSZ in <sys/adv.h>.
- */
-#ifdef SVR4
-fix = {
- hackname = svr4_nmsz;
- files = sys/adv.h;
- select = '\[NMSZ\]';
- sed = 's/\[NMSZ\]/\[RFS_NMSZ\]/g';
-};
-#endif
-
-/*
- * Completely replace <sys/varargs.h> with a file that includes gcc's
- * stdarg.h or varargs.h files as appropriate.
- */
-#ifdef SVR4
-fix = {
- hackname = svr4_no_varargs;
- files = sys/varargs.h;
- shell = "cat > /dev/null\n"
- "cat << _EOF_\n"
- "/* This file was generated by fixincludes. */\n"
- "#ifndef _SYS_VARARGS_H\n"
- "#define _SYS_VARARGS_H\n\n"
-
- "#ifdef __STDC__\n"
- "#include <stdarg.h>\n"
- "#else\n"
- "#include <varargs.h>\n"
- "#endif\n\n"
-
- "#endif /* _SYS_VARARGS_H */\n"
- "_EOF_";
-};
-#endif
-
-/*
- * Fix broken decl of profil present on some svr4 systems.
- */
-#ifdef SVR4
-fix = {
- hackname = svr4_profil;
- files = stdlib.h;
- files = unistd.h;
-
- sed = 's/profil(unsigned short \*, unsigned int, '
- 'unsigned int, unsigned int)'
- '/profil(unsigned short *, size_t, int, unsigned)/';
-};
-#endif
-
-/*
- * Convert functions to prototype form, and fix arg names in <sys/stat.h>.
- */
-#ifdef SVR4
-fix = {
- hackname = svr4_proto_form;
- files = sys/stat.h;
- select = 'const extern';
-
- sed = "/^stat([ \t]*[^c]/ {\nN\nN\n"
- "s/(.*)\\n/( /\n"
- "s/;\\n/, /\n"
- "s/;$/)/\n" "}";
-
- sed = "/^lstat([ \t]*[^c]/ {\nN\nN\n"
- "s/(.*)\\n/( /\n"
- "s/;\\n/, /\n"
- "s/;$/)/\n" "}";
-
- sed = "/^fstat([ \t]*[^i]/ {\nN\nN\n"
- "s/(.*)\\n/( /\n"
- "s/;\\n/, /\n"
- "s/;$/)/\n" "}";
-
- sed = "/^mknod([ \t]*[^c]/{\nN\nN\nN\n"
- "s/(.*)\\n/( /\n"
- "s/;\\n/, /g\n"
- "s/;$/)/\n" "}";
-
- sed = "1,$s/\\([^A-Za-z]\\)path\\([^A-Za-z]\\)/\\1__path\\2/g";
- sed = "1,$s/\\([^A-Za-z]\\)buf\\([^A-Za-z]\\)/\\1__buf\\2/g";
- sed = "1,$s/\\([^A-Za-z]\\)fd\\([^A-Za-z]\\)/\\1__fd\\2/g";
- sed = "1,$s/ret\\([^u]\\)/__ret\\1/g";
- sed = "1,$s/\\([^_]\\)mode\\([^_]\\)/\\1__mode\\2/g";
- sed = "1,$s/\\([^_r]\\)dev\\([^_]\\)/\\1__dev\\2/g";
-};
-#endif
-
-/*
- * Add a prototyped declaration of mmap to <sys/mman.h>.
- */
-#ifdef SVR4
-fix = {
- hackname = svr4_proto_mmap;
- files = sys/mman.h;
- select = '^extern caddr_t mmap();$';
- sed = '/^extern caddr_t mmap();$/c' "\\\n"
- "#ifdef __STDC__\\\n"
- "extern caddr_t mmap (caddr_t, size_t, int, int, int, off_t);\\\n"
- "#else /* !defined(__STDC__) */\\\n"
- "extern caddr_t mmap ();\\\n"
- "#endif /* !defined(__STDC__) */\\\n";
-};
-#endif
-
-/*
- * Add a #define of _SIGACTION_ into <sys/signal.h>.
- */
-#ifdef SVR4
-fix = {
- hackname = svr4_sigaction;
- files = sys/signal.h;
- sed = "/^struct sigaction {/i\\\n"
- "#define _SIGACTION_";
- sed = 's/(void *(\*)())/(void (*)(int))/';
-};
-#endif
-
-/*
- * Put storage class at start of decl, to avoid warning.
- */
-#ifdef SVR4
-fix = {
- hackname = svr4_storage_class;
- files = rpc/types.h;
- select = 'const extern';
- sed = 's/const extern/extern const/g';
-};
-#endif
-
-/*
- * Fix return value of mem{ccpy,chr,cpy,set} and str{len,spn,cspn}
- * in string.h on sysV68
- * Correct the return type for strlen in string.h on Lynx.
- * Correct the argument type for ffs in string.h on Alpha OSF/1 V2.0.
- * Add missing const for strdup on OSF/1 V3.0.
- * On sysV88 layout is slightly different.
- */
-fix = {
- hackname = systypes;
- files = "sys/types.h";
- files = "stdlib.h";
- files = "sys/stdtypes.h";
- files = "stddef.h";
- files = "memory.h";
- files = "unistd.h";
- select = "typedef[ \t]+[a-z_][ \ta-z_]*[ \t]"
- "(size|ptrdiff|wchar)_t";
-
- sed = "/^[ \t]*\\*[ \t]*typedef unsigned int size_t;/N";
-
- sed = "s/^\\([ \t]*\\*[ \t]*typedef unsigned int size_t;\\n"
- "[ \t]*\\*\\/\\)/\\1\\\n"
- "#ifndef __SIZE_TYPE__\\\n"
- "#define __SIZE_TYPE__ long unsigned int\\\n"
- "#endif\\\n"
- "typedef __SIZE_TYPE__ size_t;\\\n/";
-
- sed = "/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]size_t/i\\\n"
- "#ifndef __SIZE_TYPE__\\\n"
- "#define __SIZE_TYPE__ long unsigned int\\\n"
- "#endif\n";
-
- sed = "s/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]size_t/"
- "typedef __SIZE_TYPE__ size_t/";
-
- sed = "/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]ptrdiff_t/i\\\n"
- "#ifndef __PTRDIFF_TYPE__\\\n"
- "#define __PTRDIFF_TYPE__ long int\\\n"
- "#endif\n";
-
- sed = "s/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]ptrdiff_t/"
- "typedef __PTRDIFF_TYPE__ ptrdiff_t/";
-
- sed = "/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]wchar_t/i\\\n"
- "#ifndef __WCHAR_TYPE__\\\n"
- "#define __WCHAR_TYPE__ int\\\n"
- "#endif\\\n"
- "#ifndef __cplusplus\n";
-
- sed = "/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]wchar_t/a\\\n"
- "#endif\n";
-
- sed = "s/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]wchar_t/"
- "typedef __WCHAR_TYPE__ wchar_t/";
-};
-
-
-/*
- * Fix return type of exit and abort in <stdlib.h> on SunOS 4.1.
- * Also wrap protection around size_t for m88k-sysv3 systems.
- * We use a funny name to ensure it follows 'systypes' fix.
- */
-fix = {
- hackname = systypes_for_aix;
- files = sys/types.h;
- select = "typedef[ \t][ \t]*[A-Za-z_][ \tA-Za-z_]*[ \t]size_t";
- bypass = "_GCC_SIZE_T";
-
- sed = "/typedef[ \t][ \t]*[A-Za-z_][ \tA-Za-z_]*[ \t]size_t/i\\\n"
- "#ifndef _GCC_SIZE_T\\\n"
- "#define _GCC_SIZE_T\n";
-
- sed = "/typedef[ \t][ \t]*[A-Za-z_][ \tA-Za-z_]*[ \t]size_t/a\\\n"
- "#endif\n";
-};
-
-
-/*
- * if the #if says _cplusplus, not the double underscore __cplusplus
- * that it should be
- */
-fix = {
- hackname = sysv68_string;
- files = string.h;
-
- sed = "s/extern[ \t]*int[ \t]*strlen();/extern unsigned int strlen();/";
- sed = "s/extern[ \t]*int[ \t]*ffs[ \t]*(long);/extern int ffs(int);/";
- sed = "s/strdup(char \\*s1);/strdup(const char *s1);/";
- sed = "/^extern char$/N";
- sed = "s/^extern char\\(\\n\t\\*memccpy(),\\)$/extern void\\1/";
- sed = "/^\tstrncmp(),$/N";
- sed = "s/^\\(\tstrncmp()\\),\\n\\(\tstrlen(),\\)$/\\1;\\\n"
- "extern unsigned int\\\n\\2/";
- sed = "/^extern int$/N";
- sed = "s/^extern int\\(\\n\tstrlen(),\\)/extern size_t\\1/";
-};
-
-
-/*
- * Replace definitions of size_t, ptrdiff_t and wchar_t
- * Install the proper definition of the three standard types
- * in header files that they come from.
- */
-fix = {
- hackname = sysz_stdlib_for_sun;
- mach = "*-sun-*";
- mach = "m88k-*-sysv3*";
- files = stdlib.h;
-
- sed = "s/int\tabort/void\tabort/g";
- sed = "s/int\tfree/void\tfree/g";
- sed = "s/char[ \t]*\\*[ \t]*calloc/void \\*\tcalloc/g";
- sed = "s/char[ \t]*\\*[ \t]*malloc/void \\*\tmalloc/g";
- sed = "s/char[ \t]*\\*[ \t]*realloc/void \\*\trealloc/g";
- sed = "s/int[ \t][ \t]*exit/void\texit/g";
-
- sed = "/typedef[ \ta-zA-Z_]*[ \t]size_t[ \t]*;/i\\\n"
- "#ifndef _GCC_SIZE_T\\\n"
- "#define _GCC_SIZE_T\n";
-
- sed = "/typedef[ \ta-zA-Z_]*[ \t]size_t[ \t]*;/a\\\n"
- "#endif\n";
-};
-
-
-/*
- * Fix this Sun file to avoid interfering with stddef.h.
- * We use a funny name to ensure it follows 'systypes' fix.
- */
-fix = {
- hackname = sysz_stdtypes_for_sun;
- files = sys/stdtypes.h;
- sed = "/[\t ]size_t.*;/i\\\n"
- "#ifndef _GCC_SIZE_T\\\n"
- "#define _GCC_SIZE_T\n";
-
- sed = "/[\t ]size_t.*;/a\\\n"
- "#endif\n";
-
- sed = "/[\t ]ptrdiff_t.*;/i\\\n"
- "#ifndef _GCC_PTRDIFF_T\\\n"
- "#define _GCC_PTRDIFF_T\n";
-
- sed = "/[\t ]ptrdiff_t.*;/a\\\n"
- "#endif\n";
-
- sed = "/[\t ]wchar_t.*;/i\\\n"
- "#ifndef _GCC_WCHAR_T\\\n"
- "#define _GCC_WCHAR_T\n";
-
- sed = "/[\t ]wchar_t.*;/a\\\n"
- "#endif\n";
-};
-
-
-/*
- * Fix this file to avoid interfering with stddef.h,
- * but don't mistakenly match ssize_t present in AIX for the ps/2,
- * or typedefs which use (but do not set) size_t.
- */
-fix = {
- hackname = tinfo_cplusplus;
- files = tinfo.h;
- sed = "s/[ \t]_cplusplus/ __cplusplus/";
-};
-
-
-/*
- * Cancel out ansi_compat.h on Ultrix. Replace it with empty file.
- */
-fix = {
- hackname = ultrix_ansi_compat;
- files = ansi_compat.h;
- select = ULTRIX;
- sed = "1i\\\n/* This file intentionally left blank. */\n";
- sed = "1,$d";
-};
-
-
-/*
- * parameter to atof not const on DECstation Ultrix V4.0 and NEWS-OS 4.2R.
- * also get rid of bogus inline definitions in HP-UX 8.0
- */
-fix = {
- hackname = ultrix_atof_param;
- files = math.h;
-
- sed = "s@atof(\\([ \t]*char[ \t]*\\*[^)]*\\))@atof(const \\1)@";
- sed = "s@inline int abs(int [a-z][a-z]*) {.*}@extern \"C\" int abs(int);@";
- sed = "s@inline double abs(double [a-z][a-z]*) {.*}@@";
- sed = "s@inline int sqr(int [a-z][a-z]*) {.*}@@";
- sed = "s@inline double sqr(double [a-z][a-z]*) {.*}@@";
-};
-
-
-/*
- * parameters not const on DECstation Ultrix V4.0 and OSF/1.
- */
-fix = {
- hackname = ultrix_const;
- files = stdio.h;
-
- sed = 's@perror( char \*__s );@perror( const char *__s );@';
- sed = 's@fputs( char \*__s,@fputs( const char *__s,@';
- sed = 's@fopen( char \*__filename, char \*__type );@'
- 'fopen( const char *__filename, const char *__type );@';
- sed = 's@fwrite( void \*__ptr,@fwrite( const void *__ptr,@';
- sed = 's@fscanf( FILE \*__stream, char \*__format,@'
- 'fscanf( FILE *__stream, const char *__format,@';
- sed = 's@scanf( char \*__format,@scanf( const char *__format,@';
- sed = 's@sscanf( char \*__s, char \*__format,@'
- 'sscanf( const char *__s, const char *__format,@';
- sed = 's@popen(char \*, char \*);@popen(const char *, const char *);@';
- sed = 's@tempnam(char\*,char\*);@tempnam(const char*,const char*);@';
-};
-
-
-/*
- * Check for bad #ifdef line (in Ultrix 4.1)
- */
-fix = {
- hackname = ultrix_ifdef;
- select = "#ifdef KERNEL";
- files = sys/file.h;
- sed = "s/#ifdef KERNEL/#if defined(KERNEL)/";
-};
-
-
-/*
- * Avoid nested comments on Ultrix 4.3.
- */
-fix = {
- hackname = ultrix_nested_cmnt;
- files = rpc/svc.h;
- sed = "s@^\\( \\*\tint protocol; \\)/\\*@\\1*/ /*@";
-};
-
-
-/*
- * Check for superfluous `static' (in Ultrix 4.2)
- * On Ultrix 4.3, includes of other files (r3_cpu.h,r4_cpu.h) is broken.
- */
-fix = {
- hackname = ultrix_static;
- files = machine/cpu.h;
- select = '#include "r[34]_cpu';
- sed = "s/^static struct tlb_pid_state/struct tlb_pid_state/";
- sed = 's/^#include "r3_cpu\.h"$/#include <machine\/r3_cpu\.h>/';
- sed = 's/^#include "r4_cpu\.h"$/#include <machine\/r4_cpu\.h>/';
-};
-
-
-/*
- * Fix multiple defines for NULL
- */
-fix = {
- hackname = undefine_null;
- select = "^#[ \t]*define[ \t]*[ \t]NULL[ \t]";
- bypass = "#[ \t]*(ifn|un)def[ \t]*[ \t]NULL($|[ \t])";
- sed = "/^#[ \t]*define[ \t][ \t]*NULL[ \t]/i\\\n"
- "#undef NULL\n";
-};
-
-
-/*
- * Fix definitions of macros used by va-i960.h in VxWorks header file.
- */
-fix = {
- hackname = va_i960_macro;
- files = arch/i960/archI960.h;
- select = "__(vsiz|vali|vpad|alignof__)";
- sed = "s/__vsiz/__vxvsiz/";
- sed = "s/__vali/__vxvali/";
- sed = "s/__vpad/__vxvpad/";
- sed = "s/__alignof__/__vxalignof__/";
-};
-
-
-/*
- * AIX headers define NULL to be cast to a void pointer,
- * which is illegal in ANSI C++.
- */
-fix = {
- hackname = void_null;
- files = curses.h;
- files = dbm.h;
- files = locale.h;
- files = stdio.h;
- files = stdlib.h;
- files = string.h;
- files = time.h;
- files = unistd.h;
- files = sys/dir.h;
- files = sys/param.h;
- files = sys/types.h;
- select = "#[ \t]*define[ \t][ \t]*NULL[ \t].*void";
- sed = "s/^#[ \t]*define[ \t]*NULL[ \t]*((void[ \t]*\\*)0)"
- "/#define NULL 0/";
-};
-
-
-/*
- * Make VxWorks header which is almost gcc ready fully gcc ready.
- */
-fix = {
- hackname = vxworks_gcc_problem;
- files = types/vxTypesBase.h;
- select = "__GNUC_TYPEOF_FEATURE_BROKEN_USE_DEFAULT_UNTIL_FIXED__";
-
- sed = "s/#ifdef __GNUC_TYPEOF_FEATURE_BROKEN_USE_DEFAULT_UNTIL_FIXED__/"
- "#if 1/";
-
- sed = "/[ \t]size_t/i\\\n"
- "#ifndef _GCC_SIZE_T\\\n"
- "#define _GCC_SIZE_T\n";
-
- sed = "/[ \t]size_t/a\\\n"
- "#endif\n";
-
- sed = "/[ \t]ptrdiff_t/i\\\n"
- "#ifndef _GCC_PTRDIFF_T\\\n"
- "#define _GCC_PTRDIFF_T\n";
-
- sed = "/[ \t]ptrdiff_t/a\\\n"
- "#endif\n";
-
- sed = "/[ \t]wchar_t/i\\\n"
- "#ifndef _GCC_WCHAR_T\\\n"
- "#define _GCC_WCHAR_T\n";
-
- sed = "/[ \t]wchar_t/a\\\n"
- "#endif\n";
-};
-
-
-/*
- * Fix VxWorks <time.h> to not require including <vxTypes.h>.
- */
-fix = {
- hackname = vxworks_needs_vxtypes;
- files = time.h;
- select = "uint_t[ \t][ \t]*_clocks_per_sec";
- sed = "s/uint_t/unsigned int/";
-};
-
-
-/*
- * Fix VxWorks <sys/stat.h> to not require including <vxWorks.h>.
- */
-fix = {
- hackname = vxworks_needs_vxworks;
- files = sys/stat.h;
- test = "-r types/vxTypesOld.h";
- test = "-n \"`fgrep '#include' $file`\"";
- test = "-n \"`fgrep ULONG $file`\"";
- select = "#[ \t]define[ \t][ \t]*__INCstath";
-
- sed = "/#[ \t]define[ \t][ \t]*__INCstath/a\\\n"
- "#include <types/vxTypesOld.h>\n";
-};
-
-
-/*
- * Another bad dependency in VxWorks 5.2 <time.h>.
- */
-fix = {
- hackname = vxworks_time;
- files = time.h;
- select = "VOIDFUNCPTR";
- test = "-r vxWorks.h";
- sed = "/VOIDFUNCPTR/i\\\n"
- "#ifndef __gcc_VOIDFUNCPTR_defined\\\n"
- "#ifdef __cplusplus\\\n"
- "typedef void (*__gcc_VOIDFUNCPTR) (...);\\\n"
- "#else\\\n"
- "typedef void (*__gcc_VOIDFUNCPTR) ();\\\n"
- "#endif\\\n"
- "#define __gcc_VOIDFUNCPTR_defined\\\n"
- "#endif\n";
-
- sed = "s/VOIDFUNCPTR/__gcc_VOIDFUNCPTR/g";
-};
-
-
-/*
- * There are several name conflicts with C++ reserved words in X11 header
- * files. These are fixed in some versions, so don't do the fixes if
- * we find __cplusplus in the file. These were found on the RS/6000.
- */
-fix = {
- hackname = x11_class;
- files = X11/ShellP.h;
- bypass = __cplusplus;
- sed = "/char \\*class;/i\\\n"
- "#ifdef __cplusplus\\\n"
- "\tchar *c_class;\\\n"
- "#else\n";
- sed = "/char \\*class;/a\\\n"
- "#endif\n";
-};
-
-
-/*
- * class in Xm/BaseClassI.h
- */
-fix = {
- hackname = x11_class_usage;
- files = Xm/BaseClassI.h;
- bypass = "__cplusplus";
- sed = "s/ class[)]/ c_class)/g";
-};
-
-
-/*
- * new in Xm/Traversal.h
- */
-fix = {
- hackname = x11_new;
- files = Xm/Traversal.h;
- bypass = __cplusplus;
-
- sed = "/Widget\told, new;/i\\\n"
- "#ifdef __cplusplus\\\n"
- "\tWidget\told, c_new;\\\n"
- "#else\n";
-
- sed = "/Widget\told, new;/a\\\n"
- "#endif\n";
-
- sed = "s/Widget new,/Widget c_new,/g";
-};
-
-
-/*
- * Incorrect sprintf declaration in X11/Xmu.h
- */
-fix = {
- hackname = x11_sprintf;
- files = X11*/Xmu.h;
- sed = "s,^extern char \\*\tsprintf();$,#ifndef __STDC__\\\n"
- "extern char *\tsprintf();\\\n"
- "#endif /* !defined __STDC__ */,";
-};
-
-
-/*
- * Purge some HP-UX 11 files that are only borken after they are "fixed".
- */
-fix = {
- hackname = zzz_ki_iface;
- files = sys/ki_iface.h;
- select = 'These definitions are for HP Internal developers';
- shell =
- "echo \"Removing incorrect fix to HP-UX <$file>\" >&2\n"
- "rm -f ${DESTDIR}/$file ${DESTDIR}/$file.\ncat > /dev/null";
-};
-
-
-/*
- * Purge some HP-UX 11 files that are only borken after they are "fixed".
- */
-fix = {
- hackname = zzz_ki;
- files = sys/ki.h;
- select = '11.00 HP-UX LP64';
- shell =
- "echo \"Removing incorrect fix to HP-UX <$file>\" >&2\n"
- "rm -f ${DESTDIR}/$file ${DESTDIR}/$file.\ncat > /dev/null";
-};
-
-
-/*
- * Purge some HP-UX 11 files that are only borken after they are "fixed".
- */
-fix = {
- hackname = zzz_ki_calls;
- files = sys/ki_calls.h;
- select = 'KI_MAX_PROCS is an arbitrary number';
- shell =
- "echo \"Removing incorrect fix to HP-UX <$file>\" >&2\n"
- "rm -f ${DESTDIR}/$file ${DESTDIR}/$file.\ncat > /dev/null";
-};
-
-
-/*
- * Purge some HP-UX 11 files that are only borken after they are "fixed".
- */
-fix = {
- hackname = zzz_ki_defs;
- files = sys/ki_defs.h;
- select = 'Kernel Instrumentation Definitions';
- shell =
- "echo \"Removing incorrect fix to HP-UX <$file>\" >&2\n"
- "rm -f ${DESTDIR}/$file ${DESTDIR}/$file.\ncat > /dev/null";
-};
-
-
-/*
- * Purge some HP-UX 11 files that are only borken after they are "fixed".
- */
-fix = {
- hackname = zzz_time;
- files = sys/time.h;
- select = 'For CASPEC, look in';
- shell =
- "echo \"Removing incorrect fix to HP-UX <$file>\" >&2\n"
- "rm -f ${DESTDIR}/$file ${DESTDIR}/$file.\ncat > /dev/null";
-};
-
-
-/*EOF*/
diff --git a/contrib/fixinc/inclhack.sh b/contrib/fixinc/inclhack.sh
deleted file mode 100755
index 7647fd58841..00000000000
--- a/contrib/fixinc/inclhack.sh
+++ /dev/null
@@ -1,3050 +0,0 @@
-#!/bin/sh
-#
-# DO NOT EDIT THIS FILE (inclhack.sh)
-#
-# It has been autogen-ed Tuesday September 22, 1998 at 07:22:34 AM PDT
-# From the definitions inclhack.def
-# and the template file inclhack.tpl
-#
-# 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 104 fixup scripts.
-#
-# See README-fixinc for more information.
-#
-# fixincludes 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.
-#
-# fixincludes 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 fixincludes. See the file "COPYING". If not,
-# write to: The Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-#
-# # # # # # # # # # # # # # # # # # # # #
-#
-# Directory containing the original header files.
-# (This was named INCLUDES, but that conflicts with a name in Makefile.in.)
-#
-INPUT=${2-${INPUT-/usr/include}}
-
-( \cd ${INPUT} > /dev/null 2>&1 ) || {
- echo 'fixincludes: input dir `'$INPUT"' is an invalid directory"
- exit 1
-}
-
-# # # # # # # # # # # # # # # # # # # # #
-#
-# Directory in which to store the results.
-# 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
-
-LIB=${1}
-
-# Make sure it exists.
-if [ ! -d $LIB ]; then
- mkdir $LIB || {
- echo fixincludes: output dir '`'$LIB"' cannot be created"
- exit 1
- }
-else
- ( \cd $LIB && touch DONE && rm DONE ) || {
- echo fixincludes: output dir '`'$LIB"' is an invalid directory"
- exit 1
- }
-fi
-
-# Define what target system we're fixing.
-#
-if test -r ./Makefile; then
- target_canonical="`sed -n -e 's,^target[ ]*=[ ]*\(.*\)$,\1,p' < Makefile`"
-fi
-
-# If not from the Makefile, then try config.guess
-#
-if test -z "${target_canonical}" ; then
- if test -x ./config.guess ; then
- target_canonical="`config.guess`" ; fi
- test -z "${target_canonical}" && target_canonical=unknown
-fi
-export target_canonical
-
-# # # # # # # # # # # # # # # # # # # # #
-#
-# Define PWDCMD as a command to use to get the working dir
-# in the form that we want.
-PWDCMD=pwd
-
-case "`$PWDCMD`" in
-//*)
- # On an Apollo, discard everything before `/usr'.
- PWDCMD="eval pwd | sed -e 's,.*/usr/,/usr/,'"
- ;;
-esac
-
-# Original directory.
-ORIGDIR=`${PWDCMD}`
-
-# Make LIB absolute only if needed to avoid problems with the amd.
-case $LIB in
-/*)
- ;;
-*)
- cd $LIB; LIB=`${PWDCMD}`
- ;;
-esac
-
-echo Fixing headers into ${LIB} for ${target_canonical} target
-
-# 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"
-
- # Find all directories under $d, relative to $d, excluding $d itself.
- # (The /. is needed after $d in case $d is a symlink.)
- files="$files `find $d/. -type d -print | \
- sed -e '/\/\.$/d' -e 's@/./@/@g'`"
- # 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 | sed -e 's@/./@/@g'`
- for d1 in $theselinks --dummy--
- do
- # If the link points to a directory,
- # add that dir to $newdirs
- if [ -d $d1 ]
- then
- files="$files $d1"
- if [ "`ls -ld $d1 | sed -n 's/.*-> //p'`" != "." ]
- then
- newdirs="$newdirs $d1"
- fi
- fi
- done
- done
-
- 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}`
- # Canonicalize ${INPUT} now to minimize the time an
- # automounter has to change the result of ${PWDCMD}.
- cinput=`cd ${INPUT}; ${PWDCMD}`
- # If a link points to ., make a similar link to .
- if [ $x = ${cinput} ]; 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 : "${cinput}/.*" > /dev/null; then
- # Y gets the actual target dir name, relative to ${INPUT}.
- y=`echo $x | sed -n "s&${cinput}/&&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@[^/][^/]*@..@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
- # Get the path from ${LIB} to $file, accounting for symlinks.
- parent=`echo "$file" | sed -e 's@/[^/]*$@@'`
- libabs=`cd ${LIB}; ${PWDCMD}`
- file2=`cd ${LIB}; cd $parent; ${PWDCMD} | sed -e "s@^${libabs}@@"`
- # DOTS is the relative path from ${LIB}/$file's dir back to ${LIB}.
- dots=`echo "$file2" | sed -e 's@/[^/]*@../@g'`
- 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
-
-# # # # # # # # # # # # # # # # # # # # #
-#
-required=
-set x $treetops
-shift
-while [ $# != 0 ]; do
- # $1 is an old directory to copy, and $2 is the new directory to copy to.
- #
- SRCDIR=`cd ${INPUT} ; cd $1 ; ${PWDCMD}`
- export SRCDIR
- shift
-
- DESTDIR=`cd $1;${PWDCMD}`
- export DESTDIR
- shift
-
- # The same dir can appear more than once in treetops.
- # There's no need to scan it more than once.
- #
- if [ -f ${DESTDIR}/DONE ]
- then continue ; fi
-
- touch ${DESTDIR}/DONE
- echo Fixing directory ${SRCDIR} into ${DESTDIR}
-
- # 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.
- #
- cd ${SRCDIR}
-
- 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=""
-
- #
- # Fix 1: Aix_Syswait
- #
- case "$file" in ./sys/wait.h )
- if ( test -n "`egrep 'bos325,' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- aix_syswait"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e '/^extern pid_t wait3();$/i\
-struct rusage;
-' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 2: Aix_Volatile
- #
- case "$file" in ./sys/signal.h )
- if ( test -n "`egrep 'typedef volatile int sig_atomic_t' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- aix_volatile"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's/typedef volatile int sig_atomic_t/typedef int sig_atomic_t/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 3: Alpha_Getopt
- #
- case "$file" in ./stdio.h | \
- ./stdlib.h )
- if ( test -n "`egrep 'getopt\\(int, char \\*\\[' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- alpha_getopt"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's/getopt(int, char \*\[\],[ ]*char \*)/getopt(int, char *const[], const char *)/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 4: Alpha_Parens
- #
- case "$file" in ./sym.h )
- if ( test -n "`egrep '#ifndef\\(__mips64\\)' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- alpha_parens"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's/#ifndef(__mips64)/#ifndef __mips64/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 5: Alpha_Sbrk
- #
- case "$file" in ./unistd.h )
- if ( test -n "`egrep 'char[ ]*\\*[ ]*sbrk[ ]*\\(' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- alpha_sbrk"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's/char\([ ]*\*[ ]*sbrk[ ]*(\)/void\1/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 6: Arm_Norcroft_Hint
- #
- case "$file" in ./X11/Intrinsic.h )
- fixlist="${fixlist}
- arm_norcroft_hint"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's/___type p_type/p_type/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 7: Arm_Wchar
- #
- case "$file" in ./stdlib.h )
- if ( test -n "`egrep '#[ ]*define[ ]*__wchar_t' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- arm_wchar"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's/\(#[ ]*ifndef[ ]*\)__wchar_t/\1_GCC_WCHAR_T/' \
- -e 's/\(#[ ]*define[ ]*\)__wchar_t/\1_GCC_WCHAR_T/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 8: Aux_Asm
- #
- case "$file" in ./sys/param.h )
- if ( test -n "`egrep '#ifndef NOINLINE' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- aux_asm"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's|#ifndef NOINLINE|#if !defined(NOINLINE) \&\& !defined(__GNUC__)|' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 9: Avoid_Bool
- #
- case "$file" in ./curses.h | \
- ./term.h | \
- ./tinfo.h )
- fixlist="${fixlist}
- avoid_bool"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e '/^#[ ]*define[ ][ ]*bool[ ][ ]*char[ ]*$/i\
-#ifndef __cplusplus
-' \
- -e '/^#[ ]*define[ ][ ]*bool[ ][ ]*char[ ]*$/a\
-#endif
-' \
- -e '/^typedef[ ][ ]*char[ ][ ]*bool[ ]*;/i\
-#ifndef __cplusplus
-' \
- -e '/^typedef[ ][ ]*char[ ][ ]*bool[ ]*;/a\
-#endif
-' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 10: Bad_Malloc_Decl
- #
- case "$file" in ./rpc/types.h )
- if ( test -z "`egrep '\"C\"' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- bad_malloc_decl"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e '1i\
-#ifdef __cplusplus\
-extern "C" {\
-#endif\
-
-' \
- -e '$a\
-#ifdef __cplusplus\
-}\
-#endif
-' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 11: Bad_Struct_Term
- #
- case "$file" in ./curses.h )
- if ( test -n "`egrep '^[ ]*typedef[ ]+struct[ ]+term[ ]*;' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- bad_struct_term"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's/^[ ]*typedef[ ][ ]*\(struct[ ][ ]*term[ ]*;[ ]*\)$/\1/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 12: Badquote
- #
- case "$file" in ./sundev/vuid_event.h )
- fixlist="${fixlist}
- badquote"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's/doesn'\''t/does not/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 13: Bad_Lval
- #
- case "$file" in ./libgen.h | \
- ./dirent.h | \
- ./ftw.h | \
- ./grp.h | \
- ./ndbm.h | \
- ./pthread.h | \
- ./pwd.h | \
- ./signal.h | \
- ./standards.h | \
- ./stdlib.h | \
- ./string.h | \
- ./stropts.h | \
- ./time.h | \
- ./unistd.h )
- if ( test -n "`egrep '^[ ]*#[ ]*pragma[ ]extern_prefix' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- bad_lval"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's/^[ ]*#[ ]*define[ ]*\([^(]*\)\(([^)]*)\)[ ]*\(_.\)\1\2[ ]*$/#define \1 \3\1/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 14: Broken_Assert_Stdio
- #
- case "$file" in ./assert.h )
- if ( test -n "`egrep 'stderr' $file`" -a \
- -z "`egrep 'include.*stdio.h' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- broken_assert_stdio"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e '1i\
-#include <stdio.h>
-' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 15: Broken_Assert_Stdlib
- #
- case "$file" in ./assert.h )
- if ( test -n "`egrep 'exit *\\(|abort *\\(' $file`" -a \
- -z "`egrep 'include.*stdlib.h' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- broken_assert_stdlib"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e '1i\
-#ifdef __cplusplus\
-#include <stdlib.h>\
-#endif
-' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 16: Bsd43_Io_Macros
- #
- if ( test -n "`egrep 'BSD43__IO' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- bsd43_io_macros"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e '/[ ]BSD43__IO[A-Z]*[ ]*(/s/(\(.\),/('\''\1'\'',/' \
- -e '/#[ ]*define[ ]*[ ]BSD43__IO/s/'\''\([cgx]\)'\''/\1/g' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
-
-
- #
- # Fix 17: No_Double_Slash
- #
- if ( test -n "`egrep '//[^*]' $file`" -a \
- '(' -z "`echo ${file}|egrep '++$|\.hh$|\.H$'`" ')'
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- no_double_slash"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e '/\/\/[^*]/s|//.*$||g' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
-
-
- #
- # Fix 18: Irix_Bogus_Cxx_Cmnt
- #
- case "$file" in ./elf_abi.h | \
- ./elf.h )
- fixlist="${fixlist}
- irix_bogus_cxx_cmnt"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's@"/\*"\*/@"//"@' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 19: Ecd_Cursor
- #
- case "$file" in ./sunwindow/win_lock.h | \
- ./sunwindow/win_cursor.h )
- fixlist="${fixlist}
- ecd_cursor"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's/ecd.cursor/ecd_cursor/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 20: Else_Label
- #
- if ( test -n "`egrep '^[ ]*#[ ]*else[ ]+[!-.0-~]' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- else_label"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e ':loop
-/\\$/N
-s/\\$/\\+++fixinc_eol+++/
-/\\$/b loop
-s/\\+++fixinc_eol+++/\\/g
-s%^\([ ]*#[ ]*else\)[ ]*/[^*].*%\1%
-s%^\([ ]*#[ ]*else\)[ ]*[^/ ].*%\1%' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
-
-
- #
- # Fix 21: Endif_Label
- #
- if ( test -n "`egrep '^[ ]*#[ ]*endif[ ]+[!-.0-z{|}~]' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- endif_label"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e ':loop
-/\\$/N
-s/\\$/\\+++fixinc_eol+++/
-/\\$/b loop
-s/\\+++fixinc_eol+++/\\/g
-s%^\([ ]*#[ ]*endif\)[ ]*/[^*].*%\1%
-s%^\([ ]*#[ ]*endif\)[ ]*\*[^/].*%\1%
-s%^\([ ]*#[ ]*endif\)[ ]*[^/* ].*%\1%' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
-
-
- #
- # Fix 22: Hp_Inline
- #
- case "$file" in ./sys/spinlock.h )
- if ( test -n "`egrep 'include.*\"\\.\\./machine/' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- hp_inline"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's,"../machine/inline.h",<machine/inline.h>,' \
- -e 's,"../machine/psl.h",<machine/psl.h>,' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 23: Hp_Sysfile
- #
- case "$file" in ./sys/file.h )
- if ( test -n "`egrep 'HPUX_SOURCE' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- hp_sysfile"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's/(\.\.\.)/(struct file * ...)/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 24: Hpux_Cxx_Unready
- #
- case "$file" in ./sys/mman.h )
- if ( test -z "`egrep '\"C\"|__BEGIN_DECLS' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- hpux_cxx_unready"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e '1i\
-#ifdef __cplusplus\
-extern "C" {\
-#endif\
-
-' \
- -e '$a\
-#ifdef __cplusplus\
-}\
-#endif
-' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 25: Hpux_Maxint
- #
- case "$file" in ./sys/param.h )
- fixlist="${fixlist}
- hpux_maxint"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e '/^#[ ]*define[ ]*MAXINT[ ]/i\
-#ifndef MAXINT
-' \
- -e '/^#[ ]*define[ ]*MAXINT[ ]/a\
-#endif
-' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 26: Hpux_Systime
- #
- case "$file" in ./sys/time.h )
- if ( test -n "`egrep '^extern struct sigevent;' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- hpux_systime"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's/^extern struct sigevent;/struct sigevent;/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 27: Interactv_Add1
- #
- case "$file" in ./stdio.h | \
- ./math.h | \
- ./ctype.h | \
- ./sys/limits.h | \
- ./sys/fcntl.h | \
- ./sys/dirent.h )
- if ( test '(' -d /etc/conf/kconfig.d ')' -a \
- '(' -n "`grep _POSIX_VERSION /usr/include/sys/unistd.h`" ')'
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- interactv_add1"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's/!defined(__STDC__) && !defined(_POSIX_SOURCE)/!defined(_POSIX_SOURCE)/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 28: Interactv_Add2
- #
- case "$file" in ./math.h )
- if ( test '(' -d /etc/conf/kconfig.d ')' -a \
- '(' -n "`grep _POSIX_VERSION /usr/include/sys/unistd.h`" ')'
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- interactv_add2"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's/fmod(double)/fmod(double, double)/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 29: Interactv_Add3
- #
- case "$file" in ./sys/limits.h )
- if ( test '(' -d /etc/conf/kconfig.d ')' -a \
- '(' -n "`grep _POSIX_VERSION /usr/include/sys/unistd.h`" ')'
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- interactv_add3"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e '/CHILD_MAX/s,/\* Max, Max,' \
- -e '/OPEN_MAX/s,/\* Max, Max,' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 30: Io_Def_Quotes
- #
- if ( test -n "`egrep '[ ]_IO[A-Z]*[ ]*\\([A-Za-z]' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- io_def_quotes"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's/\([ ]_IO[A-Z]*[ ]*(\)\([A-Za-z]\),/\1'\''\2'\'',/' \
- -e '/#[ ]*define[ ]*[ ]_IO/s/'\''\([cgxtf]\)'\''/\1/g' \
- -e '/#[ ]*define[ ]*[ ]DESIOC/s/'\''\([cdgx]\)'\''/\1/g' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
-
-
- #
- # Fix 31: Ioctl_Fix_Ctrl
- #
- if ( test -n "`egrep 'CTRL[ ]' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- ioctl_fix_ctrl"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e '/[^A-Z0-9_]CTRL[ ]*(/s/\([^'\'']\))/'\''\1'\'')/' \
- -e '/[^A-Z0-9]_CTRL[ ]*(/s/\([^'\'']\))/'\''\1'\'')/' \
- -e '/#[ ]*define[ ]*[ ]CTRL/s/'\''\([cgx]\)'\''/\1/g' \
- -e '/#[ ]*define[ ]*[ ]_CTRL/s/'\''\([cgx]\)'\''/\1/g' \
- -e '/#[ ]*define[ ]*[ ]BSD43_CTRL/s/'\''\([cgx]\)'\''/\1/g' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
-
-
- #
- # Fix 32: Ip_Missing_Semi
- #
- case "$file" in ./netinet/ip.h )
- fixlist="${fixlist}
- ip_missing_semi"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e '/^struct/,/^};/s/}$/};/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 33: Irix_Multiline_Cmnt
- #
- case "$file" in ./sys/types.h )
- fixlist="${fixlist}
- irix_multiline_cmnt"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's@type of the result@type of the result */@' \
- -e 's@of the sizeof@/* of the sizeof@' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 34: Irix_Sockaddr
- #
- case "$file" in ./rpc/auth.h )
- if ( test -n "`egrep 'authdes_create.*struct sockaddr' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- irix_sockaddr"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e '/authdes_create.*struct sockaddr/i\
-struct sockaddr;
-' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 35: Irix_Struct__File
- #
- case "$file" in ./rpc/xdr.h )
- fixlist="${fixlist}
- irix_struct__file"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e '/xdrstdio_create.*struct __file_s/i\
-struct __file_s;
-' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 36: Isc_Fmod
- #
- case "$file" in ./math.h )
- if ( test -n "`egrep 'fmod\\(double\\)' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- isc_fmod"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's/fmod(double)/fmod(double, double)/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 37: Motorola_Nested
- #
- case "$file" in ./limits.h | \
- ./sys/limits.h )
- fixlist="${fixlist}
- motorola_nested"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's@^\(#undef[ ][ ]*PIPE_BUF[ ]*/\* max # bytes atomic in write to a\)$@\1 */@' \
- -e 's@\(/\*#define HUGE_VAL 3.40282346638528860e+38 \)\(/\*error value returned by Math lib\*/\)$@\1*/ \2@' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 38: Isc_Sys_Limits
- #
- case "$file" in ./sys/limits.h )
- if ( test -n "`egrep 'CHILD_MAX' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- isc_sys_limits"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e '/CHILD_MAX/s,/\* Max, Max,' \
- -e '/OPEN_MAX/s,/\* Max, Max,' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 39: Kandr_Concat
- #
- case "$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 | \
- ./arm/as_support.h | \
- ./arm/mc_type.h | \
- ./arm/xcb.h | \
- ./dev/chardefmac.h | \
- ./dev/ps_irq.h | \
- ./dev/screen.h | \
- ./dev/scsi.h | \
- ./sys/tty.h | \
- ./Xm.acorn/XmP.h | \
- ./bsd43/bsd43_.h )
- if ( test -n "`egrep '/\\*\\*/' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- kandr_concat"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's|/\*\*/| ## |g' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 40: Limits_Ifndefs
- #
- case "$file" in ./limits.h )
- if ( test -z "`egrep 'ifndef[ ]+FLT_MIN' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- limits_ifndefs"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- 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
-' \
- -e '/^\(\/\*#define HUGE_VAL 3\.[0-9e+]* *\)\/\*/s//\1/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 41: Lynx_Void_Int
- #
- case "$file" in ./curses.h )
- if ( test -n "`egrep '#[ ]*define[ ]+void[ ]+int' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- lynx_void_int"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e '/#[ ]*define[ ][ ]*void[ ]int/d' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 42: Lynxos_Fcntl_Proto
- #
- case "$file" in ./fcntl.h )
- fixlist="${fixlist}
- lynxos_fcntl_proto"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's/\(fcntl.*(int, int, \)int)/\1...)/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 43: M88k_Bad_Hypot_Opt
- #
- case "$file" in ./math.h )
- case "$target_canonical" in m88k-motorola-sysv3* )
- fixlist="${fixlist}
- m88k_bad_hypot_opt"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's/extern double floor(), ceil(), fmod(), fabs();/extern double floor(), ceil(), fmod(), fabs _PARAMS((double));/' \
- -e '/^extern double hypot();$/a\
-\/* Workaround a stupid Motorola optimization if one\
- of x or y is 0.0 and the other is negative! *\/\
-#ifdef __STDC__\
-static __inline__ double fake_hypot (double x, double y)\
-#else\
-static __inline__ double fake_hypot (x, y)\
- double x, y;\
-#endif\
-{\
- return fabs (hypot (x, y));\
-}\
-#define hypot fake_hypot
-' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- ;; # case end for machine type test
- esac
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 44: M88k_Bad_S_If
- #
- case "$file" in ./sys/stat.h )
- case "$target_canonical" in m88k-*-sysv3* )
- if ( test -n "`egrep '#define[ ]+S_IS[A-Z]*(m)[ ]' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- m88k_bad_s_if"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's/^\(#define[ ]*S_IS[A-Z]*(m)\)[ ]*(m[ ]*&[ ]*\(S_IF[A-Z][A-Z][A-Z][A-Z]*\)[ ]*)/\1 (((m)\&S_IFMT)==\2)/' \
- -e 's/^\(#define[ ]*S_IS[A-Z]*(m)\)[ ]*(m[ ]*&[ ]*\(0[0-9]*\)[ ]*)/\1 (((m)\&S_IFMT)==\2)/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for machine type test
- esac
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 45: M88k_Multi_Incl
- #
- case "$file" in ./time.h )
- case "$target_canonical" in m88k-tektronix-sysv3* )
- if ( test -z "`egrep '#ifndef' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- m88k_multi_incl"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
- ( echo Fixing $file, to protect against multiple inclusion. >&2
- cpp_wrapper=`echo $file | sed -e 's,\.,_,g' -e 's,/,_,g'`
- sed -e "1i\
-#ifndef __GCC_GOT_${cpp_wrapper}_\
-#define __GCC_GOT_${cpp_wrapper}_\
-" \
- -e "$a\
-#endif /* ! __GCC_GOT_${cpp_wrapper}_ */
-" ) < $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
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for machine type test
- esac
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 46: Machine_Name
- #
- if ( test -n "`egrep '^#[ ]*(if|elif).*[^a-zA-Z0-9_](_*[MSRrhim]|[Mbimnpstuv])[a-zA-Z0-9_]' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- machine_name"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e ':loop
-/\\$/N
-s/\\$/\\+++fixinc_eol+++/
-/\\$/b loop
-s/\\+++fixinc_eol+++/\\/g
-/#[ ]*[el]*if/ {
- s/[a-zA-Z0-9_][a-zA-Z0-9_]*/ & /g
- s/ M32 / __M32__ /g
- s/ _*MIPSE\([LB]\) / __MIPSE\1__ /g
- s/ _*SYSTYPE_\([A-Z0-9]*\) / __SYSTYPE_\1__ /g
- s/ _*\([Rr][34]\)000 / __\1000__ /g
- s/ _*host_mips / __host_mips__ /g
- s/ _*i386 / __i386__ /g
- s/ _*mips / __mips__ /g
- s/ bsd4\([0-9]\) / __bsd4\1__ /g
- s/ is68k / __is68k__ /g
- s/ m68k / __m68k__ /g
- s/ m88k / __m88k__ /g
- s/ mc680\([0-9]\)0 / __mc680\10__ /g
- s/ news\([0-9]*\) / __news\1__ /g
- s/ ns32000 / __ns32000__ /g
- s/ pdp11 / __pdp11__ /g
- s/ pyr / __pyr__ /g
- s/ sel / __sel__ /g
- s/ sony_news / __sony_news__ /g
- s/ sparc / __sparc__ /g
- s/ sun\([a-z0-9]*\) / __sun\1__ /g
- s/ tahoe / __tahoe__ /g
- s/ tower\([_0-9]*\) / __tower\1__ /g
- s/ u370 / __u370__ /g
- s/ u3b\([0-9]*\) / __u3b\1__ /g
- s/ unix / __unix__ /g
- s/ vax / __vax__ /g
- s/ \([a-zA-Z0-9_][a-zA-Z0-9_]*\) /\1/g
- }' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
-
-
- #
- # Fix 47: Math_Exception
- #
- case "$file" in ./math.h )
- if ( test -n "`egrep 'struct exception' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- math_exception"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e '/struct exception/i\
-#ifdef __cplusplus\
-#define exception __math_exception\
-#endif
-' \
- -e '/struct exception/a\
-#ifdef __cplusplus\
-#undef exception\
-#endif
-' \
- -e '/matherr/i\
-#ifdef __cplusplus\
-#define exception __math_exception\
-#endif
-' \
- -e '/matherr/a\
-#ifdef __cplusplus\
-#undef exception\
-#endif
-' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 48: Math_Gcc_Ifndefs
- #
- case "$file" in ./math.h )
- fixlist="${fixlist}
- math_gcc_ifndefs"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
- ( dbl_max_def="`egrep 'define[ ]+DBL_MAX[ ]+.*' ${SRCDIR}/float.h 2>/dev/null`"
-
- if ( test -n "${dbl_max_def}" \
- -a -n "`egrep '#define[ ]*HUGE_VAL[ ]+DBL_MAX' $file`" \
- -a -z "`egrep '#define[ ]+DBL_MAX[ ]+' $file`"
- ) > /dev/null 2>&1
- then sed -e '/define[ ]HUGE_VAL[ ]/i\
-#ifndef HUGE_VAL
-' \
- -e '/define[ ]HUGE_VAL[ ]/a\
-#endif
-'\
- -e "/define[ ]HUGE_VAL[ ]DBL_MAX/s/DBL_MAX/$dbl_max_def/"
- else sed -e '/define[ ]HUGE_VAL[ ]/i\
-#ifndef HUGE_VAL
-' \
- -e '/define[ ]HUGE_VAL[ ]/a\
-#endif
-'
- fi ) < $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
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 49: Motorola_Stupid_Opt
- #
- case "$file" in ./math.h )
- case "$target_canonical" in m88k-motorola-sysv3* )
- if ( test -n "`egrep '^extern double hypot();$' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- motorola_stupid_opt"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e '/^extern double hypot();$/a\
-\/* Workaround a stupid Motorola optimization if one\
- of x or y is 0.0 and the other is negative! *\/\
-#ifdef __STDC__\
-static __inline__ double fake_hypot (double x, double y)\
-#else\
-static __inline__ double fake_hypot (x, y)\
- double x, y;\
-#endif\
-{\
- return fabs (hypot (x, y));\
-}\
-#define hypot fake_hypot
-' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for machine type test
- esac
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 50: Nested_Comment
- #
- case "$file" in ./rpc/rpc.h )
- fixlist="${fixlist}
- nested_comment"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's@^\(/\*.*rpc/auth_des.h>.*\)/\*@\1*/ /*@' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 51: News_Os_Recursion
- #
- case "$file" in ./stdlib.h )
- if ( test -n "`egrep '#include <stdlib.h>' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- news_os_recursion"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e '/^#include <stdlib.h>/i\
-#ifdef BOGUS_RECURSION
-' \
- -e '/^#include <stdlib.h>/a\
-#endif
-' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 52: Next_Math_Prefix
- #
- case "$file" in ./ansi/math.h )
- if ( test -n "`egrep '^extern.*double.*__const__.*' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- next_math_prefix"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e '/^extern.*double.*__const__.*sqrt(/s/__const__//' \
- -e '/^extern.*double.*__const__.*fabs(/s/__const__//' \
- -e '/^extern.*double.*__const__.*cos(/s/__const__//' \
- -e '/^extern.*double.*__const__.*hypot(/s/__const__//' \
- -e '/^extern.*double.*__const__.*sin(/s/__const__//' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 53: Next_Template
- #
- case "$file" in ./bsd/libc.h )
- if ( test -n "`egrep 'template' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- next_template"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e '/\(.*template\)/s/template//' \
- -e '/extern.*volatile.*void.*abort/s/volatile//' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 54: Next_Volitile
- #
- case "$file" in ./ansi/stdlib.h )
- if ( test -n "`egrep 'volatile' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- next_volitile"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e '/extern.*volatile.*void.*exit/s/volatile//' \
- -e '/extern.*volatile.*void.*abort/s/volatile//' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 55: Next_Wait_Union
- #
- case "$file" in ./sys/wait.h )
- if ( test -n "`egrep 'wait\\(union wait' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- next_wait_union"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's@wait(union wait@wait(void@' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 56: Nodeent_Syntax
- #
- case "$file" in ./netdnet/dnetdb.h )
- fixlist="${fixlist}
- nodeent_syntax"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's/char.*na_addr *$/char *na_addr;/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 57: Osf_Namespace_A
- #
- case "$file" in ./reg_types.h | \
- ./sys/lc_core.h )
- if ( test '(' -r reg_types.h-a -r sys/lc_core.h-a -n "`grep '} regex_t;' reg_types.h`"-a -z "`grep __regex_t regex.h`" ')'
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- osf_namespace_a"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's/regex_t/__regex_t/g' \
- -e 's/regoff_t/__regoff_t/g' \
- -e 's/regmatch_t/__regmatch_t/g' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 58: Osf_Namespace_B
- #
- case "$file" in ./regex.h )
- if ( test '(' -r reg_types.h-a -r sys/lc_core.h-a -n "`grep '} regex_t;' reg_types.h`"-a -z "`grep __regex_t regex.h`" ')'
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- osf_namespace_b"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e '/#include <reg_types.h>/a\
-typedef __regex_t regex_t;\
-typedef __regoff_t regoff_t;\
-typedef __regmatch_t regmatch_t;
-' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 59: Pthread_Page_Size
- #
- case "$file" in ./pthread.h )
- if ( test -n "`egrep '^int __page_size' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- pthread_page_size"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's/^int __page_size/extern int __page_size/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 60: Rs6000_Double
- #
- case "$file" in ./math.h )
- if ( test -n "`egrep '[^a-zA-Z_]class\\(' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- rs6000_double"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e '/class[(]/i\
-#ifndef __cplusplus
-' \
- -e '/class[(]/a\
-#endif
-' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 61: Rs6000_Fchmod
- #
- case "$file" in ./sys/stat.h )
- if ( test -n "`egrep 'fchmod\\(char' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- rs6000_fchmod"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's/fchmod(char \*/fchmod(int/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 62: Rs6000_Param
- #
- case "$file" in ./stdio.h | \
- ./unistd.h )
- fixlist="${fixlist}
- rs6000_param"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's@rename(const char \*old, const char \*new)@rename(const char *_old, const char *_new)@' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 63: Sony_Include
- #
- case "$file" in ./machine/machparam.h )
- if ( test -n "`egrep '\"\\.\\./machine/endian.h\"' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- sony_include"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's@"../machine/endian.h"@<machine/endian.h>@' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 64: Statsswtch
- #
- case "$file" in ./rpcsvc/rstat.h )
- if ( test -n "`egrep 'boottime$' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- statsswtch"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's/boottime$/boottime;/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 65: Stdio_Va_List
- #
- case "$file" in ./stdio.h )
- fixlist="${fixlist}
- stdio_va_list"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
- ( if ( egrep "__need___va_list" $file ) > /dev/null 2>&1 ; then
- :
- else
- echo "#define __need___va_list"
- echo "#include <stdarg.h>"
- fi
-
- sed -e 's@ va_list @ __gnuc_va_list @' \
- -e 's@ va_list)@ __gnuc_va_list)@' \
- -e 's@ _BSD_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)@ __gnuc_va_list)@' \
- -e 's@GNUC_VA_LIST@GNUC_Va_LIST@' \
- -e 's@_NEED___VA_LIST@_NEED___Va_LIST@' \
- -e 's@VA_LIST@DUMMY_VA_LIST@' \
- -e 's@_Va_LIST@_VA_LIST@' ) < $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
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 66: Sun_Bogus_Ifdef
- #
- case "$file" in ./hsfs/hsfs_spec.h | \
- ./hsfs/iso_spec.h )
- if ( test -n "`egrep '#ifdef __i386__ || __vax__' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- sun_bogus_ifdef"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's/\#ifdef __i386__ || __vax__/\#if __i386__ || __vax__/g' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 67: Sun_Bogus_Ifdef_Sun4c
- #
- case "$file" in ./hsfs/hsnode.h )
- if ( test -n "`egrep '#ifdef __i386__ || __sun4c__' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- sun_bogus_ifdef_sun4c"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's/\#ifdef __i386__ || __sun4c__/\#if __i386__ || __sun4c__/g' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 68: Sun_Catmacro
- #
- case "$file" in ./pixrect/memvar.h )
- if ( test -n "`egrep '^#define[ ]+CAT(a,b)' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- sun_catmacro"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e '/^#define[ ]CAT(a,b)/ i\
-#ifdef __STDC__ \
-#define CAT(a,b) a##b\
-#else
-' \
- -e '/^#define[ ]CAT(a,b)/ a\
-#endif
-' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 69: Sun_Malloc
- #
- case "$file" in ./malloc.h )
- fixlist="${fixlist}
- sun_malloc"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's/typedef[ ]char \* malloc_t/typedef void \* malloc_t/g' \
- -e 's/int[ ][ ]*free/void free/g' \
- -e 's/char\([ ]*\*[ ]*malloc\)/void\1/g' \
- -e 's/char\([ ]*\*[ ]*realloc\)/void\1/g' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 70: Sun_Memcpy
- #
- case "$file" in ./memory.h )
- if ( test -n "`egrep '/\\* @\\(#\\)(head/memory.h 50.1 |memory\\.h 1\\.[2-4] 8./../.. SMI; from S5R2 1\\.2 )\\*/' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- sun_memcpy"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e '1i\
-/* 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__ */
-' \
- -e '1,$d' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 71: Sun_Rusers_Semi
- #
- case "$file" in ./rpcsvc/rusers.h )
- if ( test -n "`egrep '_cnt$' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- sun_rusers_semi"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e '/^struct/,/^};/s/_cnt$/_cnt;/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 72: Sun_Signal
- #
- case "$file" in ./sys/signal.h | \
- ./signal.h )
- if ( test -n "`egrep '^void \\(\\*signal\\(\\)\\)\\(\\);' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- sun_signal"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e '/^void (\*signal())();$/i\
-#ifdef __cplusplus\
-void (*signal(...))(...);\
-#else
-' \
- -e '/^void (\*signal())();$/a\
-#endif
-' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 73: Sun_Xdr_Proto
- #
- case "$file" in ./rpc/xdr.h )
- fixlist="${fixlist}
- sun_xdr_proto"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's/^\(.*\)\*\(x_.*\)();\(.*\)/\
-#ifdef __cplusplus\
-\1*\2(...);\3\
-#else\
-\1*\2();\3\
-#endif/g' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 74: Sunos_Large_Macro
- #
- case "$file" in ./sundev/ipi_error.h )
- fixlist="${fixlist}
- sunos_large_macro"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
- ( echo "Removing incorrect fix to SunOS <sundev/ipi_error.h>" >&2
-rm -f ${DESTDIR}/$file ${DESTDIR}/$file.
-cat > /dev/null ) < $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
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 75: Sunos_Matherr_Decl
- #
- case "$file" in ./math.h )
- if ( test '(' "`fgrep 'struct exception' $file | line`" != 'struct exception {' ')'
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- sunos_matherr_decl"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e '/matherr/i\
-struct exception;
-' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 76: Sunos_Strlen
- #
- case "$file" in ./strings.h )
- fixlist="${fixlist}
- sunos_strlen"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's/int[ ]*strlen();/__SIZE_TYPE__ strlen();/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 77: Systypes
- #
- case "$file" in ./sys/types.h | \
- ./stdlib.h | \
- ./sys/stdtypes.h | \
- ./stddef.h | \
- ./memory.h | \
- ./unistd.h )
- if ( test -n "`egrep 'typedef[ ]+[a-z_][ a-z_]*[ ](size|ptrdiff|wchar)_t' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- systypes"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e '/^[ ]*\*[ ]*typedef unsigned int size_t;/N' \
- -e 's/^\([ ]*\*[ ]*typedef unsigned int size_t;\n[ ]*\*\/\)/\1\
-#ifndef __SIZE_TYPE__\
-#define __SIZE_TYPE__ long unsigned int\
-#endif\
-typedef __SIZE_TYPE__ size_t;\
-/' \
- -e '/typedef[ ][ ]*[a-z_][ a-z_]*[ ]size_t/i\
-#ifndef __SIZE_TYPE__\
-#define __SIZE_TYPE__ long unsigned int\
-#endif
-' \
- -e 's/typedef[ ][ ]*[a-z_][ a-z_]*[ ]size_t/typedef __SIZE_TYPE__ size_t/' \
- -e '/typedef[ ][ ]*[a-z_][ a-z_]*[ ]ptrdiff_t/i\
-#ifndef __PTRDIFF_TYPE__\
-#define __PTRDIFF_TYPE__ long int\
-#endif
-' \
- -e 's/typedef[ ][ ]*[a-z_][ a-z_]*[ ]ptrdiff_t/typedef __PTRDIFF_TYPE__ ptrdiff_t/' \
- -e '/typedef[ ][ ]*[a-z_][ a-z_]*[ ]wchar_t/i\
-#ifndef __WCHAR_TYPE__\
-#define __WCHAR_TYPE__ int\
-#endif\
-#ifndef __cplusplus
-' \
- -e '/typedef[ ][ ]*[a-z_][ a-z_]*[ ]wchar_t/a\
-#endif
-' \
- -e 's/typedef[ ][ ]*[a-z_][ a-z_]*[ ]wchar_t/typedef __WCHAR_TYPE__ wchar_t/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 78: Systypes_For_Aix
- #
- case "$file" in ./sys/types.h )
- if ( test -n "`egrep 'typedef[ ][ ]*[A-Za-z_][ A-Za-z_]*[ ]size_t' $file`" -a \
- -z "`egrep '_GCC_SIZE_T' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- systypes_for_aix"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e '/typedef[ ][ ]*[A-Za-z_][ A-Za-z_]*[ ]size_t/i\
-#ifndef _GCC_SIZE_T\
-#define _GCC_SIZE_T
-' \
- -e '/typedef[ ][ ]*[A-Za-z_][ A-Za-z_]*[ ]size_t/a\
-#endif
-' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 79: Sysv68_String
- #
- case "$file" in ./string.h )
- fixlist="${fixlist}
- sysv68_string"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's/extern[ ]*int[ ]*strlen();/extern unsigned int strlen();/' \
- -e 's/extern[ ]*int[ ]*ffs[ ]*(long);/extern int ffs(int);/' \
- -e 's/strdup(char \*s1);/strdup(const char *s1);/' \
- -e '/^extern char$/N' \
- -e 's/^extern char\(\n \*memccpy(),\)$/extern void\1/' \
- -e '/^ strncmp(),$/N' \
- -e 's/^\( strncmp()\),\n\( strlen(),\)$/\1;\
-extern unsigned int\
-\2/' \
- -e '/^extern int$/N' \
- -e 's/^extern int\(\n strlen(),\)/extern size_t\1/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 80: Sysz_Stdlib_For_Sun
- #
- case "$file" in ./stdlib.h )
- case "$target_canonical" in *-sun-* | \
- m88k-*-sysv3* )
- fixlist="${fixlist}
- sysz_stdlib_for_sun"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- 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
-' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- ;; # case end for machine type test
- esac
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 81: Sysz_Stdtypes_For_Sun
- #
- case "$file" in ./sys/stdtypes.h )
- fixlist="${fixlist}
- sysz_stdtypes_for_sun"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- 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
-' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 82: Tinfo_Cplusplus
- #
- case "$file" in ./tinfo.h )
- fixlist="${fixlist}
- tinfo_cplusplus"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's/[ ]_cplusplus/ __cplusplus/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 83: Ultrix_Ansi_Compat
- #
- case "$file" in ./ansi_compat.h )
- if ( test -n "`egrep 'ULTRIX' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- ultrix_ansi_compat"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e '1i\
-/* This file intentionally left blank. */
-' \
- -e '1,$d' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 84: Ultrix_Atof_Param
- #
- case "$file" in ./math.h )
- fixlist="${fixlist}
- ultrix_atof_param"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's@atof(\([ ]*char[ ]*\*[^)]*\))@atof(const \1)@' \
- -e 's@inline int abs(int [a-z][a-z]*) {.*}@extern "C" int abs(int);@' \
- -e 's@inline double abs(double [a-z][a-z]*) {.*}@@' \
- -e 's@inline int sqr(int [a-z][a-z]*) {.*}@@' \
- -e 's@inline double sqr(double [a-z][a-z]*) {.*}@@' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 85: Ultrix_Const
- #
- case "$file" in ./stdio.h )
- fixlist="${fixlist}
- ultrix_const"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- 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,@' \
- -e 's@popen(char \*, char \*);@popen(const char *, const char *);@' \
- -e 's@tempnam(char\*,char\*);@tempnam(const char*,const char*);@' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 86: Ultrix_Ifdef
- #
- case "$file" in ./sys/file.h )
- if ( test -n "`egrep '#ifdef KERNEL' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- ultrix_ifdef"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's/#ifdef KERNEL/#if defined(KERNEL)/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 87: Ultrix_Nested_Cmnt
- #
- case "$file" in ./rpc/svc.h )
- fixlist="${fixlist}
- ultrix_nested_cmnt"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's@^\( \* int protocol; \)/\*@\1*/ /*@' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 88: Ultrix_Static
- #
- case "$file" in ./machine/cpu.h )
- if ( test -n "`egrep '#include \"r[34]_cpu' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- ultrix_static"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's/^static struct tlb_pid_state/struct tlb_pid_state/' \
- -e 's/^#include "r3_cpu\.h"$/#include <machine\/r3_cpu\.h>/' \
- -e 's/^#include "r4_cpu\.h"$/#include <machine\/r4_cpu\.h>/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 89: Undefine_Null
- #
- if ( test -n "`egrep '^#[ ]*define[ ]*[ ]NULL[ ]' $file`" -a \
- -z "`egrep '#[ ]*(ifn|un)def[ ]*[ ]NULL($|[ ])' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- undefine_null"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e '/^#[ ]*define[ ][ ]*NULL[ ]/i\
-#undef NULL
-' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
-
-
- #
- # Fix 90: Va_I960_Macro
- #
- case "$file" in ./arch/i960/archI960.h )
- if ( test -n "`egrep '__(vsiz|vali|vpad|alignof__)' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- va_i960_macro"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's/__vsiz/__vxvsiz/' \
- -e 's/__vali/__vxvali/' \
- -e 's/__vpad/__vxvpad/' \
- -e 's/__alignof__/__vxalignof__/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 91: Void_Null
- #
- case "$file" in ./curses.h | \
- ./dbm.h | \
- ./locale.h | \
- ./stdio.h | \
- ./stdlib.h | \
- ./string.h | \
- ./time.h | \
- ./unistd.h | \
- ./sys/dir.h | \
- ./sys/param.h | \
- ./sys/types.h )
- if ( test -n "`egrep '#[ ]*define[ ][ ]*NULL[ ].*void' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- void_null"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's/^#[ ]*define[ ]*NULL[ ]*((void[ ]*\*)0)/#define NULL 0/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 92: Vxworks_Gcc_Problem
- #
- case "$file" in ./types/vxTypesBase.h )
- if ( test -n "`egrep '__GNUC_TYPEOF_FEATURE_BROKEN_USE_DEFAULT_UNTIL_FIXED__' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- vxworks_gcc_problem"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's/#ifdef __GNUC_TYPEOF_FEATURE_BROKEN_USE_DEFAULT_UNTIL_FIXED__/#if 1/' \
- -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
-' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 93: Vxworks_Needs_Vxtypes
- #
- case "$file" in ./time.h )
- if ( test -n "`egrep 'uint_t[ ][ ]*_clocks_per_sec' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- vxworks_needs_vxtypes"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's/uint_t/unsigned int/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 94: Vxworks_Needs_Vxworks
- #
- case "$file" in ./sys/stat.h )
- if ( test -n "`egrep '#[ ]define[ ][ ]*__INCstath' $file`" -a \
- '(' -r types/vxTypesOld.h ')' -a \
- '(' -n "`fgrep '#include' $file`" ')' -a \
- '(' -n "`fgrep ULONG $file`" ')'
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- vxworks_needs_vxworks"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e '/#[ ]define[ ][ ]*__INCstath/a\
-#include <types/vxTypesOld.h>
-' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 95: Vxworks_Time
- #
- case "$file" in ./time.h )
- if ( test -n "`egrep 'VOIDFUNCPTR' $file`" -a \
- '(' -r vxWorks.h ')'
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- vxworks_time"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e '/VOIDFUNCPTR/i\
-#ifndef __gcc_VOIDFUNCPTR_defined\
-#ifdef __cplusplus\
-typedef void (*__gcc_VOIDFUNCPTR) (...);\
-#else\
-typedef void (*__gcc_VOIDFUNCPTR) ();\
-#endif\
-#define __gcc_VOIDFUNCPTR_defined\
-#endif
-' \
- -e 's/VOIDFUNCPTR/__gcc_VOIDFUNCPTR/g' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 96: X11_Class
- #
- case "$file" in ./X11/ShellP.h )
- if ( test -z "`egrep '__cplusplus' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- x11_class"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e '/char \*class;/i\
-#ifdef __cplusplus\
- char *c_class;\
-#else
-' \
- -e '/char \*class;/a\
-#endif
-' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 97: X11_Class_Usage
- #
- case "$file" in ./Xm/BaseClassI.h )
- if ( test -z "`egrep '__cplusplus' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- x11_class_usage"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's/ class[)]/ c_class)/g' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 98: X11_New
- #
- case "$file" in ./Xm/Traversal.h )
- if ( test -z "`egrep '__cplusplus' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- x11_new"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e '/Widget old, new;/i\
-#ifdef __cplusplus\
- Widget old, c_new;\
-#else
-' \
- -e '/Widget old, new;/a\
-#endif
-' \
- -e 's/Widget new,/Widget c_new,/g' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 99: X11_Sprintf
- #
- case "$file" in ./X11*/Xmu.h )
- fixlist="${fixlist}
- x11_sprintf"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e 's,^extern char \* sprintf();$,#ifndef __STDC__\
-extern char * sprintf();\
-#endif /* !defined __STDC__ */,' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 100: Zzz_Ki_Iface
- #
- case "$file" in ./sys/ki_iface.h )
- if ( test -n "`egrep 'These definitions are for HP Internal developers' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- zzz_ki_iface"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
- ( echo "Removing incorrect fix to HP-UX <$file>" >&2
-rm -f ${DESTDIR}/$file ${DESTDIR}/$file.
-cat > /dev/null ) < $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
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 101: Zzz_Ki
- #
- case "$file" in ./sys/ki.h )
- if ( test -n "`egrep '11.00 HP-UX LP64' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- zzz_ki"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
- ( echo "Removing incorrect fix to HP-UX <$file>" >&2
-rm -f ${DESTDIR}/$file ${DESTDIR}/$file.
-cat > /dev/null ) < $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
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 102: Zzz_Ki_Calls
- #
- case "$file" in ./sys/ki_calls.h )
- if ( test -n "`egrep 'KI_MAX_PROCS is an arbitrary number' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- zzz_ki_calls"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
- ( echo "Removing incorrect fix to HP-UX <$file>" >&2
-rm -f ${DESTDIR}/$file ${DESTDIR}/$file.
-cat > /dev/null ) < $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
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 103: Zzz_Ki_Defs
- #
- case "$file" in ./sys/ki_defs.h )
- if ( test -n "`egrep 'Kernel Instrumentation Definitions' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- zzz_ki_defs"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
- ( echo "Removing incorrect fix to HP-UX <$file>" >&2
-rm -f ${DESTDIR}/$file ${DESTDIR}/$file.
-cat > /dev/null ) < $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
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 104: Zzz_Time
- #
- case "$file" in ./sys/time.h )
- if ( test -n "`egrep 'For CASPEC, look in' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- zzz_time"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
- ( echo "Removing incorrect fix to HP-UX <$file>" >&2
-rm -f ${DESTDIR}/$file ${DESTDIR}/$file.
-cat > /dev/null ) < $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
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for file name test
- esac
- # 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
-done
-
-## Make sure that any include files referenced using double quotes
-## exist in the fixed directory. This comes last since otherwise
-## we might end up deleting some of these files "because they don't
-## need any change."
-set x `echo $required`
-shift
-while [ $# != 0 ]; do
- newreq=
- while [ $# != 0 ]; do
- # $1 is the directory to copy from,
- # $2 is the unfixed file,
- # $3 is the fixed file name.
- #
- cd ${INPUT}
- cd $1
- if [ -r $2 ] && [ ! -r $3 ]; then
- cp $2 $3 >/dev/null 2>&1 || echo "Can't copy $2" >&2
- chmod +w $3 2>/dev/null
- chmod a+r $3 2>/dev/null
- echo Copied $2
- for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' $3 |
- sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`
- do
- dir=`echo $2 | sed -e s'|/[^/]*$||'`
- dir2=`echo $3 | sed -e s'|/[^/]*$||'`
- newreq="$newreq $1 $dir/$include $dir2/$include"
- done
- fi
- shift; shift; shift
- done
- set x $newreq
- shift
-done
-
-echo 'Cleaning up DONE files.'
-cd $LIB
-find . -name DONE -exec rm -f '{}' ';'
-
-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
diff --git a/contrib/fixinc/inclhack.tpl b/contrib/fixinc/inclhack.tpl
deleted file mode 100644
index 3b0d89b0e58..00000000000
--- a/contrib/fixinc/inclhack.tpl
+++ /dev/null
@@ -1,366 +0,0 @@
-[= autogen template -*- Mode: shell-script -*-
-sh
-#
-# $Id: inclhack.tpl,v 1.2 1998/09/22 07:21:14 korbb Exp $
-#
-=]
-#!/bin/sh
-#
-[= _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 _count =] fixup scripts.
-#
-# See README-fixinc for more information.
-#
-[=_eval fixincludes "## " _gpl=]
-#
-# # # # # # # # # # # # # # # # # # # # #
-#
-# Directory containing the original header files.
-# (This was named INCLUDES, but that conflicts with a name in Makefile.in.)
-#
-INPUT=${2-${INPUT-/usr/include}}
-
-( \cd ${INPUT} > /dev/null 2>&1 ) || {
- echo 'fixincludes: input dir `'$INPUT"' is an invalid directory"
- exit 1
-}
-
-# # # # # # # # # # # # # # # # # # # # #
-#
-# Directory in which to store the results.
-# 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
-
-LIB=${1}
-
-# Make sure it exists.
-if [ ! -d $LIB ]; then
- mkdir $LIB || {
- echo fixincludes: output dir '`'$LIB"' cannot be created"
- exit 1
- }
-else
- ( \cd $LIB && touch DONE && rm DONE ) || {
- echo fixincludes: output dir '`'$LIB"' is an invalid directory"
- exit 1
- }
-fi
-
-# Define what target system we're fixing.
-#
-if test -r ./Makefile; then
- target_canonical="`sed -n -e 's,^target[ ]*=[ ]*\(.*\)$,\1,p' < Makefile`"
-fi
-
-# If not from the Makefile, then try config.guess
-#
-if test -z "${target_canonical}" ; then
- if test -x ./config.guess ; then
- target_canonical="`config.guess`" ; fi
- test -z "${target_canonical}" && target_canonical=unknown
-fi
-export target_canonical
-
-# # # # # # # # # # # # # # # # # # # # #
-#
-# Define PWDCMD as a command to use to get the working dir
-# in the form that we want.
-PWDCMD=pwd
-
-case "`$PWDCMD`" in
-//*)
- # On an Apollo, discard everything before `/usr'.
- PWDCMD="eval pwd | sed -e 's,.*/usr/,/usr/,'"
- ;;
-esac
-
-# Original directory.
-ORIGDIR=`${PWDCMD}`[=
-_IF PROGRAM _env =]
-FIXINCL=${ORIGDIR}/fixincl
-export FIXINCL[=
-_ENDIF=]
-
-# Make LIB absolute only if needed to avoid problems with the amd.
-case $LIB in
-/*)
- ;;
-*)
- cd $LIB; LIB=`${PWDCMD}`
- ;;
-esac
-
-echo Fixing headers into ${LIB} for ${target_canonical} target
-
-# 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"
-
- # Find all directories under $d, relative to $d, excluding $d itself.
- # (The /. is needed after $d in case $d is a symlink.)
- files="$files `find $d/. -type d -print | \
- sed -e '/\/\.$/d' -e 's@/./@/@g'`"
- # 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 | sed -e 's@/./@/@g'`
- for d1 in $theselinks --dummy--
- do
- # If the link points to a directory,
- # add that dir to $newdirs
- if [ -d $d1 ]
- then
- files="$files $d1"
- if [ "`ls -ld $d1 | sed -n 's/.*-> //p'`" != "." ]
- then
- newdirs="$newdirs $d1"
- fi
- fi
- done
- done
-
- 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}`
- # Canonicalize ${INPUT} now to minimize the time an
- # automounter has to change the result of ${PWDCMD}.
- cinput=`cd ${INPUT}; ${PWDCMD}`
- # If a link points to ., make a similar link to .
- if [ $x = ${cinput} ]; 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 : "${cinput}/.*" > /dev/null; then
- # Y gets the actual target dir name, relative to ${INPUT}.
- y=`echo $x | sed -n "s&${cinput}/&&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@[^/][^/]*@..@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
- # Get the path from ${LIB} to $file, accounting for symlinks.
- parent=`echo "$file" | sed -e 's@/[^/]*$@@'`
- libabs=`cd ${LIB}; ${PWDCMD}`
- file2=`cd ${LIB}; cd $parent; ${PWDCMD} | sed -e "s@^${libabs}@@"`
- # DOTS is the relative path from ${LIB}/$file's dir back to ${LIB}.
- dots=`echo "$file2" | sed -e 's@/[^/]*@../@g'`
- 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
-
-# # # # # # # # # # # # # # # # # # # # #
-#
-required=
-set x $treetops
-shift
-while [ $# != 0 ]; do
- # $1 is an old directory to copy, and $2 is the new directory to copy to.
- #
- SRCDIR=`cd ${INPUT} ; cd $1 ; ${PWDCMD}`
- export SRCDIR
- shift
-
- DESTDIR=`cd $1;${PWDCMD}`
- export DESTDIR
- shift
-
- # The same dir can appear more than once in treetops.
- # There's no need to scan it more than once.
- #
- if [ -f ${DESTDIR}/DONE ]
- then continue ; fi
-
- touch ${DESTDIR}/DONE
- echo Fixing directory ${SRCDIR} into ${DESTDIR}
-
- # 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.
- #
- cd ${SRCDIR}
-[=_IF PROGRAM _env ! =][=
-
- _include hackshell =][=
-
- _ELSE
-
-=]
- required="$required `if $LINKS; then
- find . -name '*.h' \( -type f -o -type l \) -print
- else
- find . -name '*.h' -type f -print
- fi | ${FIXINCL}`"[=
-
-
- _ENDIF =]
-done
-
-## Make sure that any include files referenced using double quotes
-## exist in the fixed directory. This comes last since otherwise
-## we might end up deleting some of these files "because they don't
-## need any change."
-set x `echo $required`
-shift
-while [ $# != 0 ]; do
- newreq=
- while [ $# != 0 ]; do
- # $1 is the directory to copy from,
- # $2 is the unfixed file,
- # $3 is the fixed file name.
- #
- cd ${INPUT}
- cd $1
- if [ -r $2 ] && [ ! -r $3 ]; then
- cp $2 $3 >/dev/null 2>&1 || echo "Can't copy $2" >&2
- chmod +w $3 2>/dev/null
- chmod a+r $3 2>/dev/null
- echo Copied $2
- for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' $3 |
- sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`
- do
- dir=`echo $2 | sed -e s'|/[^/]*$||'`
- dir2=`echo $3 | sed -e s'|/[^/]*$||'`
- newreq="$newreq $1 $dir/$include $dir2/$include"
- done
- fi
- shift; shift; shift
- done
- set x $newreq
- shift
-done
-
-echo 'Cleaning up DONE files.'
-cd $LIB
-find . -name DONE -exec rm -f '{}' ';'
-
-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[=
-
-# Make the output file executable
-# =][=
-_eval _outfile "chmod +x %s" _printf _shell=]
diff --git a/contrib/fixinc/mkfixinc.sh b/contrib/fixinc/mkfixinc.sh
deleted file mode 100755
index 0e806feb29f..00000000000
--- a/contrib/fixinc/mkfixinc.sh
+++ /dev/null
@@ -1,119 +0,0 @@
-#! /bin/sh
-
-machine=$1
-dest=$2
-
-if test -z "$dest"
-then
- echo "No destination directory specified"
- exit 1
-fi
-
-echo constructing $dest for $machine
-
-case $machine in
- alpha*-dec-vms* | \
- arm-semi-aout | \
- armel-semi-aout | \
- arm-semi-aof | \
- armel-semi-aof | \
- c1-convex-* | \
- c2-convex-* | \
- c32-convex-* | \
- c34-convex-* | \
- c38-convex-* | \
- hppa1.[01]-*-osf* | \
- hppa1.[01]-*-bsd* | \
- hppa*-*-lites* | \
- i[34567]86-moss-msdos* | \
- i[34567]86-*-moss* | \
- i[34567]86-*-sysv5* | \
- i[34567]86-*-osf1* | \
- i[34567]86-*-pe | \
- i[34567]86-*-cygwin32 | \
- i[34567]86-*-mingw32* | \
- mips-sgi-irix5cross64 | \
- mips-dec-bsd* | \
- powerpc-*-eabi* | \
- powerpc-*-rtems* | \
- powerpcle-*-eabi* | \
- powerpcle-*-winnt* | \
- powerpcle-*-pe | \
- powerpcle-*-cygwin32 | \
- *-*-linux-* | \
- *-*-gnu* )
- fixincludes=`basename $dest`
- ;;
-
- i[34567]86-dg-dgux* | \
- m88k-dg-dgux*)
- fixincludes=fixinc.dgux
- ;;
-
- mips-sgi-irix[56]* )
- fixincludes=fixinc.irix
- ;;
-
- i[34567]86-sequent-ptx1* | \
- i[34567]86-sequent-ptx2* | \
- i[34567]86-sequent-ptx4* | \
- i[34567]86-sequent-sysv3* | \
- i[34567]86-sequent-sysv4*)
- fixincludes=fixinc.ptx
- ;;
-
- i[34567]86-*-sco3.2v[45]*)
- fixincludes=fixinc.sco
- ;;
-
- i[34567]86-*-solaris2.[0-4]* | \
- *-*-solaris2.[0-4]* | \
- *-*-sysv4*)
- fixincludes=fixinc.svr4
- ;;
-
- alpha*-*-winnt* | \
- i[34567]86-*-winnt3*)
- fixincludes=fixinc.winnt
- ;;
-
- alpha*-*-netbsd* | \
- arm-*-netbsd* | \
- i[34567]86-*-freebsdelf* | \
- i[34567]86-*-freebsd* | \
- i[34567]86-*-netbsd* | \
- i[34567]86-*-solaris2* | \
- m68k-*-netbsd* | \
- mips-dec-netbsd* | \
- ns32k-pc532-netbsd* | \
- *-*-solaris2* | \
- sparc-*-netbsd* | \
- vax-*-netbsd*)
- fixincludes=fixinc.wrap
- ;;
-
- *)
- fixincludes=`basename $dest`
- ;;
-esac
-
-if test -z "$fixincludes"
-then
- cat > $dest <<- _EOF_
- #! /bin/sh
- exit 0
- _EOF_
- exit 0
-fi
-
-if test -f "$fixincludes"
-then
- echo copying $fixincludes to $dest
- cp $fixincludes $dest
- exit 0
-fi
-
-echo $MAKE install DESTDIR=`dirname $dest` TARGET=$machine
-$MAKE install DESTDIR=`dirname $dest` TARGET=$machine
-
-exit 1
diff --git a/contrib/fixinc/regex.c b/contrib/fixinc/regex.c
deleted file mode 100644
index 92e5fba4c47..00000000000
--- a/contrib/fixinc/regex.c
+++ /dev/null
@@ -1,5059 +0,0 @@
-/* Extended regular expression matching and search library,
- version 0.12.
- (Implements POSIX draft P10003.2/D11.2, except for
- internationalization features.)
-
- Copyright (C) 1993 Free Software Foundation, Inc.
-
- This program is free software; you can 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.
-
- This program 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 this program; if not, write to the Free Software
- Foundation, 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
-
-/* AIX requires this to be the first thing in the file. */
-#if defined (_AIX) && !defined (REGEX_MALLOC)
- #pragma alloca
-#endif
-
-/* $Id: regex.c,v 1.3 1999/01/11 13:25:47 law Exp $ */
-
-#define _GNU_SOURCE
-
-/* We need this for `regex.h', and perhaps for the Emacs include files. */
-#ifdef __TANDEM
-/*
- * WARN 107: constant used as logical expression
- * Side effect of some complex macros
- */
-# pragma NOWARN( 107 )
-
-/*
- * WARN 95: prototype function declaration not in scope:
- * TANDEM brain damaged C.
- */
-# pragma NOWARN( 95 )
-# include <systype.h>
-#else
-# include <sys/types.h>
-#endif
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-/* The `emacs' switch turns on certain matching commands
- that make sense only in Emacs. */
-#ifdef emacs
-
-#include "lisp.h"
-#include "buffer.h"
-#include "syntax.h"
-
-/* Emacs uses `NULL' as a predicate. */
-#undef NULL
-
-#else /* not emacs */
-
-#ifdef __TANDEM
-# include <string.h>
-# include <stdlib.h>
-# ifndef bcmp
-# define bcmp(s1, s2, n) memcmp ((s1), (s2), (n))
-# endif
-# ifndef bcopy
-# define bcopy(s, d, n) memcpy ((d), (s), (n))
-# endif
-# ifndef bzero
-# define bzero(s, n) memset ((s), 0, (n))
-# endif
-# pragma NOWARN( 96 )
-
-#else /* NOT TANDEM */
-
-/* We used to test for `BSTRING' here, but only GCC and Emacs define
- `BSTRING', as far as I know, and neither of them use this code. */
-# if HAVE_STRING_H || STDC_HEADERS
-# include <string.h>
-# ifndef bcmp
-# define bcmp(s1, s2, n) memcmp ((s1), (s2), (n))
-# endif
-# ifndef bcopy
-# define bcopy(s, d, n) memcpy ((d), (s), (n))
-# endif
-# ifndef bzero
-# define bzero(s, n) memset ((s), 0, (n))
-# endif
-# else
-# include <strings.h>
-# endif
-
-# ifdef STDC_HEADERS
-# include <stdlib.h>
-# else
- char *malloc ();
- char *realloc ();
-# endif
-#endif /* TANDEM */
-
-/* Define the syntax stuff for \<, \>, etc. */
-
-/* This must be nonzero for the wordchar and notwordchar pattern
- commands in re_match_2. */
-#ifndef Sword
-#define Sword 1
-#endif
-
-#ifdef SYNTAX_TABLE
-
-extern char *re_syntax_table;
-
-#else /* not SYNTAX_TABLE */
-
-/* How many characters in the character set. */
-#define CHAR_SET_SIZE 256
-
-static char re_syntax_table[CHAR_SET_SIZE];
-
-static void
-init_syntax_once ()
-{
- register int c;
- static int done = 0;
-
- if (done)
- return;
-
- bzero (re_syntax_table, sizeof re_syntax_table);
-
- for (c = 'a'; c <= 'z'; c++)
- re_syntax_table[c] = Sword;
-
- for (c = 'A'; c <= 'Z'; c++)
- re_syntax_table[c] = Sword;
-
- for (c = '0'; c <= '9'; c++)
- re_syntax_table[c] = Sword;
-
- re_syntax_table['_'] = Sword;
-
- done = 1;
-}
-
-#endif /* not SYNTAX_TABLE */
-
-#define SYNTAX(c) re_syntax_table[c]
-
-#endif /* not emacs */
-
-/* Get the interface, including the syntax bits. */
-#include "regex.h"
-
-/* isalpha etc. are used for the character classes. */
-#include <ctype.h>
-
-#ifndef isascii
-#define isascii(c) 1
-#endif
-
-#ifdef isblank
-#define ISBLANK(c) (isascii (c) && isblank (c))
-#else
-#define ISBLANK(c) ((c) == ' ' || (c) == '\t')
-#endif
-#ifdef isgraph
-#define ISGRAPH(c) (isascii (c) && isgraph (c))
-#else
-#define ISGRAPH(c) (isascii (c) && isprint (c) && !isspace (c))
-#endif
-
-#define ISPRINT(c) (isascii (c) && isprint (c))
-#define ISDIGIT(c) (isascii (c) && isdigit (c))
-#define ISALNUM(c) (isascii (c) && isalnum (c))
-#define ISALPHA(c) (isascii (c) && isalpha (c))
-#define ISCNTRL(c) (isascii (c) && iscntrl (c))
-#define ISLOWER(c) (isascii (c) && islower (c))
-#define ISPUNCT(c) (isascii (c) && ispunct (c))
-#define ISSPACE(c) (isascii (c) && isspace (c))
-#define ISUPPER(c) (isascii (c) && isupper (c))
-#define ISXDIGIT(c) (isascii (c) && isxdigit (c))
-
-#ifndef NULL
-#define NULL 0
-#endif
-
-/* We remove any previous definition of `SIGN_EXTEND_CHAR',
- since ours (we hope) works properly with all combinations of
- machines, compilers, `char' and `unsigned char' argument types.
- (Per Bothner suggested the basic approach.) */
-#undef SIGN_EXTEND_CHAR
-#if __STDC__
-#define SIGN_EXTEND_CHAR(c) ((signed char) (c))
-#else /* not __STDC__ */
-/* As in Harbison and Steele. */
-#define SIGN_EXTEND_CHAR(c) ((((unsigned char) (c)) ^ 128) - 128)
-#endif
-
-/* Should we use malloc or alloca? If REGEX_MALLOC is not defined, we
- use `alloca' instead of `malloc'. This is because using malloc in
- re_search* or re_match* could cause memory leaks when C-g is used in
- Emacs; also, malloc is slower and causes storage fragmentation. On
- the other hand, malloc is more portable, and easier to debug.
-
- Because we sometimes use alloca, some routines have to be macros,
- not functions -- `alloca'-allocated space disappears at the end of the
- function it is called in. */
-
-#ifdef __TANDEM
-#define REGEX_MALLOC 1
-#endif
-
-#ifdef REGEX_MALLOC
-
-#define REGEX_ALLOCATE malloc
-#define DESTINATION_DECL
-#define REGEX_REALLOCATE(source, osize, nsize) realloc (source, nsize)
-
-#else /* not REGEX_MALLOC */
-
-/* Emacs already defines alloca, sometimes. */
-#ifndef alloca
-
-/* Make alloca work the best possible way. */
-#ifdef __GNUC__
-#define alloca __builtin_alloca
-#else /* not __GNUC__ */
-#if HAVE_ALLOCA_H
-#include <alloca.h>
-#else /* not __GNUC__ or HAVE_ALLOCA_H */
-#ifndef _AIX /* Already did AIX, up at the top. */
-char *alloca ();
-#endif /* not _AIX */
-#endif /* not HAVE_ALLOCA_H */
-#endif /* not __GNUC__ */
-
-#endif /* not alloca */
-
-#define REGEX_ALLOCATE alloca
-#define DESTINATION_DECL char* destination;
-
-/* Assumes a `char *destination' variable. */
-#define REGEX_REALLOCATE(source, osize, nsize) \
- (destination = (char *) alloca (nsize), \
- bcopy (source, destination, osize), \
- destination)
-
-#endif /* not REGEX_MALLOC */
-
-
-/* True if `size1' is non-NULL and PTR is pointing anywhere inside
- `string1' or just past its end. This works if PTR is NULL, which is
- a good thing. */
-#define FIRST_STRING_P(ptr) \
- (size1 && string1 <= (ptr) && (ptr) <= string1 + size1)
-
-/* (Re)Allocate N items of type T using malloc, or fail. */
-#define TALLOC(n, t) ((t *) malloc ((n) * sizeof (t)))
-#define RETALLOC(addr, n, t) ((addr) = (t *) realloc (addr, (n) * sizeof (t)))
-#define REGEX_TALLOC(n, t) ((t *) REGEX_ALLOCATE ((n) * sizeof (t)))
-
-#define BYTEWIDTH 8 /* In bits. */
-
-#define STREQ(s1, s2) ((strcmp (s1, s2) == 0))
-
-#define MAX(a, b) ((a) > (b) ? (a) : (b))
-#define MIN(a, b) ((a) < (b) ? (a) : (b))
-
-typedef char boolean;
-#define false 0
-#define true 1
-
-/* These are the command codes that appear in compiled regular
- expressions. Some opcodes are followed by argument bytes. A
- command code can specify any interpretation whatsoever for its
- arguments. Zero bytes may appear in the compiled regular expression.
-
- The value of `exactn' is needed in search.c (search_buffer) in Emacs.
- So regex.h defines a symbol `RE_EXACTN_VALUE' to be 1; the value of
- `exactn' we use here must also be 1. */
-
-typedef enum
-{
- no_op = 0,
-
- /* Followed by one byte giving n, then by n literal bytes. */
- exactn = 1,
-
- /* Matches any (more or less) character. */
- anychar,
-
- /* Matches any one char belonging to specified set. First
- following byte is number of bitmap bytes. Then come bytes
- for a bitmap saying which chars are in. Bits in each byte
- are ordered low-bit-first. A character is in the set if its
- bit is 1. A character too large to have a bit in the map is
- automatically not in the set. */
- charset,
-
- /* Same parameters as charset, but match any character that is
- not one of those specified. */
- charset_not,
-
- /* Start remembering the text that is matched, for storing in a
- register. Followed by one byte with the register number, in
- the range 0 to one less than the pattern buffer's re_nsub
- field. Then followed by one byte with the number of groups
- inner to this one. (This last has to be part of the
- start_memory only because we need it in the on_failure_jump
- of re_match_2.) */
- start_memory,
-
- /* Stop remembering the text that is matched and store it in a
- memory register. Followed by one byte with the register
- number, in the range 0 to one less than `re_nsub' in the
- pattern buffer, and one byte with the number of inner groups,
- just like `start_memory'. (We need the number of inner
- groups here because we don't have any easy way of finding the
- corresponding start_memory when we're at a stop_memory.) */
- stop_memory,
-
- /* Match a duplicate of something remembered. Followed by one
- byte containing the register number. */
- duplicate,
-
- /* Fail unless at beginning of line. */
- begline,
-
- /* Fail unless at end of line. */
- endline,
-
- /* Succeeds if at beginning of buffer (if emacs) or at beginning
- of string to be matched (if not). */
- begbuf,
-
- /* Analogously, for end of buffer/string. */
- endbuf,
-
- /* Followed by two byte relative address to which to jump. */
- jump,
-
- /* Same as jump, but marks the end of an alternative. */
- jump_past_alt,
-
- /* Followed by two-byte relative address of place to resume at
- in case of failure. */
- on_failure_jump,
-
- /* Like on_failure_jump, but pushes a placeholder instead of the
- current string position when executed. */
- on_failure_keep_string_jump,
-
- /* Throw away latest failure point and then jump to following
- two-byte relative address. */
- pop_failure_jump,
-
- /* Change to pop_failure_jump if know won't have to backtrack to
- match; otherwise change to jump. This is used to jump
- back to the beginning of a repeat. If what follows this jump
- clearly won't match what the repeat does, such that we can be
- sure that there is no use backtracking out of repetitions
- already matched, then we change it to a pop_failure_jump.
- Followed by two-byte address. */
- maybe_pop_jump,
-
- /* Jump to following two-byte address, and push a dummy failure
- point. This failure point will be thrown away if an attempt
- is made to use it for a failure. A `+' construct makes this
- before the first repeat. Also used as an intermediary kind
- of jump when compiling an alternative. */
- dummy_failure_jump,
-
- /* Push a dummy failure point and continue. Used at the end of
- alternatives. */
- push_dummy_failure,
-
- /* Followed by two-byte relative address and two-byte number n.
- After matching N times, jump to the address upon failure. */
- succeed_n,
-
- /* Followed by two-byte relative address, and two-byte number n.
- Jump to the address N times, then fail. */
- jump_n,
-
- /* Set the following two-byte relative address to the
- subsequent two-byte number. The address *includes* the two
- bytes of number. */
- set_number_at,
-
- wordchar, /* Matches any word-constituent character. */
- notwordchar, /* Matches any char that is not a word-constituent. */
-
- wordbeg, /* Succeeds if at word beginning. */
- wordend, /* Succeeds if at word end. */
-
- wordbound, /* Succeeds if at a word boundary. */
- notwordbound /* Succeeds if not at a word boundary. */
-
-#ifdef emacs
- ,before_dot, /* Succeeds if before point. */
- at_dot, /* Succeeds if at point. */
- after_dot, /* Succeeds if after point. */
-
- /* Matches any character whose syntax is specified. Followed by
- a byte which contains a syntax code, e.g., Sword. */
- syntaxspec,
-
- /* Matches any character whose syntax is not that specified. */
- notsyntaxspec
-#endif /* emacs */
-} re_opcode_t;
-
-/* Common operations on the compiled pattern. */
-
-/* Store NUMBER in two contiguous bytes starting at DESTINATION. */
-
-#define STORE_NUMBER(destination, number) \
- do { \
- (destination)[0] = (unsigned char)((number) & 0377); \
- (destination)[1] = (unsigned char)((number) >> 8); \
- } while (0)
-
-/* Same as STORE_NUMBER, except increment DESTINATION to
- the byte after where the number is stored. Therefore, DESTINATION
- must be an lvalue. */
-
-#define STORE_NUMBER_AND_INCR(destination, number) \
- do { \
- STORE_NUMBER (destination, number); \
- (destination) += 2; \
- } while (0)
-
-/* Put into DESTINATION a number stored in two contiguous bytes starting
- at SOURCE. */
-
-#define EXTRACT_NUMBER(destination, source) \
- do { \
- (destination) = *(source) & 0377; \
- (destination) += SIGN_EXTEND_CHAR (*((source) + 1)) << 8; \
- } while (0)
-
-#ifdef DEBUG
-static void
-extract_number (dest, source)
- int *dest;
- unsigned char *source;
-{
- int temp = SIGN_EXTEND_CHAR (*(source + 1));
- *dest = *source & 0377;
- *dest += temp << 8;
-}
-
-#ifndef EXTRACT_MACROS /* To debug the macros. */
-#undef EXTRACT_NUMBER
-#define EXTRACT_NUMBER(dest, src) extract_number (&dest, src)
-#endif /* not EXTRACT_MACROS */
-
-#endif /* DEBUG */
-
-/* Same as EXTRACT_NUMBER, except increment SOURCE to after the number.
- SOURCE must be an lvalue. */
-
-#define EXTRACT_NUMBER_AND_INCR(destination, source) \
- do { \
- EXTRACT_NUMBER (destination, source); \
- (source) += 2; \
- } while (0)
-
-#ifdef DEBUG
-static void
-extract_number_and_incr (destination, source)
- int *destination;
- unsigned char **source;
-{
- extract_number (destination, *source);
- *source += 2;
-}
-
-#ifndef EXTRACT_MACROS
-#undef EXTRACT_NUMBER_AND_INCR
-#define EXTRACT_NUMBER_AND_INCR(dest, src) \
- extract_number_and_incr (&dest, &src)
-#endif /* not EXTRACT_MACROS */
-
-#endif /* DEBUG */
-
-/* If DEBUG is defined, Regex prints many voluminous messages about what
- it is doing (if the variable `debug' is nonzero). If linked with the
- main program in `iregex.c', you can enter patterns and strings
- interactively. And if linked with the main program in `main.c' and
- the other test files, you can run the already-written tests. */
-
-#ifdef DEBUG
-
-/* We use standard I/O for debugging. */
-#include <stdio.h>
-
-/* It is useful to test things that ``must'' be true when debugging. */
-#include <assert.h>
-
-static int debug = 0;
-
-#define DEBUG_STATEMENT(e) e
-#define DEBUG_PRINT1(x) if (debug) printf (x)
-#define DEBUG_PRINT2(x1, x2) if (debug) printf (x1, x2)
-#define DEBUG_PRINT3(x1, x2, x3) if (debug) printf (x1, x2, x3)
-#define DEBUG_PRINT4(x1, x2, x3, x4) if (debug) printf (x1, x2, x3, x4)
-#define DEBUG_PRINT_COMPILED_PATTERN(p, s, e) \
- if (debug) print_partial_compiled_pattern (s, e)
-#define DEBUG_PRINT_DOUBLE_STRING(w, s1, sz1, s2, sz2) \
- if (debug) print_double_string (w, s1, sz1, s2, sz2)
-
-
-extern void printchar ();
-
-/* Print the fastmap in human-readable form. */
-
-void
-print_fastmap (fastmap)
- char *fastmap;
-{
- unsigned was_a_range = 0;
- unsigned i = 0;
-
- while (i < (1 << BYTEWIDTH))
- {
- if (fastmap[i++])
- {
- was_a_range = 0;
- printchar (i - 1);
- while (i < (1 << BYTEWIDTH) && fastmap[i])
- {
- was_a_range = 1;
- i++;
- }
- if (was_a_range)
- {
- printf ("-");
- printchar (i - 1);
- }
- }
- }
- putchar ('\n');
-}
-
-
-/* Print a compiled pattern string in human-readable form, starting at
- the START pointer into it and ending just before the pointer END. */
-
-void
-print_partial_compiled_pattern (start, end)
- unsigned char *start;
- unsigned char *end;
-{
- int mcnt, mcnt2;
- unsigned char *p = start;
- unsigned char *pend = end;
-
- if (start == NULL)
- {
- printf ("(null)\n");
- return;
- }
-
- /* Loop over pattern commands. */
- while (p < pend)
- {
- switch ((re_opcode_t) *p++)
- {
- case no_op:
- printf ("/no_op");
- break;
-
- case exactn:
- mcnt = *p++;
- printf ("/exactn/%d", mcnt);
- do
- {
- putchar ('/');
- printchar (*p++);
- }
- while (--mcnt);
- break;
-
- case start_memory:
- mcnt = *p++;
- printf ("/start_memory/%d/%d", mcnt, *p++);
- break;
-
- case stop_memory:
- mcnt = *p++;
- printf ("/stop_memory/%d/%d", mcnt, *p++);
- break;
-
- case duplicate:
- printf ("/duplicate/%d", *p++);
- break;
-
- case anychar:
- printf ("/anychar");
- break;
-
- case charset:
- case charset_not:
- {
- register int c;
-
- printf ("/charset%s",
- (re_opcode_t) *(p - 1) == charset_not ? "_not" : "");
-
- assert (p + *p < pend);
-
- for (c = 0; c < *p; c++)
- {
- unsigned bit;
- unsigned char map_byte = p[1 + c];
-
- putchar ('/');
-
- for (bit = 0; bit < BYTEWIDTH; bit++)
- if (map_byte & (1 << bit))
- printchar (c * BYTEWIDTH + bit);
- }
- p += 1 + *p;
- break;
- }
-
- case begline:
- printf ("/begline");
- break;
-
- case endline:
- printf ("/endline");
- break;
-
- case on_failure_jump:
- extract_number_and_incr (&mcnt, &p);
- printf ("/on_failure_jump/0/%d", mcnt);
- break;
-
- case on_failure_keep_string_jump:
- extract_number_and_incr (&mcnt, &p);
- printf ("/on_failure_keep_string_jump/0/%d", mcnt);
- break;
-
- case dummy_failure_jump:
- extract_number_and_incr (&mcnt, &p);
- printf ("/dummy_failure_jump/0/%d", mcnt);
- break;
-
- case push_dummy_failure:
- printf ("/push_dummy_failure");
- break;
-
- case maybe_pop_jump:
- extract_number_and_incr (&mcnt, &p);
- printf ("/maybe_pop_jump/0/%d", mcnt);
- break;
-
- case pop_failure_jump:
- extract_number_and_incr (&mcnt, &p);
- printf ("/pop_failure_jump/0/%d", mcnt);
- break;
-
- case jump_past_alt:
- extract_number_and_incr (&mcnt, &p);
- printf ("/jump_past_alt/0/%d", mcnt);
- break;
-
- case jump:
- extract_number_and_incr (&mcnt, &p);
- printf ("/jump/0/%d", mcnt);
- break;
-
- case succeed_n:
- extract_number_and_incr (&mcnt, &p);
- extract_number_and_incr (&mcnt2, &p);
- printf ("/succeed_n/0/%d/0/%d", mcnt, mcnt2);
- break;
-
- case jump_n:
- extract_number_and_incr (&mcnt, &p);
- extract_number_and_incr (&mcnt2, &p);
- printf ("/jump_n/0/%d/0/%d", mcnt, mcnt2);
- break;
-
- case set_number_at:
- extract_number_and_incr (&mcnt, &p);
- extract_number_and_incr (&mcnt2, &p);
- printf ("/set_number_at/0/%d/0/%d", mcnt, mcnt2);
- break;
-
- case wordbound:
- printf ("/wordbound");
- break;
-
- case notwordbound:
- printf ("/notwordbound");
- break;
-
- case wordbeg:
- printf ("/wordbeg");
- break;
-
- case wordend:
- printf ("/wordend");
-
-#ifdef emacs
- case before_dot:
- printf ("/before_dot");
- break;
-
- case at_dot:
- printf ("/at_dot");
- break;
-
- case after_dot:
- printf ("/after_dot");
- break;
-
- case syntaxspec:
- printf ("/syntaxspec");
- mcnt = *p++;
- printf ("/%d", mcnt);
- break;
-
- case notsyntaxspec:
- printf ("/notsyntaxspec");
- mcnt = *p++;
- printf ("/%d", mcnt);
- break;
-#endif /* emacs */
-
- case wordchar:
- printf ("/wordchar");
- break;
-
- case notwordchar:
- printf ("/notwordchar");
- break;
-
- case begbuf:
- printf ("/begbuf");
- break;
-
- case endbuf:
- printf ("/endbuf");
- break;
-
- default:
- printf ("?%d", *(p-1));
- }
- }
- printf ("/\n");
-}
-
-
-void
-print_compiled_pattern (bufp)
- struct re_pattern_buffer *bufp;
-{
- unsigned char *buffer = bufp->buffer;
-
- print_partial_compiled_pattern (buffer, buffer + bufp->used);
- printf ("%d bytes used/%d bytes allocated.\n", bufp->used, bufp->allocated);
-
- if (bufp->fastmap_accurate && bufp->fastmap)
- {
- printf ("fastmap: ");
- print_fastmap (bufp->fastmap);
- }
-
- printf ("re_nsub: %d\t", bufp->re_nsub);
- printf ("regs_alloc: %d\t", bufp->regs_allocated);
- printf ("can_be_null: %d\t", bufp->can_be_null);
- printf ("newline_anchor: %d\n", bufp->newline_anchor);
- printf ("no_sub: %d\t", bufp->no_sub);
- printf ("not_bol: %d\t", bufp->not_bol);
- printf ("not_eol: %d\t", bufp->not_eol);
- printf ("syntax: %d\n", bufp->syntax);
- /* Perhaps we should print the translate table? */
-}
-
-
-void
-print_double_string (where, string1, size1, string2, size2)
- const char *where;
- const char *string1;
- const char *string2;
- int size1;
- int size2;
-{
- unsigned this_char;
-
- if (where == NULL)
- printf ("(null)");
- else
- {
- if (FIRST_STRING_P (where))
- {
- for (this_char = where - string1; this_char < size1; this_char++)
- printchar (string1[this_char]);
-
- where = string2;
- }
-
- for (this_char = where - string2; this_char < size2; this_char++)
- printchar (string2[this_char]);
- }
-}
-
-#else /* not DEBUG */
-
-#undef assert
-#define assert(e)
-
-#define DEBUG_STATEMENT(e)
-#define DEBUG_PRINT1(x)
-#define DEBUG_PRINT2(x1, x2)
-#define DEBUG_PRINT3(x1, x2, x3)
-#define DEBUG_PRINT4(x1, x2, x3, x4)
-#define DEBUG_PRINT_COMPILED_PATTERN(p, s, e)
-#define DEBUG_PRINT_DOUBLE_STRING(w, s1, sz1, s2, sz2)
-
-#endif /* not DEBUG */
-
-/* Set by `re_set_syntax' to the current regexp syntax to recognize. Can
- also be assigned to arbitrarily: each pattern buffer stores its own
- syntax, so it can be changed between regex compilations. */
-reg_syntax_t re_syntax_options = RE_SYNTAX_EMACS;
-
-
-/* Specify the precise syntax of regexps for compilation. This provides
- for compatibility for various utilities which historically have
- different, incompatible syntaxes.
-
- The argument SYNTAX is a bit mask comprised of the various bits
- defined in regex.h. We return the old syntax. */
-
-reg_syntax_t
-re_set_syntax (syntax)
- reg_syntax_t syntax;
-{
- reg_syntax_t ret = re_syntax_options;
-
- re_syntax_options = syntax;
- return ret;
-}
-
-/* This table gives an error message for each of the error codes listed
- in regex.h. Obviously the order here has to be same as there. */
-#define _RERR_(n,t) t,
-static const char *re_error_msg[] = { REG_ERR_TABLE };
-# undef _RERR_
-
-/* Subroutine declarations and macros for regex_compile. */
-
-/* Fetch the next character in the uncompiled pattern---translating it
- if necessary. Also cast from a signed character in the constant
- string passed to us by the user to an unsigned char that we can use
- as an array index (in, e.g., `translate'). */
-#define PATFETCH(c) \
- do {if (p == pend) return REG_EEND; \
- c = (unsigned char) *p++; \
- if (translate) c = translate[c]; \
- } while (0)
-
-/* Fetch the next character in the uncompiled pattern, with no
- translation. */
-#define PATFETCH_RAW(c) \
- do {if (p == pend) return REG_EEND; \
- c = (unsigned char) *p++; \
- } while (0)
-
-/* Go backwards one character in the pattern. */
-#define PATUNFETCH p--
-
-
-/* If `translate' is non-null, return translate[D], else just D. We
- cast the subscript to translate because some data is declared as
- `char *', to avoid warnings when a string constant is passed. But
- when we use a character as a subscript we must make it unsigned. */
-#define TRANSLATE(d) (translate ? translate[(unsigned char) (d)] : (d))
-
-
-/* Macros for outputting the compiled pattern into `buffer'. */
-
-/* If the buffer isn't allocated when it comes in, use this. */
-#define INIT_BUF_SIZE 32
-
-/* Make sure we have at least N more bytes of space in buffer. */
-#define GET_BUFFER_SPACE(n) \
- while (b - bufp->buffer + (n) > bufp->allocated) \
- EXTEND_BUFFER ()
-
-/* Make sure we have one more byte of buffer space and then add C to it. */
-#define BUF_PUSH(c) \
- do { \
- GET_BUFFER_SPACE (1); \
- *b++ = (unsigned char) (c); \
- } while (0)
-
-
-/* Ensure we have two more bytes of buffer space and then append C1 and C2. */
-#define BUF_PUSH_2(c1, c2) \
- do { \
- GET_BUFFER_SPACE (2); \
- *b++ = (unsigned char) (c1); \
- *b++ = (unsigned char) (c2); \
- } while (0)
-
-
-/* As with BUF_PUSH_2, except for three bytes. */
-#define BUF_PUSH_3(c1, c2, c3) \
- do { \
- GET_BUFFER_SPACE (3); \
- *b++ = (unsigned char) (c1); \
- *b++ = (unsigned char) (c2); \
- *b++ = (unsigned char) (c3); \
- } while (0)
-
-
-/* Store a jump with opcode OP at LOC to location TO. We store a
- relative address offset by the three bytes the jump itself occupies. */
-#define STORE_JUMP(op, loc, to) \
- store_op1 (op, loc, (to) - (loc) - 3)
-
-/* Likewise, for a two-argument jump. */
-#define STORE_JUMP2(op, loc, to, arg) \
- store_op2 (op, loc, (to) - (loc) - 3, arg)
-
-/* Like `STORE_JUMP', but for inserting. Assume `b' is the buffer end. */
-#define INSERT_JUMP(op, loc, to) \
- insert_op1 (op, loc, (to) - (loc) - 3, b)
-
-/* Like `STORE_JUMP2', but for inserting. Assume `b' is the buffer end. */
-#define INSERT_JUMP2(op, loc, to, arg) \
- insert_op2 (op, loc, (to) - (loc) - 3, arg, b)
-
-
-/* This is not an arbitrary limit: the arguments which represent offsets
- into the pattern are two bytes long. So if 2^16 bytes turns out to
- be too small, many things would have to change. */
-#define MAX_BUF_SIZE (1L << 16)
-
-
-/* Extend the buffer by twice its current size via realloc and
- reset the pointers that pointed into the old block to point to the
- correct places in the new one. If extending the buffer results in it
- being larger than MAX_BUF_SIZE, then flag memory exhausted. */
-#define EXTEND_BUFFER() \
- do { \
- unsigned char *old_buffer = bufp->buffer; \
- if (bufp->allocated == MAX_BUF_SIZE) \
- return REG_ESIZE; \
- bufp->allocated <<= 1; \
- if (bufp->allocated > MAX_BUF_SIZE) \
- bufp->allocated = MAX_BUF_SIZE; \
- bufp->buffer = (unsigned char *) realloc (bufp->buffer, bufp->allocated);\
- if (bufp->buffer == NULL) \
- return REG_ESPACE; \
- /* If the buffer moved, move all the pointers into it. */ \
- if (old_buffer != bufp->buffer) \
- { \
- b = (b - old_buffer) + bufp->buffer; \
- begalt = (begalt - old_buffer) + bufp->buffer; \
- if (fixup_alt_jump) \
- fixup_alt_jump = (fixup_alt_jump - old_buffer) + bufp->buffer;\
- if (laststart) \
- laststart = (laststart - old_buffer) + bufp->buffer; \
- if (pending_exact) \
- pending_exact = (pending_exact - old_buffer) + bufp->buffer; \
- } \
- } while (0)
-
-
-/* Since we have one byte reserved for the register number argument to
- {start,stop}_memory, the maximum number of groups we can report
- things about is what fits in that byte. */
-#define MAX_REGNUM 255
-
-/* But patterns can have more than `MAX_REGNUM' registers. We just
- ignore the excess. */
-typedef unsigned regnum_t;
-
-
-/* Macros for the compile stack. */
-
-/* Since offsets can go either forwards or backwards, this type needs to
- be able to hold values from -(MAX_BUF_SIZE - 1) to MAX_BUF_SIZE - 1. */
-typedef int pattern_offset_t;
-
-typedef struct
-{
- pattern_offset_t begalt_offset;
- pattern_offset_t fixup_alt_jump;
- pattern_offset_t inner_group_offset;
- pattern_offset_t laststart_offset;
- regnum_t regnum;
-} compile_stack_elt_t;
-
-
-typedef struct
-{
- compile_stack_elt_t *stack;
- unsigned size;
- unsigned avail; /* Offset of next open position. */
-} compile_stack_type;
-
-
-#define INIT_COMPILE_STACK_SIZE 32
-
-#define COMPILE_STACK_EMPTY (compile_stack.avail == 0)
-#define COMPILE_STACK_FULL (compile_stack.avail == compile_stack.size)
-
-/* The next available element. */
-#define COMPILE_STACK_TOP (compile_stack.stack[compile_stack.avail])
-
-#ifdef __TANDEM
-#define TYPED_SET_LIST_BIT(c) \
- (b[(c) / BYTEWIDTH] |= (unsigned char) (1 << ((c) % BYTEWIDTH)))
-
-/* Set the bit for character C in a list. */
-#define SET_LIST_BIT(c) TYPED_SET_LIST_BIT((unsigned char)c)
-#else
-/* Set the bit for character C in a list. */
-#define SET_LIST_BIT(c) \
- (b[((unsigned char) (c)) / BYTEWIDTH] \
- |= 1 << (((unsigned char) c) % BYTEWIDTH))
-#endif
-
-/* Get the next unsigned number in the uncompiled pattern. */
-#define GET_UNSIGNED_NUMBER(num) \
- { if (p != pend) \
- { \
- PATFETCH (c); \
- while (ISDIGIT (c)) \
- { \
- if (num < 0) \
- num = 0; \
- num = num * 10 + c - '0'; \
- if (p == pend) \
- break; \
- PATFETCH (c); \
- } \
- } \
- }
-
-#define CHAR_CLASS_MAX_LENGTH 6 /* Namely, `xdigit'. */
-
-#define IS_CHAR_CLASS(string) \
- (STREQ (string, "alpha") || STREQ (string, "upper") \
- || STREQ (string, "lower") || STREQ (string, "digit") \
- || STREQ (string, "alnum") || STREQ (string, "xdigit") \
- || STREQ (string, "space") || STREQ (string, "print") \
- || STREQ (string, "punct") || STREQ (string, "graph") \
- || STREQ (string, "cntrl") || STREQ (string, "blank"))
-
-static void store_op1 (), store_op2 ();
-static void insert_op1 (), insert_op2 ();
-static boolean at_begline_loc_p (), at_endline_loc_p ();
-#ifndef __TANDEM
-static boolean group_in_compile_stack ();
-#else
-static boolean group_in_compile_stack (compile_stack_type*, regnum_t);
-#endif
-static reg_errcode_t compile_range ();
-
-
-/* `regex_compile' compiles PATTERN (of length SIZE) according to SYNTAX.
- Returns one of error codes defined in `regex.h', or zero for success.
-
- Assumes the `allocated' (and perhaps `buffer') and `translate'
- fields are set in BUFP on entry.
-
- If it succeeds, results are put in BUFP (if it returns an error, the
- contents of BUFP are undefined):
- `buffer' is the compiled pattern;
- `syntax' is set to SYNTAX;
- `used' is set to the length of the compiled pattern;
- `fastmap_accurate' is zero;
- `re_nsub' is the number of subexpressions in PATTERN;
- `not_bol' and `not_eol' are zero;
-
- The `fastmap' and `newline_anchor' fields are neither
- examined nor set. */
-
-static reg_errcode_t
-regex_compile (pattern, size, syntax, bufp)
- const char *pattern;
- int size;
- reg_syntax_t syntax;
- struct re_pattern_buffer *bufp;
-{
- /* We fetch characters from PATTERN here. Even though PATTERN is
- `char *' (i.e., signed), we declare these variables as unsigned, so
- they can be reliably used as array indices. */
- register unsigned char c, c1;
-
- /* A random tempory spot in PATTERN. */
- const char *p1;
-
- /* Points to the end of the buffer, where we should append. */
- register unsigned char *b;
-
- /* Keeps track of unclosed groups. */
- compile_stack_type compile_stack;
-
- /* Points to the current (ending) position in the pattern. */
- const char *p = pattern;
- const char *pend = pattern + size;
-
- /* How to translate the characters in the pattern. */
- char *translate = bufp->translate;
-
- /* Address of the count-byte of the most recently inserted `exactn'
- command. This makes it possible to tell if a new exact-match
- character can be added to that command or if the character requires
- a new `exactn' command. */
- unsigned char *pending_exact = 0;
-
- /* Address of start of the most recently finished expression.
- This tells, e.g., postfix * where to find the start of its
- operand. Reset at the beginning of groups and alternatives. */
- unsigned char *laststart = 0;
-
- /* Address of beginning of regexp, or inside of last group. */
- unsigned char *begalt;
-
- /* Place in the uncompiled pattern (i.e., the {) to
- which to go back if the interval is invalid. */
- const char *beg_interval;
-
- /* Address of the place where a forward jump should go to the end of
- the containing expression. Each alternative of an `or' -- except the
- last -- ends with a forward jump of this sort. */
- unsigned char *fixup_alt_jump = 0;
-
- /* Counts open-groups as they are encountered. Remembered for the
- matching close-group on the compile stack, so the same register
- number is put in the stop_memory as the start_memory. */
- regnum_t regnum = 0;
-
-#ifdef DEBUG
- DEBUG_PRINT1 ("\nCompiling pattern: ");
- if (debug)
- {
- unsigned debug_count;
-
- for (debug_count = 0; debug_count < size; debug_count++)
- printchar (pattern[debug_count]);
- putchar ('\n');
- }
-#endif /* DEBUG */
-
- /* Initialize the compile stack. */
- compile_stack.stack = TALLOC (INIT_COMPILE_STACK_SIZE, compile_stack_elt_t);
- if (compile_stack.stack == NULL)
- return REG_ESPACE;
-
- compile_stack.size = INIT_COMPILE_STACK_SIZE;
- compile_stack.avail = 0;
-
- /* Initialize the pattern buffer. */
- bufp->syntax = syntax;
- bufp->fastmap_accurate = 0;
- bufp->not_bol = bufp->not_eol = 0;
-
- /* Set `used' to zero, so that if we return an error, the pattern
- printer (for debugging) will think there's no pattern. We reset it
- at the end. */
- bufp->used = 0;
-
- /* Always count groups, whether or not bufp->no_sub is set. */
- bufp->re_nsub = 0;
-
-#if !defined (emacs) && !defined (SYNTAX_TABLE)
- /* Initialize the syntax table. */
-#ifdef __TANDEM
- /*
- * How can any compiler be so amazingly brain dead?
- */
-#pragma NOWARN( 95 )
-#endif
- init_syntax_once ();
-#endif
-
- if (bufp->allocated == 0)
- {
- if (bufp->buffer)
- { /* If zero allocated, but buffer is non-null, try to realloc
- enough space. This loses if buffer's address is bogus, but
- that is the user's responsibility. */
- RETALLOC (bufp->buffer, INIT_BUF_SIZE, unsigned char);
- }
- else
- { /* Caller did not allocate a buffer. Do it for them. */
- bufp->buffer = TALLOC (INIT_BUF_SIZE, unsigned char);
- }
- if (!bufp->buffer) return REG_ESPACE;
-
- bufp->allocated = INIT_BUF_SIZE;
- }
-
- begalt = b = bufp->buffer;
-
- /* Loop through the uncompiled pattern until we're at the end. */
- while (p != pend)
- {
- PATFETCH (c);
-
- switch (c)
- {
- case '^':
- {
- if ( /* If at start of pattern, it's an operator. */
- p == pattern + 1
- /* If context independent, it's an operator. */
- || syntax & RE_CONTEXT_INDEP_ANCHORS
- /* Otherwise, depends on what's come before. */
- || at_begline_loc_p (pattern, p, syntax))
- BUF_PUSH (begline);
- else
- goto normal_char;
- }
- break;
-
-
- case '$':
- {
- if ( /* If at end of pattern, it's an operator. */
- p == pend
- /* If context independent, it's an operator. */
- || syntax & RE_CONTEXT_INDEP_ANCHORS
- /* Otherwise, depends on what's next. */
- || at_endline_loc_p (p, pend, syntax))
- BUF_PUSH (endline);
- else
- goto normal_char;
- }
- break;
-
-
- case '+':
- case '?':
- if ((syntax & RE_BK_PLUS_QM)
- || (syntax & RE_LIMITED_OPS))
- goto normal_char;
- handle_plus:
- case '*':
- /* If there is no previous pattern... */
- if (!laststart)
- {
- if (syntax & RE_CONTEXT_INVALID_OPS)
- return REG_BADRPT;
- else if (!(syntax & RE_CONTEXT_INDEP_OPS))
- goto normal_char;
- }
-
- {
- /* Are we optimizing this jump? */
- boolean keep_string_p = false;
-
- /* 1 means zero (many) matches is allowed. */
- char zero_times_ok = 0, many_times_ok = 0;
-
- /* If there is a sequence of repetition chars, collapse it
- down to just one (the right one). We can't combine
- interval operators with these because of, e.g., `a{2}*',
- which should only match an even number of `a's. */
-
- for (;;)
- {
- zero_times_ok |= c != '+';
- many_times_ok |= c != '?';
-
- if (p == pend)
- break;
-
- PATFETCH (c);
-
- if (c == '*'
- || (!(syntax & RE_BK_PLUS_QM) && (c == '+' || c == '?')))
- ;
-
- else if (syntax & RE_BK_PLUS_QM && c == '\\')
- {
- if (p == pend) return REG_EESCAPE;
-
- PATFETCH (c1);
- if (!(c1 == '+' || c1 == '?'))
- {
- PATUNFETCH;
- PATUNFETCH;
- break;
- }
-
- c = c1;
- }
- else
- {
- PATUNFETCH;
- break;
- }
-
- /* If we get here, we found another repeat character. */
- }
-
- /* Star, etc. applied to an empty pattern is equivalent
- to an empty pattern. */
- if (!laststart)
- break;
-
- /* Now we know whether or not zero matches is allowed
- and also whether or not two or more matches is allowed. */
- if (many_times_ok)
- { /* More than one repetition is allowed, so put in at the
- end a backward relative jump from `b' to before the next
- jump we're going to put in below (which jumps from
- laststart to after this jump).
-
- But if we are at the `*' in the exact sequence `.*\n',
- insert an unconditional jump backwards to the .,
- instead of the beginning of the loop. This way we only
- push a failure point once, instead of every time
- through the loop. */
- assert (p - 1 > pattern);
-
- /* Allocate the space for the jump. */
- GET_BUFFER_SPACE (3);
-
- /* We know we are not at the first character of the pattern,
- because laststart was nonzero. And we've already
- incremented `p', by the way, to be the character after
- the `*'. Do we have to do something analogous here
- for null bytes, because of RE_DOT_NOT_NULL? */
- if (TRANSLATE (*(p - 2)) == TRANSLATE ('.')
- && zero_times_ok
- && p < pend && TRANSLATE (*p) == TRANSLATE ('\n')
- && !(syntax & RE_DOT_NEWLINE))
- { /* We have .*\n. */
- STORE_JUMP (jump, b, laststart);
- keep_string_p = true;
- }
- else
- /* Anything else. */
- STORE_JUMP (maybe_pop_jump, b, laststart - 3);
-
- /* We've added more stuff to the buffer. */
- b += 3;
- }
-
- /* On failure, jump from laststart to b + 3, which will be the
- end of the buffer after this jump is inserted. */
- GET_BUFFER_SPACE (3);
- INSERT_JUMP (keep_string_p ? on_failure_keep_string_jump
- : on_failure_jump,
- laststart, b + 3);
- pending_exact = 0;
- b += 3;
-
- if (!zero_times_ok)
- {
- /* At least one repetition is required, so insert a
- `dummy_failure_jump' before the initial
- `on_failure_jump' instruction of the loop. This
- effects a skip over that instruction the first time
- we hit that loop. */
- GET_BUFFER_SPACE (3);
- INSERT_JUMP (dummy_failure_jump, laststart, laststart + 6);
- b += 3;
- }
- }
- break;
-
-
- case '.':
- laststart = b;
- BUF_PUSH (anychar);
- break;
-
-
- case '[':
- {
- boolean had_char_class = false;
-
- if (p == pend) return REG_EBRACK;
-
- /* Ensure that we have enough space to push a charset: the
- opcode, the length count, and the bitset; 34 bytes in all. */
- GET_BUFFER_SPACE (34);
-
- laststart = b;
-
- /* We test `*p == '^' twice, instead of using an if
- statement, so we only need one BUF_PUSH. */
- BUF_PUSH (*p == '^' ? charset_not : charset);
- if (*p == '^')
- p++;
-
- /* Remember the first position in the bracket expression. */
- p1 = p;
-
- /* Push the number of bytes in the bitmap. */
- BUF_PUSH ((1 << BYTEWIDTH) / BYTEWIDTH);
-
- /* Clear the whole map. */
- bzero (b, (1 << BYTEWIDTH) / BYTEWIDTH);
-
- /* charset_not matches newline according to a syntax bit. */
- if ((re_opcode_t) b[-2] == charset_not
- && (syntax & RE_HAT_LISTS_NOT_NEWLINE))
- SET_LIST_BIT ('\n');
-
- /* Read in characters and ranges, setting map bits. */
- for (;;)
- {
- if (p == pend) return REG_EBRACK;
-
- PATFETCH (c);
-
- /* \ might escape characters inside [...] and [^...]. */
- if ((syntax & RE_BACKSLASH_ESCAPE_IN_LISTS) && c == '\\')
- {
- if (p == pend) return REG_EESCAPE;
-
- PATFETCH (c1);
- SET_LIST_BIT (c1);
- continue;
- }
-
- /* Could be the end of the bracket expression. If it's
- not (i.e., when the bracket expression is `[]' so
- far), the ']' character bit gets set way below. */
- if (c == ']' && p != p1 + 1)
- break;
-
- /* Look ahead to see if it's a range when the last thing
- was a character class. */
- if (had_char_class && c == '-' && *p != ']')
- return REG_ERANGE;
-
- /* Look ahead to see if it's a range when the last thing
- was a character: if this is a hyphen not at the
- beginning or the end of a list, then it's the range
- operator. */
- if (c == '-'
- && !(p - 2 >= pattern && p[-2] == '[')
- && !(p - 3 >= pattern && p[-3] == '[' && p[-2] == '^')
- && *p != ']')
- {
- reg_errcode_t ret
- = compile_range (&p, pend, translate, syntax, b);
- if (ret != REG_NOERROR) return ret;
- }
-
- else if (p[0] == '-' && p[1] != ']')
- { /* This handles ranges made up of characters only. */
- reg_errcode_t ret;
-
- /* Move past the `-'. */
- PATFETCH (c1);
-
- ret = compile_range (&p, pend, translate, syntax, b);
- if (ret != REG_NOERROR) return ret;
- }
-
- /* See if we're at the beginning of a possible character
- class. */
-
- else if (syntax & RE_CHAR_CLASSES && c == '[' && *p == ':')
- { /* Leave room for the null. */
- char str[CHAR_CLASS_MAX_LENGTH + 1];
-
- PATFETCH (c);
- c1 = 0;
-
- /* If pattern is `[[:'. */
- if (p == pend) return REG_EBRACK;
-
- for (;;)
- {
- PATFETCH (c);
- if (c == ':' || c == ']' || p == pend
- || c1 == CHAR_CLASS_MAX_LENGTH)
- break;
- str[c1++] = c;
- }
- str[c1] = '\0';
-
- /* If isn't a word bracketed by `[:' and:`]':
- undo the ending character, the letters, and leave
- the leading `:' and `[' (but set bits for them). */
- if (c == ':' && *p == ']')
- {
- int ch;
- boolean is_alnum = STREQ (str, "alnum");
- boolean is_alpha = STREQ (str, "alpha");
- boolean is_blank = STREQ (str, "blank");
- boolean is_cntrl = STREQ (str, "cntrl");
- boolean is_digit = STREQ (str, "digit");
- boolean is_graph = STREQ (str, "graph");
- boolean is_lower = STREQ (str, "lower");
- boolean is_print = STREQ (str, "print");
- boolean is_punct = STREQ (str, "punct");
- boolean is_space = STREQ (str, "space");
- boolean is_upper = STREQ (str, "upper");
- boolean is_xdigit = STREQ (str, "xdigit");
-
- if (!IS_CHAR_CLASS (str)) return REG_ECTYPE;
-
- /* Throw away the ] at the end of the character
- class. */
- PATFETCH (c);
-
- if (p == pend) return REG_EBRACK;
-
- for (ch = 0; ch < 1 << BYTEWIDTH; ch++)
- {
- if ( (is_alnum && ISALNUM (ch))
- || (is_alpha && ISALPHA (ch))
- || (is_blank && ISBLANK (ch))
- || (is_cntrl && ISCNTRL (ch))
- || (is_digit && ISDIGIT (ch))
- || (is_graph && ISGRAPH (ch))
- || (is_lower && ISLOWER (ch))
- || (is_print && ISPRINT (ch))
- || (is_punct && ISPUNCT (ch))
- || (is_space && ISSPACE (ch))
- || (is_upper && ISUPPER (ch))
- || (is_xdigit && ISXDIGIT (ch)))
- SET_LIST_BIT (ch);
- }
- had_char_class = true;
- }
- else
- {
- c1++;
- while (c1--)
- PATUNFETCH;
- SET_LIST_BIT ('[');
- SET_LIST_BIT (':');
- had_char_class = false;
- }
- }
- else
- {
- had_char_class = false;
- SET_LIST_BIT (c);
- }
- }
-
- /* Discard any (non)matching list bytes that are all 0 at the
- end of the map. Decrease the map-length byte too. */
- while ((int) b[-1] > 0 && b[b[-1] - 1] == 0)
- b[-1]--;
- b += b[-1];
- }
- break;
-
-
- case '(':
- if (syntax & RE_NO_BK_PARENS)
- goto handle_open;
- else
- goto normal_char;
-
-
- case ')':
- if (syntax & RE_NO_BK_PARENS)
- goto handle_close;
- else
- goto normal_char;
-
-
- case '\n':
- if (syntax & RE_NEWLINE_ALT)
- goto handle_alt;
- else
- goto normal_char;
-
-
- case '|':
- if (syntax & RE_NO_BK_VBAR)
- goto handle_alt;
- else
- goto normal_char;
-
-
- case '{':
- if (syntax & RE_INTERVALS && syntax & RE_NO_BK_BRACES)
- goto handle_interval;
- else
- goto normal_char;
-
-
- case '\\':
- if (p == pend) return REG_EESCAPE;
-
- /* Do not translate the character after the \, so that we can
- distinguish, e.g., \B from \b, even if we normally would
- translate, e.g., B to b. */
- PATFETCH_RAW (c);
-
- switch (c)
- {
- case '(':
- if (syntax & RE_NO_BK_PARENS)
- goto normal_backslash;
-
- handle_open:
- bufp->re_nsub++;
- regnum++;
-
- if (COMPILE_STACK_FULL)
- {
- RETALLOC (compile_stack.stack, compile_stack.size << 1,
- compile_stack_elt_t);
- if (compile_stack.stack == NULL) return REG_ESPACE;
-
- compile_stack.size <<= 1;
- }
-
- /* These are the values to restore when we hit end of this
- group. They are all relative offsets, so that if the
- whole pattern moves because of realloc, they will still
- be valid. */
- COMPILE_STACK_TOP.begalt_offset = begalt - bufp->buffer;
- COMPILE_STACK_TOP.fixup_alt_jump
- = fixup_alt_jump ? fixup_alt_jump - bufp->buffer + 1 : 0;
- COMPILE_STACK_TOP.laststart_offset = b - bufp->buffer;
- COMPILE_STACK_TOP.regnum = regnum;
-
- /* We will eventually replace the 0 with the number of
- groups inner to this one. But do not push a
- start_memory for groups beyond the last one we can
- represent in the compiled pattern. */
- if (regnum <= MAX_REGNUM)
- {
- COMPILE_STACK_TOP.inner_group_offset = b - bufp->buffer + 2;
- BUF_PUSH_3 (start_memory, regnum, 0);
- }
-
- compile_stack.avail++;
-
- fixup_alt_jump = 0;
- laststart = 0;
- begalt = b;
- /* If we've reached MAX_REGNUM groups, then this open
- won't actually generate any code, so we'll have to
- clear pending_exact explicitly. */
- pending_exact = 0;
- break;
-
-
- case ')':
- if (syntax & RE_NO_BK_PARENS) goto normal_backslash;
-
- if (COMPILE_STACK_EMPTY)
- if (syntax & RE_UNMATCHED_RIGHT_PAREN_ORD)
- goto normal_backslash;
- else
- return REG_ERPAREN;
-
- handle_close:
- if (fixup_alt_jump)
- { /* Push a dummy failure point at the end of the
- alternative for a possible future
- `pop_failure_jump' to pop. See comments at
- `push_dummy_failure' in `re_match_2'. */
- BUF_PUSH (push_dummy_failure);
-
- /* We allocated space for this jump when we assigned
- to `fixup_alt_jump', in the `handle_alt' case below. */
- STORE_JUMP (jump_past_alt, fixup_alt_jump, b - 1);
- }
-
- /* See similar code for backslashed left paren above. */
- if (COMPILE_STACK_EMPTY)
- if (syntax & RE_UNMATCHED_RIGHT_PAREN_ORD)
- goto normal_char;
- else
- return REG_ERPAREN;
-
- /* Since we just checked for an empty stack above, this
- ``can't happen''. */
- assert (compile_stack.avail != 0);
- {
- /* We don't just want to restore into `regnum', because
- later groups should continue to be numbered higher,
- as in `(ab)c(de)' -- the second group is #2. */
- regnum_t this_group_regnum;
-
- compile_stack.avail--;
- begalt = bufp->buffer + COMPILE_STACK_TOP.begalt_offset;
- fixup_alt_jump
- = COMPILE_STACK_TOP.fixup_alt_jump
- ? bufp->buffer + COMPILE_STACK_TOP.fixup_alt_jump - 1
- : 0;
- laststart = bufp->buffer + COMPILE_STACK_TOP.laststart_offset;
- this_group_regnum = COMPILE_STACK_TOP.regnum;
- /* If we've reached MAX_REGNUM groups, then this open
- won't actually generate any code, so we'll have to
- clear pending_exact explicitly. */
- pending_exact = 0;
-
- /* We're at the end of the group, so now we know how many
- groups were inside this one. */
- if (this_group_regnum <= MAX_REGNUM)
- {
- unsigned char *inner_group_loc
- = bufp->buffer + COMPILE_STACK_TOP.inner_group_offset;
-
- *inner_group_loc = (unsigned char)
- (regnum - this_group_regnum);
- BUF_PUSH_3 (stop_memory, this_group_regnum,
- regnum - this_group_regnum);
- }
- }
- break;
-
-
- case '|': /* `\|'. */
- if (syntax & RE_LIMITED_OPS || syntax & RE_NO_BK_VBAR)
- goto normal_backslash;
- handle_alt:
- if (syntax & RE_LIMITED_OPS)
- goto normal_char;
-
- /* Insert before the previous alternative a jump which
- jumps to this alternative if the former fails. */
- GET_BUFFER_SPACE (3);
- INSERT_JUMP (on_failure_jump, begalt, b + 6);
- pending_exact = 0;
- b += 3;
-
- /* The alternative before this one has a jump after it
- which gets executed if it gets matched. Adjust that
- jump so it will jump to this alternative's analogous
- jump (put in below, which in turn will jump to the next
- (if any) alternative's such jump, etc.). The last such
- jump jumps to the correct final destination. A picture:
- _____ _____
- | | | |
- | v | v
- a | b | c
-
- If we are at `b', then fixup_alt_jump right now points to a
- three-byte space after `a'. We'll put in the jump, set
- fixup_alt_jump to right after `b', and leave behind three
- bytes which we'll fill in when we get to after `c'. */
-
- if (fixup_alt_jump)
- STORE_JUMP (jump_past_alt, fixup_alt_jump, b);
-
- /* Mark and leave space for a jump after this alternative,
- to be filled in later either by next alternative or
- when know we're at the end of a series of alternatives. */
- fixup_alt_jump = b;
- GET_BUFFER_SPACE (3);
- b += 3;
-
- laststart = 0;
- begalt = b;
- break;
-
-
- case '{':
- /* If \{ is a literal. */
- if (!(syntax & RE_INTERVALS)
- /* If we're at `\{' and it's not the open-interval
- operator. */
- || ((syntax & RE_INTERVALS) && (syntax & RE_NO_BK_BRACES))
- || (p - 2 == pattern && p == pend))
- goto normal_backslash;
-
- handle_interval:
- {
- /* If got here, then the syntax allows intervals. */
-
- /* At least (most) this many matches must be made. */
- int lower_bound = -1, upper_bound = -1;
-
- beg_interval = p - 1;
-
- if (p == pend)
- {
- if (syntax & RE_NO_BK_BRACES)
- goto unfetch_interval;
- else
- return REG_EBRACE;
- }
-
- GET_UNSIGNED_NUMBER (lower_bound);
-
- if (c == ',')
- {
- GET_UNSIGNED_NUMBER (upper_bound);
- if (upper_bound < 0) upper_bound = RE_DUP_MAX;
- }
- else
- /* Interval such as `{1}' => match exactly once. */
- upper_bound = lower_bound;
-
- if (lower_bound < 0 || upper_bound > RE_DUP_MAX
- || lower_bound > upper_bound)
- {
- if (syntax & RE_NO_BK_BRACES)
- goto unfetch_interval;
- else
- return REG_BADBR;
- }
-
- if (!(syntax & RE_NO_BK_BRACES))
- {
- if (c != '\\') return REG_EBRACE;
-
- PATFETCH (c);
- }
-
- if (c != '}')
- {
- if (syntax & RE_NO_BK_BRACES)
- goto unfetch_interval;
- else
- return REG_BADBR;
- }
-
- /* We just parsed a valid interval. */
-
- /* If it's invalid to have no preceding re. */
- if (!laststart)
- {
- if (syntax & RE_CONTEXT_INVALID_OPS)
- return REG_BADRPT;
- else if (syntax & RE_CONTEXT_INDEP_OPS)
- laststart = b;
- else
- goto unfetch_interval;
- }
-
- /* If the upper bound is zero, don't want to succeed at
- all; jump from `laststart' to `b + 3', which will be
- the end of the buffer after we insert the jump. */
- if (upper_bound == 0)
- {
- GET_BUFFER_SPACE (3);
- INSERT_JUMP (jump, laststart, b + 3);
- b += 3;
- }
-
- /* Otherwise, we have a nontrivial interval. When
- we're all done, the pattern will look like:
- set_number_at <jump count> <upper bound>
- set_number_at <succeed_n count> <lower bound>
- succeed_n <after jump addr> <succed_n count>
- <body of loop>
- jump_n <succeed_n addr> <jump count>
- (The upper bound and `jump_n' are omitted if
- `upper_bound' is 1, though.) */
- else
- { /* If the upper bound is > 1, we need to insert
- more at the end of the loop. */
- unsigned nbytes = 10 + (upper_bound > 1) * 10;
-
- GET_BUFFER_SPACE (nbytes);
-
- /* Initialize lower bound of the `succeed_n', even
- though it will be set during matching by its
- attendant `set_number_at' (inserted next),
- because `re_compile_fastmap' needs to know.
- Jump to the `jump_n' we might insert below. */
- INSERT_JUMP2 (succeed_n, laststart,
- b + 5 + (upper_bound > 1) * 5,
- lower_bound);
- b += 5;
-
- /* Code to initialize the lower bound. Insert
- before the `succeed_n'. The `5' is the last two
- bytes of this `set_number_at', plus 3 bytes of
- the following `succeed_n'. */
- insert_op2 (set_number_at, laststart, 5, lower_bound, b);
- b += 5;
-
- if (upper_bound > 1)
- { /* More than one repetition is allowed, so
- append a backward jump to the `succeed_n'
- that starts this interval.
-
- When we've reached this during matching,
- we'll have matched the interval once, so
- jump back only `upper_bound - 1' times. */
- STORE_JUMP2 (jump_n, b, laststart + 5,
- upper_bound - 1);
- b += 5;
-
- /* The location we want to set is the second
- parameter of the `jump_n'; that is `b-2' as
- an absolute address. `laststart' will be
- the `set_number_at' we're about to insert;
- `laststart+3' the number to set, the source
- for the relative address. But we are
- inserting into the middle of the pattern --
- so everything is getting moved up by 5.
- Conclusion: (b - 2) - (laststart + 3) + 5,
- i.e., b - laststart.
-
- We insert this at the beginning of the loop
- so that if we fail during matching, we'll
- reinitialize the bounds. */
- insert_op2 (set_number_at, laststart, b - laststart,
- upper_bound - 1, b);
- b += 5;
- }
- }
- pending_exact = 0;
- beg_interval = NULL;
- }
- break;
-
- unfetch_interval:
- /* If an invalid interval, match the characters as literals. */
- assert (beg_interval);
- p = beg_interval;
- beg_interval = NULL;
-
- /* normal_char and normal_backslash need `c'. */
- PATFETCH (c);
-
- if (!(syntax & RE_NO_BK_BRACES))
- {
- if (p > pattern && p[-1] == '\\')
- goto normal_backslash;
- }
- goto normal_char;
-
-#ifdef emacs
- /* There is no way to specify the before_dot and after_dot
- operators. rms says this is ok. --karl */
- case '=':
- BUF_PUSH (at_dot);
- break;
-
- case 's':
- laststart = b;
- PATFETCH (c);
- BUF_PUSH_2 (syntaxspec, syntax_spec_code[c]);
- break;
-
- case 'S':
- laststart = b;
- PATFETCH (c);
- BUF_PUSH_2 (notsyntaxspec, syntax_spec_code[c]);
- break;
-#endif /* emacs */
-
-
- case 'w':
- laststart = b;
- BUF_PUSH (wordchar);
- break;
-
-
- case 'W':
- laststart = b;
- BUF_PUSH (notwordchar);
- break;
-
-
- case '<':
- BUF_PUSH (wordbeg);
- break;
-
- case '>':
- BUF_PUSH (wordend);
- break;
-
- case 'b':
- BUF_PUSH (wordbound);
- break;
-
- case 'B':
- BUF_PUSH (notwordbound);
- break;
-
- case '`':
- BUF_PUSH (begbuf);
- break;
-
- case '\'':
- BUF_PUSH (endbuf);
- break;
-
- case '1': case '2': case '3': case '4': case '5':
- case '6': case '7': case '8': case '9':
- if (syntax & RE_NO_BK_REFS)
- goto normal_char;
-
- c1 = c - '0';
-
- if (c1 > regnum)
- return REG_ESUBREG;
-
- /* Can't back reference to a subexpression if inside of it. */
- if (group_in_compile_stack( &compile_stack, c1))
- goto normal_char;
-
- laststart = b;
- BUF_PUSH_2 (duplicate, c1);
- break;
-
-
- case '+':
- case '?':
- if (syntax & RE_BK_PLUS_QM)
- goto handle_plus;
- else
- goto normal_backslash;
-
- default:
- normal_backslash:
- /* You might think it would be useful for \ to mean
- not to translate; but if we don't translate it,
- it will never match anything. */
- c = TRANSLATE (c);
- goto normal_char;
- }
- break;
-
-
- default:
- /* Expects the character in `c'. */
- normal_char:
- /* If no exactn currently being built. */
- if (!pending_exact
-
- /* If last exactn not at current position. */
- || pending_exact + *pending_exact + 1 != b
-
- /* We have only one byte following the exactn for the count. */
- || *pending_exact == (1 << BYTEWIDTH) - 1
-
- /* If followed by a repetition operator. */
- || *p == '*' || *p == '^'
- || ((syntax & RE_BK_PLUS_QM)
- ? *p == '\\' && (p[1] == '+' || p[1] == '?')
- : (*p == '+' || *p == '?'))
- || ((syntax & RE_INTERVALS)
- && ((syntax & RE_NO_BK_BRACES)
- ? *p == '{'
- : (p[0] == '\\' && p[1] == '{'))))
- {
- /* Start building a new exactn. */
-
- laststart = b;
-
- BUF_PUSH_2 (exactn, 0);
- pending_exact = b - 1;
- }
-
- BUF_PUSH (c);
- (*pending_exact)++;
- break;
- } /* switch (c) */
- } /* while p != pend */
-
-
- /* Through the pattern now. */
-
- if (fixup_alt_jump)
- STORE_JUMP (jump_past_alt, fixup_alt_jump, b);
-
- if (!COMPILE_STACK_EMPTY)
- return REG_EPAREN;
-
- free (compile_stack.stack);
-
- /* We have succeeded; set the length of the buffer. */
- bufp->used = b - bufp->buffer;
-
-#ifdef DEBUG
- if (debug)
- {
- DEBUG_PRINT1 ("\nCompiled pattern: ");
- print_compiled_pattern (bufp);
- }
-#endif /* DEBUG */
-
- return REG_NOERROR;
-} /* regex_compile */
-
-/* Subroutines for `regex_compile'. */
-
-/* Store OP at LOC followed by two-byte integer parameter ARG. */
-
-static void
-store_op1 (op, loc, arg)
- re_opcode_t op;
- unsigned char *loc;
- int arg;
-{
- *loc = (unsigned char) op;
- STORE_NUMBER (loc + 1, arg);
-}
-
-
-/* Like `store_op1', but for two two-byte parameters ARG1 and ARG2. */
-
-static void
-store_op2 (op, loc, arg1, arg2)
- re_opcode_t op;
- unsigned char *loc;
- int arg1, arg2;
-{
- *loc = (unsigned char) op;
- STORE_NUMBER (loc + 1, arg1);
- STORE_NUMBER (loc + 3, arg2);
-}
-
-
-/* Copy the bytes from LOC to END to open up three bytes of space at LOC
- for OP followed by two-byte integer parameter ARG. */
-
-static void
-insert_op1 (op, loc, arg, end)
- re_opcode_t op;
- unsigned char *loc;
- int arg;
- unsigned char *end;
-{
- register unsigned char *pfrom = end;
- register unsigned char *pto = end + 3;
-
- while (pfrom != loc)
- *--pto = *--pfrom;
-
- store_op1 (op, loc, arg);
-}
-
-
-/* Like `insert_op1', but for two two-byte parameters ARG1 and ARG2. */
-
-static void
-insert_op2 (op, loc, arg1, arg2, end)
- re_opcode_t op;
- unsigned char *loc;
- int arg1, arg2;
- unsigned char *end;
-{
- register unsigned char *pfrom = end;
- register unsigned char *pto = end + 5;
-
- while (pfrom != loc)
- *--pto = *--pfrom;
-
- store_op2 (op, loc, arg1, arg2);
-}
-
-
-/* P points to just after a ^ in PATTERN. Return true if that ^ comes
- after an alternative or a begin-subexpression. We assume there is at
- least one character before the ^. */
-
-static boolean
-at_begline_loc_p (pattern, p, syntax)
- const char *pattern, *p;
- reg_syntax_t syntax;
-{
- const char *prev = p - 2;
-# define prev_prev_backslash(p) (((p) > pattern) && ((p)[-1] == '\\'))
-
- switch (*prev) {
- case '(':
- return (boolean)(
- prev_prev_backslash(prev) || ((syntax & RE_NO_BK_PARENS) != 0));
-
- case '|':
- return (boolean)(
- prev_prev_backslash(prev) || ((syntax & RE_NO_BK_VBAR) != 0));
- }
- return false;
-}
-
-
-/* The dual of at_begline_loc_p. This one is for $. We assume there is
- at least one character after the $, i.e., `P < PEND'. */
-
-static boolean
-at_endline_loc_p (p, pend, syntax)
- const char *p, *pend;
- int syntax;
-{
- const char *next = p;
- boolean next_backslash = *next == '\\';
- const char *next_next = p + 1 < pend ? p + 1 : NULL;
-#ifdef __TANDEM
-# pragma NOWARN( 85 )
-#endif
- return
- /* Before a subexpression? */
- (syntax & RE_NO_BK_PARENS ? *next == ')'
- : next_backslash && next_next && *next_next == ')')
- /* Before an alternative? */
- || (syntax & RE_NO_BK_VBAR ? *next == '|'
- : next_backslash && next_next && *next_next == '|');
-}
-#ifdef __TANDEM
-# pragma WARN( 85 )
-#endif
-
-
-/* Returns true if REGNUM is in one of COMPILE_STACK's elements and
- false if it's not. */
-static boolean
-group_in_compile_stack( compile_stack_type* compile_stack,
- regnum_t regnum )
-{
- int this_element;
-
- for (this_element = compile_stack->avail - 1;
- this_element >= 0;
- this_element--)
- if (compile_stack->stack[this_element].regnum == regnum)
- return true;
-
- return false;
-}
-#undef CS
-
-/* Read the ending character of a range (in a bracket expression) from the
- uncompiled pattern *P_PTR (which ends at PEND). We assume the
- starting character is in `P[-2]'. (`P[-1]' is the character `-'.)
- Then we set the translation of all bits between the starting and
- ending characters (inclusive) in the compiled pattern B.
-
- Return an error code.
-
- We use these short variable names so we can use the same macros as
- `regex_compile' itself. */
-
-static reg_errcode_t
-compile_range (p_ptr, pend, translate, syntax, b)
- const char **p_ptr, *pend;
- char *translate;
- reg_syntax_t syntax;
- unsigned char *b;
-{
- unsigned this_char;
-
- const char *p = *p_ptr;
- int range_start, range_end;
-
- if (p == pend)
- return REG_ERANGE;
-
- /* Even though the pattern is a signed `char *', we need to fetch
- with unsigned char *'s; if the high bit of the pattern character
- is set, the range endpoints will be negative if we fetch using a
- signed char *.
-
- We also want to fetch the endpoints without translating them; the
- appropriate translation is done in the bit-setting loop below. */
- range_start = ((unsigned char *) p)[-2];
- range_end = ((unsigned char *) p)[0];
-
- /* Have to increment the pointer into the pattern string, so the
- caller isn't still at the ending character. */
- (*p_ptr)++;
-
- /* If the start is after the end, the range is empty. */
- if (range_start > range_end)
- return syntax & RE_NO_EMPTY_RANGES ? REG_ERANGE : REG_NOERROR;
-
- /* Here we see why `this_char' has to be larger than an `unsigned
- char' -- the range is inclusive, so if `range_end' == 0xff
- (assuming 8-bit characters), we would otherwise go into an infinite
- loop, since all characters <= 0xff. */
- for (this_char = range_start; this_char <= range_end; this_char++)
- {
- SET_LIST_BIT (TRANSLATE (this_char));
- }
-
- return REG_NOERROR;
-}
-
-/* Failure stack declarations and macros; both re_compile_fastmap and
- re_match_2 use a failure stack. These have to be macros because of
- REGEX_ALLOCATE. */
-
-
-/* Number of failure points for which to initially allocate space
- when matching. If this number is exceeded, we allocate more
- space, so it is not a hard limit. */
-#ifndef INIT_FAILURE_ALLOC
-#define INIT_FAILURE_ALLOC 5
-#endif
-
-/* Roughly the maximum number of failure points on the stack. Would be
- exactly that if always used MAX_FAILURE_SPACE each time we failed.
- This is a variable only so users of regex can assign to it; we never
- change it ourselves. */
-int re_max_failures = 2000;
-
-typedef const unsigned char *fail_stack_elt_t;
-
-typedef struct
-{
- fail_stack_elt_t *stack;
- unsigned size;
- unsigned avail; /* Offset of next open position. */
-} fail_stack_type;
-
-#define FAIL_STACK_EMPTY() (fail_stack.avail == 0)
-#define FAIL_STACK_PTR_EMPTY() (fail_stack_ptr->avail == 0)
-#define FAIL_STACK_FULL() (fail_stack.avail == fail_stack.size)
-#define FAIL_STACK_TOP() (fail_stack.stack[fail_stack.avail])
-
-
-/* Initialize `fail_stack'. Do `return -2' if the alloc fails. */
-
-#define INIT_FAIL_STACK() \
- do { \
- fail_stack.stack = (fail_stack_elt_t *) \
- REGEX_ALLOCATE (INIT_FAILURE_ALLOC * sizeof (fail_stack_elt_t)); \
- \
- if (fail_stack.stack == NULL) \
- return -2; \
- \
- fail_stack.size = INIT_FAILURE_ALLOC; \
- fail_stack.avail = 0; \
- } while (0)
-
-
-/* Double the size of FAIL_STACK, up to approximately `re_max_failures' items.
-
- Return 1 if succeeds, and 0 if either ran out of memory
- allocating space for it or it was already too large.
-
- REGEX_REALLOCATE requires `destination' be declared. */
-
-#define DOUBLE_FAIL_STACK(fail_stack) \
- ((fail_stack).size > re_max_failures * MAX_FAILURE_ITEMS \
- ? 0 \
- : ((fail_stack).stack = (fail_stack_elt_t *) \
- REGEX_REALLOCATE ((fail_stack).stack, \
- (fail_stack).size * sizeof (fail_stack_elt_t), \
- ((fail_stack).size << 1) * sizeof (fail_stack_elt_t)), \
- \
- (fail_stack).stack == NULL \
- ? 0 \
- : ((fail_stack).size <<= 1, \
- 1)))
-
-
-/* Push PATTERN_OP on FAIL_STACK.
-
- Return 1 if was able to do so and 0 if ran out of memory allocating
- space to do so. */
-#define PUSH_PATTERN_OP(pattern_op, fail_stack) \
- ((FAIL_STACK_FULL () \
- && !DOUBLE_FAIL_STACK (fail_stack)) \
- ? 0 \
- : ((fail_stack).stack[(fail_stack).avail++] = pattern_op, \
- 1))
-
-/* This pushes an item onto the failure stack. Must be a four-byte
- value. Assumes the variable `fail_stack'. Probably should only
- be called from within `PUSH_FAILURE_POINT'. */
-#define PUSH_FAILURE_ITEM(item) \
- fail_stack.stack[fail_stack.avail++] = (fail_stack_elt_t) item
-
-/* The complement operation. Assumes `fail_stack' is nonempty. */
-#define POP_FAILURE_ITEM() fail_stack.stack[--fail_stack.avail]
-
-/* Used to omit pushing failure point id's when we're not debugging. */
-#ifdef DEBUG
-#define DEBUG_PUSH PUSH_FAILURE_ITEM
-#define DEBUG_POP(item_addr) *(item_addr) = POP_FAILURE_ITEM ()
-#else
-#define DEBUG_PUSH(item)
-#define DEBUG_POP(item_addr)
-#endif
-
-
-/* Push the information about the state we will need
- if we ever fail back to it.
-
- Requires variables fail_stack, regstart, regend, reg_info, and
- num_regs be declared. DOUBLE_FAIL_STACK requires `destination' be
- declared.
-
- Does `return FAILURE_CODE' if runs out of memory. */
-
-#define PUSH_FAILURE_POINT(pattern_place, string_place, failure_code) \
- do { \
- DESTINATION_DECL \
- /* Must be int, so when we don't save any registers, the arithmetic \
- of 0 + -1 isn't done as unsigned. */ \
- int this_reg; \
- \
- DEBUG_STATEMENT (failure_id++); \
- DEBUG_STATEMENT (nfailure_points_pushed++); \
- DEBUG_PRINT2 ("\nPUSH_FAILURE_POINT #%u:\n", failure_id); \
- DEBUG_PRINT2 (" Before push, next avail: %d\n", (fail_stack).avail);\
- DEBUG_PRINT2 (" size: %d\n", (fail_stack).size);\
- \
- DEBUG_PRINT2 (" slots needed: %d\n", NUM_FAILURE_ITEMS); \
- DEBUG_PRINT2 (" available: %d\n", REMAINING_AVAIL_SLOTS); \
- \
- /* Ensure we have enough space allocated for what we will push. */ \
- while (REMAINING_AVAIL_SLOTS < NUM_FAILURE_ITEMS) \
- { \
- if (!DOUBLE_FAIL_STACK (fail_stack)) \
- return failure_code; \
- \
- DEBUG_PRINT2 ("\n Doubled stack; size now: %d\n", \
- (fail_stack).size); \
- DEBUG_PRINT2 (" slots available: %d\n", REMAINING_AVAIL_SLOTS);\
- } \
- \
- /* Push the info, starting with the registers. */ \
- DEBUG_PRINT1 ("\n"); \
- \
- for (this_reg = lowest_active_reg; this_reg <= highest_active_reg; \
- this_reg++) \
- { \
- DEBUG_PRINT2 (" Pushing reg: %d\n", this_reg); \
- DEBUG_STATEMENT (num_regs_pushed++); \
- \
- DEBUG_PRINT2 (" start: 0x%x\n", regstart[this_reg]); \
- PUSH_FAILURE_ITEM (regstart[this_reg]); \
- \
- DEBUG_PRINT2 (" end: 0x%x\n", regend[this_reg]); \
- PUSH_FAILURE_ITEM (regend[this_reg]); \
- \
- DEBUG_PRINT2 (" info: 0x%x\n ", reg_info[this_reg]); \
- DEBUG_PRINT2 (" match_null=%d", \
- REG_MATCH_NULL_STRING_P (reg_info[this_reg])); \
- DEBUG_PRINT2 (" active=%d", IS_ACTIVE (reg_info[this_reg])); \
- DEBUG_PRINT2 (" matched_something=%d", \
- MATCHED_SOMETHING (reg_info[this_reg])); \
- DEBUG_PRINT2 (" ever_matched=%d", \
- EVER_MATCHED_SOMETHING (reg_info[this_reg])); \
- DEBUG_PRINT1 ("\n"); \
- PUSH_FAILURE_ITEM (reg_info[this_reg].word); \
- } \
- \
- DEBUG_PRINT2 (" Pushing low active reg: %d\n", lowest_active_reg);\
- PUSH_FAILURE_ITEM (lowest_active_reg); \
- \
- DEBUG_PRINT2 (" Pushing high active reg: %d\n", highest_active_reg);\
- PUSH_FAILURE_ITEM (highest_active_reg); \
- \
- DEBUG_PRINT2 (" Pushing pattern 0x%x: ", pattern_place); \
- DEBUG_PRINT_COMPILED_PATTERN (bufp, pattern_place, pend); \
- PUSH_FAILURE_ITEM (pattern_place); \
- \
- DEBUG_PRINT2 (" Pushing string 0x%x: `", string_place); \
- DEBUG_PRINT_DOUBLE_STRING (string_place, string1, size1, string2, \
- size2); \
- DEBUG_PRINT1 ("'\n"); \
- PUSH_FAILURE_ITEM (string_place); \
- \
- DEBUG_PRINT2 (" Pushing failure id: %u\n", failure_id); \
- DEBUG_PUSH (failure_id); \
- } while (0)
-
-/* This is the number of items that are pushed and popped on the stack
- for each register. */
-#define NUM_REG_ITEMS 3
-
-/* Individual items aside from the registers. */
-#ifdef DEBUG
-#define NUM_NONREG_ITEMS 5 /* Includes failure point id. */
-#else
-#define NUM_NONREG_ITEMS 4
-#endif
-
-/* We push at most this many items on the stack. */
-#define MAX_FAILURE_ITEMS ((num_regs - 1) * NUM_REG_ITEMS + NUM_NONREG_ITEMS)
-
-/* We actually push this many items. */
-#define NUM_FAILURE_ITEMS \
- ((highest_active_reg - lowest_active_reg + 1) * NUM_REG_ITEMS \
- + NUM_NONREG_ITEMS)
-
-/* How many items can still be added to the stack without overflowing it. */
-#define REMAINING_AVAIL_SLOTS ((fail_stack).size - (fail_stack).avail)
-
-
-/* Pops what PUSH_FAIL_STACK pushes.
-
- We restore into the parameters, all of which should be lvalues:
- STR -- the saved data position.
- PAT -- the saved pattern position.
- LOW_REG, HIGH_REG -- the highest and lowest active registers.
- REGSTART, REGEND -- arrays of string positions.
- REG_INFO -- array of information about each subexpression.
-
- Also assumes the variables `fail_stack' and (if debugging), `bufp',
- `pend', `string1', `size1', `string2', and `size2'. */
-
-#define POP_FAILURE_POINT(str, pat, low_reg, high_reg, regstart, regend, reg_info)\
-{ \
- DEBUG_STATEMENT (fail_stack_elt_t failure_id;) \
- int this_reg; \
- const unsigned char *string_temp; \
- \
- assert (!FAIL_STACK_EMPTY ()); \
- \
- /* Remove failure points and point to how many regs pushed. */ \
- DEBUG_PRINT1 ("POP_FAILURE_POINT:\n"); \
- DEBUG_PRINT2 (" Before pop, next avail: %d\n", fail_stack.avail); \
- DEBUG_PRINT2 (" size: %d\n", fail_stack.size); \
- \
- assert (fail_stack.avail >= NUM_NONREG_ITEMS); \
- \
- DEBUG_POP (&failure_id); \
- DEBUG_PRINT2 (" Popping failure id: %u\n", failure_id); \
- \
- /* If the saved string location is NULL, it came from an \
- on_failure_keep_string_jump opcode, and we want to throw away the \
- saved NULL, thus retaining our current position in the string. */ \
- string_temp = POP_FAILURE_ITEM (); \
- if (string_temp != NULL) \
- str = (const char *) string_temp; \
- \
- DEBUG_PRINT2 (" Popping string 0x%x: `", str); \
- DEBUG_PRINT_DOUBLE_STRING (str, string1, size1, string2, size2); \
- DEBUG_PRINT1 ("'\n"); \
- \
- pat = (unsigned char *) POP_FAILURE_ITEM (); \
- DEBUG_PRINT2 (" Popping pattern 0x%x: ", pat); \
- DEBUG_PRINT_COMPILED_PATTERN (bufp, pat, pend); \
- \
- /* Restore register info. */ \
- high_reg = (unsigned) POP_FAILURE_ITEM (); \
- DEBUG_PRINT2 (" Popping high active reg: %d\n", high_reg); \
- \
- low_reg = (unsigned) POP_FAILURE_ITEM (); \
- DEBUG_PRINT2 (" Popping low active reg: %d\n", low_reg); \
- \
- for (this_reg = high_reg; this_reg >= low_reg; this_reg--) \
- { \
- DEBUG_PRINT2 (" Popping reg: %d\n", this_reg); \
- \
- reg_info[this_reg].word = POP_FAILURE_ITEM (); \
- DEBUG_PRINT2 (" info: 0x%x\n", reg_info[this_reg]); \
- \
- regend[this_reg] = (const char *) POP_FAILURE_ITEM (); \
- DEBUG_PRINT2 (" end: 0x%x\n", regend[this_reg]); \
- \
- regstart[this_reg] = (const char *) POP_FAILURE_ITEM (); \
- DEBUG_PRINT2 (" start: 0x%x\n", regstart[this_reg]); \
- } \
- \
- DEBUG_STATEMENT (nfailure_points_popped++); \
-} /* POP_FAILURE_POINT */
-
-/* re_compile_fastmap computes a ``fastmap'' for the compiled pattern in
- BUFP. A fastmap records which of the (1 << BYTEWIDTH) possible
- characters can start a string that matches the pattern. This fastmap
- is used by re_search to skip quickly over impossible starting points.
-
- The caller must supply the address of a (1 << BYTEWIDTH)-byte data
- area as BUFP->fastmap.
-
- We set the `fastmap', `fastmap_accurate', and `can_be_null' fields in
- the pattern buffer.
-
- Returns 0 if we succeed, -2 if an internal error. */
-
-int
-re_compile_fastmap (bufp)
- struct re_pattern_buffer *bufp;
-{
- int j, k;
- fail_stack_type fail_stack;
-#ifndef REGEX_MALLOC
- char *destination;
-#endif
- /* We don't push any register information onto the failure stack. */
- unsigned num_regs = 0;
-
- register char *fastmap = bufp->fastmap;
- unsigned char *pattern = bufp->buffer;
- unsigned long size = bufp->used;
- const unsigned char *p = pattern;
- register unsigned char *pend = pattern + size;
-
- /* Assume that each path through the pattern can be null until
- proven otherwise. We set this false at the bottom of switch
- statement, to which we get only if a particular path doesn't
- match the empty string. */
- boolean path_can_be_null = true;
-
- /* We aren't doing a `succeed_n' to begin with. */
- boolean succeed_n_p = false;
-
- assert (fastmap != NULL && p != NULL);
-
- INIT_FAIL_STACK ();
- bzero (fastmap, 1 << BYTEWIDTH); /* Assume nothing's valid. */
- bufp->fastmap_accurate = 1; /* It will be when we're done. */
- bufp->can_be_null = 0;
-
- while (p != pend || !FAIL_STACK_EMPTY ())
- {
- if (p == pend)
- {
- bufp->can_be_null |= path_can_be_null;
-
- /* Reset for next path. */
- path_can_be_null = true;
-
- p = fail_stack.stack[--fail_stack.avail];
- }
-
- /* We should never be about to go beyond the end of the pattern. */
- assert (p < pend);
-
-#ifdef SWITCH_ENUM_BUG
- switch ((int) ((re_opcode_t) *p++))
-#else
- switch ((re_opcode_t) *p++)
-#endif
- {
-
- /* I guess the idea here is to simply not bother with a fastmap
- if a backreference is used, since it's too hard to figure out
- the fastmap for the corresponding group. Setting
- `can_be_null' stops `re_search_2' from using the fastmap, so
- that is all we do. */
- case duplicate:
- bufp->can_be_null = 1;
- return 0;
-
-
- /* Following are the cases which match a character. These end
- with `break'. */
-
- case exactn:
- fastmap[p[1]] = 1;
- break;
-
-
- case charset:
- for (j = *p++ * BYTEWIDTH - 1; j >= 0; j--)
- if (p[j / BYTEWIDTH] & (1 << (j % BYTEWIDTH)))
- fastmap[j] = 1;
- break;
-
-
- case charset_not:
- /* Chars beyond end of map must be allowed. */
- for (j = *p * BYTEWIDTH; j < (1 << BYTEWIDTH); j++)
- fastmap[j] = 1;
-
- for (j = *p++ * BYTEWIDTH - 1; j >= 0; j--)
- if (!(p[j / BYTEWIDTH] & (1 << (j % BYTEWIDTH))))
- fastmap[j] = 1;
- break;
-
-
- case wordchar:
- for (j = 0; j < (1 << BYTEWIDTH); j++)
- if (SYNTAX (j) == Sword)
- fastmap[j] = 1;
- break;
-
-
- case notwordchar:
- for (j = 0; j < (1 << BYTEWIDTH); j++)
- if (SYNTAX (j) != Sword)
- fastmap[j] = 1;
- break;
-
-
- case anychar:
- /* `.' matches anything ... */
- for (j = 0; j < (1 << BYTEWIDTH); j++)
- fastmap[j] = 1;
-
- /* ... except perhaps newline. */
- if (!(bufp->syntax & RE_DOT_NEWLINE))
- fastmap['\n'] = 0;
-
- /* Return if we have already set `can_be_null'; if we have,
- then the fastmap is irrelevant. Something's wrong here. */
- else if (bufp->can_be_null)
- return 0;
-
- /* Otherwise, have to check alternative paths. */
- break;
-
-
-#ifdef emacs
- case syntaxspec:
- k = *p++;
- for (j = 0; j < (1 << BYTEWIDTH); j++)
- if (SYNTAX (j) == (enum syntaxcode) k)
- fastmap[j] = 1;
- break;
-
-
- case notsyntaxspec:
- k = *p++;
- for (j = 0; j < (1 << BYTEWIDTH); j++)
- if (SYNTAX (j) != (enum syntaxcode) k)
- fastmap[j] = 1;
- break;
-
-
- /* All cases after this match the empty string. These end with
- `continue'. */
-
-
- case before_dot:
- case at_dot:
- case after_dot:
- continue;
-#endif /* not emacs */
-
-
- case no_op:
- case begline:
- case endline:
- case begbuf:
- case endbuf:
- case wordbound:
- case notwordbound:
- case wordbeg:
- case wordend:
- case push_dummy_failure:
- continue;
-
-
- case jump_n:
- case pop_failure_jump:
- case maybe_pop_jump:
- case jump:
- case jump_past_alt:
- case dummy_failure_jump:
- EXTRACT_NUMBER_AND_INCR (j, p);
- p += j;
- if (j > 0)
- continue;
-
- /* Jump backward implies we just went through the body of a
- loop and matched nothing. Opcode jumped to should be
- `on_failure_jump' or `succeed_n'. Just treat it like an
- ordinary jump. For a * loop, it has pushed its failure
- point already; if so, discard that as redundant. */
- if ((re_opcode_t) *p != on_failure_jump
- && (re_opcode_t) *p != succeed_n)
- continue;
-
- p++;
- EXTRACT_NUMBER_AND_INCR (j, p);
- p += j;
-
- /* If what's on the stack is where we are now, pop it. */
- if (!FAIL_STACK_EMPTY ()
- && fail_stack.stack[fail_stack.avail - 1] == p)
- fail_stack.avail--;
-
- continue;
-
-
- case on_failure_jump:
- case on_failure_keep_string_jump:
- handle_on_failure_jump:
- EXTRACT_NUMBER_AND_INCR (j, p);
-
- /* For some patterns, e.g., `(a?)?', `p+j' here points to the
- end of the pattern. We don't want to push such a point,
- since when we restore it above, entering the switch will
- increment `p' past the end of the pattern. We don't need
- to push such a point since we obviously won't find any more
- fastmap entries beyond `pend'. Such a pattern can match
- the null string, though. */
- if (p + j < pend)
- {
- /*
- * WARN 191: illegal pointer conversion
- * between CONST and NON-CONST attribute
- */
-# ifdef __TANDEM
-# pragma NOWARN( 191 )
-# endif
- if (!PUSH_PATTERN_OP (p + j, fail_stack))
- return -2;
-# ifdef __TANDEM
-# pragma WARN( 191 )
-# endif
- }
- else
- bufp->can_be_null = 1;
-
- if (succeed_n_p)
- {
- EXTRACT_NUMBER_AND_INCR (k, p); /* Skip the n. */
- succeed_n_p = false;
- }
-
- continue;
-
-
- case succeed_n:
- /* Get to the number of times to succeed. */
- p += 2;
-
- /* Increment p past the n for when k != 0. */
- EXTRACT_NUMBER_AND_INCR (k, p);
- if (k == 0)
- {
- p -= 4;
- succeed_n_p = true; /* Spaghetti code alert. */
- goto handle_on_failure_jump;
- }
- continue;
-
-
- case set_number_at:
- p += 4;
- continue;
-
-
- case start_memory:
- case stop_memory:
- p += 2;
- continue;
-
-
- default:
- abort (); /* We have listed all the cases. */
- } /* switch *p++ */
-
- /* Getting here means we have found the possible starting
- characters for one path of the pattern -- and that the empty
- string does not match. We need not follow this path further.
- Instead, look at the next alternative (remembered on the
- stack), or quit if no more. The test at the top of the loop
- does these things. */
- path_can_be_null = false;
- p = pend;
- } /* while p */
-
- /* Set `can_be_null' for the last path (also the first path, if the
- pattern is empty). */
- bufp->can_be_null |= path_can_be_null;
- return 0;
-} /* re_compile_fastmap */
-
-/* Set REGS to hold NUM_REGS registers, storing them in STARTS and
- ENDS. Subsequent matches using PATTERN_BUFFER and REGS will use
- this memory for recording register information. STARTS and ENDS
- must be allocated using the malloc library routine, and must each
- be at least NUM_REGS * sizeof (regoff_t) bytes long.
-
- If NUM_REGS == 0, then subsequent matches should allocate their own
- register data.
-
- Unless this function is called, the first search or match using
- PATTERN_BUFFER will allocate its own register data, without
- freeing the old data. */
-
-void
-re_set_registers (bufp, regs, num_regs, starts, ends)
- struct re_pattern_buffer *bufp;
- struct re_registers *regs;
- unsigned num_regs;
- regoff_t *starts, *ends;
-{
- if (num_regs)
- {
- bufp->regs_allocated = REGS_REALLOCATE;
- regs->num_regs = num_regs;
- regs->start = starts;
- regs->end = ends;
- }
- else
- {
- bufp->regs_allocated = REGS_UNALLOCATED;
- regs->num_regs = 0;
- regs->start = regs->end = (regoff_t) 0;
- }
-}
-
-/* Searching routines. */
-
-/* Like re_search_2, below, but only one string is specified, and
- doesn't let you say where to stop matching. */
-
-int
-re_search (bufp, string, size, startpos, range, regs)
- struct re_pattern_buffer *bufp;
- const char *string;
- int size, startpos, range;
- struct re_registers *regs;
-{
- return re_search_2 (bufp, NULL, 0, string, size, startpos, range,
- regs, size);
-}
-
-
-/* Using the compiled pattern in BUFP->buffer, first tries to match the
- virtual concatenation of STRING1 and STRING2, starting first at index
- STARTPOS, then at STARTPOS + 1, and so on.
-
- STRING1 and STRING2 have length SIZE1 and SIZE2, respectively.
-
- RANGE is how far to scan while trying to match. RANGE = 0 means try
- only at STARTPOS; in general, the last start tried is STARTPOS +
- RANGE.
-
- In REGS, return the indices of the virtual concatenation of STRING1
- and STRING2 that matched the entire BUFP->buffer and its contained
- subexpressions.
-
- Do not consider matching one past the index STOP in the virtual
- concatenation of STRING1 and STRING2.
-
- We return either the position in the strings at which the match was
- found, -1 if no match, or -2 if error (such as failure
- stack overflow). */
-
-int
-re_search_2 (bufp, string1, size1, string2, size2, startpos, range, regs, stop)
- struct re_pattern_buffer *bufp;
- const char *string1, *string2;
- int size1, size2;
- int startpos;
- int range;
- struct re_registers *regs;
- int stop;
-{
- int val;
- register char *fastmap = bufp->fastmap;
- register char *translate = bufp->translate;
- int total_size = size1 + size2;
- int endpos = startpos + range;
-
- /* Check for out-of-range STARTPOS. */
- if (startpos < 0 || startpos > total_size)
- return -1;
-
- /* Fix up RANGE if it might eventually take us outside
- the virtual concatenation of STRING1 and STRING2. */
- if (endpos < -1)
- range = -1 - startpos;
- else if (endpos > total_size)
- range = total_size - startpos;
-
- /* If the search isn't to be a backwards one, don't waste time in a
- search for a pattern that must be anchored. */
- if (bufp->used > 0 && (re_opcode_t) bufp->buffer[0] == begbuf && range > 0)
- {
- if (startpos > 0)
- return -1;
- else
- range = 1;
- }
-
- /* Update the fastmap now if not correct already. */
- if (fastmap && !bufp->fastmap_accurate)
- if (re_compile_fastmap (bufp) == -2)
- return -2;
-
- /* Loop through the string, looking for a place to start matching. */
- for (;;)
- {
- /* If a fastmap is supplied, skip quickly over characters that
- cannot be the start of a match. If the pattern can match the
- null string, however, we don't need to skip characters; we want
- the first null string. */
- if (fastmap && startpos < total_size && !bufp->can_be_null)
- {
- if (range > 0) /* Searching forwards. */
- {
- register const char *d;
- register int lim = 0;
- int irange = range;
-
- if (startpos < size1 && startpos + range >= size1)
- lim = range - (size1 - startpos);
-
- d = (startpos >= size1 ? string2 - size1 : string1) + startpos;
-
- /* Written out as an if-else to avoid testing `translate'
- inside the loop. */
- if (translate)
- while (range > lim
- && !fastmap[(unsigned char)
- translate[(unsigned char) *d++]])
- range--;
- else
- while (range > lim && !fastmap[(unsigned char) *d++])
- range--;
-
- startpos += irange - range;
- }
- else /* Searching backwards. */
- {
- register char c = (size1 == 0 || startpos >= size1
- ? string2[startpos - size1]
- : string1[startpos]);
-
- if (!fastmap[(unsigned char) TRANSLATE (c)])
- goto advance;
- }
- }
-
- /* If can't match the null string, and that's all we have left, fail. */
- if (range >= 0 && startpos == total_size && fastmap
- && !bufp->can_be_null)
- return -1;
-
- val = re_match_2 (bufp, string1, size1, string2, size2,
- startpos, regs, stop);
- if (val >= 0)
- return startpos;
-
- if (val == -2)
- return -2;
-
- advance:
- if (!range)
- break;
- else if (range > 0)
- {
- range--;
- startpos++;
- }
- else
- {
- range++;
- startpos--;
- }
- }
- return -1;
-} /* re_search_2 */
-
-/* Declarations and macros for re_match_2. */
-
-static int bcmp_translate ();
-static boolean alt_match_null_string_p (),
- common_op_match_null_string_p (),
- group_match_null_string_p ();
-
-/* Structure for per-register (a.k.a. per-group) information.
- This must not be longer than one word, because we push this value
- onto the failure stack. Other register information, such as the
- starting and ending positions (which are addresses), and the list of
- inner groups (which is a bits list) are maintained in separate
- variables.
-
- We are making a (strictly speaking) nonportable assumption here: that
- the compiler will pack our bit fields into something that fits into
- the type of `word', i.e., is something that fits into one item on the
- failure stack. */
-typedef union
-{
- fail_stack_elt_t word;
- struct
- {
- /* This field is one if this group can match the empty string,
- zero if not. If not yet determined, `MATCH_NULL_UNSET_VALUE'. */
-#define MATCH_NULL_UNSET_VALUE 3
- unsigned match_null_string_p : 2;
- unsigned is_active : 1;
- unsigned matched_something : 1;
- unsigned ever_matched_something : 1;
- } bits;
-} register_info_type;
-
-#define REG_MATCH_NULL_STRING_P(R) ((R).bits.match_null_string_p)
-#define IS_ACTIVE(R) ((R).bits.is_active)
-#define MATCHED_SOMETHING(R) ((R).bits.matched_something)
-#define EVER_MATCHED_SOMETHING(R) ((R).bits.ever_matched_something)
-
-
-/* Call this when have matched a real character; it sets `matched' flags
- for the subexpressions which we are currently inside. Also records
- that those subexprs have matched. */
-#define SET_REGS_MATCHED() \
- do \
- { \
- unsigned r; \
- for (r = lowest_active_reg; r <= highest_active_reg; r++) \
- { \
- MATCHED_SOMETHING (reg_info[r]) \
- = EVER_MATCHED_SOMETHING (reg_info[r]) \
- = 1; \
- } \
- } \
- while (0)
-
-
-/* This converts PTR, a pointer into one of the search strings `string1'
- and `string2' into an offset from the beginning of that string. */
-#define POINTER_TO_OFFSET(ptr) \
- (FIRST_STRING_P (ptr) ? (ptr) - string1 : (ptr) - string2 + size1)
-
-/* Registers are set to a sentinel when they haven't yet matched. */
-#define REG_UNSET_VALUE ((char *) -1)
-#define REG_UNSET(e) ((e) == REG_UNSET_VALUE)
-
-
-/* Macros for dealing with the split strings in re_match_2. */
-
-#define MATCHING_IN_FIRST_STRING (dend == end_match_1)
-
-/* Call before fetching a character with *d. This switches over to
- string2 if necessary. */
-#define PREFETCH() \
- while (d == dend) \
- { \
- /* End of string2 => fail. */ \
- if (dend == end_match_2) \
- goto fail; \
- /* End of string1 => advance to string2. */ \
- d = string2; \
- dend = end_match_2; \
- }
-
-
-/* Test if at very beginning or at very end of the virtual concatenation
- of `string1' and `string2'. If only one string, it's `string2'. */
-#define AT_STRINGS_BEG(d) ((d) == (size1 ? string1 : string2) || !size2)
-#define AT_STRINGS_END(d) ((d) == end2)
-
-
-/* Test if D points to a character which is word-constituent. We have
- two special cases to check for: if past the end of string1, look at
- the first character in string2; and if before the beginning of
- string2, look at the last character in string1. */
-#define WORDCHAR_P(d) \
- (SYNTAX ((d) == end1 ? *string2 \
- : (d) == string2 - 1 ? *(end1 - 1) : *(d)) \
- == Sword)
-
-/* Test if the character before D and the one at D differ with respect
- to being word-constituent. */
-#define AT_WORD_BOUNDARY(d) \
- (AT_STRINGS_BEG (d) || AT_STRINGS_END (d) \
- || WORDCHAR_P (d - 1) != WORDCHAR_P (d))
-
-
-/* Free everything we malloc. */
-#ifdef REGEX_MALLOC
-#define FREE_VAR(var) do{if(var){free((void*)var); var = NULL;}}while (0)
-#define FREE_VARIABLES() \
- do { \
- FREE_VAR (fail_stack.stack); \
- FREE_VAR (regstart); \
- FREE_VAR (regend); \
- FREE_VAR (old_regstart); \
- FREE_VAR (old_regend); \
- FREE_VAR (best_regstart); \
- FREE_VAR (best_regend); \
- FREE_VAR (reg_info); \
- FREE_VAR (reg_dummy); \
- FREE_VAR (reg_info_dummy); \
- } while (0)
-#else /* not REGEX_MALLOC */
-/* Some MIPS systems (at least) want this to free alloca'd storage. */
-#define FREE_VARIABLES() alloca (0)
-#endif /* not REGEX_MALLOC */
-
-
-/* These values must meet several constraints. They must not be valid
- register values; since we have a limit of 255 registers (because
- we use only one byte in the pattern for the register number), we can
- use numbers larger than 255. They must differ by 1, because of
- NUM_FAILURE_ITEMS above. And the value for the lowest register must
- be larger than the value for the highest register, so we do not try
- to actually save any registers when none are active. */
-#define NO_HIGHEST_ACTIVE_REG (1 << BYTEWIDTH)
-#define NO_LOWEST_ACTIVE_REG (NO_HIGHEST_ACTIVE_REG + 1)
-
-/* Matching routines. */
-
-#ifndef emacs /* Emacs never uses this. */
-/* re_match is like re_match_2 except it takes only a single string. */
-
-int
-re_match (bufp, string, size, pos, regs)
- struct re_pattern_buffer *bufp;
- const char *string;
- int size, pos;
- struct re_registers *regs;
- {
- return re_match_2 (bufp, NULL, 0, string, size, pos, regs, size);
-}
-#endif /* not emacs */
-
-
-/* re_match_2 matches the compiled pattern in BUFP against the
- (virtual) concatenation of STRING1 and STRING2 (of length SIZE1
- and SIZE2, respectively). We start matching at POS, and stop
- matching at STOP.
-
- If REGS is non-null and the `no_sub' field of BUFP is nonzero, we
- store offsets for the substring each group matched in REGS. See the
- documentation for exactly how many groups we fill.
-
- We return -1 if no match, -2 if an internal error (such as the
- failure stack overflowing). Otherwise, we return the length of the
- matched substring. */
-
-int
-re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop)
- struct re_pattern_buffer *bufp;
- const char *string1, *string2;
- int size1, size2;
- int pos;
- struct re_registers *regs;
- int stop;
-{
- /* General temporaries. */
- int mcnt;
- unsigned char *p1;
-
- /* Just past the end of the corresponding string. */
- const char *end1, *end2;
-
- /* Pointers into string1 and string2, just past the last characters in
- each to consider matching. */
- const char *end_match_1, *end_match_2;
-
- /* Where we are in the data, and the end of the current string. */
- const char *d, *dend;
-
- /* Where we are in the pattern, and the end of the pattern. */
- unsigned char *p = bufp->buffer;
- register unsigned char *pend = p + bufp->used;
-
- /* We use this to map every character in the string. */
- char *translate = bufp->translate;
-
- /* Failure point stack. Each place that can handle a failure further
- down the line pushes a failure point on this stack. It consists of
- restart, regend, and reg_info for all registers corresponding to
- the subexpressions we're currently inside, plus the number of such
- registers, and, finally, two char *'s. The first char * is where
- to resume scanning the pattern; the second one is where to resume
- scanning the strings. If the latter is zero, the failure point is
- a ``dummy''; if a failure happens and the failure point is a dummy,
- it gets discarded and the next one is tried. */
- fail_stack_type fail_stack;
-#ifdef DEBUG
- static unsigned failure_id = 0;
- unsigned nfailure_points_pushed = 0, nfailure_points_popped = 0;
-#endif
-
- /* We fill all the registers internally, independent of what we
- return, for use in backreferences. The number here includes
- an element for register zero. */
- unsigned num_regs = bufp->re_nsub + 1;
-
- /* The currently active registers. */
- unsigned lowest_active_reg = NO_LOWEST_ACTIVE_REG;
- unsigned highest_active_reg = NO_HIGHEST_ACTIVE_REG;
-
- /* Information on the contents of registers. These are pointers into
- the input strings; they record just what was matched (on this
- attempt) by a subexpression part of the pattern, that is, the
- regnum-th regstart pointer points to where in the pattern we began
- matching and the regnum-th regend points to right after where we
- stopped matching the regnum-th subexpression. (The zeroth register
- keeps track of what the whole pattern matches.) */
- const char **regstart, **regend;
-
- /* If a group that's operated upon by a repetition operator fails to
- match anything, then the register for its start will need to be
- restored because it will have been set to wherever in the string we
- are when we last see its open-group operator. Similarly for a
- register's end. */
- const char **old_regstart, **old_regend;
-
- /* The is_active field of reg_info helps us keep track of which (possibly
- nested) subexpressions we are currently in. The matched_something
- field of reg_info[reg_num] helps us tell whether or not we have
- matched any of the pattern so far this time through the reg_num-th
- subexpression. These two fields get reset each time through any
- loop their register is in. */
- register_info_type *reg_info;
-
- /* The following record the register info as found in the above
- variables when we find a match better than any we've seen before.
- This happens as we backtrack through the failure points, which in
- turn happens only if we have not yet matched the entire string. */
- unsigned best_regs_set = false;
- const char **best_regstart, **best_regend;
-
- /* Logically, this is `best_regend[0]'. But we don't want to have to
- allocate space for that if we're not allocating space for anything
- else (see below). Also, we never need info about register 0 for
- any of the other register vectors, and it seems rather a kludge to
- treat `best_regend' differently than the rest. So we keep track of
- the end of the best match so far in a separate variable. We
- initialize this to NULL so that when we backtrack the first time
- and need to test it, it's not garbage. */
- const char *match_end = NULL;
-
- /* Used when we pop values we don't care about. */
- const char **reg_dummy;
- register_info_type *reg_info_dummy;
-
-#ifdef DEBUG
- /* Counts the total number of registers pushed. */
- unsigned num_regs_pushed = 0;
-#endif
-
- DEBUG_PRINT1 ("\n\nEntering re_match_2.\n");
-
- INIT_FAIL_STACK ();
-
- /* Do not bother to initialize all the register variables if there are
- no groups in the pattern, as it takes a fair amount of time. If
- there are groups, we include space for register 0 (the whole
- pattern), even though we never use it, since it simplifies the
- array indexing. We should fix this. */
- if (bufp->re_nsub)
- {
- regstart = REGEX_TALLOC (num_regs, const char *);
- regend = REGEX_TALLOC (num_regs, const char *);
- old_regstart = REGEX_TALLOC (num_regs, const char *);
- old_regend = REGEX_TALLOC (num_regs, const char *);
- best_regstart = REGEX_TALLOC (num_regs, const char *);
- best_regend = REGEX_TALLOC (num_regs, const char *);
- reg_info = REGEX_TALLOC (num_regs, register_info_type);
- reg_dummy = REGEX_TALLOC (num_regs, const char *);
- reg_info_dummy = REGEX_TALLOC (num_regs, register_info_type);
-
- if (!(regstart && regend && old_regstart && old_regend && reg_info
- && best_regstart && best_regend && reg_dummy && reg_info_dummy))
- {
- FREE_VARIABLES ();
- return -2;
- }
- }
-#ifdef REGEX_MALLOC
- else
- {
- /* We must initialize all our variables to NULL, so that
- `FREE_VARIABLES' doesn't try to free them. */
- regstart = regend = old_regstart = old_regend = best_regstart
- = best_regend = reg_dummy = NULL;
- reg_info = reg_info_dummy = (register_info_type *) NULL;
- }
-#endif /* REGEX_MALLOC */
-
- /* The starting position is bogus. */
- if (pos < 0 || pos > size1 + size2)
- {
- FREE_VARIABLES ();
- return -1;
- }
-
- /* Initialize subexpression text positions to -1 to mark ones that no
- start_memory/stop_memory has been seen for. Also initialize the
- register information struct. */
- for (mcnt = 1; mcnt < num_regs; mcnt++)
- {
- regstart[mcnt] = regend[mcnt]
- = old_regstart[mcnt] = old_regend[mcnt] = REG_UNSET_VALUE;
-
- REG_MATCH_NULL_STRING_P (reg_info[mcnt]) = MATCH_NULL_UNSET_VALUE;
- IS_ACTIVE (reg_info[mcnt]) = 0;
- MATCHED_SOMETHING (reg_info[mcnt]) = 0;
- EVER_MATCHED_SOMETHING (reg_info[mcnt]) = 0;
- }
-
- /* We move `string1' into `string2' if the latter's empty -- but not if
- `string1' is null. */
- if (size2 == 0 && string1 != NULL)
- {
- string2 = string1;
- size2 = size1;
- string1 = 0;
- size1 = 0;
- }
- end1 = string1 + size1;
- end2 = string2 + size2;
-
- /* Compute where to stop matching, within the two strings. */
- if (stop <= size1)
- {
- end_match_1 = string1 + stop;
- end_match_2 = string2;
- }
- else
- {
- end_match_1 = end1;
- end_match_2 = string2 + stop - size1;
- }
-
- /* `p' scans through the pattern as `d' scans through the data.
- `dend' is the end of the input string that `d' points within. `d'
- is advanced into the following input string whenever necessary, but
- this happens before fetching; therefore, at the beginning of the
- loop, `d' can be pointing at the end of a string, but it cannot
- equal `string2'. */
- if (size1 > 0 && pos <= size1)
- {
- d = string1 + pos;
- dend = end_match_1;
- }
- else
- {
- d = string2 + pos - size1;
- dend = end_match_2;
- }
-
- DEBUG_PRINT1 ("The compiled pattern is: ");
- DEBUG_PRINT_COMPILED_PATTERN (bufp, p, pend);
- DEBUG_PRINT1 ("The string to match is: `");
- DEBUG_PRINT_DOUBLE_STRING (d, string1, size1, string2, size2);
- DEBUG_PRINT1 ("'\n");
-
- /* This loops over pattern commands. It exits by returning from the
- function if the match is complete, or it drops through if the match
- fails at this starting point in the input data. */
- for (;;)
- {
- DEBUG_PRINT2 ("\n0x%x: ", p);
-
- if (p == pend)
- { /* End of pattern means we might have succeeded. */
- DEBUG_PRINT1 ("end of pattern ... ");
-
- /* If we haven't matched the entire string, and we want the
- longest match, try backtracking. */
- if (d != end_match_2)
- {
- DEBUG_PRINT1 ("backtracking.\n");
-
- if (!FAIL_STACK_EMPTY ())
- { /* More failure points to try. */
- boolean same_str_p = (FIRST_STRING_P (match_end)
- == MATCHING_IN_FIRST_STRING);
-
- /* If exceeds best match so far, save it. */
- if (!best_regs_set
- || (same_str_p && d > match_end)
- || (!same_str_p && !MATCHING_IN_FIRST_STRING))
- {
- best_regs_set = true;
- match_end = d;
-
- DEBUG_PRINT1 ("\nSAVING match as best so far.\n");
-
- for (mcnt = 1; mcnt < num_regs; mcnt++)
- {
- best_regstart[mcnt] = regstart[mcnt];
- best_regend[mcnt] = regend[mcnt];
- }
- }
- goto fail;
- }
-
- /* If no failure points, don't restore garbage. */
- else if (best_regs_set)
- {
- restore_best_regs:
- /* Restore best match. It may happen that `dend ==
- end_match_1' while the restored d is in string2.
- For example, the pattern `x.*y.*z' against the
- strings `x-' and `y-z-', if the two strings are
- not consecutive in memory. */
- DEBUG_PRINT1 ("Restoring best registers.\n");
-
- d = match_end;
- dend = ((d >= string1 && d <= end1)
- ? end_match_1 : end_match_2);
-
- for (mcnt = 1; mcnt < num_regs; mcnt++)
- {
- regstart[mcnt] = best_regstart[mcnt];
- regend[mcnt] = best_regend[mcnt];
- }
- }
- } /* d != end_match_2 */
-
- DEBUG_PRINT1 ("Accepting match.\n");
-
- /* If caller wants register contents data back, do it. */
- if (regs && !bufp->no_sub)
- {
- /* Have the register data arrays been allocated? */
- if (bufp->regs_allocated == REGS_UNALLOCATED)
- { /* No. So allocate them with malloc. We need one
- extra element beyond `num_regs' for the `-1' marker
- GNU code uses. */
- regs->num_regs = MAX (RE_NREGS, num_regs + 1);
- regs->start = TALLOC (regs->num_regs, regoff_t);
- regs->end = TALLOC (regs->num_regs, regoff_t);
- if (regs->start == NULL || regs->end == NULL)
- return -2;
- bufp->regs_allocated = REGS_REALLOCATE;
- }
- else if (bufp->regs_allocated == REGS_REALLOCATE)
- { /* Yes. If we need more elements than were already
- allocated, reallocate them. If we need fewer, just
- leave it alone. */
- if (regs->num_regs < num_regs + 1)
- {
- regs->num_regs = num_regs + 1;
- RETALLOC (regs->start, regs->num_regs, regoff_t);
- RETALLOC (regs->end, regs->num_regs, regoff_t);
- if (regs->start == NULL || regs->end == NULL)
- return -2;
- }
- }
- else
- assert (bufp->regs_allocated == REGS_FIXED);
-
- /* Convert the pointer data in `regstart' and `regend' to
- indices. Register zero has to be set differently,
- since we haven't kept track of any info for it. */
- if (regs->num_regs > 0)
- {
- regs->start[0] = pos;
- regs->end[0] = (MATCHING_IN_FIRST_STRING ? d - string1
- : d - string2 + size1);
- }
-
- /* Go through the first `min (num_regs, regs->num_regs)'
- registers, since that is all we initialized. */
- for (mcnt = 1; mcnt < MIN (num_regs, regs->num_regs); mcnt++)
- {
- if (REG_UNSET (regstart[mcnt]) || REG_UNSET (regend[mcnt]))
- regs->start[mcnt] = regs->end[mcnt] = -1;
- else
- {
- regs->start[mcnt] = POINTER_TO_OFFSET (regstart[mcnt]);
- regs->end[mcnt] = POINTER_TO_OFFSET (regend[mcnt]);
- }
- }
-
- /* If the regs structure we return has more elements than
- were in the pattern, set the extra elements to -1. If
- we (re)allocated the registers, this is the case,
- because we always allocate enough to have at least one
- -1 at the end. */
- for (mcnt = num_regs; mcnt < regs->num_regs; mcnt++)
- regs->start[mcnt] = regs->end[mcnt] = -1;
- } /* regs && !bufp->no_sub */
-
- FREE_VARIABLES ();
- DEBUG_PRINT4 ("%u failure points pushed, %u popped (%u remain).\n",
- nfailure_points_pushed, nfailure_points_popped,
- nfailure_points_pushed - nfailure_points_popped);
- DEBUG_PRINT2 ("%u registers pushed.\n", num_regs_pushed);
-
- mcnt = d - pos - (MATCHING_IN_FIRST_STRING
- ? string1
- : string2 - size1);
-
- DEBUG_PRINT2 ("Returning %d from re_match_2.\n", mcnt);
-
- return mcnt;
- }
-
- /* Otherwise match next pattern command. */
-#ifdef SWITCH_ENUM_BUG
- switch ((int) ((re_opcode_t) *p++))
-#else
- switch ((re_opcode_t) *p++)
-#endif
- {
- /* Ignore these. Used to ignore the n of succeed_n's which
- currently have n == 0. */
- case no_op:
- DEBUG_PRINT1 ("EXECUTING no_op.\n");
- break;
-
-
- /* Match the next n pattern characters exactly. The following
- byte in the pattern defines n, and the n bytes after that
- are the characters to match. */
- case exactn:
- mcnt = *p++;
- DEBUG_PRINT2 ("EXECUTING exactn %d.\n", mcnt);
-
- /* This is written out as an if-else so we don't waste time
- testing `translate' inside the loop. */
- if (translate)
- {
- do
- {
- PREFETCH ();
- if (translate[(unsigned char) *d++] != (char) *p++)
- goto fail;
- }
- while (--mcnt);
- }
- else
- {
- do
- {
- PREFETCH ();
- if (*d++ != (char) *p++) goto fail;
- }
- while (--mcnt);
- }
- SET_REGS_MATCHED ();
- break;
-
-
- /* Match any character except possibly a newline or a null. */
- case anychar:
- DEBUG_PRINT1 ("EXECUTING anychar.\n");
-
- PREFETCH ();
-
- if ((!(bufp->syntax & RE_DOT_NEWLINE) && TRANSLATE (*d) == '\n')
- || (bufp->syntax & RE_DOT_NOT_NULL && TRANSLATE (*d) == '\000'))
- goto fail;
-
- SET_REGS_MATCHED ();
- DEBUG_PRINT2 (" Matched `%d'.\n", *d);
- d++;
- break;
-
-
- case charset:
- case charset_not:
- {
- register unsigned char c;
- boolean not = (re_opcode_t) *(p - 1) == charset_not;
-
- DEBUG_PRINT2 ("EXECUTING charset%s.\n", not ? "_not" : "");
-
- PREFETCH ();
- c = TRANSLATE (*d); /* The character to match. */
-
- /* Cast to `unsigned' instead of `unsigned char' in case the
- bit list is a full 32 bytes long. */
- if (c < (unsigned) (*p * BYTEWIDTH)
- && p[1 + c / BYTEWIDTH] & (1 << (c % BYTEWIDTH)))
- not = !not;
-
- p += 1 + *p;
-
- if (!not) goto fail;
-
- SET_REGS_MATCHED ();
- d++;
- break;
- }
-
-
- /* The beginning of a group is represented by start_memory.
- The arguments are the register number in the next byte, and the
- number of groups inner to this one in the next. The text
- matched within the group is recorded (in the internal
- registers data structure) under the register number. */
- case start_memory:
- DEBUG_PRINT3 ("EXECUTING start_memory %d (%d):\n", *p, p[1]);
-
- /* Find out if this group can match the empty string. */
- p1 = p; /* To send to group_match_null_string_p. */
-
- if (REG_MATCH_NULL_STRING_P (reg_info[*p]) == MATCH_NULL_UNSET_VALUE)
- REG_MATCH_NULL_STRING_P (reg_info[*p])
- = group_match_null_string_p (&p1, pend, reg_info);
-
- /* Save the position in the string where we were the last time
- we were at this open-group operator in case the group is
- operated upon by a repetition operator, e.g., with `(a*)*b'
- against `ab'; then we want to ignore where we are now in
- the string in case this attempt to match fails. */
- old_regstart[*p] = REG_MATCH_NULL_STRING_P (reg_info[*p])
- ? REG_UNSET (regstart[*p]) ? d : regstart[*p]
- : regstart[*p];
- DEBUG_PRINT2 (" old_regstart: %d\n",
- POINTER_TO_OFFSET (old_regstart[*p]));
-
- regstart[*p] = d;
- DEBUG_PRINT2 (" regstart: %d\n", POINTER_TO_OFFSET (regstart[*p]));
-
- IS_ACTIVE (reg_info[*p]) = 1;
- MATCHED_SOMETHING (reg_info[*p]) = 0;
-
- /* This is the new highest active register. */
- highest_active_reg = *p;
-
- /* If nothing was active before, this is the new lowest active
- register. */
- if (lowest_active_reg == NO_LOWEST_ACTIVE_REG)
- lowest_active_reg = *p;
-
- /* Move past the register number and inner group count. */
- p += 2;
- break;
-
-
- /* The stop_memory opcode represents the end of a group. Its
- arguments are the same as start_memory's: the register
- number, and the number of inner groups. */
- case stop_memory:
- DEBUG_PRINT3 ("EXECUTING stop_memory %d (%d):\n", *p, p[1]);
-
- /* We need to save the string position the last time we were at
- this close-group operator in case the group is operated
- upon by a repetition operator, e.g., with `((a*)*(b*)*)*'
- against `aba'; then we want to ignore where we are now in
- the string in case this attempt to match fails. */
- old_regend[*p] = REG_MATCH_NULL_STRING_P (reg_info[*p])
- ? REG_UNSET (regend[*p]) ? d : regend[*p]
- : regend[*p];
- DEBUG_PRINT2 (" old_regend: %d\n",
- POINTER_TO_OFFSET (old_regend[*p]));
-
- regend[*p] = d;
- DEBUG_PRINT2 (" regend: %d\n", POINTER_TO_OFFSET (regend[*p]));
-
- /* This register isn't active anymore. */
- IS_ACTIVE (reg_info[*p]) = 0;
-
- /* If this was the only register active, nothing is active
- anymore. */
- if (lowest_active_reg == highest_active_reg)
- {
- lowest_active_reg = NO_LOWEST_ACTIVE_REG;
- highest_active_reg = NO_HIGHEST_ACTIVE_REG;
- }
- else
- { /* We must scan for the new highest active register, since
- it isn't necessarily one less than now: consider
- (a(b)c(d(e)f)g). When group 3 ends, after the f), the
- new highest active register is 1. */
- unsigned char r = *p - 1;
- while (r > 0 && !IS_ACTIVE (reg_info[r]))
- r--;
-
- /* If we end up at register zero, that means that we saved
- the registers as the result of an `on_failure_jump', not
- a `start_memory', and we jumped to past the innermost
- `stop_memory'. For example, in ((.)*) we save
- registers 1 and 2 as a result of the *, but when we pop
- back to the second ), we are at the stop_memory 1.
- Thus, nothing is active. */
- if (r == 0)
- {
- lowest_active_reg = NO_LOWEST_ACTIVE_REG;
- highest_active_reg = NO_HIGHEST_ACTIVE_REG;
- }
- else
- highest_active_reg = r;
- }
-
- /* If just failed to match something this time around with a
- group that's operated on by a repetition operator, try to
- force exit from the ``loop'', and restore the register
- information for this group that we had before trying this
- last match. */
- if ((!MATCHED_SOMETHING (reg_info[*p])
- || (re_opcode_t) p[-3] == start_memory)
- && (p + 2) < pend)
- {
- boolean is_a_jump_n = false;
-
- p1 = p + 2;
- mcnt = 0;
- switch ((re_opcode_t) *p1++)
- {
- case jump_n:
- is_a_jump_n = true;
- case pop_failure_jump:
- case maybe_pop_jump:
- case jump:
- case dummy_failure_jump:
- EXTRACT_NUMBER_AND_INCR (mcnt, p1);
- if (is_a_jump_n)
- p1 += 2;
- break;
-
- default:
- /* do nothing */ ;
- }
- p1 += mcnt;
-
- /* If the next operation is a jump backwards in the pattern
- to an on_failure_jump right before the start_memory
- corresponding to this stop_memory, exit from the loop
- by forcing a failure after pushing on the stack the
- on_failure_jump's jump in the pattern, and d. */
- if (mcnt < 0 && (re_opcode_t) *p1 == on_failure_jump
- && (re_opcode_t) p1[3] == start_memory && p1[4] == *p)
- {
- /* If this group ever matched anything, then restore
- what its registers were before trying this last
- failed match, e.g., with `(a*)*b' against `ab' for
- regstart[1], and, e.g., with `((a*)*(b*)*)*'
- against `aba' for regend[3].
-
- Also restore the registers for inner groups for,
- e.g., `((a*)(b*))*' against `aba' (register 3 would
- otherwise get trashed). */
-
- if (EVER_MATCHED_SOMETHING (reg_info[*p]))
- {
- unsigned r;
-
- EVER_MATCHED_SOMETHING (reg_info[*p]) = 0;
-
- /* Restore this and inner groups' (if any) registers. */
- for (r = *p; r < *p + *(p + 1); r++)
- {
- regstart[r] = old_regstart[r];
-
- /* xx why this test? */
- if ((int) old_regend[r] >= (int) regstart[r])
- regend[r] = old_regend[r];
- }
- }
- p1++;
- EXTRACT_NUMBER_AND_INCR (mcnt, p1);
- /*
- * WARN 191: illegal pointer conversion
- * between CONST and NON-CONST attribute
- */
-# ifdef __TANDEM
-# pragma NOWARN( 191 )
-# endif
- PUSH_FAILURE_POINT (p1 + mcnt, d, -2);
-# ifdef __TANDEM
-# pragma WARN( 191 )
-# endif
-
- goto fail;
- }
- }
-
- /* Move past the register number and the inner group count. */
- p += 2;
- break;
-
-
- /* \<digit> has been turned into a `duplicate' command which is
- followed by the numeric value of <digit> as the register number. */
- case duplicate:
- {
- register const char *d2, *dend2;
- int regno = *p++; /* Get which register to match against. */
- DEBUG_PRINT2 ("EXECUTING duplicate %d.\n", regno);
-
- /* Can't back reference a group which we've never matched. */
- if (REG_UNSET (regstart[regno]) || REG_UNSET (regend[regno]))
- goto fail;
-
- /* Where in input to try to start matching. */
- d2 = regstart[regno];
-
- /* Where to stop matching; if both the place to start and
- the place to stop matching are in the same string, then
- set to the place to stop, otherwise, for now have to use
- the end of the first string. */
-
- dend2 = ((FIRST_STRING_P (regstart[regno])
- == FIRST_STRING_P (regend[regno]))
- ? regend[regno] : end_match_1);
- for (;;)
- {
- /* If necessary, advance to next segment in register
- contents. */
- while (d2 == dend2)
- {
- if (dend2 == end_match_2) break;
- if (dend2 == regend[regno]) break;
-
- /* End of string1 => advance to string2. */
- d2 = string2;
- dend2 = regend[regno];
- }
- /* At end of register contents => success */
- if (d2 == dend2) break;
-
- /* If necessary, advance to next segment in data. */
- PREFETCH ();
-
- /* How many characters left in this segment to match. */
- mcnt = dend - d;
-
- /* Want how many consecutive characters we can match in
- one shot, so, if necessary, adjust the count. */
- if (mcnt > dend2 - d2)
- mcnt = dend2 - d2;
-
- /* Compare that many; failure if mismatch, else move
- past them. */
- if (translate
- ? bcmp_translate (d, d2, mcnt, translate)
- : bcmp (d, d2, mcnt))
- goto fail;
- d += mcnt, d2 += mcnt;
- }
- }
- break;
-
-
- /* begline matches the empty string at the beginning of the string
- (unless `not_bol' is set in `bufp'), and, if
- `newline_anchor' is set, after newlines. */
- case begline:
- DEBUG_PRINT1 ("EXECUTING begline.\n");
-
- if (AT_STRINGS_BEG (d))
- {
- if (!bufp->not_bol) break;
- }
- else if (d[-1] == '\n' && bufp->newline_anchor)
- {
- break;
- }
- /* In all other cases, we fail. */
- goto fail;
-
-
- /* endline is the dual of begline. */
- case endline:
- DEBUG_PRINT1 ("EXECUTING endline.\n");
-
- if (AT_STRINGS_END (d))
- {
- if (!bufp->not_eol) break;
- }
-
- /* We have to ``prefetch'' the next character. */
- else if ((d == end1 ? *string2 : *d) == '\n'
- && bufp->newline_anchor)
- {
- break;
- }
- goto fail;
-
-
- /* Match at the very beginning of the data. */
- case begbuf:
- DEBUG_PRINT1 ("EXECUTING begbuf.\n");
- if (AT_STRINGS_BEG (d))
- break;
- goto fail;
-
-
- /* Match at the very end of the data. */
- case endbuf:
- DEBUG_PRINT1 ("EXECUTING endbuf.\n");
- if (AT_STRINGS_END (d))
- break;
- goto fail;
-
-
- /* on_failure_keep_string_jump is used to optimize `.*\n'. It
- pushes NULL as the value for the string on the stack. Then
- `pop_failure_point' will keep the current value for the
- string, instead of restoring it. To see why, consider
- matching `foo\nbar' against `.*\n'. The .* matches the foo;
- then the . fails against the \n. But the next thing we want
- to do is match the \n against the \n; if we restored the
- string value, we would be back at the foo.
-
- Because this is used only in specific cases, we don't need to
- check all the things that `on_failure_jump' does, to make
- sure the right things get saved on the stack. Hence we don't
- share its code. The only reason to push anything on the
- stack at all is that otherwise we would have to change
- `anychar's code to do something besides goto fail in this
- case; that seems worse than this. */
- case on_failure_keep_string_jump:
- DEBUG_PRINT1 ("EXECUTING on_failure_keep_string_jump");
-
- EXTRACT_NUMBER_AND_INCR (mcnt, p);
- DEBUG_PRINT3 (" %d (to 0x%x):\n", mcnt, p + mcnt);
-
- /*
- * WARN 191: illegal pointer conversion
- * between CONST and NON-CONST attribute
- */
-# ifdef __TANDEM
-# pragma NOWARN( 191 )
-# endif
- PUSH_FAILURE_POINT (p + mcnt, NULL, -2);
-# ifdef __TANDEM
-# pragma WARN( 191 )
-# endif
- break;
-
-
- /* Uses of on_failure_jump:
-
- Each alternative starts with an on_failure_jump that points
- to the beginning of the next alternative. Each alternative
- except the last ends with a jump that in effect jumps past
- the rest of the alternatives. (They really jump to the
- ending jump of the following alternative, because tensioning
- these jumps is a hassle.)
-
- Repeats start with an on_failure_jump that points past both
- the repetition text and either the following jump or
- pop_failure_jump back to this on_failure_jump. */
- case on_failure_jump:
- on_failure:
- DEBUG_PRINT1 ("EXECUTING on_failure_jump");
-
- EXTRACT_NUMBER_AND_INCR (mcnt, p);
- DEBUG_PRINT3 (" %d (to 0x%x)", mcnt, p + mcnt);
-
- /* If this on_failure_jump comes right before a group (i.e.,
- the original * applied to a group), save the information
- for that group and all inner ones, so that if we fail back
- to this point, the group's information will be correct.
- For example, in \(a*\)*\1, we need the preceding group,
- and in \(\(a*\)b*\)\2, we need the inner group. */
-
- /* We can't use `p' to check ahead because we push
- a failure point to `p + mcnt' after we do this. */
- p1 = p;
-
- /* We need to skip no_op's before we look for the
- start_memory in case this on_failure_jump is happening as
- the result of a completed succeed_n, as in \(a\)\{1,3\}b\1
- against aba. */
- while (p1 < pend && (re_opcode_t) *p1 == no_op)
- p1++;
-
- if (p1 < pend && (re_opcode_t) *p1 == start_memory)
- {
- /* We have a new highest active register now. This will
- get reset at the start_memory we are about to get to,
- but we will have saved all the registers relevant to
- this repetition op, as described above. */
- highest_active_reg = *(p1 + 1) + *(p1 + 2);
- if (lowest_active_reg == NO_LOWEST_ACTIVE_REG)
- lowest_active_reg = *(p1 + 1);
- }
-
- DEBUG_PRINT1 (":\n");
- /*
- * WARN 191: illegal pointer conversion
- * between CONST and NON-CONST attribute
- */
-# ifdef __TANDEM
-# pragma NOWARN( 191 )
-# endif
- PUSH_FAILURE_POINT (p + mcnt, d, -2);
-# ifdef __TANDEM
-# pragma WARN( 191 )
-# endif
- break;
-
-
- /* A smart repeat ends with `maybe_pop_jump'.
- We change it to either `pop_failure_jump' or `jump'. */
- case maybe_pop_jump:
- EXTRACT_NUMBER_AND_INCR (mcnt, p);
- DEBUG_PRINT2 ("EXECUTING maybe_pop_jump %d.\n", mcnt);
- {
- register unsigned char *p2 = p;
-
- /* Compare the beginning of the repeat with what in the
- pattern follows its end. If we can establish that there
- is nothing that they would both match, i.e., that we
- would have to backtrack because of (as in, e.g., `a*a')
- then we can change to pop_failure_jump, because we'll
- never have to backtrack.
-
- This is not true in the case of alternatives: in
- `(a|ab)*' we do need to backtrack to the `ab' alternative
- (e.g., if the string was `ab'). But instead of trying to
- detect that here, the alternative has put on a dummy
- failure point which is what we will end up popping. */
-
- /* Skip over open/close-group commands. */
- while (p2 + 2 < pend
- && ((re_opcode_t) *p2 == stop_memory
- || (re_opcode_t) *p2 == start_memory))
- p2 += 3; /* Skip over args, too. */
-
- /* If we're at the end of the pattern, we can change. */
- if (p2 == pend)
- {
- /* Consider what happens when matching ":\(.*\)"
- against ":/". I don't really understand this code
- yet. */
- p[-3] = (unsigned char) pop_failure_jump;
- DEBUG_PRINT1
- (" End of pattern: change to `pop_failure_jump'.\n");
- }
-
- else if ((re_opcode_t) *p2 == exactn
- || (bufp->newline_anchor && (re_opcode_t) *p2 == endline))
- {
- register unsigned char c
- = *p2 == (unsigned char) endline ? '\n' : p2[2];
- p1 = p + mcnt;
-
- /* p1[0] ... p1[2] are the `on_failure_jump' corresponding
- to the `maybe_finalize_jump' of this case. Examine what
- follows. */
- if ((re_opcode_t) p1[3] == exactn && p1[5] != c)
- {
- p[-3] = (unsigned char) pop_failure_jump;
- DEBUG_PRINT3 (" %c != %c => pop_failure_jump.\n",
- c, p1[5]);
- }
-
- else if ((re_opcode_t) p1[3] == charset
- || (re_opcode_t) p1[3] == charset_not)
- {
- int not = (re_opcode_t) p1[3] == charset_not;
-
- if (c < (unsigned char) (p1[4] * BYTEWIDTH)
- && p1[5 + c / BYTEWIDTH] & (1 << (c % BYTEWIDTH)))
- not = !not;
-
- /* `not' is equal to 1 if c would match, which means
- that we can't change to pop_failure_jump. */
- if (!not)
- {
- p[-3] = (unsigned char) pop_failure_jump;
- DEBUG_PRINT1 (" No match => pop_failure_jump.\n");
- }
- }
- }
- }
- p -= 2; /* Point at relative address again. */
- if ((re_opcode_t) p[-1] != pop_failure_jump)
- {
- p[-1] = (unsigned char) jump;
- DEBUG_PRINT1 (" Match => jump.\n");
- goto unconditional_jump;
- }
- /* Note fall through. */
-
-
- /* The end of a simple repeat has a pop_failure_jump back to
- its matching on_failure_jump, where the latter will push a
- failure point. The pop_failure_jump takes off failure
- points put on by this pop_failure_jump's matching
- on_failure_jump; we got through the pattern to here from the
- matching on_failure_jump, so didn't fail. */
- case pop_failure_jump:
- {
- /* We need to pass separate storage for the lowest and
- highest registers, even though we don't care about the
- actual values. Otherwise, we will restore only one
- register from the stack, since lowest will == highest in
- `pop_failure_point'. */
- unsigned dummy_low_reg, dummy_high_reg;
- unsigned char *pdummy;
- const char *sdummy;
-
- DEBUG_PRINT1 ("EXECUTING pop_failure_jump.\n");
- POP_FAILURE_POINT (sdummy, pdummy,
- dummy_low_reg, dummy_high_reg,
- reg_dummy, reg_dummy, reg_info_dummy);
- }
- /* Note fall through. */
-
-
- /* Unconditionally jump (without popping any failure points). */
- case jump:
- unconditional_jump:
- EXTRACT_NUMBER_AND_INCR (mcnt, p); /* Get the amount to jump. */
- DEBUG_PRINT2 ("EXECUTING jump %d ", mcnt);
- p += mcnt; /* Do the jump. */
- DEBUG_PRINT2 ("(to 0x%x).\n", p);
- break;
-
-
- /* We need this opcode so we can detect where alternatives end
- in `group_match_null_string_p' et al. */
- case jump_past_alt:
- DEBUG_PRINT1 ("EXECUTING jump_past_alt.\n");
- goto unconditional_jump;
-
-
- /* Normally, the on_failure_jump pushes a failure point, which
- then gets popped at pop_failure_jump. We will end up at
- pop_failure_jump, also, and with a pattern of, say, `a+', we
- are skipping over the on_failure_jump, so we have to push
- something meaningless for pop_failure_jump to pop. */
- case dummy_failure_jump:
- DEBUG_PRINT1 ("EXECUTING dummy_failure_jump.\n");
- /* It doesn't matter what we push for the string here. What
- the code at `fail' tests is the value for the pattern. */
- /*
- * WARN 191: illegal pointer conversion
- * between CONST and NON-CONST attribute
- */
-# ifdef __TANDEM
-# pragma NOWARN( 191 )
-# endif
- PUSH_FAILURE_POINT (0, 0, -2);
-# ifdef __TANDEM
-# pragma WARN( 191 )
-# endif
- goto unconditional_jump;
-
-
- /* At the end of an alternative, we need to push a dummy failure
- point in case we are followed by a `pop_failure_jump', because
- we don't want the failure point for the alternative to be
- popped. For example, matching `(a|ab)*' against `aab'
- requires that we match the `ab' alternative. */
- case push_dummy_failure:
- DEBUG_PRINT1 ("EXECUTING push_dummy_failure.\n");
- /* See comments just above at `dummy_failure_jump' about the
- two zeroes. */
- /*
- * WARN 191: illegal pointer conversion
- * between CONST and NON-CONST attribute
- */
-# ifdef __TANDEM
-# pragma NOWARN( 191 )
-# endif
- PUSH_FAILURE_POINT (0, 0, -2);
-# ifdef __TANDEM
-# pragma WARN( 191 )
-# endif
- break;
-
- /* Have to succeed matching what follows at least n times.
- After that, handle like `on_failure_jump'. */
- case succeed_n:
- EXTRACT_NUMBER (mcnt, p + 2);
- DEBUG_PRINT2 ("EXECUTING succeed_n %d.\n", mcnt);
-
- assert (mcnt >= 0);
- /* Originally, this is how many times we HAVE to succeed. */
- if (mcnt > 0)
- {
- mcnt--;
- p += 2;
- STORE_NUMBER_AND_INCR (p, mcnt);
- DEBUG_PRINT3 (" Setting 0x%x to %d.\n", p, mcnt);
- }
- else if (mcnt == 0)
- {
- DEBUG_PRINT2 (" Setting two bytes from 0x%x to no_op.\n", p+2);
- p[2] = (unsigned char) no_op;
- p[3] = (unsigned char) no_op;
- goto on_failure;
- }
- break;
-
- case jump_n:
- EXTRACT_NUMBER (mcnt, p + 2);
- DEBUG_PRINT2 ("EXECUTING jump_n %d.\n", mcnt);
-
- /* Originally, this is how many times we CAN jump. */
- if (mcnt)
- {
- mcnt--;
- STORE_NUMBER (p + 2, mcnt);
- goto unconditional_jump;
- }
- /* If don't have to jump any more, skip over the rest of command. */
- else
- p += 4;
- break;
-
- case set_number_at:
- {
- DEBUG_PRINT1 ("EXECUTING set_number_at.\n");
-
- EXTRACT_NUMBER_AND_INCR (mcnt, p);
- p1 = p + mcnt;
- EXTRACT_NUMBER_AND_INCR (mcnt, p);
- DEBUG_PRINT3 (" Setting 0x%x to %d.\n", p1, mcnt);
- STORE_NUMBER (p1, mcnt);
- break;
- }
-
- case wordbound:
- DEBUG_PRINT1 ("EXECUTING wordbound.\n");
- if (AT_WORD_BOUNDARY (d))
- break;
- goto fail;
-
- case notwordbound:
- DEBUG_PRINT1 ("EXECUTING notwordbound.\n");
- if (AT_WORD_BOUNDARY (d))
- goto fail;
- break;
-
- case wordbeg:
- DEBUG_PRINT1 ("EXECUTING wordbeg.\n");
- if (WORDCHAR_P (d) && (AT_STRINGS_BEG (d) || !WORDCHAR_P (d - 1)))
- break;
- goto fail;
-
- case wordend:
- DEBUG_PRINT1 ("EXECUTING wordend.\n");
- if (!AT_STRINGS_BEG (d) && WORDCHAR_P (d - 1)
- && (!WORDCHAR_P (d) || AT_STRINGS_END (d)))
- break;
- goto fail;
-
-#ifdef emacs
-#ifdef emacs19
- case before_dot:
- DEBUG_PRINT1 ("EXECUTING before_dot.\n");
- if (PTR_CHAR_POS ((unsigned char *) d) >= point)
- goto fail;
- break;
-
- case at_dot:
- DEBUG_PRINT1 ("EXECUTING at_dot.\n");
- if (PTR_CHAR_POS ((unsigned char *) d) != point)
- goto fail;
- break;
-
- case after_dot:
- DEBUG_PRINT1 ("EXECUTING after_dot.\n");
- if (PTR_CHAR_POS ((unsigned char *) d) <= point)
- goto fail;
- break;
-#else /* not emacs19 */
- case at_dot:
- DEBUG_PRINT1 ("EXECUTING at_dot.\n");
- if (PTR_CHAR_POS ((unsigned char *) d) + 1 != point)
- goto fail;
- break;
-#endif /* not emacs19 */
-
- case syntaxspec:
- DEBUG_PRINT2 ("EXECUTING syntaxspec %d.\n", mcnt);
- mcnt = *p++;
- goto matchsyntax;
-
- case wordchar:
- DEBUG_PRINT1 ("EXECUTING Emacs wordchar.\n");
- mcnt = (int) Sword;
- matchsyntax:
- PREFETCH ();
- if (SYNTAX (*d++) != (enum syntaxcode) mcnt)
- goto fail;
- SET_REGS_MATCHED ();
- break;
-
- case notsyntaxspec:
- DEBUG_PRINT2 ("EXECUTING notsyntaxspec %d.\n", mcnt);
- mcnt = *p++;
- goto matchnotsyntax;
-
- case notwordchar:
- DEBUG_PRINT1 ("EXECUTING Emacs notwordchar.\n");
- mcnt = (int) Sword;
- matchnotsyntax:
- PREFETCH ();
- if (SYNTAX (*d++) == (enum syntaxcode) mcnt)
- goto fail;
- SET_REGS_MATCHED ();
- break;
-
-#else /* not emacs */
- case wordchar:
- DEBUG_PRINT1 ("EXECUTING non-Emacs wordchar.\n");
- PREFETCH ();
- if (!WORDCHAR_P (d))
- goto fail;
- SET_REGS_MATCHED ();
- d++;
- break;
-
- case notwordchar:
- DEBUG_PRINT1 ("EXECUTING non-Emacs notwordchar.\n");
- PREFETCH ();
- if (WORDCHAR_P (d))
- goto fail;
- SET_REGS_MATCHED ();
- d++;
- break;
-#endif /* not emacs */
-
- default:
- abort ();
- }
- continue; /* Successfully executed one pattern command; keep going. */
-
-
- /* We goto here if a matching operation fails. */
- fail:
- if (!FAIL_STACK_EMPTY ())
- { /* A restart point is known. Restore to that state. */
- DEBUG_PRINT1 ("\nFAIL:\n");
- POP_FAILURE_POINT (d, p,
- lowest_active_reg, highest_active_reg,
- regstart, regend, reg_info);
-
- /* If this failure point is a dummy, try the next one. */
- if (!p)
- goto fail;
-
- /* If we failed to the end of the pattern, don't examine *p. */
- assert (p <= pend);
- if (p < pend)
- {
- boolean is_a_jump_n = false;
-
- /* If failed to a backwards jump that's part of a repetition
- loop, need to pop this failure point and use the next one. */
- switch ((re_opcode_t) *p)
- {
- case jump_n:
- is_a_jump_n = true;
- case maybe_pop_jump:
- case pop_failure_jump:
- case jump:
- p1 = p + 1;
- EXTRACT_NUMBER_AND_INCR (mcnt, p1);
- p1 += mcnt;
-
- if ((is_a_jump_n && (re_opcode_t) *p1 == succeed_n)
- || (!is_a_jump_n
- && (re_opcode_t) *p1 == on_failure_jump))
- goto fail;
- break;
- default:
- /* do nothing */ ;
- }
- }
-
- if (d >= string1 && d <= end1)
- dend = end_match_1;
- }
- else
- break; /* Matching at this starting point really fails. */
- } /* for (;;) */
-
- if (best_regs_set)
- goto restore_best_regs;
-
- FREE_VARIABLES ();
-
- return -1; /* Failure to match. */
-} /* re_match_2 */
-
-/* Subroutine definitions for re_match_2. */
-
-
-/* We are passed P pointing to a register number after a start_memory.
-
- Return true if the pattern up to the corresponding stop_memory can
- match the empty string, and false otherwise.
-
- If we find the matching stop_memory, sets P to point to one past its number.
- Otherwise, sets P to an undefined byte less than or equal to END.
-
- We don't handle duplicates properly (yet). */
-
-static boolean
-group_match_null_string_p (p, end, reg_info)
- unsigned char **p, *end;
- register_info_type *reg_info;
-{
- int mcnt;
- /* Point to after the args to the start_memory. */
- unsigned char *p1 = *p + 2;
-
- while (p1 < end)
- {
- /* Skip over opcodes that can match nothing, and return true or
- false, as appropriate, when we get to one that can't, or to the
- matching stop_memory. */
-
- switch ((re_opcode_t) *p1)
- {
- /* Could be either a loop or a series of alternatives. */
- case on_failure_jump:
- p1++;
- EXTRACT_NUMBER_AND_INCR (mcnt, p1);
-
- /* If the next operation is not a jump backwards in the
- pattern. */
-
- if (mcnt >= 0)
- {
- /* Go through the on_failure_jumps of the alternatives,
- seeing if any of the alternatives cannot match nothing.
- The last alternative starts with only a jump,
- whereas the rest start with on_failure_jump and end
- with a jump, e.g., here is the pattern for `a|b|c':
-
- /on_failure_jump/0/6/exactn/1/a/jump_past_alt/0/6
- /on_failure_jump/0/6/exactn/1/b/jump_past_alt/0/3
- /exactn/1/c
-
- So, we have to first go through the first (n-1)
- alternatives and then deal with the last one separately. */
-
-
- /* Deal with the first (n-1) alternatives, which start
- with an on_failure_jump (see above) that jumps to right
- past a jump_past_alt. */
-
- while ((re_opcode_t) p1[mcnt-3] == jump_past_alt)
- {
- /* `mcnt' holds how many bytes long the alternative
- is, including the ending `jump_past_alt' and
- its number. */
-
- if (!alt_match_null_string_p (p1, p1 + mcnt - 3,
- reg_info))
- return false;
-
- /* Move to right after this alternative, including the
- jump_past_alt. */
- p1 += mcnt;
-
- /* Break if it's the beginning of an n-th alternative
- that doesn't begin with an on_failure_jump. */
- if ((re_opcode_t) *p1 != on_failure_jump)
- break;
-
- /* Still have to check that it's not an n-th
- alternative that starts with an on_failure_jump. */
- p1++;
- EXTRACT_NUMBER_AND_INCR (mcnt, p1);
- if ((re_opcode_t) p1[mcnt-3] != jump_past_alt)
- {
- /* Get to the beginning of the n-th alternative. */
- p1 -= 3;
- break;
- }
- }
-
- /* Deal with the last alternative: go back and get number
- of the `jump_past_alt' just before it. `mcnt' contains
- the length of the alternative. */
- EXTRACT_NUMBER (mcnt, p1 - 2);
-
- if (!alt_match_null_string_p (p1, p1 + mcnt, reg_info))
- return false;
-
- p1 += mcnt; /* Get past the n-th alternative. */
- } /* if mcnt > 0 */
- break;
-
-
- case stop_memory:
- assert (p1[1] == **p);
- *p = p1 + 2;
- return true;
-
-
- default:
- if (!common_op_match_null_string_p (&p1, end, reg_info))
- return false;
- }
- } /* while p1 < end */
-
- return false;
-} /* group_match_null_string_p */
-
-
-/* Similar to group_match_null_string_p, but doesn't deal with alternatives:
- It expects P to be the first byte of a single alternative and END one
- byte past the last. The alternative can contain groups. */
-
-static boolean
-alt_match_null_string_p (p, end, reg_info)
- unsigned char *p, *end;
- register_info_type *reg_info;
-{
- int mcnt;
- unsigned char *p1 = p;
-
- while (p1 < end)
- {
- /* Skip over opcodes that can match nothing, and break when we get
- to one that can't. */
-
- switch ((re_opcode_t) *p1)
- {
- /* It's a loop. */
- case on_failure_jump:
- p1++;
- EXTRACT_NUMBER_AND_INCR (mcnt, p1);
- p1 += mcnt;
- break;
-
- default:
- if (!common_op_match_null_string_p (&p1, end, reg_info))
- return false;
- }
- } /* while p1 < end */
-
- return true;
-} /* alt_match_null_string_p */
-
-
-/* Deals with the ops common to group_match_null_string_p and
- alt_match_null_string_p.
-
- Sets P to one after the op and its arguments, if any. */
-
-static boolean
-common_op_match_null_string_p (p, end, reg_info)
- unsigned char **p, *end;
- register_info_type *reg_info;
-{
- int mcnt;
- boolean ret;
- int reg_no;
- unsigned char *p1 = *p;
-
- switch ((re_opcode_t) *p1++)
- {
- case no_op:
- case begline:
- case endline:
- case begbuf:
- case endbuf:
- case wordbeg:
- case wordend:
- case wordbound:
- case notwordbound:
-#ifdef emacs
- case before_dot:
- case at_dot:
- case after_dot:
-#endif
- break;
-
- case start_memory:
- reg_no = *p1;
- assert (reg_no > 0 && reg_no <= MAX_REGNUM);
- ret = group_match_null_string_p (&p1, end, reg_info);
-
- /* Have to set this here in case we're checking a group which
- contains a group and a back reference to it. */
-
- if (REG_MATCH_NULL_STRING_P (reg_info[reg_no]) == MATCH_NULL_UNSET_VALUE)
- REG_MATCH_NULL_STRING_P (reg_info[reg_no]) = ret;
-
- if (!ret)
- return false;
- break;
-
- /* If this is an optimized succeed_n for zero times, make the jump. */
- case jump:
- EXTRACT_NUMBER_AND_INCR (mcnt, p1);
- if (mcnt >= 0)
- p1 += mcnt;
- else
- return false;
- break;
-
- case succeed_n:
- /* Get to the number of times to succeed. */
- p1 += 2;
- EXTRACT_NUMBER_AND_INCR (mcnt, p1);
-
- if (mcnt == 0)
- {
- p1 -= 4;
- EXTRACT_NUMBER_AND_INCR (mcnt, p1);
- p1 += mcnt;
- }
- else
- return false;
- break;
-
- case duplicate:
- if (!REG_MATCH_NULL_STRING_P (reg_info[*p1]))
- return false;
- break;
-
- case set_number_at:
- p1 += 4;
-
- default:
- /* All other opcodes mean we cannot match the empty string. */
- return false;
- }
-
- *p = p1;
- return true;
-} /* common_op_match_null_string_p */
-
-
-/* Return zero if TRANSLATE[S1] and TRANSLATE[S2] are identical for LEN
- bytes; nonzero otherwise. */
-
-static int
-bcmp_translate (s1, s2, len, translate)
- unsigned char *s1, *s2;
- register int len;
- char *translate;
-{
- register unsigned char *p1 = s1, *p2 = s2;
- while (len)
- {
- if (translate[*p1++] != translate[*p2++]) return 1;
- len--;
- }
- return 0;
-}
-
-/* Entry points for GNU code. */
-
-/* re_compile_pattern is the GNU regular expression compiler: it
- compiles PATTERN (of length SIZE) and puts the result in BUFP.
- Returns 0 if the pattern was valid, otherwise an error string.
-
- Assumes the `allocated' (and perhaps `buffer') and `translate' fields
- are set in BUFP on entry.
-
- We call regex_compile to do the actual compilation. */
-
-const char *
-re_compile_pattern (pattern, length, bufp)
- const char *pattern;
- int length;
- struct re_pattern_buffer *bufp;
-{
- reg_errcode_t ret;
-
- /* GNU code is written to assume at least RE_NREGS registers will be set
- (and at least one extra will be -1). */
- bufp->regs_allocated = REGS_UNALLOCATED;
-
- /* And GNU code determines whether or not to get register information
- by passing null for the REGS argument to re_match, etc., not by
- setting no_sub. */
- bufp->no_sub = 0;
-
- /* Match anchors at newline. */
- bufp->newline_anchor = 1;
-
- ret = regex_compile (pattern, length, re_syntax_options, bufp);
-
- return (ret == 0) ? (const char*)NULL : re_error_msg[(int) ret];
-}
-
-/* Entry points compatible with 4.2 BSD regex library. We don't define
- them if this is an Emacs or POSIX compilation. */
-
-#if !defined (emacs) && !defined (_POSIX_SOURCE)
-
-/* BSD has one and only one pattern buffer. */
-static struct re_pattern_buffer re_comp_buf;
-
-char *
-re_comp (s)
- const char *s;
-{
- reg_errcode_t ret;
-
- if (!s)
- {
- if (!re_comp_buf.buffer)
- return "No previous regular expression";
- return 0;
- }
-
- if (!re_comp_buf.buffer)
- {
- re_comp_buf.buffer = (unsigned char *) malloc (200);
- if (re_comp_buf.buffer == NULL)
- return "Memory exhausted";
- re_comp_buf.allocated = 200;
-
- re_comp_buf.fastmap = (char *) malloc (1 << BYTEWIDTH);
- if (re_comp_buf.fastmap == NULL)
- return "Memory exhausted";
- }
-
- /* Since `re_exec' always passes NULL for the `regs' argument, we
- don't need to initialize the pattern buffer fields which affect it. */
-
- /* Match anchors at newlines. */
- re_comp_buf.newline_anchor = 1;
-
- ret = regex_compile (s, strlen (s), re_syntax_options, &re_comp_buf);
-
- /* Yes, we're discarding `const' here. */
- return (char *) re_error_msg[(int) ret];
-}
-
-
-int
-re_exec (s)
- const char *s;
-{
- const int len = strlen (s);
- return
- 0 <= re_search (&re_comp_buf, s, len, 0, len, (struct re_registers *) 0);
-}
-#endif /* not emacs and not _POSIX_SOURCE */
-
-/* POSIX.2 functions. Don't define these for Emacs. */
-
-#ifndef emacs
-
-/* regcomp takes a regular expression as a string and compiles it.
-
- PREG is a regex_t *. We do not expect any fields to be initialized,
- since POSIX says we shouldn't. Thus, we set
-
- `buffer' to the compiled pattern;
- `used' to the length of the compiled pattern;
- `syntax' to RE_SYNTAX_POSIX_EXTENDED if the
- REG_EXTENDED bit in CFLAGS is set; otherwise, to
- RE_SYNTAX_POSIX_BASIC;
- `newline_anchor' to REG_NEWLINE being set in CFLAGS;
- `fastmap' and `fastmap_accurate' to zero;
- `re_nsub' to the number of subexpressions in PATTERN.
-
- PATTERN is the address of the pattern string.
-
- CFLAGS is a series of bits which affect compilation.
-
- If REG_EXTENDED is set, we use POSIX extended syntax; otherwise, we
- use POSIX basic syntax.
-
- If REG_NEWLINE is set, then . and [^...] don't match newline.
- Also, regexec will try a match beginning after every newline.
-
- If REG_ICASE is set, then we considers upper- and lowercase
- versions of letters to be equivalent when matching.
-
- If REG_NOSUB is set, then when PREG is passed to regexec, that
- routine will report only success or failure, and nothing about the
- registers.
-
- It returns 0 if it succeeds, nonzero if it doesn't. (See regex.h for
- the return codes and their meanings.) */
-
-int
-regcomp (preg, pattern, cflags)
- regex_t *preg;
- const char *pattern;
- int cflags;
-{
- reg_errcode_t ret;
- unsigned syntax
- = (cflags & REG_EXTENDED) ?
- RE_SYNTAX_POSIX_EXTENDED : RE_SYNTAX_POSIX_BASIC;
-
- /* regex_compile will allocate the space for the compiled pattern. */
- preg->buffer = 0;
- preg->allocated = 0;
-
- /* Don't bother to use a fastmap when searching. This simplifies the
- REG_NEWLINE case: if we used a fastmap, we'd have to put all the
- characters after newlines into the fastmap. This way, we just try
- every character. */
- preg->fastmap = 0;
-
- if (cflags & REG_ICASE)
- {
- unsigned i;
-
- preg->translate = (char *) malloc (CHAR_SET_SIZE);
- if (preg->translate == NULL)
- return (int) REG_ESPACE;
-
- /* Map uppercase characters to corresponding lowercase ones. */
- for (i = 0; i < CHAR_SET_SIZE; i++)
- preg->translate[i] = (unsigned char)(ISUPPER (i) ? tolower (i) : i);
- }
- else
- preg->translate = NULL;
-
- /* If REG_NEWLINE is set, newlines are treated differently. */
- if (cflags & REG_NEWLINE)
- { /* REG_NEWLINE implies neither . nor [^...] match newline. */
- syntax &= ~RE_DOT_NEWLINE;
- syntax |= RE_HAT_LISTS_NOT_NEWLINE;
- /* It also changes the matching behavior. */
- preg->newline_anchor = 1;
- }
- else
- preg->newline_anchor = 0;
-
- preg->no_sub = !!(cflags & REG_NOSUB);
-
- /* POSIX says a null character in the pattern terminates it, so we
- can use strlen here in compiling the pattern. */
- ret = regex_compile (pattern, strlen (pattern), syntax, preg);
-
- /* POSIX doesn't distinguish between an unmatched open-group and an
- unmatched close-group: both are REG_EPAREN. */
- if (ret == REG_ERPAREN) ret = REG_EPAREN;
-
- return (int) ret;
-}
-
-
-/* regexec searches for a given pattern, specified by PREG, in the
- string STRING.
-
- If NMATCH is zero or REG_NOSUB was set in the cflags argument to
- `regcomp', we ignore PMATCH. Otherwise, we assume PMATCH has at
- least NMATCH elements, and we set them to the offsets of the
- corresponding matched substrings.
-
- EFLAGS specifies `execution flags' which affect matching: if
- REG_NOTBOL is set, then ^ does not match at the beginning of the
- string; if REG_NOTEOL is set, then $ does not match at the end.
-
- We return 0 if we find a match and REG_NOMATCH if not. */
-
-int
-regexec (preg, string, nmatch, pmatch, eflags)
- const regex_t *preg;
- const char *string;
- size_t nmatch;
- regmatch_t pmatch[];
- int eflags;
-{
- int ret;
- struct re_registers regs;
- regex_t private_preg;
- int len = strlen (string);
- boolean want_reg_info = !preg->no_sub && nmatch > 0;
-
- private_preg = *preg;
-
- private_preg.not_bol = !!(eflags & REG_NOTBOL);
- private_preg.not_eol = !!(eflags & REG_NOTEOL);
-
- /* The user has told us exactly how many registers to return
- information about, via `nmatch'. We have to pass that on to the
- matching routines. */
- private_preg.regs_allocated = REGS_FIXED;
-
- if (want_reg_info)
- {
- regs.num_regs = nmatch;
- regs.start = TALLOC (nmatch, regoff_t);
- regs.end = TALLOC (nmatch, regoff_t);
- if (regs.start == NULL || regs.end == NULL)
- return (int) REG_NOMATCH;
- }
-
- /* Perform the searching operation. */
- ret = re_search (&private_preg, string, len,
- /* start: */ 0, /* range: */ len,
- want_reg_info ? &regs : (struct re_registers *) 0);
-
- /* Copy the register information to the POSIX structure. */
- if (want_reg_info)
- {
- if (ret >= 0)
- {
- unsigned r;
-
- for (r = 0; r < nmatch; r++)
- {
- pmatch[r].rm_so = regs.start[r];
- pmatch[r].rm_eo = regs.end[r];
- }
- }
-
- /* If we needed the temporary register info, free the space now. */
- free (regs.start);
- free (regs.end);
- }
-
- /* We want zero return to mean success, unlike `re_search'. */
- return ret >= 0 ? (int) REG_NOERROR : (int) REG_NOMATCH;
-}
-
-
-/* Returns a message corresponding to an error code, ERRCODE, returned
- from either regcomp or regexec. We don't use PREG here. */
-
-size_t
-regerror (errcode, preg, errbuf, errbuf_size)
- int errcode;
- const regex_t *preg;
- char *errbuf;
- size_t errbuf_size;
-{
-# define _RERR_(n,t) sizeof( t ),
- static const size_t aSizes[] = { REG_ERR_TABLE };
-# undef _RERR_
- const char* msg;
- size_t msg_size;
-
- if ((unsigned)errcode >= (int)REG_ERR_COUNT)
- /* Only error codes returned by the rest of the code should be passed
- to this routine. If we are given anything else, or if other regex
- code generates an invalid error code, then the program has a bug.
- Dump core so we can fix it. */
- abort ();
-
- msg = re_error_msg[ errcode ];
- msg_size = aSizes[ errcode ];
-
- if (msg_size >= errbuf_size)
- {
- strncpy (errbuf, msg, errbuf_size - 1);
- errbuf[errbuf_size - 1] = 0;
- }
- else
- strcpy (errbuf, msg);
-
- return msg_size;
-#ifdef __TANDEM
-/*
- * WARN 93: no reference to identifier "preg"
- */
-#pragma NOWARN( 93 )
-#endif
-}
-#ifdef __TANDEM
-#pragma WARN( 93 )
-#endif
-
-
-/* Free dynamically allocated space used by PREG. */
-
-void
-regfree (preg)
- regex_t *preg;
-{
- if (preg->buffer != NULL)
- free (preg->buffer);
- preg->buffer = NULL;
-
- preg->allocated = 0;
- preg->used = 0;
-
- if (preg->fastmap != NULL)
- free (preg->fastmap);
- preg->fastmap = NULL;
- preg->fastmap_accurate = 0;
-
- if (preg->translate != NULL)
- free (preg->translate);
- preg->translate = NULL;
-}
-
-#endif /* not emacs */
-
-/*
-Local variables:
-make-backup-files: t
-version-control: t
-trim-versions-without-asking: nil
-End:
-*/
diff --git a/contrib/fixinc/regex.h b/contrib/fixinc/regex.h
deleted file mode 100644
index f36d46f2914..00000000000
--- a/contrib/fixinc/regex.h
+++ /dev/null
@@ -1,504 +0,0 @@
-/* Definitions for data structures and routines for the regular
- expression library, version 0.12.
-
- Copyright (C) 1985, 1989, 1990, 1991, 1992, 1993 Free Software Foundation, Inc.
-
- This program is free software; you can 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.
-
- This program 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 this program; if not, write to the Free Software
- Foundation, 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
-
-/* $Id: regex.h,v 1.2 1999/01/11 13:25:48 law Exp $ */
-
-#ifndef __REGEXP_LIBRARY_H__
-#define __REGEXP_LIBRARY_H__
-
-/* POSIX says that <sys/types.h> must be included (by the caller) before
- <regex.h>. */
-
-#ifdef VMS
-/* VMS doesn't have `size_t' in <sys/types.h>, even though POSIX says it
- should be there. */
-#include <stddef.h>
-#endif
-
-
-/* The following bits are used to determine the regexp syntax we
- recognize. The set/not-set meanings are chosen so that Emacs syntax
- remains the value 0. The bits are given in alphabetical order, and
- the definitions shifted by one from the previous bit; thus, when we
- add or remove a bit, only one other definition need change. */
-typedef unsigned reg_syntax_t;
-
-/* If this bit is not set, then \ inside a bracket expression is literal.
- If set, then such a \ quotes the following character. */
-#define RE_BACKSLASH_ESCAPE_IN_LISTS (1)
-
-/* If this bit is not set, then + and ? are operators, and \+ and \? are
- literals.
- If set, then \+ and \? are operators and + and ? are literals. */
-#define RE_BK_PLUS_QM (RE_BACKSLASH_ESCAPE_IN_LISTS << 1)
-
-/* If this bit is set, then character classes are supported. They are:
- [:alpha:], [:upper:], [:lower:], [:digit:], [:alnum:], [:xdigit:],
- [:space:], [:print:], [:punct:], [:graph:], and [:cntrl:].
- If not set, then character classes are not supported. */
-#define RE_CHAR_CLASSES (RE_BK_PLUS_QM << 1)
-
-/* If this bit is set, then ^ and $ are always anchors (outside bracket
- expressions, of course).
- If this bit is not set, then it depends:
- ^ is an anchor if it is at the beginning of a regular
- expression or after an open-group or an alternation operator;
- $ is an anchor if it is at the end of a regular expression, or
- before a close-group or an alternation operator.
-
- This bit could be (re)combined with RE_CONTEXT_INDEP_OPS, because
- POSIX draft 11.2 says that * etc. in leading positions is undefined.
- We already implemented a previous draft which made those constructs
- invalid, though, so we haven't changed the code back. */
-#define RE_CONTEXT_INDEP_ANCHORS (RE_CHAR_CLASSES << 1)
-
-/* If this bit is set, then special characters are always special
- regardless of where they are in the pattern.
- If this bit is not set, then special characters are special only in
- some contexts; otherwise they are ordinary. Specifically,
- * + ? and intervals are only special when not after the beginning,
- open-group, or alternation operator. */
-#define RE_CONTEXT_INDEP_OPS (RE_CONTEXT_INDEP_ANCHORS << 1)
-
-/* If this bit is set, then *, +, ?, and { cannot be first in an re or
- immediately after an alternation or begin-group operator. */
-#define RE_CONTEXT_INVALID_OPS (RE_CONTEXT_INDEP_OPS << 1)
-
-/* If this bit is set, then . matches newline.
- If not set, then it doesn't. */
-#define RE_DOT_NEWLINE (RE_CONTEXT_INVALID_OPS << 1)
-
-/* If this bit is set, then . doesn't match NUL.
- If not set, then it does. */
-#define RE_DOT_NOT_NULL (RE_DOT_NEWLINE << 1)
-
-/* If this bit is set, nonmatching lists [^...] do not match newline.
- If not set, they do. */
-#define RE_HAT_LISTS_NOT_NEWLINE (RE_DOT_NOT_NULL << 1)
-
-/* If this bit is set, either \{...\} or {...} defines an
- interval, depending on RE_NO_BK_BRACES.
- If not set, \{, \}, {, and } are literals. */
-#define RE_INTERVALS (RE_HAT_LISTS_NOT_NEWLINE << 1)
-
-/* If this bit is set, +, ? and | aren't recognized as operators.
- If not set, they are. */
-#define RE_LIMITED_OPS (RE_INTERVALS << 1)
-
-/* If this bit is set, newline is an alternation operator.
- If not set, newline is literal. */
-#define RE_NEWLINE_ALT (RE_LIMITED_OPS << 1)
-
-/* If this bit is set, then `{...}' defines an interval, and \{ and \}
- are literals.
- If not set, then `\{...\}' defines an interval. */
-#define RE_NO_BK_BRACES (RE_NEWLINE_ALT << 1)
-
-/* If this bit is set, (...) defines a group, and \( and \) are literals.
- If not set, \(...\) defines a group, and ( and ) are literals. */
-#define RE_NO_BK_PARENS (RE_NO_BK_BRACES << 1)
-
-/* If this bit is set, then \<digit> matches <digit>.
- If not set, then \<digit> is a back-reference. */
-#define RE_NO_BK_REFS (RE_NO_BK_PARENS << 1)
-
-/* If this bit is set, then | is an alternation operator, and \| is literal.
- If not set, then \| is an alternation operator, and | is literal. */
-#define RE_NO_BK_VBAR (RE_NO_BK_REFS << 1)
-
-/* If this bit is set, then an ending range point collating higher
- than the starting range point, as in [z-a], is invalid.
- If not set, then when ending range point collates higher than the
- starting range point, the range is ignored. */
-#define RE_NO_EMPTY_RANGES (RE_NO_BK_VBAR << 1)
-
-/* If this bit is set, then an unmatched ) is ordinary.
- If not set, then an unmatched ) is invalid. */
-#define RE_UNMATCHED_RIGHT_PAREN_ORD (RE_NO_EMPTY_RANGES << 1)
-
-/* This global variable defines the particular regexp syntax to use (for
- some interfaces). When a regexp is compiled, the syntax used is
- stored in the pattern buffer, so changing this does not affect
- already-compiled regexps. */
-extern reg_syntax_t re_syntax_options;
-
-/* Define combinations of the above bits for the standard possibilities.
- (The [[[ comments delimit what gets put into the Texinfo file, so
- don't delete them!) */
-/* [[[begin syntaxes]]] */
-#define RE_SYNTAX_EMACS 0
-
-#define RE_SYNTAX_AWK \
- (RE_BACKSLASH_ESCAPE_IN_LISTS | RE_DOT_NOT_NULL \
- | RE_NO_BK_PARENS | RE_NO_BK_REFS \
- | RE_NO_BK_VBAR | RE_NO_EMPTY_RANGES \
- | RE_UNMATCHED_RIGHT_PAREN_ORD)
-
-#define RE_SYNTAX_POSIX_AWK \
- (RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS)
-
-#define RE_SYNTAX_GREP \
- (RE_BK_PLUS_QM | RE_CHAR_CLASSES \
- | RE_HAT_LISTS_NOT_NEWLINE | RE_INTERVALS \
- | RE_NEWLINE_ALT)
-
-#define RE_SYNTAX_EGREP \
- (RE_CHAR_CLASSES | RE_CONTEXT_INDEP_ANCHORS \
- | RE_CONTEXT_INDEP_OPS | RE_HAT_LISTS_NOT_NEWLINE \
- | RE_NEWLINE_ALT | RE_NO_BK_PARENS \
- | RE_NO_BK_VBAR)
-
-#define RE_SYNTAX_POSIX_EGREP \
- (RE_SYNTAX_EGREP | RE_INTERVALS | RE_NO_BK_BRACES)
-
-/* P1003.2/D11.2, section 4.20.7.1, lines 5078ff. */
-#define RE_SYNTAX_ED RE_SYNTAX_POSIX_BASIC
-
-#define RE_SYNTAX_SED RE_SYNTAX_POSIX_BASIC
-
-/* Syntax bits common to both basic and extended POSIX regex syntax. */
-#define _RE_SYNTAX_POSIX_COMMON \
- (RE_CHAR_CLASSES | RE_DOT_NEWLINE | RE_DOT_NOT_NULL \
- | RE_INTERVALS | RE_NO_EMPTY_RANGES)
-
-#define RE_SYNTAX_POSIX_BASIC \
- (_RE_SYNTAX_POSIX_COMMON | RE_BK_PLUS_QM)
-
-/* Differs from ..._POSIX_BASIC only in that RE_BK_PLUS_QM becomes
- RE_LIMITED_OPS, i.e., \? \+ \| are not recognized. Actually, this
- isn't minimal, since other operators, such as \`, aren't disabled. */
-#define RE_SYNTAX_POSIX_MINIMAL_BASIC \
- (_RE_SYNTAX_POSIX_COMMON | RE_LIMITED_OPS)
-
-#define RE_SYNTAX_POSIX_EXTENDED \
- (_RE_SYNTAX_POSIX_COMMON | RE_CONTEXT_INDEP_ANCHORS \
- | RE_CONTEXT_INDEP_OPS | RE_NO_BK_BRACES \
- | RE_NO_BK_PARENS | RE_NO_BK_VBAR \
- | RE_UNMATCHED_RIGHT_PAREN_ORD)
-
-/* Differs from ..._POSIX_EXTENDED in that RE_CONTEXT_INVALID_OPS
- replaces RE_CONTEXT_INDEP_OPS and RE_NO_BK_REFS is added. */
-#define RE_SYNTAX_POSIX_MINIMAL_EXTENDED \
- (_RE_SYNTAX_POSIX_COMMON | RE_CONTEXT_INDEP_ANCHORS \
- | RE_CONTEXT_INVALID_OPS | RE_NO_BK_BRACES \
- | RE_NO_BK_PARENS | RE_NO_BK_REFS \
- | RE_NO_BK_VBAR | RE_UNMATCHED_RIGHT_PAREN_ORD)
-/* [[[end syntaxes]]] */
-
-/* Maximum number of duplicates an interval can allow. Some systems
- (erroneously) define this in other header files, but we want our
- value, so remove any previous define. */
-#ifdef RE_DUP_MAX
-#undef RE_DUP_MAX
-#endif
-#define RE_DUP_MAX ((1 << 15) - 1)
-
-
-/* POSIX `cflags' bits (i.e., information for `regcomp'). */
-
-/* If this bit is set, then use extended regular expression syntax.
- If not set, then use basic regular expression syntax. */
-#define REG_EXTENDED 1
-
-/* If this bit is set, then ignore case when matching.
- If not set, then case is significant. */
-#define REG_ICASE (REG_EXTENDED << 1)
-
-/* If this bit is set, then anchors do not match at newline
- characters in the string.
- If not set, then anchors do match at newlines. */
-#define REG_NEWLINE (REG_ICASE << 1)
-
-/* If this bit is set, then report only success or fail in regexec.
- If not set, then returns differ between not matching and errors. */
-#define REG_NOSUB (REG_NEWLINE << 1)
-
-
-/* POSIX `eflags' bits (i.e., information for regexec). */
-
-/* If this bit is set, then the beginning-of-line operator doesn't match
- the beginning of the string (presumably because it's not the
- beginning of a line).
- If not set, then the beginning-of-line operator does match the
- beginning of the string. */
-#define REG_NOTBOL 1
-
-/* Like REG_NOTBOL, except for the end-of-line. */
-#define REG_NOTEOL (1 << 1)
-
-
- /* POSIX doesn't require that we do anything for the 0 case,
- but why not be nice. */
-
-#define REG_ERR_TABLE \
- _RERR_( NOERROR, "Success" ) \
- _RERR_( NOMATCH, "No match" ) \
- /* \
- * POSIX regcomp return error codes. \
- * (In the order listed in the standard.) \
- */ \
- _RERR_( BADPAT, "Invalid regular expression" ) \
- _RERR_( ECOLLATE, "Invalid collation character" ) \
- _RERR_( ECTYPE, "Invalid character class name" ) \
- _RERR_( EESCAPE, "Trailing backslash" ) \
- _RERR_( ESUBREG, "Invalid back reference" ) \
- _RERR_( EBRACK, "Unmatched [ or [^" ) \
- _RERR_( EPAREN, "Unmatched ( or \\(" ) \
- _RERR_( EBRACE, "Unmatched \\{" ) \
- _RERR_( BADBR, "Invalid content of \\{\\}" ) \
- _RERR_( ERANGE, "Invalid range end" ) \
- _RERR_( ESPACE, "Memory exhausted" ) \
- _RERR_( BADRPT, "Invalid preceding regular expression" ) \
- _RERR_( ECHAR, "Invalid multibyte character" ) \
- _RERR_( EBOL, "^ anchor and not BOL" ) \
- _RERR_( EEOL, "$ anchor and not EOL" ) \
- \
- /* \
- * Error codes we've added. \
- */ \
- _RERR_( EEND, "Premature end of regular expression" ) \
- _RERR_( ESIZE, "Regular expression too big" ) \
- _RERR_( ERPAREN, "Unmatched ) or \\)" )
-
-#define _RERR_(n,t) REG_ ## n,
-
-typedef enum { REG_ERR_TABLE REG_ERR_COUNT } reg_errcode_t;
-
-#undef _RERR_
-
-/* This data structure represents a compiled pattern. Before calling
- the pattern compiler, the fields `buffer', `allocated', `fastmap',
- `translate', and `no_sub' can be set. After the pattern has been
- compiled, the `re_nsub' field is available. All other fields are
- private to the regex routines. */
-
-struct re_pattern_buffer
-{
-/* [[[begin pattern_buffer]]] */
- /* Space that holds the compiled pattern. It is declared as
- `unsigned char *' because its elements are
- sometimes used as array indexes. */
- unsigned char *buffer;
-
- /* Number of bytes to which `buffer' points. */
- unsigned long allocated;
-
- /* Number of bytes actually used in `buffer'. */
- unsigned long used;
-
- /* Syntax setting with which the pattern was compiled. */
- reg_syntax_t syntax;
-
- /* Pointer to a fastmap, if any, otherwise zero. re_search uses
- the fastmap, if there is one, to skip over impossible
- starting points for matches. */
- char *fastmap;
-
- /* Either a translate table to apply to all characters before
- comparing them, or zero for no translation. The translation
- is applied to a pattern when it is compiled and to a string
- when it is matched. */
- char *translate;
-
- /* Number of subexpressions found by the compiler. */
- size_t re_nsub;
-
- /* Zero if this pattern cannot match the empty string, one else.
- Well, in truth it's used only in `re_search_2', to see
- whether or not we should use the fastmap, so we don't set
- this absolutely perfectly; see `re_compile_fastmap' (the
- `duplicate' case). */
- unsigned can_be_null : 1;
-
- /* If REGS_UNALLOCATED, allocate space in the `regs' structure
- for `max (RE_NREGS, re_nsub + 1)' groups.
- If REGS_REALLOCATE, reallocate space if necessary.
- If REGS_FIXED, use what's there. */
-#define REGS_UNALLOCATED 0
-#define REGS_REALLOCATE 1
-#define REGS_FIXED 2
- unsigned regs_allocated : 2;
-
- /* Set to zero when `regex_compile' compiles a pattern; set to one
- by `re_compile_fastmap' if it updates the fastmap. */
- unsigned fastmap_accurate : 1;
-
- /* If set, `re_match_2' does not return information about
- subexpressions. */
- unsigned no_sub : 1;
-
- /* If set, a beginning-of-line anchor doesn't match at the
- beginning of the string. */
- unsigned not_bol : 1;
-
- /* Similarly for an end-of-line anchor. */
- unsigned not_eol : 1;
-
- /* If true, an anchor at a newline matches. */
- unsigned newline_anchor : 1;
-
-/* [[[end pattern_buffer]]] */
-};
-
-typedef struct re_pattern_buffer regex_t;
-
-
-/* search.c (search_buffer) in Emacs needs this one opcode value. It is
- defined both in `regex.c' and here. */
-#define RE_EXACTN_VALUE 1
-
-/* Type for byte offsets within the string. POSIX mandates this. */
-typedef int regoff_t;
-
-
-/* This is the structure we store register match data in. See
- regex.texinfo for a full description of what registers match. */
-struct re_registers
-{
- unsigned num_regs;
- regoff_t *start;
- regoff_t *end;
-};
-
-
-/* If `regs_allocated' is REGS_UNALLOCATED in the pattern buffer,
- `re_match_2' returns information about at least this many registers
- the first time a `regs' structure is passed. */
-#ifndef RE_NREGS
-#define RE_NREGS 30
-#endif
-
-
-/* POSIX specification for registers. Aside from the different names than
- `re_registers', POSIX uses an array of structures, instead of a
- structure of arrays. */
-typedef struct
-{
- regoff_t rm_so; /* Byte offset from string's start to substring's start. */
- regoff_t rm_eo; /* Byte offset from string's start to substring's end. */
-} regmatch_t;
-
-/* Declarations for routines. */
-
-/* To avoid duplicating every routine declaration -- once with a
- prototype (if we are ANSI), and once without (if we aren't) -- we
- use the following macro to declare argument types. This
- unfortunately clutters up the declarations a bit, but I think it's
- worth it. */
-
-#if __STDC__
-
-#define _RE_ARGS(args) args
-
-#else /* not __STDC__ */
-
-#define _RE_ARGS(args) ()
-
-#endif /* not __STDC__ */
-
-/* Sets the current default syntax to SYNTAX, and return the old syntax.
- You can also simply assign to the `re_syntax_options' variable. */
-extern reg_syntax_t re_set_syntax _RE_ARGS ((reg_syntax_t syntax));
-
-/* Compile the regular expression PATTERN, with length LENGTH
- and syntax given by the global `re_syntax_options', into the buffer
- BUFFER. Return NULL if successful, and an error string if not. */
-extern const char *re_compile_pattern
- _RE_ARGS ((const char *pattern, int length,
- struct re_pattern_buffer *buffer));
-
-
-/* Compile a fastmap for the compiled pattern in BUFFER; used to
- accelerate searches. Return 0 if successful and -2 if was an
- internal error. */
-extern int re_compile_fastmap _RE_ARGS ((struct re_pattern_buffer *buffer));
-
-
-/* Search in the string STRING (with length LENGTH) for the pattern
- compiled into BUFFER. Start searching at position START, for RANGE
- characters. Return the starting position of the match, -1 for no
- match, or -2 for an internal error. Also return register
- information in REGS (if REGS and BUFFER->no_sub are nonzero). */
-extern int re_search
- _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string,
- int length, int start, int range, struct re_registers *regs));
-
-
-/* Like `re_search', but search in the concatenation of STRING1 and
- STRING2. Also, stop searching at index START + STOP. */
-extern int re_search_2
- _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string1,
- int length1, const char *string2, int length2,
- int start, int range, struct re_registers *regs, int stop));
-
-
-/* Like `re_search', but return how many characters in STRING the regexp
- in BUFFER matched, starting at position START. */
-extern int re_match
- _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string,
- int length, int start, struct re_registers *regs));
-
-
-/* Relates to `re_match' as `re_search_2' relates to `re_search'. */
-extern int re_match_2
- _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string1,
- int length1, const char *string2, int length2,
- int start, struct re_registers *regs, int stop));
-
-
-/* Set REGS to hold NUM_REGS registers, storing them in STARTS and
- ENDS. Subsequent matches using BUFFER and REGS will use this memory
- for recording register information. STARTS and ENDS must be
- allocated with malloc, and must each be at least `NUM_REGS * sizeof
- (regoff_t)' bytes long.
-
- If NUM_REGS == 0, then subsequent matches should allocate their own
- register data.
-
- Unless this function is called, the first search or match using
- PATTERN_BUFFER will allocate its own register data, without
- freeing the old data. */
-extern void re_set_registers
- _RE_ARGS ((struct re_pattern_buffer *buffer, struct re_registers *regs,
- unsigned num_regs, regoff_t *starts, regoff_t *ends));
-
-/* 4.2 bsd compatibility. */
-extern char *re_comp _RE_ARGS ((const char *));
-extern int re_exec _RE_ARGS ((const char *));
-
-/* POSIX compatibility. */
-extern int regcomp _RE_ARGS ((regex_t *preg, const char *pattern, int cflags));
-extern int regexec
- _RE_ARGS ((const regex_t *preg, const char *string, size_t nmatch,
- regmatch_t pmatch[], int eflags));
-extern size_t regerror
- _RE_ARGS ((int errcode, const regex_t *preg, char *errbuf,
- size_t errbuf_size));
-extern void regfree _RE_ARGS ((regex_t *preg));
-
-#endif /* not __REGEXP_LIBRARY_H__ */
-
-/*
-Local variables:
-make-backup-files: t
-version-control: t
-trim-versions-without-asking: nil
-End:
-*/
diff --git a/contrib/fixinc/server.c b/contrib/fixinc/server.c
deleted file mode 100644
index 381897181d0..00000000000
--- a/contrib/fixinc/server.c
+++ /dev/null
@@ -1,464 +0,0 @@
-
-/*
- * $Id: server.c,v 1.2 1998/05/28 09:21:29 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.
- */
-
-#include <fcntl.h>
-#include <errno.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <sys/param.h>
-
-#include "server.h"
-
-#ifdef DEBUG
-#define STATIC
-#else
-#define STATIC static
-#endif
-#ifndef tSCC
-#define tSCC static const char
-#endif
-#ifndef NUL
-#define NUL '\0'
-#endif
-
-STATIC bool readPipeTimeout;
-
-STATIC tpChar defArgs[] =
-{(char *) NULL, "-p", (char *) NULL};
-STATIC tpfPair serverPair =
-{(FILE *) NULL, (FILE *) NULL};
-STATIC pid_t serverId = NULLPROCESS;
-/*
- * Arbitrary text that should not be found in the shell output.
- * It must be a single line and appear verbatim at the start of
- * the terminating output line.
- */
-tSCC zDone[] = "ShElL-OuTpUt-HaS-bEeN-cOmPlEtEd";
-STATIC tpChar pCurDir = (char *) NULL;
-
-/*
- * chainOpen
- *
- * Given an FD for an inferior process to use as stdin,
- * start that process and return a NEW FD that that process
- * will use for its stdout. Requires the argument vector
- * for the new process and, optionally, a pointer to a place
- * to store the child's process id.
- */
-int
-chainOpen (stdinFd, ppArgs, pChild)
- int stdinFd;
- tpChar *ppArgs;
- pid_t *pChild;
-{
- tFdPair stdoutPair =
- {-1, -1};
- pid_t chId;
- char *pzCmd;
-
- /*
- * Create a pipe it will be the child process' stdout,
- * and the parent will read from it.
- */
- if ((pipe ((int *) &stdoutPair) < 0))
- {
- if (pChild != (pid_t *) NULL)
- *pChild = NOPROCESS;
- return -1;
- }
-
- /*
- * If we did not get an arg list, use the default
- */
- if (ppArgs == (tpChar *) NULL)
- ppArgs = defArgs;
-
- /*
- * If the arg list does not have a program,
- * assume the "SHELL" from the environment, or, failing
- * that, then sh. Set argv[0] to whatever we decided on.
- */
- if (pzCmd = *ppArgs,
- (pzCmd == (char *) NULL) || (*pzCmd == '\0'))
- {
-
- pzCmd = getenv ("SHELL");
- if (pzCmd == (char *) NULL)
- pzCmd = "sh";
- }
-#ifdef DEBUG_PRINT
- printf ("START: %s\n", pzCmd);
- {
- int idx = 0;
- while (ppArgs[++idx] != (char *) NULL)
- printf (" ARG %2d: %s\n", idx, ppArgs[idx]);
- }
-#endif
- /*
- * Call fork() and see which process we become
- */
- chId = fork ();
- switch (chId)
- {
- case NOPROCESS: /* parent - error in call */
- close (stdoutPair.readFd);
- close (stdoutPair.writeFd);
- if (pChild != (pid_t *) NULL)
- *pChild = NOPROCESS;
- return -1;
-
- default: /* parent - return opposite FD's */
- if (pChild != (pid_t *) NULL)
- *pChild = chId;
-#ifdef DEBUG_PRINT
- printf ("for pid %d: stdin from %d, stdout to %d\n"
- "for parent: read from %d\n",
- chId, stdinFd, stdoutPair.writeFd, stdoutPair.readFd);
-#endif
- close (stdinFd);
- close (stdoutPair.writeFd);
- return stdoutPair.readFd;
-
- case NULLPROCESS: /* child - continue processing */
- break;
- }
-
- /*
- * Close the pipe end handed back to the parent process
- */
- close (stdoutPair.readFd);
-
- /*
- * Close our current stdin and stdout
- */
- close (STDIN_FILENO);
- close (STDOUT_FILENO);
-
- /*
- * Make the fd passed in the stdin, and the write end of
- * the new pipe become the stdout.
- */
- fcntl (stdoutPair.writeFd, F_DUPFD, STDOUT_FILENO);
- fcntl (stdinFd, F_DUPFD, STDIN_FILENO);
-
- if (*ppArgs == (char *) NULL)
- *ppArgs = pzCmd;
-
- execvp (pzCmd, ppArgs);
- fprintf (stderr, "Error %d: Could not execvp( '%s', ... ): %s\n",
- errno, pzCmd, strerror (errno));
- exit (EXIT_PANIC);
-}
-
-
-/*
- * p2open
- *
- * Given a pointer to an argument vector, start a process and
- * place its stdin and stdout file descriptors into an fd pair
- * structure. The "writeFd" connects to the inferior process
- * stdin, and the "readFd" connects to its stdout. The calling
- * process should write to "writeFd" and read from "readFd".
- * The return value is the process id of the created process.
- */
-pid_t
-p2open (pPair, ppArgs)
- tFdPair *pPair;
- tpChar *ppArgs;
-{
- pid_t chId;
-
- /*
- * Create a bi-directional pipe. Writes on 0 arrive on 1
- * and vice versa, so the parent and child processes will
- * read and write to opposite FD's.
- */
- if (pipe ((int *) pPair) < 0)
- return NOPROCESS;
-
- pPair->readFd = chainOpen (pPair->readFd, ppArgs, &chId);
- if (chId == NOPROCESS)
- close (pPair->writeFd);
-
- return chId;
-}
-
-
-/*
- * p2fopen
- *
- * Identical to "p2open()", except that the "fd"'s are "fdopen(3)"-ed
- * into file pointers instead.
- */
-pid_t
-p2fopen (pfPair, ppArgs)
- tpfPair *pfPair;
- tpChar *ppArgs;
-{
- tFdPair fdPair;
- pid_t chId = p2open (&fdPair, ppArgs);
-
- if (chId == NOPROCESS)
- return chId;
-
- pfPair->pfRead = fdopen (fdPair.readFd, "r");
- pfPair->pfWrite = fdopen (fdPair.writeFd, "w");
- return chId;
-}
-
-
-/*
- * loadData
- *
- * Read data from a file pointer (a pipe to a process in this context)
- * until we either get EOF or we get a marker line back.
- * The read data are stored in a malloc-ed string that is truncated
- * to size at the end. Input is assumed to be an ASCII string.
- */
-STATIC char *
-loadData (fp)
- FILE *fp;
-{
- char *pzText;
- size_t textSize;
- char *pzScan;
- char zLine[1024];
-
- textSize = sizeof (zLine) * 2;
- pzScan = \
- pzText = malloc (textSize);
-
- if (pzText == (char *) NULL)
- return pzText;
-
- for (;;)
- {
- size_t usedCt;
-
- alarm (10);
- readPipeTimeout = BOOL_FALSE;
- if (fgets (zLine, sizeof (zLine), fp) == (char *) NULL)
- break;
-
- if (strncmp (zLine, zDone, sizeof (zDone) - 1) == 0)
- break;
-
- strcpy (pzScan, zLine);
- pzScan += strlen (zLine);
- usedCt = (size_t) (pzScan - pzText);
-
- if (textSize - usedCt < sizeof (zLine))
- {
-
- size_t off = (size_t) (pzScan - pzText);
- void *p;
- textSize += 4096;
- p = realloc ((void *) pzText, textSize);
- if (p == (void *) NULL)
- {
- fprintf (stderr, "Failed to get 0x%08X bytes\n", textSize);
- free ((void *) pzText);
- return (char *) NULL;
- }
-
- pzText = (char *) p;
- pzScan = pzText + off;
- }
- }
-
- alarm (0);
- if (readPipeTimeout)
- {
- free ((void *) pzText);
- return (char *) NULL;
- }
-
- while ((pzScan > pzText) && isspace (pzScan[-1]))
- pzScan--;
- *pzScan = NUL;
- return realloc ((void *) pzText, strlen (pzText) + 1);
-}
-
-
-/*
- * SHELL SERVER PROCESS CODE
- */
-
-#ifdef DONT_HAVE_SIGSEND
-typedef enum
-{
- P_ALL, P_PID, P_GID, P_UID, P_PGID, P_SID, P_CID
-}
-idtype_t;
-typedef long id_t;
-
-STATIC int
-sigsend (idtype, id, sig)
- idtype_t idtype;
- id_t id;
- int sig;
-{
- switch (idtype)
- {
- case P_PID:
- kill ((pid_t) id, sig);
- break;
-
- case P_ALL:
- case P_GID:
- case P_UID:
- case P_PGID:
- case P_SID:
- case P_CID:
- errno = EINVAL;
- return -1;
- /*NOTREACHED */
- }
-
- return 0;
-}
-#endif /* HAVE_SIGSEND */
-
-
-STATIC void
-closeServer ()
-{
- kill( (pid_t) serverId, SIGKILL);
- serverId = NULLPROCESS;
- fclose (serverPair.pfRead);
- fclose (serverPair.pfWrite);
- serverPair.pfRead = serverPair.pfWrite = (FILE *) NULL;
-}
-
-
-struct sigaction savePipeAction;
-struct sigaction saveAlrmAction;
-struct sigaction currentAction;
-
-STATIC void
-sigHandler (signo)
- int signo;
-{
- closeServer ();
- readPipeTimeout = BOOL_TRUE;
-}
-
-
-STATIC void
-serverSetup ()
-{
-#ifndef SA_SIGINFO
-# define SA_SIGINFO 0
-#else
- currentAction.sa_sigaction =
-#endif
- currentAction.sa_handler = sigHandler;
- currentAction.sa_flags = SA_SIGINFO;
- sigemptyset( &currentAction.sa_mask );
-
- sigaction( SIGPIPE, &currentAction, &savePipeAction );
- sigaction( SIGALRM, &currentAction, &saveAlrmAction );
- atexit( &closeServer );
-
- fputs ("trap : INT\n", serverPair.pfWrite);
- fflush (serverPair.pfWrite);
- pCurDir = getcwd ((char *) NULL, MAXPATHLEN + 1);
-}
-
-
-char *
-runShell (pzCmd)
- const char *pzCmd;
-{
- tSCC zNil[] = "";
-
- /*
- * IF the shell server process is not running yet,
- * THEN try to start it.
- */
- if (serverId == NULLPROCESS)
- {
- serverId = p2fopen (&serverPair, defArgs);
- if (serverId > 0)
- serverSetup ();
- }
-
- /*
- * IF it is still not running,
- * THEN return the nil string.
- */
- if (serverId <= 0)
- return (char *) zNil;
-
- /*
- * Make sure the process will pay attention to us,
- * send the supplied command, and then
- * have it output a special marker that we can find.
- */
- fprintf (serverPair.pfWrite, "\\cd %s\n%s\n\necho\necho %s\n",
- pCurDir, pzCmd, zDone);
- fflush (serverPair.pfWrite);
- if (serverId == NULLPROCESS)
- return (char *) NULL;
-
- /*
- * Now try to read back all the data. If we fail due to either
- * a sigpipe or sigalrm (timeout), we will return the nil string.
- */
- {
- char *pz = loadData (serverPair.pfRead);
- if (pz == (char *) NULL)
- {
- fprintf (stderr, "CLOSING SHELL SERVER - command failure:\n\t%s\n",
- pzCmd);
- closeServer ();
- pz = (char *) zNil;
- }
- return pz;
- }
-}
diff --git a/contrib/fixinc/server.h b/contrib/fixinc/server.h
deleted file mode 100644
index c2fd69159d3..00000000000
--- a/contrib/fixinc/server.h
+++ /dev/null
@@ -1,94 +0,0 @@
-
-/*
- * $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 */
OpenPOWER on IntegriCloud