Fixing code for unix

dotnet · Mar 27, 2021 · 29a22ef · 29a22ef
1 parent 40f8c7a
commit 29a22ef
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.Unix.cs b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.Unix.cs
@@ -391,6 +391,8 @@ private bool StartCore(ProcessStartInfo startInfo)
                                   startInfo.RedirectStandardOutput &&
                                   startInfo.RedirectStandardError);
 
+            string? originalFilename = startInfo.FileName;
+
             if (startInfo.UseShellExecute)
             {
                 string verb = startInfo.Verb;
@@ -411,7 +413,7 @@ private bool StartCore(ProcessStartInfo startInfo)
                 {
                     argv = ParseArgv(startInfo);
 
-                    isExecuting = ForkAndExecProcess(filename, argv, envp, cwd,
+                    isExecuting = ForkAndExecProcess(originalFilename, filename, argv, envp, cwd,
                         startInfo.RedirectStandardInput, startInfo.RedirectStandardOutput, startInfo.RedirectStandardError,
                         setCredentials, userId, groupId, groups,
                         out stdinFd, out stdoutFd, out stderrFd, usesTerminal,
@@ -424,7 +426,7 @@ private bool StartCore(ProcessStartInfo startInfo)
                     filename = GetPathToOpenFile();
                     argv = ParseArgv(startInfo, filename, ignoreArguments: true);
 
-                    ForkAndExecProcess(filename, argv, envp, cwd,
+                    ForkAndExecProcess(originalFilename, filename, argv, envp, cwd,
                         startInfo.RedirectStandardInput, startInfo.RedirectStandardOutput, startInfo.RedirectStandardError,
                         setCredentials, userId, groupId, groups,
                         out stdinFd, out stdoutFd, out stderrFd, usesTerminal);
@@ -439,7 +441,7 @@ private bool StartCore(ProcessStartInfo startInfo)
                     throw new Win32Exception(SR.DirectoryNotValidAsInput);
                 }
 
-                ForkAndExecProcess(filename, argv, envp, cwd,
+                ForkAndExecProcess(originalFilename, filename, argv, envp, cwd,
                     startInfo.RedirectStandardInput, startInfo.RedirectStandardOutput, startInfo.RedirectStandardError,
                     setCredentials, userId, groupId, groups,
                     out stdinFd, out stdoutFd, out stderrFd, usesTerminal);
@@ -473,6 +475,7 @@ private bool StartCore(ProcessStartInfo startInfo)
         }
 
         private bool ForkAndExecProcess(
+            string originalFilename,
             string? filename, string[] argv, string[] envp, string? cwd,
             bool redirectStdin, bool redirectStdout, bool redirectStderr,
             bool setCredentials, uint userId, uint groupId, uint[]? groups,
@@ -481,7 +484,8 @@ private bool ForkAndExecProcess(
         {
             if (string.IsNullOrEmpty(filename))
             {
-                throw new Win32Exception(Interop.Error.ENOENT.Info().RawErrno);
+                int errno = Interop.Error.ENOENT.Info().RawErrno;
+                throw CreateExceptionForFailedToStartFileDirectory(GetErrorMessage(errno), errno, originalFilename, cwd);
             }
 
             // Lock to avoid races with OnSigChild