[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[hurd, commited] hurd: Fix spawni SPAWN_XFLAGS_TRY_SHELL with empty argv
From: |
Samuel Thibault |
Subject: |
[hurd, commited] hurd: Fix spawni SPAWN_XFLAGS_TRY_SHELL with empty argv |
Date: |
Sat, 26 Dec 2020 16:40:51 +0100 |
When argv is empty, we need to add the original script to be run on the
shell command line.
---
sysdeps/mach/hurd/spawni.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/sysdeps/mach/hurd/spawni.c b/sysdeps/mach/hurd/spawni.c
index 2aeed683fe..b511265044 100644
--- a/sysdeps/mach/hurd/spawni.c
+++ b/sysdeps/mach/hurd/spawni.c
@@ -842,7 +842,11 @@ __spawni (pid_t *pid, const char *file,
{
/* The file is accessible but it is not an executable file.
Invoke the shell to interpret it as a script. */
- err = __argz_insert (&args, &argslen, args, _PATH_BSHELL);
+ err = 0;
+ if (!argslen)
+ err = __argz_insert (&args, &argslen, args, relpath);
+ if (!err)
+ err = __argz_insert (&args, &argslen, args, _PATH_BSHELL);
if (!err)
err = child_lookup (_PATH_BSHELL, O_EXEC, 0, &execfile);
if (!err)
--
2.29.2
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [hurd, commited] hurd: Fix spawni SPAWN_XFLAGS_TRY_SHELL with empty argv,
Samuel Thibault <=