Version now 1.24.

[bison.git] / src / files.c

diff --git a/src/files.c b/src/files.c
index 00342429f4602efb0eddbdd683ba13e9fbdf77ed..020111f51038c99159c8bac64d7823b1f3867746 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -18,7 +18,7 @@ along with Bison; see the file COPYING.  If not, write to
 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 
-#ifdef VMS
+#if defined (VMS) & !defined (__VMS_POSIX)
 #include <ssdef.h>
 #define unlink delete
 #ifndef XPFILE
@@ -108,7 +108,7 @@ openfiles()
   int base_length;
   int short_base_length;
 
-#ifdef VMS
+#if defined (VMS) & !defined (__VMS_POSIX)
   char *tmp_base = "sys$scratch:b_";
 #else
   char *tmp_base = "/tmp/b.";
@@ -150,7 +150,7 @@ openfiles()
       short_base_length = strlen (spec_file_prefix);
       /* Count room for `.tab'.  */
       base_length = short_base_length + 4;
-      name_base = (char *) mallocate (base_length + 1);
+      name_base = (char *) xmalloc (base_length + 1);
       /* Append `.tab'.  */
       strcpy (name_base, spec_file_prefix);
 #ifdef VMS
@@ -194,9 +194,9 @@ openfiles()
 #ifdef MSDOS
   /* File doesn't exist in current directory; try in INIT directory.  */
   cp = getenv("INIT");
-  if (filename == 0 && cp != 0)
+  if (filename == 0 && cp != NULL)
     {
-      filename = malloc(strlen(cp) + strlen(PFILE) + 2);
+      filename = xmalloc(strlen(cp) + strlen(PFILE) + 2);
       strcpy(filename, cp);
       cp = filename + strlen(filename);
       *cp++ = '/';
@@ -284,9 +284,9 @@ open_extra_files()
 #ifdef MSDOS
   /* File doesn't exist in current directory; try in INIT directory.  */
   cp = getenv("INIT");
-  if (filename == 0 && cp != 0)
+  if (filename == 0 && cp != NULL)
     {
-      filename = malloc(strlen(cp) + strlen(PFILE1) + 2);
+      filename = xmalloc(strlen(cp) + strlen(PFILE1) + 2);
       strcpy(filename, cp);
       cp = filename + strlen(filename);
       *cp++ = '/';
@@ -373,7 +373,7 @@ int k;
         }
     }
 
-#ifdef VMS
+#if defined (VMS) & !defined (__VMS_POSIX)
   if (faction)
     delete(actfile);
   if (fattrs)
@@ -390,5 +390,5 @@ int k;
   if (tmpdefsfile) unlink(tmpdefsfile);
 #endif /* MSDOS */
   exit(k);
-#endif /* not VMS */
+#endif /* not VMS, or __VMS_POSIX */
 }