RepoMirrors/mars
1
0
Fork 0
mirror of https://github.com/schoebel/mars synced 2025-04-11 03:51:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

light: fix marker check

Browse Source 
The old code was not portable across changes of CL_*
This commit is contained in:
Thomas Schoebel-Theuer 2014-03-04 07:08:12 +01:00 committed by Thomas Schoebel-Theuer
parent 56f38641ff
commit e5a558aefe
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kernel/sy_old/mars_light.c
View File

@ -1537,7 +1537,8 @@ int run_bone(struct mars_peerinfo *peer, struct mars_dent *remote_dent)
goto done;
}
if (remote_dent->d_class == CL_GLOBAL_TODO_DELETE) {
// create / check markers (prevent concurrent updates)
if (remote_dent->new_link && !strncmp(remote_dent->d_path, "/mars/todo-global/delete-", 25)) {
marker_path = backskip_replace(remote_dent->new_link, '/', true, "/.deleted-");
if (mars_stat(marker_path, &local_stat, true) < 0 ||
timespec_compare(&remote_dent->new_stat.mtime, &local_stat.mtime) > 0) {
@ -1660,7 +1661,7 @@ int run_bones(struct mars_peerinfo *peer)
for (tmp = tmp_list.next; tmp != &tmp_list; tmp = tmp->next) {
struct mars_dent *remote_dent = container_of(tmp, struct mars_dent, dent_link);
if (!remote_dent->d_path) {
if (!remote_dent->d_path || !remote_dent->d_name) {
MARS_DBG("NULL\n");
continue;
}