Changeset 3140 for trunk/src/kmk/w32/subproc/misc.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/subproc/misc.c (modified) (2 diffs)

trunk/src/kmk/w32/subproc/misc.c

@@ -1 +1 @@
 /* Process handling for Windows
-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.
 
@@ -26 +25 @@
 /*
  * Description:  Convert a NULL string terminated UNIX environment block to
- *              an environment block suitable for a windows32 system call
+ *              an environment block suitable for a windows32 system call
  *
  * Returns:  TRUE= success, FALSE=fail
  *
  * Notes/Dependencies:  the environment block is sorted in case-insensitive
- *      order, is double-null terminated, and is a char *, not a char **
+ *      order, is double-null terminated, and is a char *, not a char **
  */
 int _cdecl compare(const void *a1, const void *a2)
 {
-        return _stricoll(*((char**)a1),*((char**)a2));
+        return _stricoll(*((char**)a1),*((char**)a2));
 }
 bool_t
-arr2envblk(char **arr, char **envblk_out)
+arr2envblk(char **arr, char **envblk_out, int *envsize_needed)
 {
-        char **tmp;
-        int size_needed;
-        int arrcnt;
-        char *ptr;
+        char **tmp;
+        int size_needed;
+        int arrcnt;
+        char *ptr;
 
-        arrcnt = 0;
-        while (arr[arrcnt]) {
-                arrcnt++;
-        }
+        arrcnt = 0;
+        while (arr[arrcnt]) {
+                arrcnt++;
+        }
 
-        tmp = (char**) calloc(arrcnt + 1, sizeof(char *));
-        if (!tmp) {
-                return FALSE;
-        }
+        tmp = (char**) calloc(arrcnt + 1, sizeof(char *));
+        if (!tmp) {
+                return FALSE;
+        }
 
-        arrcnt = 0;
-        size_needed = 0;
-        while (arr[arrcnt]) {
-                tmp[arrcnt] = arr[arrcnt];
-                size_needed += strlen(arr[arrcnt]) + 1;
-                arrcnt++;
-        }
-        size_needed++;
+        arrcnt = 0;
+        size_needed = *envsize_needed = 0;
+        while (arr[arrcnt]) {
+                tmp[arrcnt] = arr[arrcnt];
+                size_needed += strlen(arr[arrcnt]) + 1;
+                arrcnt++;
+        }
+        size_needed++;
+        *envsize_needed = size_needed;
 
-        qsort((void *) tmp, (size_t) arrcnt, sizeof (char*), compare);
+        qsort((void *) tmp, (size_t) arrcnt, sizeof (char*), compare);
 
-        ptr = *envblk_out = calloc(size_needed, 1);
-        if (!ptr) {
-                free(tmp);
-                return FALSE;
-        }
+        ptr = *envblk_out = calloc(size_needed, 1);
+        if (!ptr) {
+                free(tmp);
+                return FALSE;
+        }
 
-        arrcnt = 0;
-        while (tmp[arrcnt]) {
-                strcpy(ptr, tmp[arrcnt]);
-                ptr += strlen(tmp[arrcnt]) + 1;
-                arrcnt++;
-        }
+        arrcnt = 0;
+        while (tmp[arrcnt]) {
+                strcpy(ptr, tmp[arrcnt]);
+                ptr += strlen(tmp[arrcnt]) + 1;
+                arrcnt++;
+        }
 
-        free(tmp);
-        return TRUE;
+        free(tmp);
+        return TRUE;
 }