urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-13 16:03:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bs/serf-dups-file-descriptors' (#1730)

Browse Source 
* bs/serf-dups-file-descriptors:
  worker: also replaces fd 0/1 so we don't accidentally re-use them
  worker: dup({0,1}) on serf start to prevent accidental use of stdin/stdout.

Signed-off-by: Jared Tobin <jared@tlon.io>
This commit is contained in:
Jared Tobin 2019-09-17 13:41:36 -02:30
commit b80077906d
No known key found for this signature in database
GPG Key ID: 0E4647D58F8A69E4
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/urbit/worker/main.c
View File

@ -883,6 +883,18 @@ u3_worker_boot(void)
c3_i
main(c3_i argc, c3_c* argv[])
{
// the worker is spawned with [FD 0] = events and [FD 1] = effects
// we dup [FD 0 & 1] so we don't accidently use them for something else
// we replace [FD 0] (stdin) with a fd pointing to /dev/null
// we replace [FD 1] (stdout) with a dup of [FD 2] (stderr)
//
c3_i nul_i = open("/dev/null", O_RDWR, 0);
c3_i inn_i = dup(0);
c3_i out_i = dup(1);
dup2(nul_i, 0);
dup2(2, 1);
close(nul_i);
uv_loop_t* lup_u = uv_default_loop();
c3_c* dir_c = argv[1];
c3_c* key_c = argv[2];
@ -939,11 +951,11 @@ main(c3_i argc, c3_c* argv[])
err_i = uv_pipe_init(lup_u, &u3V.inn_u.pyp_u, 0);
c3_assert(!err_i);
uv_pipe_open(&u3V.inn_u.pyp_u, 0);
uv_pipe_open(&u3V.inn_u.pyp_u, inn_i);
err_i = uv_pipe_init(lup_u, &u3V.out_u.pyp_u, 0);
c3_assert(!err_i);
uv_pipe_open(&u3V.out_u.pyp_u, 1);
uv_pipe_open(&u3V.out_u.pyp_u, out_i);
}
/* set up writing