Dolda2000 GitWeb
/
doldaconnect.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Free msg.
[doldaconnect.git]
/
daemon
/
client.c
diff --git
a/daemon/client.c
b/daemon/client.c
index
814ee0f
..
50da10d
100644
(file)
--- 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 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);
struct sharecache *shareroot = NULL;
unsigned long long sharesize = 0;
GCBCHAIN(sharechangecb, unsigned long long);
@@
-535,13
+539,10
@@
static void checkhashes(void)
char *path;
node = shareroot->child;
char *path;
node = shareroot->child;
-
while(1
)
+
for(node = shareroot->child; node != NULL; node = nextscnode(node)
)
{
{
- if(node->child != NULL)
- {
- node = node->child;
+ if(node->f.b.type != FILE_REG)
continue;
continue;
- }
if(!node->f.b.hastth)
{
if((hc = findhashcache(node->dev, node->inode)) != NULL)
if(!node->f.b.hastth)
{
if((hc = findhashcache(node->dev, node->inode)) != NULL)
@@
-555,19
+556,14
@@
static void checkhashes(void)
{
flog(LOG_WARNING, "could not hash %s, unsharing it", path);
freecache(node);
{
flog(LOG_WARNING, "could not hash %s, unsharing it", path);
freecache(node);
+ free(path);
+ flog(LOG_INFO, "sharing %lli bytes", sharesize);
+ continue;
}
free(path);
return;
}
}
}
free(path);
return;
}
}
- while(node->next == NULL)
- {
- if((node = node->parent) == shareroot)
- break;
- }
- if(node == shareroot)
- break;
- node = node->next;
}
}
}
}
@@
-928,7
+924,7
@@
int doscan(int quantum)
}
type = FILE_REG;
} else {
}
type = FILE_REG;
} else {
- flog(LOG_WARNING, "unhandled file type:
%i
", sb.st_mode);
+ flog(LOG_WARNING, "unhandled file type:
0%o
", sb.st_mode);
free(wcs);
continue;
}
free(wcs);
continue;
}
@@
-1051,6
+1047,11
@@
static int init(int hup)
static int run(void)
{
static int run(void)
{
+ if(hashjob == -1)
+ {
+ hashjob = 0;
+ checkhashes();
+ }
return(doscan(10));
}
return(doscan(10));
}