}
if(filldef)
{
- if(getenv("HOME") != NULL)
+ if((hcname = icswcstombs(confgetstr("cli", "hashcache"), NULL, NULL)) != NULL)
+ {
+ strcpy(ret, hcname);
+ return(ret);
+ } else if(getenv("HOME") != NULL) {
snprintf(ret, sizeof(ret), "%s/.dc-hashcache", getenv("HOME"));
- else
+ } else {
snprintf(ret, sizeof(ret), "/etc/%s", hcname);
+ }
return(ret);
} else {
return(NULL);
}
}
-static void hashexit(pid_t pid, int status, void *uudata)
+static void hashexit(pid_t pid, int status, struct socket *outsock)
{
if(pid != hashjob)
flog(LOG_ERR, "BUG: hashing process changed PID?! old: %i new %i", hashjob, pid);
flog(LOG_WARNING, "hashing process exited with non-zero status: %i", status);
hashjob = 0;
checkhashes();
+ putsock(outsock);
}
static int hashfile(char *path)
close(pfd[1]);
outsock = wrapsock(pfd[0]);
outsock->readcb = hashread;
- childcallback(hashjob, hashexit, NULL);
+ childcallback(hashjob, (void (*)(pid_t, int, void *))hashexit, outsock);
return(0);
}