oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

libroken: Make roken_detach_prep take const char *special_arg.

Browse Source 
Requires an internal rk_UNCONST because of annoying execvp type, but
that's better than rk_UNCONST in all the call sites.
This commit is contained in:
Taylor R Campbell
2023-06-20 11:42:30 +00:00
committed by Nicolas Williams
parent 5fec8989b5
commit a9f37d2597
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/roken/detach.c
View File

@@ -45,7 +45,7 @@
static int pipefds[2] = {-1, -1};
ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
roken_detach_prep(int argc, char **argv, char *special_arg)
roken_detach_prep(int argc, char **argv, const char *special_arg)
{
ssize_t bytes;
size_t i;
@@ -84,7 +84,7 @@ roken_detach_prep(int argc, char **argv, char *special_arg)
pipefds[1]);
new_argv[0] = argv[0];
new_argv[1] = special_arg;
new_argv[1] = rk_UNCONST(special_arg);
new_argv[2] = fildes;
for (i = 1; argv[i] != NULL; i++)
new_argv[i + 2] = argv[i];

2
lib/roken/roken.h.in
View File

@@ -922,7 +922,7 @@ ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL roken_vconcat (char *, size_t, va_list);
ROKEN_LIB_FUNCTION size_t ROKEN_LIB_CALL
roken_vmconcat (char **, size_t, va_list);
ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL roken_detach_prep(int, char **, char *);
ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL roken_detach_prep(int, char **, const char *);
ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL roken_detach_finish(const char *, int);
ROKEN_LIB_FUNCTION ssize_t ROKEN_LIB_CALL