admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor to use GetUserFromPid

Browse Source
This commit is contained in:
Andrew Schwartzmeyer
2016-07-13 15:46:25 -07:00
parent 900b46d281
commit 2abe461992
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Microsoft.PowerShell.Commands.Management/commands/management/Process.cs
+1 -1
View File
@@ -867,7 +867,7 @@ namespace Microsoft.PowerShell.Commands
{
string userName = null;
#if LINUX
userName = Platform.NonWindowsGetFileOwner("/proc/" + process.Id);
userName = Platform.NonWindowsGetUserFromPid(process.Id);
#else
IntPtr tokenUserInfo = IntPtr.Zero;
IntPtr processTokenHandler = IntPtr.Zero;
src/System.Management.Automation/CoreCLR/CorePsPlatform.cs
+5 -5
View File
@@ -354,11 +354,11 @@ namespace System.Management.Automation
}
}
internal static string NonWindowsGetFileOwner(string path)
internal static string NonWindowsGetUserFromPid(int path)
{
if (!IsWindows)
{
return LinuxPlatform.GetFileOwner(path);
return LinuxPlatform.GetUserFromPid(path);
}
else
{
@@ -752,9 +752,9 @@ namespace System.Management.Automation
return Native.FollowSymLink(path);
}
public static string GetFileOwner(string path)
public static string GetUserFromPid(int pid)
{
return Native.GetFileOwner(path);
return Native.GetUserFromPid(pid);
}
[StructLayout(LayoutKind.Sequential)]
@@ -828,7 +828,7 @@ namespace System.Management.Automation
[DllImport(psLib, CharSet = CharSet.Ansi, SetLastError = true)]
[return: MarshalAs(UnmanagedType.LPStr)]
internal static extern string GetFileOwner([MarshalAs(UnmanagedType.LPStr)]string filePath);
internal static extern string GetUserFromPid(int pid);
}
}