X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/b2ca4022ea6c61e10ac87a0a92bb0f998ecf8b48..c33638bb3048e7fa4283b18b7f15c0b3cf44aee4:/src/files.c

diff --git a/src/files.c b/src/files.c
index 3dc9ca5b..939b1731 100644
--- a/src/files.c
+++ b/src/files.c
@@ -43,7 +43,7 @@
 
 #include "getargs.h"
 #include "files.h"
-#include "alloc.h"
+#include "xalloc.h"
 #include "gram.h"
 #include "complain.h"
 
@@ -90,7 +90,7 @@ stringappend (const char *string1, int end1, const char *string2)
   while (*cp1++)
     i++;
 
-  ostring = NEW2 (i + end1 + 1, char);
+  ostring = XCALLOC (char, i + end1 + 1);
 
   cp = ostring;
   cp1 = string1;
@@ -213,7 +213,7 @@ open_files (void)
       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
@@ -232,7 +232,7 @@ open_files (void)
 
       static char FIXED_NAME_BASE[] = "y.y";
 
-      name_base = fixed_outfiles ? FIXED_NAME_BASE : infile;
+      name_base = yacc_flag ? FIXED_NAME_BASE : infile;
 
       /* BASE_LENGTH gets length of NAME_BASE, sans ".y" suffix if any.  */
 
@@ -255,7 +255,7 @@ open_files (void)
 
   finput = xfopen (infile, "r");
 
-  if (!noparserflag)
+  if (!no_parser_flag)
     {
       filename = getenv ("BISON_SIMPLE");
 #ifdef MSDOS
@@ -263,7 +263,7 @@ open_files (void)
       cp = getenv ("INIT");
       if (filename == 0 && cp != NULL)
 	{
-	  filename = xmalloc (strlen (cp) + strlen (PFILE) + 2);
+	  filename = XMALLOC (char, strlen (cp) + strlen (PFILE) + 2);
 	  strcpy (filename, cp);
 	  cp = filename + strlen (filename);
 	  *cp++ = '/';
@@ -273,7 +273,7 @@ open_files (void)
       fparser = xfopen (filename ? filename : PFILE, "r");
     }
 
-  if (verboseflag)
+  if (verbose_flag)
     {
 #ifdef MSDOS
       outfile = stringappend (name_base, short_base_length, ".out");
@@ -285,7 +285,7 @@ open_files (void)
       foutput = xfopen (outfile, "w");
     }
 
-  if (noparserflag)
+  if (no_parser_flag)
     {
       /* use permanent name for actions file */
       actfile = stringappend (name_base, short_base_length, ".act");
@@ -293,32 +293,32 @@ open_files (void)
     }
 
 #ifdef MSDOS
-  if (!noparserflag)
+  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
-  if (!noparserflag)
+  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 */
 
-  if (!noparserflag)
+  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 = xfopen (tmpdefsfile, "w+");
     }
 
 #if !(defined (MSDOS) || (defined(_WIN32) && !defined(__CYGWIN32__)))
-  if (!noparserflag)
+  if (!no_parser_flag)
     unlink (actfile);
   unlink (tmpattrsfile);
   unlink (tmptabfile);
@@ -364,7 +364,7 @@ open_extra_files (void)
 
   xfclose (fparser);
 
-  if (!noparserflag)
+  if (!no_parser_flag)
     {
       filename = (char *) getenv ("BISON_HAIRY");
 #ifdef MSDOS
@@ -372,7 +372,7 @@ open_extra_files (void)
       cp = getenv ("INIT");
       if (filename == 0 && cp != NULL)
 	{
-	  filename = xmalloc (strlen (cp) + strlen (PFILE1) + 2);
+	  filename = XMALLOC (char, strlen (cp) + strlen (PFILE1) + 2);
 	  strcpy (filename, cp);
 	  cp = filename + strlen (filename);
 	  *cp++ = '/';
@@ -417,7 +417,7 @@ done (void)
       xfclose (ftmp);
       xfclose (ftable);
 
-      if (definesflag)
+      if (defines_flag)
 	{
 	  ftmp = xfopen (defsfile, "w");
 	  fflush (fdefines);
@@ -430,7 +430,7 @@ done (void)
     }
 
 #if defined (VMS) & !defined (__VMS_POSIX)
-  if (faction && !noparserflag)
+  if (faction && !no_parser_flag)
     delete (actfile);
   if (fattrs)
     delete (tmpattrsfile);
@@ -442,7 +442,7 @@ done (void)
   sys$exit(SS$_ABORT); */
 #else
 #if (defined (MSDOS) || (defined(_WIN32) && !defined(__CYGWIN32__)))
-  if (actfile && !noparserflag)
+  if (actfile && !no_parser_flag)
     unlink (actfile);
   if (tmpattrsfile)
     unlink (tmpattrsfile);