rms/libfaketime
1
0
Fork 0
mirror of https://github.com/wolfcw/libfaketime.git synced 2026-05-17 08:36:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #92 from hbuchsbaum/work

Browse Source 
do not destroy environment when parsing FAKETIME_ONLY_CMDS
This commit is contained in:
Wolfgang Hommel
2016-06-27 08:54:00 +02:00
committed by GitHub
parent b68f2820c4 9220b5c58e
commit da778084e5
1 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/libfaketime.c
View File

@@ -1694,7 +1694,7 @@ void ftpl_init(void)
/* We can limit faking time to specified commands */
if ((tmp_env = getenv("FAKETIME_ONLY_CMDS")) != NULL)
{
char *only_cmd, *saveptr;
char *only_cmd, *saveptr, *tmpvar;
bool cmd_matched = false;
if (getenv("FAKETIME_SKIP_CMDS") != NULL)
@@ -1703,21 +1703,29 @@ void ftpl_init(void)
exit(EXIT_FAILURE);
}
only_cmd = strtok_r(tmp_env, ",", &saveptr);
while (only_cmd != NULL)
{
if (0 == strcmp(progname, only_cmd))
/* Don't mess with the env variable directly. */
tmpvar = strdup(tmp_env);
if (tmpvar != NULL) {
only_cmd = strtok_r(tmpvar, ",", &saveptr);
while (only_cmd != NULL)
{
cmd_matched = true;
break;
if (0 == strcmp(progname, only_cmd))
{
cmd_matched = true;
break;
}
only_cmd = strtok_r(NULL, ",", &saveptr);
}
only_cmd = strtok_r(NULL, ",", &saveptr);
}
if (!cmd_matched)
{
ft_mode = FT_NOOP;
dont_fake_final = true;
if (!cmd_matched)
{
ft_mode = FT_NOOP;
dont_fake_final = true;
}
free(tmpvar);
} else {
fprintf(stderr, "Error: Could not copy the environment variable value.\n");
exit(EXIT_FAILURE);
}
}