jruby · Apr 12, 2018 · Apr 12, 2018
Showing with 27 additions and 12 deletions.

+13 −2 core/src/main/java/org/jruby/util/ShellLauncher.java

+14 −10 core/src/main/java/org/jruby/util/io/PopenExecutor.java
diff --git a/core/src/main/java/org/jruby/util/ShellLauncher.java b/core/src/main/java/org/jruby/util/ShellLauncher.java
@@ -411,14 +411,25 @@ private static File findPathFile(Ruby runtime, String fname, String[] path, bool
         return pathFile;
     }
 
-    // MRI: Hopefully close to dln_find_exe_r used by popen logic
     public static File findPathExecutable(Ruby runtime, String fname) {
         RubyHash env = (RubyHash) runtime.getObject().getConstant("ENV");
         IRubyObject pathObject = env.op_aref(runtime.getCurrentContext(), RubyString.newString(runtime, PATH_ENV));
-        String[] pathNodes = null;
+        return findPathExecutable(runtime, fname, pathObject);
+    }
+
+    // MRI: Hopefully close to dln_find_exe_r used by popen logic
+    public static File findPathExecutable(Ruby runtime, String fname, IRubyObject pathObject) {
+        String[] pathNodes;
+
+        if (pathObject == null || pathObject.isNil()) {
+            RubyHash env = (RubyHash) runtime.getObject().getConstant("ENV");
+            pathObject = env.op_aref(runtime.getCurrentContext(), RubyString.newString(runtime, PATH_ENV));
+        }
+
         if (pathObject == null) {
             pathNodes = DEFAULT_PATH; // ASSUME: not modified by callee
         }
+
         else {
             String pathSeparator = System.getProperty("path.separator");
             String path = pathObject.toString();

diff --git a/core/src/main/java/org/jruby/util/io/PopenExecutor.java b/core/src/main/java/org/jruby/util/io/PopenExecutor.java
@@ -155,7 +155,7 @@ long procSpawnCmdInternal(Ruby runtime, String[] argv, String prog, ExecArg earg
 
         if (prog == null)
             prog = argv[0];
-        prog = dlnFindExeR(runtime, prog, null);
+        prog = dlnFindExeR(runtime, prog, eargp.path_env);
         if (prog == null) {
             errno = Errno.ENOENT;
             return -1;
@@ -222,7 +222,7 @@ long procSpawnCmd(Ruby runtime, String[] argv, String prog, ExecArg eargp) {
     long procSpawnSh(Ruby runtime, String str, ExecArg eargp) {
         long status;
 
-        String shell = dlnFindExeR(runtime, "sh", null);
+        String shell = dlnFindExeR(runtime, "sh", eargp.path_env);
 
 //        System.out.println("before: " + shell + ", fa=" + eargp.fileActions + ", a=" + eargp.attributes + ", argv=" + Arrays.asList("sh", "-c", str));
         status = runtime.getPosix().posix_spawnp(
@@ -323,10 +323,11 @@ public static IRubyObject popen(ThreadContext context, IRubyObject[] argv, RubyC
     }
 
     static void execargSetenv(ThreadContext context, Ruby runtime, ExecArg eargp, IRubyObject env) {
-        eargp.env_modification = !env.isNil() ? checkExecEnv(context, (RubyHash)env) : null;
+        eargp.env_modification = !env.isNil() ? checkExecEnv(context, (RubyHash)env, eargp) : null;
     }
 
-    public static RubyArray checkExecEnv(ThreadContext context, RubyHash hash) {
+    // MRI: rb_check_exec_env
+    public static RubyArray checkExecEnv(ThreadContext context, RubyHash hash, ExecArg pathArg) {
         Ruby runtime = context.runtime;
         RubyArray env;
 
@@ -346,6 +347,10 @@ public static RubyArray checkExecEnv(ThreadContext context, RubyHash hash) {
             key = key.convertToString().export(context);
             if (!val.isNil()) val = val.convertToString().export(context);
 
+            if (key.convertToString().toString().equalsIgnoreCase("PATH")) {
+                pathArg.path_env = val;
+            }
+
             env.push(runtime.newArray(key, val));
         }
 
@@ -1858,7 +1863,7 @@ else if (!eargp.chdir_given()) { // only if :chdir is not specified
         }
 
         if (!env.isNil()) {
-            eargp.env_modification = checkExecEnv(context, (RubyHash) env);
+            eargp.env_modification = checkExecEnv(context, (RubyHash) env, eargp);
         }
 
         prog = prog.export(context);
@@ -1958,7 +1963,7 @@ else if (progByteList.get(p) == '/'){
 
         if (!eargp.use_shell) {
             String abspath;
-            abspath = dlnFindExeR(runtime, eargp.command_name.toString(), null);
+            abspath = dlnFindExeR(runtime, eargp.command_name.toString(), eargp.path_env);
             if (abspath != null)
                 eargp.command_abspath = StringSupport.checkEmbeddedNulls(runtime, RubyString.newString(runtime, abspath));
             else
@@ -2000,10 +2005,8 @@ public int compare(String o1, String o2) {
 
     }
 
-    private static String dlnFindExeR(Ruby runtime, String fname, String path) {
-        if (path != null) throw new RuntimeException("BUG: dln_find_exe_r with path is not supported yet");
-        // FIXME: need to reencode path as same
-        File exePath = ShellLauncher.findPathExecutable(runtime, fname);
+    private static String dlnFindExeR(Ruby runtime, String fname, IRubyObject path) {
+        File exePath = ShellLauncher.findPathExecutable(runtime, fname, path);
         return exePath != null ? exePath.getAbsolutePath() : null;
     }
 
@@ -2036,6 +2039,7 @@ public static class ExecArg {
         String chdir_dir;
         List<SpawnFileAction> fileActions = new ArrayList();
         List<SpawnAttribute> attributes = new ArrayList();
+        IRubyObject path_env;
 
         boolean pgroup_given() {
             return (flags & 0x1) != 0;