X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Fclient.c;h=1e659aba1a5db3f9f8a4801baa7437a05bf8f26b;hb=a3a4a3a7ae1030512acfd849bb184b9d2264c24d;hp=c304d0137b9c2e8511cd9298bfee6f7fae830f45;hpb=dfc72ce3ef0801b54a285abdd72b620a4dceb72e;p=doldaconnect.git diff --git a/daemon/client.c b/daemon/client.c index c304d01..1e659ab 100644 --- a/daemon/client.c +++ b/daemon/client.c @@ -278,15 +278,10 @@ static char *findhashcachefile(int filldef) } if(filldef) { - if((hcname = icswcstombs(confgetstr("cli", "hashcache"), NULL, NULL)) != NULL) - { - strcpy(ret, hcname); - return(ret); - } else if(getenv("HOME") != NULL) { + 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); @@ -551,7 +546,7 @@ static void checkhashes(void) 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;