Remove unnecessary indirection from Platform.Unix

andyleejordan · andyleejordan · commit 70aa6af9604c · 2016-07-14T17:34:12.000-07:00
diff --git a/src/System.Management.Automation/CoreCLR/CorePsPlatform.cs b/src/System.Management.Automation/CoreCLR/CorePsPlatform.cs
@@ -239,7 +239,7 @@ internal static bool NonWindowsIsHardLink(FileSystemInfo fileInfo)
 
         internal static bool NonWindowsIsSymLink(FileSystemInfo fileInfo)
         {
-            return Unix.IsSymLink(fileInfo);
+            return Unix.NativeMethods.IsSymLink(fileInfo.FullName);
         }
 
         internal static string NonWindowsInternalGetTarget(SafeFileHandle handle)
@@ -250,12 +250,12 @@ internal static string NonWindowsInternalGetTarget(SafeFileHandle handle)
 
         internal static string NonWindowsInternalGetTarget(string path)
         {
-            return Unix.FollowSymLink(path);
+            return Unix.NativeMethods.FollowSymLink(path);
         }
 
         internal static string NonWindowsGetUserFromPid(int path)
         {
-            return Unix.GetUserFromPid(path);
+            return Unix.NativeMethods.GetUserFromPid(path);
         }
 
         #if CORECLR
@@ -344,7 +344,7 @@ internal static bool NonWindowsIsDirectory(string path)
 
         internal static bool NonWindowsIsExecutable(string path)
         {
-            return Unix.IsExecutable(path);
+            return Unix.NativeMethods.IsExecutable(path);
         }
 
         internal static uint NonWindowsGetThreadId()
@@ -516,16 +516,6 @@ public static bool IsHardLink(FileSystemInfo fs)
 
         }
 
-        public static bool IsSymLink(FileSystemInfo fs)
-        {
-            return NativeMethods.IsSymLink(fs.FullName);
-        }
-
-        public static bool IsExecutable(string filePath)
-        {
-            return NativeMethods.IsExecutable(filePath);
-        }
-
         public static void SetDate(SetDateInfoInternal info)
         {
             int ret = NativeMethods.SetDate(info);
@@ -542,16 +532,6 @@ public static bool CreateHardLink(string path, string strTargetPath)
             return ret == 1 ? true : false;
         }
 
-        public static string FollowSymLink(string path)
-        {
-            return NativeMethods.FollowSymLink(path);
-        }
-
-        public static string GetUserFromPid(int pid)
-        {
-            return NativeMethods.GetUserFromPid(pid);
-        }
-
         [StructLayout(LayoutKind.Sequential)]
         internal class SetDateInfoInternal
         {

Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,7 @@ internal static bool NonWindowsIsHardLink(FileSystemInfo fileInfo)`
`239`	`239`
`240`	`240`	`internal static bool NonWindowsIsSymLink(FileSystemInfo fileInfo)`
`241`	`241`	`{`
`242`		`- return Unix.IsSymLink(fileInfo);`
	`242`	`+ return Unix.NativeMethods.IsSymLink(fileInfo.FullName);`
`243`	`243`	`}`
`244`	`244`
`245`	`245`	`internal static string NonWindowsInternalGetTarget(SafeFileHandle handle)`
`@@ -250,12 +250,12 @@ internal static string NonWindowsInternalGetTarget(SafeFileHandle handle)`
`250`	`250`
`251`	`251`	`internal static string NonWindowsInternalGetTarget(string path)`
`252`	`252`	`{`
`253`		`- return Unix.FollowSymLink(path);`
	`253`	`+ return Unix.NativeMethods.FollowSymLink(path);`
`254`	`254`	`}`
`255`	`255`
`256`	`256`	`internal static string NonWindowsGetUserFromPid(int path)`
`257`	`257`	`{`
`258`		`- return Unix.GetUserFromPid(path);`
	`258`	`+ return Unix.NativeMethods.GetUserFromPid(path);`
`259`	`259`	`}`
`260`	`260`
`261`	`261`	`#if CORECLR`
`@@ -344,7 +344,7 @@ internal static bool NonWindowsIsDirectory(string path)`
`344`	`344`
`345`	`345`	`internal static bool NonWindowsIsExecutable(string path)`
`346`	`346`	`{`
`347`		`- return Unix.IsExecutable(path);`
	`347`	`+ return Unix.NativeMethods.IsExecutable(path);`
`348`	`348`	`}`
`349`	`349`
`350`	`350`	`internal static uint NonWindowsGetThreadId()`
`@@ -516,16 +516,6 @@ public static bool IsHardLink(FileSystemInfo fs)`
`516`	`516`
`517`	`517`	`}`
`518`	`518`
`519`		`- public static bool IsSymLink(FileSystemInfo fs)`
`520`		`- {`
`521`		`- return NativeMethods.IsSymLink(fs.FullName);`
`522`		`- }`
`523`		`-`
`524`		`- public static bool IsExecutable(string filePath)`
`525`		`- {`
`526`		`- return NativeMethods.IsExecutable(filePath);`
`527`		`- }`
`528`		`-`
`529`	`519`	`public static void SetDate(SetDateInfoInternal info)`
`530`	`520`	`{`
`531`	`521`	`int ret = NativeMethods.SetDate(info);`
`@@ -542,16 +532,6 @@ public static bool CreateHardLink(string path, string strTargetPath)`
`542`	`532`	`return ret == 1 ? true : false;`
`543`	`533`	`}`
`544`	`534`
`545`		`- public static string FollowSymLink(string path)`
`546`		`- {`
`547`		`- return NativeMethods.FollowSymLink(path);`
`548`		`- }`
`549`		`-`
`550`		`- public static string GetUserFromPid(int pid)`
`551`		`- {`
`552`		`- return NativeMethods.GetUserFromPid(pid);`
`553`		`- }`
`554`		`-`
`555`	`535`	`[StructLayout(LayoutKind.Sequential)]`
`556`	`536`	`internal class SetDateInfoInternal`
`557`	`537`	`{`