Changeset 2699 in kBuild for trunk/src/kmk

Timestamp:

Sep 20, 2013 12:33:20 AM (11 years ago)

Author:

bird

Message:

kmk_redirect: Cross platform environment variable unsetting.

File:

• trunk/src/kmk/kmkbuiltin/redirect.c (modified) (1 diff)

trunk/src/kmk/kmkbuiltin/redirect.c

@@ -311 +311 @@
                 else
 #endif /* __OS2__ */
-                if (putenv(psz))
-                {
-                    fprintf(pStdErr, "%s: error: putenv(\"%s\"): %s\n", name(argv[0]), psz, strerror(errno));
-                    return 1;
+                {
+                    const char *pchEqual = strchr(psz, '=');
+                    if (pchEqual && pchEqual[1] != '\0')
+                    {
+                        if (putenv(psz))
+                        {
+                            fprintf(pStdErr, "%s: error: putenv(\"%s\"): %s\n", name(argv[0]), psz, strerror(errno));
+                            return 1;
+                        }
+                    }
+                    else
+                    {
+                        size_t cchVar = pchEqual ? (size_t)(pchEqual - psz) : strlen(psz);
+                        char *pszCopy = (char *)malloc(cchVar + 2);
+                        memcpy(pszCopy, psz, cchVar);
+
+#if defined(_MSC_VER) || defined(__OS2__)
+                        pszCopy[cchVar] = '=';
+                        pszCopy[cchVar + 1] = '\0';
+                        if (putenv(pszCopy))
+                        {
+                            fprintf(pStdErr, "%s: error: putenv(\"%s\"): %s\n", name(argv[0]), pszCopy, strerror(errno));
+                            return 1;
+                        }
+#else
+                        pszCopy[cchVar] = '\0';
+                        if (unsetenv(pszCopy))
+                        {
+                            fprintf(pStdErr, "%s: error: unsetenv(\"%s\"): %s\n", name(argv[0]), pszCopy, strerror(errno));
+                            return 1;
+                        }
+#endif
+                        free(pszCopy);
+                    }
                 }
                 continue;