From 4888106cdfd80d1af925e5a485a2812d35a83b46 Mon Sep 17 00:00:00 2001 From: Philip McGrath Date: Mon, 11 Apr 2022 20:43:18 -0400 Subject: [PATCH] Zuo: patch zuo_process for "/bin/sh" on Guix This patch reuses the C preprocessor macro `GUIX_RKTIO_BIN_SH` from a previous patch. If: 1. The `GUIX_RKTIO_BIN_SH` macro is defined; and 2. `zuo_process` is called with the exact path "/bin/sh"; and 3. The path specified by `GUIX_RKTIO_BIN_SH` exists; then `zuo_process` will execute the file specified by `GUIX_RKTIO_BIN_SH` instead of "/bin/sh". --- racket/src/zuo/zuo.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/racket/src/zuo/zuo.c b/racket/src/zuo/zuo.c index 17f161826d..10e7a2a297 100644 --- a/racket/src/zuo/zuo.c +++ b/racket/src/zuo/zuo.c @@ -5730,7 +5730,18 @@ static void zuo_pipe(zuo_raw_handle_t *_r, zuo_raw_handle_t *_w) zuo_t *zuo_process(zuo_t *command_and_args) { const char *who = "process"; - zuo_t *command = _zuo_car(command_and_args); + /* BEGIN PATCH for Guix */ + zuo_t *_guix_orig_command = _zuo_car(command_and_args); + zuo_t *command; +#if defined(GUIX_RKTIO_BIN_SH) +# define GUIX_AS_a_STR_HELPER(x) #x +# define GUIX_AS_a_STR(x) GUIX_AS_a_STR_HELPER(x) + /* A level of indirection makes `#` work as needed: */ + const char *guix_sh = GUIX_AS_a_STR(GUIX_RKTIO_BIN_SH); +# undef GUIX_AS_a_STR +# undef GUIX_AS_a_STR_HELPER +#endif + /* END PATCH for Guix */ zuo_t *args = _zuo_cdr(command_and_args), *rev_args = z.o_null; zuo_t *options = z.o_empty_hash, *opt; zuo_t *dir, *l, *p_handle, *result; @@ -5741,7 +5752,19 @@ zuo_t *zuo_process(zuo_t *command_and_args) void *env; int as_child, exact_cmdline; - check_path_string(who, command); + /* BEGIN PATCH for Guix */ + check_path_string(who, _guix_orig_command); +#if defined(GUIX_RKTIO_BIN_SH) + command = + ((z.o_false == zuo_string_eql(_guix_orig_command, zuo_string("/bin/sh"))) + || (z.o_false == zuo_stat(zuo_string(guix_sh), z.o_false, z.o_true))) + ? _guix_orig_command + : zuo_string(guix_sh); +#else + command = _guix_orig_command; +#endif + /* END PATCH for Guix */ + for (l = args; l->tag == zuo_pair_tag; l = _zuo_cdr(l)) { zuo_t *a = _zuo_car(l); if (a == z.o_null) { base-commit: 87eee6e2adb8c6bc11e60619c706fa6295096085 -- 2.32.0