X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Fclient.c;h=9f3eac0b2120690959047bd56a8ae12d18058679;hb=24220575a31ee174497fb93869c1a1ce4eb4b74a;hp=bf7a3afb8b144f1dde54b47fe5fa98087c07372c;hpb=2eaefd316777cb97c72cf9d03df72246d44ec8be;p=doldaconnect.git diff --git a/daemon/client.c b/daemon/client.c index bf7a3af..9f3eac0 100644 --- a/daemon/client.c +++ b/daemon/client.c @@ -76,7 +76,11 @@ static struct scanstate *scanjob = NULL; static struct scanqueue *scanqueue = NULL; static struct sharepoint *shares = NULL; static struct hashcache *hashcache = NULL; -static pid_t hashjob = 0; +/* Set initially to -1, but changed to 0 the first time run() is + * called. This is to avoid forking a hash job before daemonizing, + * since that would make the daemon unable to wait() for the hash + * job. */ +static pid_t hashjob = -1; struct sharecache *shareroot = NULL; unsigned long long sharesize = 0; GCBCHAIN(sharechangecb, unsigned long long); @@ -198,9 +202,21 @@ wchar_t *unparsehash(struct hash *hash) addtobuf(buf, ':'); bufcat(buf, whbuf, wcslen(whbuf)); free(whbuf); + addtobuf(buf, 0); return(buf); } +int hashcmp(struct hash *h1, struct hash *h2) +{ + if(wcscmp(h1->algo, h2->algo)) + return(0); + if(h1->len != h2->len) + return(0); + if(memcmp(h1->buf, h2->buf, h1->len)) + return(0); + return(1); +} + static struct hashcache *newhashcache(void) { struct hashcache *new; @@ -916,7 +932,7 @@ int doscan(int quantum) } type = FILE_REG; } else { - flog(LOG_WARNING, "unhandled file type: %i", sb.st_mode); + flog(LOG_WARNING, "unhandled file type: %o", sb.st_mode); free(wcs); continue; } @@ -1039,6 +1055,11 @@ static int init(int hup) static int run(void) { + if(hashjob == -1) + { + hashjob = 0; + checkhashes(); + } return(doscan(10)); }