sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix error: conflicting types for built-in function 'execl'; expected 'int(const char *, const char *, ...)

Browse Source 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2022-03-18 15:10:04 +08:00 committed by Petro Karashchenko
parent 15960f25a5
commit eea014efb7
2 changed files with 37 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/unistd.h
View File

@ -367,7 +367,7 @@ int lchown(FAR const char *path, uid_t owner, gid_t group);
/* Execution of programs from files */ /* Execution of programs from files */
#ifdef CONFIG_LIBC_EXECFUNCS #ifdef CONFIG_LIBC_EXECFUNCS
int execl(FAR const char *path, ...); int execl(FAR const char *path, FAR const char *arg0, ...);
int execv(FAR const char *path, FAR char * const argv[]); int execv(FAR const char *path, FAR char * const argv[]);
#endif #endif

82
libs/libc/unistd/lib_execl.c
View File

@ -113,10 +113,10 @@
* *
****************************************************************************/ ****************************************************************************/
int execl(FAR const char *path, ...) int execl(FAR const char *path, FAR const char *arg0, ...)
{ {
FAR char **argv = (FAR char **)NULL; FAR char **argv = NULL;
FAR char *arg; FAR char *arg = (FAR char *)arg0;
size_t nargs; size_t nargs;
va_list ap; va_list ap;
int argc; int argc;
@ -124,67 +124,57 @@ int execl(FAR const char *path, ...)
/* Count the number of arguments */ /* Count the number of arguments */
va_start(ap, path); va_start(ap, arg0);
nargs = 0; nargs = 0;
do
while (arg != NULL)
{ {
/* Check if the next argument is present */ /* Yes.. increment the number of arguments. Here is a sanity
* check to prevent running away with an unterminated argv[] list.
* MAX_EXECL_ARGS should be sufficiently large that this never
* happens in normal usage.
*/
if (++nargs > MAX_EXECL_ARGS)
{
set_errno(E2BIG);
va_end(ap);
return ERROR;
}
arg = va_arg(ap, FAR char *); arg = va_arg(ap, FAR char *);
if (arg)
{
/* Yes.. increment the number of arguments. Here is a sanity
* check to prevent running away with an unterminated argv[] list.
* MAX_EXECL_ARGS should be sufficiently large that this never
* happens in normal usage.
*/
if (++nargs > MAX_EXECL_ARGS)
{
set_errno(E2BIG);
va_end(ap);
return ERROR;
}
}
} }
while (arg);
va_end(ap); va_end(ap);
/* Allocate a temporary argv[] array */ /* Allocate a temporary argv[] array */
if (nargs > 0) argv = (FAR char **)lib_malloc((nargs + 1) * sizeof(FAR char *));
if (argv == NULL)
{ {
argv = (FAR char **)lib_malloc((nargs + 1) * sizeof(FAR char *)); set_errno(ENOMEM);
if (argv == (FAR char **)NULL) return ERROR;
{
set_errno(ENOMEM);
return ERROR;
}
/* Collect the arguments into the argv[] array */
va_start(ap, path);
for (argc = 0; argc < nargs; argc++)
{
argv[argc] = va_arg(ap, FAR char *);
}
argv[nargs] = NULL;
va_end(ap);
} }
argv[0] = (FAR char *)arg0;
/* Collect the arguments into the argv[] array */
va_start(ap, arg0);
for (argc = 1; argc <= nargs; argc++)
{
argv[argc] = va_arg(ap, FAR char *);
}
va_end(ap);
/* Then let execv() do the real work */ /* Then let execv() do the real work */
ret = execv(path, (FAR char * const *)argv); ret = execv(path, argv);
/* Free the allocated argv[] list */ /* Free the allocated argv[] list */
if (argv) lib_free(argv);
{
lib_free(argv);
}
return ret; return ret;
} }