Changeset 3140 for trunk/src/kmk/vmsify.c

Timestamp:

Mar 14, 2018, 10:28:10 PM (7 years ago)

Author:

bird

Message:

kmk: Merged in changes from GNU make 4.2.1 (2e55f5e4abdc0e38c1d64be703b446695e70b3b6 / ​https://git.savannah.gnu.org/git/make.git).

Location:

trunk/src/kmk

Files:

• . (modified) (1 prop)
• vmsify.c (modified) (7 diffs)

trunk/src/kmk/vmsify.c

@@ -1 +1 @@
 /* vmsify.c -- Module for vms <-> unix file name conversion
-Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+Copyright (C) 1996-2016 Free Software Foundation, Inc.
 This file is part of GNU Make.
 
@@ -23 +22 @@
 #include <string.h>
 #include <ctype.h>
+
+#include "makeint.h"
 
 #if VMS
@@ -139 +140 @@
   reslt[resltlen] = '\0';
 
-  s = malloc (resltlen+1);
-  if (s == 0)
-    return "";
+  s = xmalloc (resltlen+1);
   strcpy (s, reslt);
   return s;
@@ -223 +222 @@
    max 5 version
 */
-#define MAXPATHLEN 512
+/* todo: VMSMAXPATHLEN is defined for ODS2 names: it needs to be adjusted. */
+#define VMSMAXPATHLEN 512
 
   enum namestate nstate;
-  static char vmsname[MAXPATHLEN+1];
+  static char vmsname[VMSMAXPATHLEN+1];
   const char *fptr;
   const char *t;
@@ -404 +404 @@
             if (*fptr == 0)             /* just // */
               {
-                char cwdbuf[MAXPATHLEN+1];
-
-                s1 = getcwd(cwdbuf, MAXPATHLEN);
+                char cwdbuf[VMSMAXPATHLEN+1];
+
+                s1 = getcwd(cwdbuf, VMSMAXPATHLEN);
                 if (s1 == 0)
                   {
@@ -798 +798 @@
             {                                   /* got '..' or '../' */
               char *vp;
-              char cwdbuf[MAXPATHLEN+1];
-
-              vp = getcwd(cwdbuf, MAXPATHLEN);
+              char cwdbuf[VMSMAXPATHLEN+1];
+
+              vp = getcwd(cwdbuf, VMSMAXPATHLEN);
               if (vp == 0)
                 {
@@ -858 +858 @@
             {
               char *vp;
-              char cwdbuf[MAXPATHLEN+1];
-
-              vp = getcwd(cwdbuf, MAXPATHLEN);
+              char cwdbuf[VMSMAXPATHLEN+1];
+
+              vp = getcwd(cwdbuf, VMSMAXPATHLEN);
               if (vp == 0)
                 {