RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

native: add daemonize argv filter

Browse Source 
When daemonizing, only the first instance should do so.
This commit is contained in:
Ludwig Ortmann 2014-11-17 12:40:13 +01:00
parent bb347e0a30
commit 8d2a5b22b4
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
cpu/native/startup.c
View File

@ -150,6 +150,29 @@ void daemonize(void)
}
}
/**
* Remove any -d options from an argument vector.
*
* @param[in][out] argv an argument vector
*
* @return 1 if "-d" was found, 0 otherwise
*/
static int filter_daemonize_argv(char **argv)
{
int ret = 0;
for (char **narg = argv; *narg != NULL; narg++) {
if (strcmp("-d", narg[0]) == 0) {
ret = 1;
char **xarg = narg;
do {
xarg[0] = xarg[1];
} while (*xarg++ != NULL);
narg--; /* rescan current item to filter out double args */
}
}
return ret;
}
void usage_exit(void)
{
real_printf("usage: %s", _progname);
@ -240,7 +263,6 @@ __attribute__((constructor)) static void startup(int argc, char **argv)
_native_id = atol(argv[argp]);
}
else if (strcmp("-d", arg) == 0) {
daemonize();
if (strcmp(stdiotype, "stdio") == 0) {
stdiotype = "null";
}
@ -300,6 +322,10 @@ __attribute__((constructor)) static void startup(int argc, char **argv)
}
}
if (filter_daemonize_argv(_native_argv)) {
daemonize();
}
_native_log_stderr(stderrtype);
_native_log_stdout(stdouttype);
_native_null_in(stdiotype);