Dolda2000 GitWeb
/
doldaconnect.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Partial Gaim-2 port.
[doldaconnect.git]
/
daemon
/
client.c
diff --git
a/daemon/client.c
b/daemon/client.c
index
c304d01
..
1e659ab
100644
(file)
--- a/
daemon/client.c
+++ b/
daemon/client.c
@@
-278,15
+278,10
@@
static char *findhashcachefile(int filldef)
}
if(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"));
snprintf(ret, sizeof(ret), "%s/.dc-hashcache", getenv("HOME"));
- } else {
+ else
snprintf(ret, sizeof(ret), "/etc/%s", hcname);
snprintf(ret, sizeof(ret), "/etc/%s", hcname);
- }
return(ret);
} else {
return(NULL);
return(ret);
} else {
return(NULL);
@@
-551,7
+546,7
@@
static void checkhashes(void)
continue;
if(!node->f.b.hastth)
{
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;
{
memcpy(node->hashtth, hc->tth, 24);
node->f.b.hastth = 1;