* src/getargs.c (getargs): Don't dump `--help' on unrecognized

[bison.git] / src / files.c

diff --git a/src/files.c b/src/files.c
index f227685eb15bacaaf3f212d0ea82dcc3a44a2d48..939b173147f8e1f1ba38acb79b965b898a395671 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -1,50 +1,51 @@
 /* Open and close files for bison,
 /* Open and close files for bison,

-   Copyright (C) 1984, 1986, 1989, 1992 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.

 
 

-This file is part of Bison, the GNU Compiler Compiler.
+   This file is part of Bison, the GNU Compiler Compiler.

 
 

-Bison 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.
+   Bison 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.

 
 

-Bison 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.
+   Bison 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 Bison; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with Bison; see the file COPYING.  If not, write to the Free
+   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+   02111-1307, USA.  */

 
 
 #include "system.h"
 
 #if defined (VMS) & !defined (__VMS_POSIX)
 
 
 #include "system.h"
 
 #if defined (VMS) & !defined (__VMS_POSIX)

-#include <ssdef.h>
-#define unlink delete
-#ifndef XPFILE
-#define XPFILE "GNU_BISON:[000000]BISON.SIMPLE"
-#endif
-#ifndef XPFILE1
-#define XPFILE1 "GNU_BISON:[000000]BISON.HAIRY"
-#endif
+# include <ssdef.h>
+# define unlink delete
+# ifndef XPFILE
+#  define XPFILE "GNU_BISON:[000000]BISON.SIMPLE"
+# endif
+# ifndef XPFILE1
+#  define XPFILE1 "GNU_BISON:[000000]BISON.HAIRY"
+# endif

 #endif
 
 #if defined (_MSC_VER)
 #endif
 
 #if defined (_MSC_VER)

-#ifndef XPFILE
-#define XPFILE "c:/usr/local/lib/bison.simple"
-#endif
-#ifndef XPFILE1
-#define XPFILE1 "c:/usr/local/lib/bison.hairy"
-#endif
+# ifndef XPFILE
+#  define XPFILE "c:/usr/local/lib/bison.simple"
+# endif
+# ifndef XPFILE1
+#  define XPFILE1 "c:/usr/local/lib/bison.hairy"
+# endif

 #endif
 
 #endif
 

-#include <stdio.h>
+#include "getargs.h"

 #include "files.h"
 #include "files.h"

-#include "alloc.h"
+#include "xalloc.h"

 #include "gram.h"
 #include "gram.h"

+#include "complain.h"

 
 FILE *finput = NULL;
 FILE *foutput = NULL;
 
 FILE *finput = NULL;
 FILE *foutput = NULL;


@@ -59,46 +60,37 @@ FILE *fparser = NULL;
 char *spec_outfile;
 
 char *infile;
 char *spec_outfile;
 
 char *infile;

-char *outfile;
-char *defsfile;
-char *tabfile;

 char *attrsfile;
 char *attrsfile;

-char *guardfile;
-char *actfile;
-char *tmpattrsfile;
-char *tmptabfile;
-char *tmpdefsfile;

 
 

-extern int noparserflag;
+static char *outfile;
+static char *defsfile;
+static char *tabfile;
+static char *guardfile;
+static char *actfile;
+static char *tmpattrsfile;
+static char *tmptabfile;
+static char *tmpdefsfile;

 
 

-extern char    *mktemp();      /* So the compiler won't complain */
-extern char    *getenv();
-extern void    perror();
-
-char *stringappend PARAMS((char *, int, char *));
-void openfiles PARAMS((void));
-void open_extra_files PARAMS((void));
-FILE *tryopen PARAMS((char *, char *));        /* This might be a good idea */
-int tryclose PARAMS((FILE *));
-void done PARAMS((int));
+extern char *mktemp ();                /* So the compiler won't complain */
+extern char *getenv ();

 
 extern char *program_name;
 
 extern char *program_name;

-extern int verboseflag;
-extern int definesflag;
-int fixed_outfiles = 0;

 \f
 
 \f
 

-char *
-stringappend (char *string1, int end1, char *string2)
+static char *
+stringappend (const char *string1, int end1, const char *string2)

 {
   register char *ostring;
 {
   register char *ostring;

-  register char *cp, *cp1;
+  register char *cp;
+  register const char *cp1;

   register int i;
 
   register int i;
 

-  cp = string2;  i = 0;
-  while (*cp++) i++;
+  cp1 = string2;
+  i = 0;
+  while (*cp1++)
+    i++;

 
 

-  ostring = NEW2(i+end1+1, char);
+  ostring = XCALLOC (char, i + end1 + 1);

 
   cp = ostring;
   cp1 = string1;
 
   cp = ostring;
   cp1 = string1;


@@ -112,11 +104,46 @@ stringappend (char *string1, int end1, char *string2)
   return ostring;
 }
 
   return ostring;
 }
 

+/*-----------------------------------------------------------------.
+| Try to open file NAME with mode MODE, and print an error message |
+| if fails.                                                        |
+`-----------------------------------------------------------------*/
+
+static FILE *
+xfopen (const char *name, const char *mode)
+{
+  FILE *ptr;
+
+  ptr = fopen (name, mode);
+  if (!ptr)
+    error (2, errno, _("cannot open file `%s'"), name);
+
+  return ptr;
+}

 
 

+/*-------------------------------------------------------------.
+| Try to close file PTR, and print an error message if fails.  |
+`-------------------------------------------------------------*/
+
+static int
+xfclose (FILE *ptr)
+{
+  int result;
+
+  if (ptr == NULL)
+    return 0;
+
+  result = fclose (ptr);
+  if (result == EOF)
+    error (2, errno, _("cannot close file"));
+
+  return result;
+}
+\f

 /* JF this has been hacked to death.  Nowaday it sets up the file names for
    the output files, and opens the tmp files and the parser */
 void
 /* JF this has been hacked to death.  Nowaday it sets up the file names for
    the output files, and opens the tmp files and the parser */
 void

-openfiles (void)
+open_files (void)

 {
   char *name_base;
 #ifdef MSDOS
 {
   char *name_base;
 #ifdef MSDOS


@@ -127,9 +154,9 @@ openfiles (void)
   int short_base_length;
 
 #if defined (VMS) & !defined (__VMS_POSIX)
   int short_base_length;
 
 #if defined (VMS) & !defined (__VMS_POSIX)

-  char *tmp_base = "sys$scratch:b_";
+  const char *tmp_base = "sys$scratch:b_";

 #else
 #else

-  char *tmp_base = "/tmp/b.";
+  const char *tmp_base = "/tmp/b.";

 #endif
   int tmp_len;
 
 #endif
   int tmp_len;
 


@@ -141,29 +168,29 @@ openfiles (void)
 #endif /* MSDOS */
 
 #if (defined(_WIN32) && !defined(__CYGWIN32__))
 #endif /* MSDOS */
 
 #if (defined(_WIN32) && !defined(__CYGWIN32__))

-  tmp_base = getenv ("TEMP");          /* Windows95 defines this ... */
+  tmp_base = getenv ("TEMP");  /* Windows95 defines this ... */

   if (tmp_base == 0)
   if (tmp_base == 0)

-    tmp_base = getenv ("Temp");                /* ... while NT prefers this */
+    tmp_base = getenv ("Temp");        /* ... while NT prefers this */

   if (tmp_base == 0)
     tmp_base = "";
   strlwr (infile);
 #endif /* _WIN32 && !__CYGWIN32__ */
 
   if (tmp_base == 0)
     tmp_base = "";
   strlwr (infile);
 #endif /* _WIN32 && !__CYGWIN32__ */
 

-#if (defined(unix) || defined(__unix) || defined(__unix__))
+#if (defined(unix) || defined(__unix) || defined(__unix__) || defined(__EMX__))

   {
   {

-    char *tmp_ptr = getenv("TMPDIR");
+    char *tmp_ptr = getenv ("TMPDIR");

 
     if (tmp_ptr != 0)
       tmp_base = stringappend (tmp_ptr, strlen (tmp_ptr), "/b.");
   }
 
     if (tmp_ptr != 0)
       tmp_base = stringappend (tmp_ptr, strlen (tmp_ptr), "/b.");
   }

-#endif  /* unix || __unix || __unix__ */
+#endif /* unix || __unix || __unix__ */

 
   tmp_len = strlen (tmp_base);
 
   if (spec_outfile)
     {
       /* -o was specified.  The precise -o name will be used for ftable.
 
   tmp_len = strlen (tmp_base);
 
   if (spec_outfile)
     {
       /* -o was specified.  The precise -o name will be used for ftable.

-        For other output files, remove the ".c" or ".tab.c" suffix.  */
+         For other output files, remove the ".c" or ".tab.c" suffix.  */

       name_base = spec_outfile;
 #ifdef MSDOS
       strlwr (name_base);
       name_base = spec_outfile;
 #ifdef MSDOS
       strlwr (name_base);


@@ -186,7 +213,7 @@ openfiles (void)
       short_base_length = strlen (spec_file_prefix);
       /* Count room for `.tab'.  */
       base_length = short_base_length + 4;
       short_base_length = strlen (spec_file_prefix);
       /* Count room for `.tab'.  */
       base_length = short_base_length + 4;

-      name_base = (char *) xmalloc (base_length + 1);
+      name_base = XMALLOC (char, base_length + 1);

       /* Append `.tab'.  */
       strcpy (name_base, spec_file_prefix);
 #ifdef VMS
       /* Append `.tab'.  */
       strcpy (name_base, spec_file_prefix);
 #ifdef VMS


@@ -201,9 +228,11 @@ openfiles (void)
   else
     {
       /* -o was not specified; compute output file name from input
   else
     {
       /* -o was not specified; compute output file name from input

-        or use y.tab.c, etc., if -y was specified.  */
+         or use y.tab.c, etc., if -y was specified.  */
+
+      static char FIXED_NAME_BASE[] = "y.y";

 
 

-      name_base = fixed_outfiles ? "y.y" : infile;
+      name_base = yacc_flag ? FIXED_NAME_BASE : infile;

 
       /* BASE_LENGTH gets length of NAME_BASE, sans ".y" suffix if any.  */
 
 
       /* BASE_LENGTH gets length of NAME_BASE, sans ".y" suffix if any.  */
 


@@ -213,113 +242,115 @@ openfiles (void)
       short_base_length = base_length;
 
 #ifdef VMS
       short_base_length = base_length;
 
 #ifdef VMS

-      name_base = stringappend(name_base, short_base_length, "_tab");
+      name_base = stringappend (name_base, short_base_length, "_tab");

 #else
 #ifdef MSDOS
 #else
 #ifdef MSDOS

-      name_base = stringappend(name_base, short_base_length, "_tab");
+      name_base = stringappend (name_base, short_base_length, "_tab");

 #else
 #else

-      name_base = stringappend(name_base, short_base_length, ".tab");
+      name_base = stringappend (name_base, short_base_length, ".tab");

 #endif /* not MSDOS */
 #endif
       base_length = short_base_length + 4;
     }
 
 #endif /* not MSDOS */
 #endif
       base_length = short_base_length + 4;
     }
 

-  finput = tryopen(infile, "r");
+  finput = xfopen (infile, "r");

 
 

-  if (! noparserflag) 
+  if (!no_parser_flag)

     {
     {

-      filename = getenv("BISON_SIMPLE");
+      filename = getenv ("BISON_SIMPLE");

 #ifdef MSDOS
       /* File doesn't exist in current directory; try in INIT directory.  */
 #ifdef MSDOS
       /* File doesn't exist in current directory; try in INIT directory.  */

-      cp = getenv("INIT");
+      cp = getenv ("INIT");

       if (filename == 0 && cp != NULL)
       if (filename == 0 && cp != NULL)

-        {
-          filename = xmalloc(strlen(cp) + strlen(PFILE) + 2);
-          strcpy(filename, cp);
-          cp = filename + strlen(filename);
-          *cp++ = '/';
-          strcpy(cp, PFILE);
-        }
+       {
+         filename = XMALLOC (char, strlen (cp) + strlen (PFILE) + 2);
+         strcpy (filename, cp);
+         cp = filename + strlen (filename);
+         *cp++ = '/';
+         strcpy (cp, PFILE);
+       }

 #endif /* MSDOS */
 #endif /* MSDOS */

-      fparser = tryopen(filename ? filename : PFILE, "r");
+      fparser = xfopen (filename ? filename : PFILE, "r");

     }
 
     }
 

-  if (verboseflag)
+  if (verbose_flag)

     {
 #ifdef MSDOS
     {
 #ifdef MSDOS

-      outfile = stringappend(name_base, short_base_length, ".out");
+      outfile = stringappend (name_base, short_base_length, ".out");

 #else
       /* We used to use just .out if spec_name_prefix (-p) was used,
 #else
       /* We used to use just .out if spec_name_prefix (-p) was used,

-        but that conflicts with Posix.  */
-      outfile = stringappend(name_base, short_base_length, ".output");
+         but that conflicts with Posix.  */
+      outfile = stringappend (name_base, short_base_length, ".output");

 #endif
 #endif

-      foutput = tryopen(outfile, "w");
+      foutput = xfopen (outfile, "w");

     }
 
     }
 

-  if (noparserflag)
+  if (no_parser_flag)

     {
       /* use permanent name for actions file */
     {
       /* use permanent name for actions file */

-      actfile = stringappend(name_base, short_base_length, ".act");
-      faction = tryopen(actfile, "w");
-    } 
+      actfile = stringappend (name_base, short_base_length, ".act");
+      faction = xfopen (actfile, "w");
+    }

 
 #ifdef MSDOS
 
 #ifdef MSDOS

-  if (! noparserflag)
-    actfile = mktemp(stringappend(tmp_base, tmp_len, "acXXXXXX"));
-  tmpattrsfile = mktemp(stringappend(tmp_base, tmp_len, "atXXXXXX"));
-  tmptabfile = mktemp(stringappend(tmp_base, tmp_len, "taXXXXXX"));
-  tmpdefsfile = mktemp(stringappend(tmp_base, tmp_len, "deXXXXXX"));
+  if (!no_parser_flag)
+    actfile = mktemp (stringappend (tmp_base, tmp_len, "acXXXXXX"));
+  tmpattrsfile = mktemp (stringappend (tmp_base, tmp_len, "atXXXXXX"));
+  tmptabfile = mktemp (stringappend (tmp_base, tmp_len, "taXXXXXX"));
+  tmpdefsfile = mktemp (stringappend (tmp_base, tmp_len, "deXXXXXX"));

 #else
 #else

-  if (! noparserflag)
-    actfile = mktemp(stringappend(tmp_base, tmp_len, "act.XXXXXX"));
-  tmpattrsfile = mktemp(stringappend(tmp_base, tmp_len, "attrs.XXXXXX"));
-  tmptabfile = mktemp(stringappend(tmp_base, tmp_len, "tab.XXXXXX"));
-  tmpdefsfile = mktemp(stringappend(tmp_base, tmp_len, "defs.XXXXXX"));
+  if (!no_parser_flag)
+    actfile = mktemp (stringappend (tmp_base, tmp_len, "act.XXXXXX"));
+  tmpattrsfile = mktemp (stringappend (tmp_base, tmp_len, "attrs.XXXXXX"));
+  tmptabfile = mktemp (stringappend (tmp_base, tmp_len, "tab.XXXXXX"));
+  tmpdefsfile = mktemp (stringappend (tmp_base, tmp_len, "defs.XXXXXX"));

 #endif /* not MSDOS */
 
 #endif /* not MSDOS */
 

-  if (! noparserflag)
-    faction = tryopen(actfile, "w+");
-  fattrs = tryopen(tmpattrsfile,"w+");
-  ftable = tryopen(tmptabfile, "w+");
+  if (!no_parser_flag)
+    faction = xfopen (actfile, "w+");
+  fattrs = xfopen (tmpattrsfile, "w+");
+  ftable = xfopen (tmptabfile, "w+");

 
 

-  if (definesflag)
+  if (defines_flag)

     {
     {

-      defsfile = stringappend(name_base, base_length, ".h");
-      fdefines = tryopen(tmpdefsfile, "w+");
+      defsfile = stringappend (name_base, base_length, ".h");
+      fdefines = xfopen (tmpdefsfile, "w+");

     }
 
 #if !(defined (MSDOS) || (defined(_WIN32) && !defined(__CYGWIN32__)))
     }
 
 #if !(defined (MSDOS) || (defined(_WIN32) && !defined(__CYGWIN32__)))

-  if (! noparserflag)
-    unlink(actfile);
-  unlink(tmpattrsfile);
-  unlink(tmptabfile);
-  unlink(tmpdefsfile);
+  if (!no_parser_flag)
+    unlink (actfile);
+  unlink (tmpattrsfile);
+  unlink (tmptabfile);
+  unlink (tmpdefsfile);

 #endif /* MSDOS || (_WIN32 && !__CYGWIN32__) */
 
 #endif /* MSDOS || (_WIN32 && !__CYGWIN32__) */
 

-       /* These are opened by `done' or `open_extra_files', if at all */
+  /* These are opened by `done' or `open_extra_files', if at all */

   if (spec_outfile)
     tabfile = spec_outfile;
   else
   if (spec_outfile)
     tabfile = spec_outfile;
   else

-    tabfile = stringappend(name_base, base_length, ".c");
+    tabfile = stringappend (name_base, base_length, ".c");

 
 #ifdef VMS
 
 #ifdef VMS

-  attrsfile = stringappend(name_base, short_base_length, "_stype.h");
-  guardfile = stringappend(name_base, short_base_length, "_guard.c");
+  attrsfile = stringappend (name_base, short_base_length, "_stype.h");
+  guardfile = stringappend (name_base, short_base_length, "_guard.c");

 #else
 #ifdef MSDOS
 #else
 #ifdef MSDOS

-  attrsfile = stringappend(name_base, short_base_length, ".sth");
-  guardfile = stringappend(name_base, short_base_length, ".guc");
+  attrsfile = stringappend (name_base, short_base_length, ".sth");
+  guardfile = stringappend (name_base, short_base_length, ".guc");

 #else
 #else

-  attrsfile = stringappend(name_base, short_base_length, ".stype.h");
-  guardfile = stringappend(name_base, short_base_length, ".guard.c");
+  attrsfile = stringappend (name_base, short_base_length, ".stype.h");
+  guardfile = stringappend (name_base, short_base_length, ".guard.c");

 #endif /* not MSDOS */
 #endif /* not VMS */
 }
 
 
 
 #endif /* not MSDOS */
 #endif /* not VMS */
 }
 
 
 

-/* open the output files needed only for the semantic parser.
-This is done when %semantic_parser is seen in the declarations section.  */
+/*--------------------------------------------------------------------.
+| Open the output files needed only for the semantic parser.  This    |
+| is done when %semantic_parser is seen in the declarations section.  |
+`--------------------------------------------------------------------*/

 
 void
 open_extra_files (void)
 
 void
 open_extra_files (void)


@@ -331,124 +362,96 @@ open_extra_files (void)
   char *cp;
 #endif
 
   char *cp;
 #endif
 

-  tryclose(fparser);
+  xfclose (fparser);

 
 

-  if (! noparserflag) 
+  if (!no_parser_flag)

     {
       filename = (char *) getenv ("BISON_HAIRY");
 #ifdef MSDOS
       /* File doesn't exist in current directory; try in INIT directory.  */
     {
       filename = (char *) getenv ("BISON_HAIRY");
 #ifdef MSDOS
       /* File doesn't exist in current directory; try in INIT directory.  */

-      cp = getenv("INIT");
+      cp = getenv ("INIT");

       if (filename == 0 && cp != NULL)
       if (filename == 0 && cp != NULL)

-        {
-          filename = xmalloc(strlen(cp) + strlen(PFILE1) + 2);
-          strcpy(filename, cp);
-          cp = filename + strlen(filename);
-          *cp++ = '/';
-          strcpy(cp, PFILE1);
-        }
+       {
+         filename = XMALLOC (char, strlen (cp) + strlen (PFILE1) + 2);
+         strcpy (filename, cp);
+         cp = filename + strlen (filename);
+         *cp++ = '/';
+         strcpy (cp, PFILE1);
+       }

 #endif
 #endif

-      fparser= tryopen(filename ? filename : PFILE1, "r");
-    }
-
-               /* JF change from inline attrs file to separate one */
-  ftmp = tryopen(attrsfile, "w");
-  rewind(fattrs);
-  while((c=getc(fattrs))!=EOF) /* Thank god for buffering */
-    putc(c,ftmp);
-  tryclose(fattrs);
-  fattrs=ftmp;
-
-  fguard = tryopen(guardfile, "w");
-
-}
-
-       /* JF to make file opening easier.  This func tries to open file
-          NAME with mode MODE, and prints an error message if it fails. */
-FILE *
-tryopen (char *name, char *mode)
-{
-  FILE *ptr;
-
-  ptr = fopen(name, mode);
-  if (ptr == NULL)
-    {
-      fprintf(stderr, "%s: ", program_name);
-      perror(name);
-      done(2);
+      fparser = xfopen (filename ? filename : PFILE1, "r");

     }
     }

-  return ptr;
-}

 
 

-int
-tryclose (FILE *ptr)
-{
-  int result;
+  /* JF change from inline attrs file to separate one */
+  ftmp = xfopen (attrsfile, "w");
+  rewind (fattrs);
+  while ((c = getc (fattrs)) != EOF)   /* Thank god for buffering */
+    putc (c, ftmp);
+  xfclose (fattrs);
+  fattrs = ftmp;

 
 

-  if (ptr == NULL)
-    return 0;
+  fguard = xfopen (guardfile, "w");

 
 

-  result = fclose (ptr);
-  if (result == EOF)
-    {
-      fprintf (stderr, "%s: ", program_name);
-      perror ("fclose");
-      done (2);
-    }
-  return result;

 }
 
 void
 }
 
 void

-done (int k)
+done (void)

 {
 {

-  tryclose(faction);
-  tryclose(fattrs);
-  tryclose(fguard);
-  tryclose(finput);
-  tryclose(fparser);
-  tryclose(foutput);
-
-       /* JF write out the output file */
-  if (k == 0 && ftable)
+  xfclose (faction);
+  xfclose (fattrs);
+  xfclose (fguard);
+  xfclose (finput);
+  xfclose (fparser);
+  xfclose (foutput);
+
+  /* JF write out the output file */
+  if (!complain_message_count && ftable)

     {
       FILE *ftmp;
       register int c;
 
     {
       FILE *ftmp;
       register int c;
 

-      ftmp=tryopen(tabfile, "w");
-      rewind(ftable);
-      while((c=getc(ftable)) != EOF)
-        putc(c,ftmp);
-      tryclose(ftmp);
-      tryclose(ftable);
-
-      if (definesflag)
-        {
-          ftmp = tryopen(defsfile, "w");
-          fflush(fdefines);
-          rewind(fdefines);
-          while((c=getc(fdefines)) != EOF)
-            putc(c,ftmp);
-          tryclose(ftmp);
-          tryclose(fdefines);
-        }
+      ftmp = xfopen (tabfile, "w");
+      rewind (ftable);
+      while ((c = getc (ftable)) != EOF)
+       putc (c, ftmp);
+      xfclose (ftmp);
+      xfclose (ftable);
+
+      if (defines_flag)
+       {
+         ftmp = xfopen (defsfile, "w");
+         fflush (fdefines);
+         rewind (fdefines);
+         while ((c = getc (fdefines)) != EOF)
+           putc (c, ftmp);
+         xfclose (ftmp);
+         xfclose (fdefines);
+       }

     }
 
 #if defined (VMS) & !defined (__VMS_POSIX)
     }
 
 #if defined (VMS) & !defined (__VMS_POSIX)

-  if (faction && ! noparserflag)
-    delete(actfile);
+  if (faction && !no_parser_flag)
+    delete (actfile);

   if (fattrs)
   if (fattrs)

-    delete(tmpattrsfile);
+    delete (tmpattrsfile);

   if (ftable)
   if (ftable)

-    delete(tmptabfile);
-  if (k==0) sys$exit(SS$_NORMAL);
-  sys$exit(SS$_ABORT);
+    delete (tmptabfile);
+/* Don't call exit again, we're in atexit ().
+  if (!complain_message_count)
+    sys$exit(SS$_NORMAL);
+  sys$exit(SS$_ABORT); */

 #else
 #if (defined (MSDOS) || (defined(_WIN32) && !defined(__CYGWIN32__)))
 #else
 #if (defined (MSDOS) || (defined(_WIN32) && !defined(__CYGWIN32__)))

-  if (actfile && ! noparserflag) unlink(actfile);
-  if (tmpattrsfile) unlink(tmpattrsfile);
-  if (tmptabfile) unlink(tmptabfile);
-  if (tmpdefsfile) unlink(tmpdefsfile);
+  if (actfile && !no_parser_flag)
+    unlink (actfile);
+  if (tmpattrsfile)
+    unlink (tmpattrsfile);
+  if (tmptabfile)
+    unlink (tmptabfile);
+  if (tmpdefsfile)
+    unlink (tmpdefsfile);

 #endif /* MSDOS || (_WIN32 && !__CYGWIN32__) */
 #endif /* MSDOS || (_WIN32 && !__CYGWIN32__) */

-  exit(k);
+/* Don't call exit again, we're in atexit ().
+  exit (complain_message_count ? 1 : 0); */

 #endif /* not VMS, or __VMS_POSIX */
 }
 #endif /* not VMS, or __VMS_POSIX */
 }