emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Save a needless malloc when re-creating PATH.

Browse Source
This commit is contained in:
Roy Marples 2008-11-12 10:55:42 +00:00
parent 937b1b2abf
commit fe509db660
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/rc/start-stop-daemon.c
View File

@ -1131,22 +1131,28 @@ int start_stop_daemon(int argc, char **argv)
rc_stringlist_free(env_list);
/* For the path, remove the rcscript bin dir from it */
if ((tmp = xstrdup(getenv("PATH")))) {
len = strlen(tmp);
newpath = np = xmalloc(len);
p = tmp;
while ((token = strsep(&p, ":"))) {
if (strcmp(token, RC_LIBDIR "/bin") == 0 ||
strcmp(token, RC_LIBDIR "/sbin") == 0)
continue;
if ((token = getenv("PATH"))) {
len = strlen(token);
newpath = np = xmalloc(len + 1);
while (token && *token) {
p = strchr(token, ':');
if (p) {
*p++ = '\0';
while (*p == ':')
p++;
}
if (strcmp(token, RC_LIBDIR "/bin") != 0 &&
strcmp(token, RC_LIBDIR "/sbin") != 0)
{
len = strlen(token);
if (np != newpath)
*np++ = ':';
memcpy(np, token, len);
np += len;
*np = '\0';
}
free(tmp);
token = p;
}
*np = '\0';
unsetenv("PATH");
setenv("PATH", newpath, 1);
}