Don't log error trace messages when calling file_exists (dotnet/core-setup#3912)

Commit migrated from https://github.com/dotnet/core-setup/commit/24ba120b0ca1ba60a24a79b7dc95866cd3e9f799

diff --git a/src/installer/corehost/common/pal.h b/src/installer/corehost/common/pal.h
index 9b5980e..71c7fa4 100644 (file)
--- a/src/installer/corehost/common/pal.h
+++ b/src/installer/corehost/common/pal.h
@@ -201,7 +201,7 @@ namespace pal
     }
         
     bool touch_file(const pal::string_t& path);
-    bool realpath(string_t* path);
+    bool realpath(string_t* path, bool skip_error_logging = false);
     bool file_exists(const string_t& path);
     inline bool directory_exists(const string_t& path) { return file_exists(path); }
     void readdir(const string_t& path, const string_t& pattern, std::vector<pal::string_t>* list);

diff --git a/src/installer/corehost/common/pal.unix.cpp b/src/installer/corehost/common/pal.unix.cpp
index 34a36df..8f3a5a4 100644 (file)
--- a/src/installer/corehost/common/pal.unix.cpp
+++ b/src/installer/corehost/common/pal.unix.cpp
@@ -509,7 +509,7 @@ bool pal::getenv(const pal::char_t* name, pal::string_t* recv)
     return (recv->length() > 0);
 }
 
-bool pal::realpath(pal::string_t* path)
+bool pal::realpath(pal::string_t* path, bool skip_error_logging)
 {
     auto resolved = ::realpath(path->c_str(), nullptr);
     if (resolved == nullptr)
@@ -518,9 +518,15 @@ bool pal::realpath(pal::string_t* path)
         {
             return false;
         }
-        perror("realpath()");
+
+        if (!skip_error_logging)
+        {
+            perror("realpath()");
+        }
+        
         return false;
     }
+
     path->assign(resolved);
     ::free(resolved);
     return true;

diff --git a/src/installer/corehost/common/pal.windows.cpp b/src/installer/corehost/common/pal.windows.cpp
index 11db21b..7dd25e1 100644 (file)
--- a/src/installer/corehost/common/pal.windows.cpp
+++ b/src/installer/corehost/common/pal.windows.cpp
@@ -367,7 +367,7 @@ bool pal::clr_palstring(const char* cstr, pal::string_t* out)
 }
 
 // Return if path is valid and file exists, return true and adjust path as appropriate.
-bool pal::realpath(string_t* path)
+bool pal::realpath(string_t* path, bool skip_error_logging)
 {
     if (LongFile::IsNormalized(path->c_str()))
     {
@@ -382,7 +382,10 @@ bool pal::realpath(string_t* path)
     auto size = ::GetFullPathNameW(path->c_str(), MAX_PATH, buf, nullptr);
     if (size == 0)
     {
-        trace::error(_X("Error resolving full path [%s]"), path->c_str());
+        if (!skip_error_logging)
+        {
+            trace::error(_X("Error resolving full path [%s]"), path->c_str());
+        }
         return false;
     }
 
@@ -400,7 +403,10 @@ bool pal::realpath(string_t* path)
 
         if (size == 0)
         {
-            trace::error(_X("Error resolving full path [%s]"), path->c_str());
+            if (!skip_error_logging)
+            {
+                trace::error(_X("Error resolving full path [%s]"), path->c_str());
+            }
             return false;
         }
 
@@ -436,7 +442,7 @@ bool pal::file_exists(const string_t& path)
     }
 
     string_t tmp(path);
-    return pal::realpath(&tmp);
+    return pal::realpath(&tmp, true);
 }
 
 static void readdir(const pal::string_t& path, const pal::string_t& pattern, bool onlydirectories, std::vector<pal::string_t>* list)