diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2017-04-03 01:00:58 +0200 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2017-04-03 01:00:58 +0200 |
| commit | 64a2d6243471cee6a4151768f8ef4ca556ba2402 (patch) | |
| tree | d097604a14347806e08ff6529cb4687f139b175b /community/clsync/musl-fix.patch | |
| parent | 8f9e0dc8f2e3b2ed519e3c41335f50d32240a751 (diff) | |
| download | aports-64a2d6243471cee6a4151768f8ef4ca556ba2402.tar.bz2 aports-64a2d6243471cee6a4151768f8ef4ca556ba2402.tar.xz | |
community/clsync: move from testing
Diffstat (limited to 'community/clsync/musl-fix.patch')
| -rw-r--r-- | community/clsync/musl-fix.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/community/clsync/musl-fix.patch b/community/clsync/musl-fix.patch new file mode 100644 index 0000000000..a0dc31e9f2 --- /dev/null +++ b/community/clsync/musl-fix.patch @@ -0,0 +1,32 @@ +musl declares lstat64 only for GNU compatibility using macro +`#define lstat64 lstat`. Local variable lstat in mon_gio overrides +global function lstat from sys/stat.h. + +Upstream issue: https://github.com/xaionaro/clsync/issues/150 +--- a/mon_gio.c ++++ b/mon_gio.c +@@ -305,18 +305,18 @@ + count = 0; + while (gio_wait(ctx_p, indexes_p, &tv)) { + event_t *ev = event_pop(); +- stat64_t lstat, *lstat_p; ++ stat64_t _lstat, *lstat_p; + mode_t st_mode; + size_t st_size; +- if ((ev->objtype_new == EOT_DOESNTEXIST) || (ctx_p->flags[CANCEL_SYSCALLS]&CSC_MON_STAT) || lstat64(ev->path, &lstat)) { +- debug(2, "Cannot lstat64(\"%s\", lstat). Seems, that the object had been deleted (%i) or option \"--cancel-syscalls mon_stat\" (%i) is set.", ev->path, ev->objtype_new == EOT_DOESNTEXIST, ctx_p->flags[CANCEL_SYSCALLS]&CSC_MON_STAT); ++ if ((ev->objtype_new == EOT_DOESNTEXIST) || (ctx_p->flags[CANCEL_SYSCALLS]&CSC_MON_STAT) || lstat64(ev->path, &_lstat)) { ++ debug(2, "Cannot lstat64(\"%s\", _lstat). Seems, that the object had been deleted (%i) or option \"--cancel-syscalls mon_stat\" (%i) is set.", ev->path, ev->objtype_new == EOT_DOESNTEXIST, ctx_p->flags[CANCEL_SYSCALLS]&CSC_MON_STAT); + st_mode = (ev->objtype_event == EOT_DIR ? S_IFDIR : S_IFREG); + st_size = 0; + lstat_p = NULL; + } else { +- st_mode = lstat.st_mode; +- st_size = lstat.st_size; +- lstat_p = &lstat; ++ st_mode = _lstat.st_mode; ++ st_size = _lstat.st_size; ++ lstat_p = &_lstat; + } + + if (sync_prequeue_loadmark(1, ctx_p, indexes_p, NULL, ev->path, lstat_p, ev->objtype_old, ev->objtype_new, ev->event_id, ev->handle_id, st_mode, st_size, &path_full, &path_full_len, NULL)) { |