RepoMirrors/mars
1
0
Fork 0
mirror of https://github.com/schoebel/mars synced 2024-12-17 12:14:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

import mars-62.tgz

Browse Source
This commit is contained in:
Thomas Schoebel-Theuer 2011-02-28 10:04:16 +01:00
parent 93b96df54f
commit db2dfebcb1
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mars_light.c
View File

@ -499,7 +499,7 @@ int _update_file(struct mars_global *global, struct light_dent *parent, const ch
snprintf(tmp, sizeof(tmp), "%s+%s", peer, path); snprintf(tmp, sizeof(tmp), "%s+%s", peer, path);
status = __make_copy(global, parent, path, argv, -1, NULL); status = __make_copy(global, parent, tmp, argv, -1, NULL);
return status; return status;
} }
@ -511,12 +511,17 @@ int _is_peer_logfile(const char *name, const char *id)
int idlen = id ? strlen(id) : 4 + 9 + 1; int idlen = id ? strlen(id) : 4 + 9 + 1;
if (len <= idlen || if (len <= idlen ||
strncmp(name, "log-", 4) != 0 || strncmp(name, "log-", 4) != 0) {
(id && MARS_DBG("not a logfile at all: '%s'\n", name);
name[len - idlen - 1] == '-' &&
!strncmp(name + len - idlen, id, idlen))) {
return false; return false;
} }
if (id &&
name[len - idlen - 1] == '-' &&
strncmp(name + len - idlen, id, idlen) == 0) {
MARS_DBG("not a peer logfile: '%s'\n", name);
return false;
}
MARS_DBG("found peer logfile: '%s'\n", name);
return true; return true;
} }
@ -586,7 +591,7 @@ int run_bones(void *buf, struct light_dent *dent)
if (!stat_ok || local_stat.size < src_size) { if (!stat_ok || local_stat.size < src_size) {
status = _update_file(peer->global, dent->d_parent, peer->peer, dent->d_path); status = _update_file(peer->global, dent->d_parent, peer->peer, dent->d_path);
MARS_DBG("update '%s' status = %d\n", dent->d_path, status); MARS_DBG("update '%s' from peer '%s' status = %d\n", dent->d_path, peer->peer, status);
if (status >= 0) { if (status >= 0) {
struct mars_dent *local_alias; struct mars_dent *local_alias;
int len = dent->d_pathlen; int len = dent->d_pathlen;