From: Federico Zuccollo <federico.zuccollo@gmail.com>
Date: Mon, 17 Feb 2020 16:06:19 +0000 (+0100)
Subject: Update environ.cpp (#832)
X-Git-Tag: submit/tizen/20210909.063632~9674
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8e91564410917d0646dc5c2d5cba46cf9b7bf7d4;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

Update environ.cpp (#832)

The search for a prefix has been inlined to squeeze some extra performance by directly comparing bytes.

The prefix search functionality has been put in a separate static function to have all the state given as input and use multiple returns as control flow.

Fixes https://github.com/dotnet/runtime/issues/866
---

diff --git a/src/coreclr/src/pal/src/misc/environ.cpp b/src/coreclr/src/pal/src/misc/environ.cpp
index f253875..9fec8a3 100644
--- a/src/coreclr/src/pal/src/misc/environ.cpp
+++ b/src/coreclr/src/pal/src/misc/environ.cpp
@@ -893,6 +893,55 @@ done:
     return result;
 }
 
+
+/*++
+Function:
+  FindEnvVarValue
+
+Get the value of environment variable with the given name.
+Caller should take care of locking and releasing palEnvironment.
+
+Parameters
+
+    name
+            [in] The name of the environment variable to get.
+
+Return Value
+
+    A pointer to the value of the environment variable if it exists,
+    or nullptr otherwise.
+
+--*/
+char* FindEnvVarValue(const char* name)
+{
+    if (*name == '\0')
+        return nullptr;
+    
+    for (int i = 0; palEnvironment[i] != nullptr; ++i)
+    {
+        const char* pch = name;
+        char* p = palEnvironment[i];
+
+        do 
+        {
+            if (*pch == '\0') 
+            {
+                if (*p == '=')
+                    return p + 1;
+                    
+                if (*p == '\0') // no = sign -> empty value
+                    return p;
+                
+                break;
+            }
+        }
+        while (*pch++ == *p++);
+    }
+    
+    return nullptr;
+}
+
+
 /*++
 Function:
   EnvironGetenv
@@ -919,33 +968,11 @@ Return Value
 --*/
 char* EnvironGetenv(const char* name, BOOL copyValue)
 {
-    char *retValue = nullptr;
-
     CPalThread * pthrCurrent = InternalGetCurrentThread();
     InternalEnterCriticalSection(pthrCurrent, &gcsEnvironment);
-
-    size_t nameLength = strlen(name);
-    for (int i = 0; palEnvironment[i] != nullptr; ++i)
-    {
-        if (strncmp(palEnvironment[i], name, nameLength) == 0)
-        {
-            char *equalsSignPosition = palEnvironment[i] + nameLength;
-
-            // If this is one of the variables which has no equals sign, we
-            // treat the whole thing as name, so the value is an empty string.
-            if (*equalsSignPosition == '\0')
-            {
-                retValue = (char *)"";
-                break;
-            }
-            else if (*equalsSignPosition == '=')
-            {
-                retValue = equalsSignPosition + 1;
-                break;
-            }
-        }
-    }
-
+    
+    char* retValue = FindEnvVarValue(name);
+    
     if ((retValue != nullptr) && copyValue)
     {
         retValue = strdup(retValue);
@@ -955,6 +982,7 @@ char* EnvironGetenv(const char* name, BOOL copyValue)
     return retValue;
 }
 
+
 /*++
 Function:
   EnvironGetSystemEnvironment