guix - Wojtek's customized Guix

about summary refs log tree commit diff

Branch	Commit message	Author	Age
koszko	Allow unauthorized `guix pull`	W. Kosior	11 days
koszko-scripts	Add `tmate' branch.	W. Kosior	3 weeks

ex 90b087f1..284f063f 100644 --- a/c/prim5.c +++ b/c/prim5.c @@ -27,6 +27,12 @@ #include <sys/resource.h> #endif +/* BEGIN PATCH for Guix */ +#ifndef WIN32 +# include <paths.h> +#endif +/* END PATCH for Guix */ + /* locally defined functions */ static INT s_errno(void); static IBOOL s_addr_in_heap(uptr x); @@ -875,6 +881,17 @@ static ptr s_process(char *s, IBOOL stderrp) { INT tofds[2], fromfds[2], errfds[2]; struct sigaction act, oint_act; + /* BEGIN PATCH for Guix */ +#if defined(_PATH_BSHELL) + struct stat guix_stat_buf; + char *guix_sh = + (0 == stat(_PATH_BSHELL, &guix_stat_buf)) + ? _PATH_BSHELL + : "/bin/sh"; +#else /* _PATH_BSHELL */ + char *guix_sh = "/bin/sh"; +#endif + /* END PATCH for Guix */ if (pipe(tofds)) S_error("process","cannot open pipes"); if (pipe(fromfds)) { @@ -911,7 +928,9 @@ static ptr s_process(char *s, IBOOL stderrp) { } } #endif /* __GNU__ Hurd */ - execl("/bin/sh", "/bin/sh", "-c", s, NULL); + /* BEGIN PATCH for Guix */ + execl(guix_sh, guix_sh, "-c", s, NULL); + /* END PATCH for Guix */ _exit(1) /* only if execl fails */; /*NOTREACHED*/ } else { base-commit: 253230f7dfbb4fe777277d6bbf93f39f9567f086 -- 2.41.0