Changeset 2877 for trunk/src/kmk

Timestamp:

Sep 5, 2016, 5:05:10 PM (9 years ago)

Author:

bird

Message:

updates

File:

• trunk/src/kmk/kmkbuiltin/kSubmit.c (modified) (5 diffs)

trunk/src/kmk/kmkbuiltin/kSubmit.c

@@ -1132 +1132 @@
 
 
+/** The environment variable compare function.
+ * We must use case insensitive compare on windows (Path vs PATH).  */
+#ifdef KBUILD_OS_WINDOWS
+# define KSUBMIT_ENV_NCMP   _strnicmp
+#else
+# define KSUBMIT_ENV_NCMP   strncmp
+#endif
+
 
 /**
@@ -1154 +1162 @@
         unsigned iEnvVar;
         unsigned cEnvVars = *pcEnvVars;
-        size_t const cchVar = pszValue - pszEqual;
+        size_t const cchVar = pszEqual - pszValue;
         for (iEnvVar = 0; iEnvVar < cEnvVars; iEnvVar++)
-            if (   strncmp(papszEnv[iEnvVar], pszValue, cchVar) == 0
-                && papszEnv[iEnvVar][cchVar] == '=')
+        {
+            char *pszCur = papszEnv[iEnvVar];
+            if (   KSUBMIT_ENV_NCMP(pszCur, pszValue, cchVar) == 0
+                && pszCur[cchVar] == '=')
             {
                 if (cVerbosity > 0)
@@ -1165 +1175 @@
                 break;
             }
+        }
         if (iEnvVar == cEnvVars)
         {
@@ -1183 +1194 @@
             /* Check for duplicates. */
             for (iEnvVar++; iEnvVar < cEnvVars; iEnvVar++)
-                if (   strncmp(papszEnv[iEnvVar], pszValue, cchVar) == 0
+                if (   KSUBMIT_ENV_NCMP(papszEnv[iEnvVar], pszValue, cchVar) == 0
                     && papszEnv[iEnvVar][cchVar] == '=')
                 {
@@ -1224 +1235 @@
 
         for (iEnvVar = 0; iEnvVar < cEnvVars; iEnvVar++)
-            if (   strncmp(papszEnv[iEnvVar], pszVarToRemove, cchVar) == 0
+            if (   KSUBMIT_ENV_NCMP(papszEnv[iEnvVar], pszVarToRemove, cchVar) == 0
                 && papszEnv[iEnvVar][cchVar] == '=')
             {