Changeset 3140 for trunk/src/kmk/w32/pathstuff.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)
• w32/pathstuff.c (modified) (5 diffs)

trunk/src/kmk/w32/pathstuff.c

@@ -1 +1 @@
 /* Path conversion for Windows pathnames.
-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.
 
@@ -16 +15 @@
 this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "make.h"
+#include "makeint.h"
 #include <string.h>
 #include <stdlib.h>
@@ -32 +31 @@
     char *etok;            /* token separator for old Path */
 
-        /*
-         * Convert all spaces to delimiters. Note that pathnames which
-         * contain blanks get trounced here. Use 8.3 format as a workaround.
-         */
-        for (etok = Path; etok && *etok; etok++)
-                if (isblank ((unsigned char) *etok))
-                        *etok = to_delim;
-
-        return (convert_Path_to_windows32(Path, to_delim));
+        /*
+         * Convert all spaces to delimiters. Note that pathnames which
+         * contain blanks get trounced here. Use 8.3 format as a workaround.
+         */
+        for (etok = Path; etok && *etok; etok++)
+                if (ISBLANK ((unsigned char) *etok))
+                        *etok = to_delim;
+
+        return (convert_Path_to_windows32(Path, to_delim));
 }
 
@@ -84 +83 @@
                 *etok = to_delim;
                 p = ++etok;
-            } else
+            } else
                 p += strlen(p);
         } else {
@@ -128 +127 @@
 getcwd_fs(char* buf, int len)
 {
-        char *p = getcwd(buf, len);
-
-        if (p) {
-                char *q = w32ify(buf, 0);
-#if 1  /* bird */
+        char *p = getcwd(buf, len);
+
+        if (p) {
+                char *q = w32ify(buf, 0);
+#if 1  /* bird - UPSTREAM? */
                 buf[0] = '\0';
                 strncat(buf, q, len);
 #else  /* !bird */
-                strncpy(buf, q, len);
-#endif /* !bird */
-        }
-
-        return p;
+                strncpy(buf, q, len);
+#endif
+        }
+
+        return p;
 }