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

meson: auto-detect execvpe on FreeBSD

Browse source 
0667d0e0e3
This commit is contained in:
Jan Beich 2024-05-25 14:40:25 +02:00 • committed by Daniel Eklöf
parent bb2e0d64e1
commit f67449700b
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
meson.build
View file

@ -16,6 +16,11 @@ if cc.has_function('memfd_create')
add_project_arguments('-DMEMFD_CREATE', language: 'c') add_project_arguments('-DMEMFD_CREATE', language: 'c')
endif endif
# Missing on DragonFly, FreeBSD < 14.1
if cc.has_function('execvpe')
add_project_arguments('-DEXECVPE', language: 'c')
endif
utmp_backend = get_option('utmp-backend') utmp_backend = get_option('utmp-backend')
if utmp_backend == 'auto' if utmp_backend == 'auto'
host_os = host_machine.system() host_os = host_machine.system()

6
slave.c
View file

@ -31,7 +31,7 @@ struct environ {
char **envp; char **envp;
}; };
#if defined(__FreeBSD__) #if !defined(EXECVPE)
static char * static char *
find_file_in_path(const char *file) find_file_in_path(const char *file)
{ {
@ -82,11 +82,11 @@ foot_execvpe(const char *file, char *const argv[], char *const envp[])
return ret; return ret;
} }
#else /* !__FreeBSD__ */ #else /* EXECVPE */
#define foot_execvpe(file, argv, envp) execvpe(file, argv, envp) #define foot_execvpe(file, argv, envp) execvpe(file, argv, envp)
#endif /* !__FreeBSD__ */ #endif /* EXECVPE */
static bool static bool
is_valid_shell(const char *shell) is_valid_shell(const char *shell)