mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-02-05 04:06:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

slave: roll our own ‘execvpe()’ on FreeBSD

Browse source
This commit is contained in:
Daniel Eklöf 2022-04-11 14:02:18 +02:00
parent fd414f79be
commit b3d0cdd4b2
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 58 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

59
slave.c
View file

@ -25,6 +25,63 @@
extern char **environ;
#if defined(__FreeBSD__)
static char *
find_file_in_path(const char *file)
{
if (strchr(file, '/') != NULL)
return xstrdup(file);
const char *env_path = getenv("PATH");
char *path_list = NULL;
if (env_path != NULL && env_path[0] != '\0')
path_list = xstrdup(env_path);
else {
size_t sc_path_len = confstr(_CS_PATH, NULL, 0);
if (sc_path_len > 0) {
path_list = xmalloc(sc_path_len);
confstr(_CS_PATH, path_list, sc_path_len);
} else
return xstrdup(file);
}
for (const char *path = strtok(path_list, ":");
path != NULL;
path = strtok(NULL, ":"))
{
char *full = xasprintf("%s/%s", path, file);
if (access(full, F_OK) == 0) {
free(path_list);
return full;
}
free(full);
}
free(path_list);
return xstrdup(file);
}
static int
foot_execvpe(const char *file, char *const argv[], char *const envp[])
{
char *path = find_file_in_path(file);
int ret = execve(path, argv, envp);
/*
* Getting here is an error
*/
free(path);
return ret;
}
#else /* !__FreeBSD__ */
#define foot_execvpe(file, argv, envp) execvpe(file, argv, envp)
#endif /* !__FreeBSD__ */
static bool
is_valid_shell(const char *shell)
{
@ -234,7 +291,7 @@ slave_exec(int ptmx, char *argv[], char *const envp[], int err_fd,
} else
file = argv[0];
execvpe(file, argv, envp);
foot_execvpe(file, argv, envp);
err:
(void)!write(err_fd, &errno, sizeof(errno));