matthieu
/
dune
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix order of chdir and open in Future

This commit is contained in:
Jeremie Dimino 2017-02-24 13:48:23 +00:00
parent dce615a559
commit 21cd4d1a9a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/future.ml
View File

@ -340,7 +340,6 @@ module Scheduler = struct
if !Clflags.debug_run then
Format.eprintf "@{<kwd>Running@}[@{<id>%d@}]: %s@." id
(Ansi_color.strip_colors_for_stderr command_line);
Option.iter job.dir ~f:(fun dir -> Sys.chdir dir);
let argv = Array.of_list (job.prog :: job.args) in
let output_filename = Filename.temp_file "jbuilder" ".output" in
let output_fd = Unix.openfile output_filename [O_WRONLY] 0 in
@ -351,6 +350,7 @@ module Scheduler = struct
let fd = Unix.openfile fn [O_WRONLY; O_CREAT; O_TRUNC] 0o666 in
(fd, true)
in
Option.iter job.dir ~f:(fun dir -> Sys.chdir dir);
let pid =
match job.env with
| None ->
@ -360,9 +360,9 @@ module Scheduler = struct
Unix.create_process_env job.prog argv env
Unix.stdin stdout output_fd
in
Option.iter job.dir ~f:(fun _ -> Sys.chdir cwd);
Unix.close output_fd;
if close_stdout then Unix.close stdout;
Option.iter job.dir ~f:(fun _ -> Sys.chdir cwd);
Hashtbl.add running ~key:pid
~data:{ id
; job