diff options
| author | Radek Podgorny <radek@podgorny.cz> | 2014-02-22 17:47:56 +0100 |
|---|---|---|
| committer | Radek Podgorny <radek@podgorny.cz> | 2014-02-22 17:47:56 +0100 |
| commit | bdcb13125fade1692344febea37e63be0618a234 (patch) | |
| tree | 6fe3a8de3cd4d565f9145c5e91d7fdbeee580c56 | |
| parent | cae1ebbf6a5260d29d500f8dd083402e960b546b (diff) | |
| download | unionfs-fuse-bdcb13125fade1692344febea37e63be0618a234.tar.gz | |
formatting and getting to sync with bernd's repo
| -rw-r--r-- | src/unionfs.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/src/unionfs.c b/src/unionfs.c index 8c8f0cb..52543f4 100644 --- a/src/unionfs.c +++ b/src/unionfs.c @@ -681,21 +681,15 @@ static int unionfs_utimens(const char *path, const struct timespec ts[2]) { char p[PATHLEN_MAX]; if (BUILD_PATH(p, uopt.branches[i].path, path)) RETURN(-ENAMETOOLONG); -#if __APPLE__ - struct timeval tv[2] = { - {ts[0].tv_sec, ts[0].tv_nsec / 1000}, - {ts[1].tv_sec, ts[1].tv_nsec / 1000}, - }; - int res = utimes(p, tv); -#elif UNIONFS_HAVE_AT +#ifdef UNIONFS_HAVE_AT + int res = utimensat(0, p, ts, AT_SYMLINK_NOFOLLOW); +#else struct timeval tv[2]; tv[0].tv_sec = ts[0].tv_sec; tv[0].tv_usec = ts[0].tv_nsec * 1000; tv[1].tv_sec = ts[1].tv_sec; tv[1].tv_usec = ts[1].tv_nsec * 1000; int res = utimes(p, tv); -#else - int res = utimensat(0, p, ts, AT_SYMLINK_NOFOLLOW); #endif if (res == -1) RETURN(-errno); @@ -731,7 +725,7 @@ static int unionfs_getxattr(const char *path, const char *name, char *value, siz char p[PATHLEN_MAX]; if (BUILD_PATH(p, uopt.branches[i].path, path)) RETURN(-ENAMETOOLONG); -#if __APPLE__ +#if __APPLE__ int res = getxattr(p, name, value, size, position, XATTR_NOFOLLOW); #else int res = lgetxattr(p, name, value, size); @@ -751,7 +745,7 @@ static int unionfs_listxattr(const char *path, char *list, size_t size) { char p[PATHLEN_MAX]; if (BUILD_PATH(p, uopt.branches[i].path, path)) RETURN(-ENAMETOOLONG); -#if __APPLE__ +#if __APPLE__ int res = listxattr(p, list, size, XATTR_NOFOLLOW); #else int res = llistxattr(p, list, size); @@ -771,7 +765,7 @@ static int unionfs_removexattr(const char *path, const char *name) { char p[PATHLEN_MAX]; if (BUILD_PATH(p, uopt.branches[i].path, path)) RETURN(-ENAMETOOLONG); -#if __APPLE__ +#if __APPLE__ int res = removexattr(p, name, XATTR_NOFOLLOW); #else int res = lremovexattr(p, name); @@ -795,7 +789,7 @@ static int unionfs_setxattr(const char *path, const char *name, const char *valu char p[PATHLEN_MAX]; if (BUILD_PATH(p, uopt.branches[i].path, path)) RETURN(-ENAMETOOLONG); -#if __APPLE__ +#if __APPLE__ int res = setxattr(p, name, value, size, position, flags | XATTR_NOFOLLOW); #else int res = lsetxattr(p, name, value, size, flags); |