UT / clsync

Go to a project
Toggle navigation Toggle navigation pinning
redmine
805cd6ab 1 parent ed194768

Fix of https://github.com/xaionaro/clsync/issues/93

Inline Side-by-side
Showing 3 changed files with 14 additions and 20 deletions
... ... @@ -569,9 +569,9 @@ int bsm_handle_allevents(struct ctx *ctx_p, struct indexes *indexes_p, bsm_handl
else
path_stat = event_p->path;
if ((ctx_p->flags[CANCEL_SYSCALLS]&CSC_MON_STAT) || lstat(path_stat, &st)) {
debug(2, "Cannot lstat64(\"%s\", st). Seems, that the object disappeared or option \"--cancel-syscalls=mon_stat\" is set.", path_stat);
if(r.f.objtype_old == EOT_DIR || r.f.objtype_new == EOT_DIR)
if ((r.t.objtype_new == EOT_DOESNTEXIST) || (ctx_p->flags[CANCEL_SYSCALLS]&CSC_MON_STAT) || lstat(path_stat, &st)) {
debug(2, "Cannot lstat64(\"%s\", st). Seems, that the object had been deleted (%i) or option \"--cancel-syscalls=mon_stat\" (%i) is set.", path_stat, r.t.objtype_new == EOT_DOESNTEXIST, ctx_p->flags[CANCEL_SYSCALLS]&CSC_MON_STAT);
if (r.f.objtype_old == EOT_DIR || r.f.objtype_new == EOT_DIR)
st_mode = S_IFDIR;
else
st_mode = S_IFREG;
... ...
... ... @@ -108,7 +108,7 @@ int inotify_handle(ctx_t *ctx_p, indexes_t *indexes_p) {
// Removing stale wd-s
if(event->mask & IN_IGNORED) {
if (event->mask & IN_IGNORED) {
debug(2, "Cleaning up info about watch descriptor %i.", event->wd);
indexes_remove_bywd(indexes_p, event->wd);
INOTIFY_HANDLE_CONTINUE;
... ... @@ -118,7 +118,7 @@ int inotify_handle(ctx_t *ctx_p, indexes_t *indexes_p) {
char *fpath = indexes_wd2fpath(indexes_p, event->wd);
if(fpath == NULL) {
if (fpath == NULL) {
debug(2, "Event %p on stale watch (wd: %i).", (void *)(long)event->mask, event->wd);
INOTIFY_HANDLE_CONTINUE;
}
... ... @@ -139,15 +139,15 @@ int inotify_handle(ctx_t *ctx_p, indexes_t *indexes_p) {
// Getting infomation about file/dir/etc
struct recognize_event_return r = {0};
recognize_event(&r, event->mask);
stat64_t lstat, *lstat_p;
mode_t st_mode;
size_t st_size;
if ((ctx_p->flags[CANCEL_SYSCALLS]&CSC_MON_STAT) || lstat64(path_full, &lstat)) {
debug(2, "Cannot lstat64(\"%s\", lstat). Seems, that the object disappeared or option \"--cancel-syscalls mon_stat\" is set.", path_full);
if(event->mask & IN_ISDIR)
st_mode = S_IFDIR;
else
st_mode = S_IFREG;
if ((r->objtype_new == EOT_DOESNTEXIST) || (ctx_p->flags[CANCEL_SYSCALLS]&CSC_MON_STAT) || lstat64(path_full, &lstat)) {
debug(2, "Cannot lstat64(\"%s\", lstat). Seems, that the object had been deleted (%i) or option \"--cancel-syscalls mon_stat\" (%i) is set.", path_full, r->objtype_new == EOT_DOESNTEXIST, ctx_p->flags[CANCEL_SYSCALLS]&CSC_MON_STAT);
st_mode = (event->mask & IN_ISDIR ? S_IFDIR : S_IFREG);
st_size = 0;
lstat_p = NULL;
} else {
... ... @@ -156,9 +156,6 @@ int inotify_handle(ctx_t *ctx_p, indexes_t *indexes_p) {
lstat_p = &lstat;
}
struct recognize_event_return r = {0};
recognize_event(&r, event->mask);
if (sync_prequeue_loadmark(1, ctx_p, indexes_p, path_full, NULL, lstat_p, r.objtype_old, r.objtype_new, event->mask, event->wd, st_mode, st_size, &path_rel, &path_rel_len, NULL)) {
count = -1;
goto l_inotify_handle_end;
... ...
... ... @@ -562,12 +562,9 @@ int kqueue_sync(ctx_t *ctx_p, indexes_t *indexes_p, struct kevent *ev_p, monobj_
mode_t st_mode;
size_t st_size;
if ((ctx_p->flags[CANCEL_SYSCALLS]&CSC_MON_STAT) || lstat64(path_full, &lstat)) {
debug(2, "Cannot or cancelled lstat64(\"%s\", lstat). The object disappeared or option \"--cancel-syscalls=mon_stat\" is set.", path_full);
if(obj_p->type == DT_DIR)
st_mode = S_IFDIR;
else
st_mode = S_IFREG;
if ((ev_p->fflags == NOTE_DELETE) || (ctx_p->flags[CANCEL_SYSCALLS]&CSC_MON_STAT) || lstat64(path_full, &lstat)) {
debug(2, "Cannot or cancelled lstat64(\"%s\", lstat). The object had been deleted (%i) or option \"--cancel-syscalls=mon_stat\" (%i) is set.", path_full, ev_p->fflags == NOTE_DELETE, ctx_p->flags[CANCEL_SYSCALLS]&CSC_MON_STAT);
st_mode = (obj_p->type == DT_DIR ? S_IFDIR : S_IFREG);
st_size = 0;
lstat_p = NULL;
} else {
... ...