}
}
-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);
}
continue;
if(!node->f.b.hastth)
{
- if((hc = findhashcache(node->dev, node->inode)) != NULL)
+ if(((hc = findhashcache(node->dev, node->inode)) != NULL) && (hc->mtime == node->mtime))
{
memcpy(node->hashtth, hc->tth, 24);
node->f.b.hastth = 1;