utimens availability check

fusexmp uses utimens and takes that function for granted. It is part of
POSIX exended API set 2 and some systems do not have it yet. Attached
patch checks for utimens availability and returns ENOSYS if unavailable.

diff --git a/ChangeLog b/ChangeLog
index ad42adcf9805f47ba68860ee92a6311f76959428..828a18196845e3ef1ed86cc865ec47f6e650be2d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
        * Fix build if FUSE_NODE_SLAB is not defined.  Patch by Emmanuel
        Dreyfus
 
+       * Check for availability of utimensat() function.  Patch by
+       Emmanuel Dreyfus
+
 2011-12-07  Miklos Szeredi <miklos@szeredi.hu>
 
        * Add fuse_lowlevel_notify_delete() which tells the kernel that a

diff --git a/configure.in b/configure.in
index aab304bda066378e6578a9ccce2960e7eac8b4f8..1d7dd5c18bc7d6f9657c1bb85c482d173f755021 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -56,7 +56,7 @@ if test "$enable_mtab" = "no"; then
        AC_DEFINE(IGNORE_MTAB, 1, [Don't update /etc/mtab])
 fi
 
-AC_CHECK_FUNCS([fork setxattr fdatasync splice vmsplice])
+AC_CHECK_FUNCS([fork setxattr fdatasync splice vmsplice utimensat])
 AC_CHECK_MEMBERS([struct stat.st_atim])
 AC_CHECK_MEMBERS([struct stat.st_atimespec])
 

diff --git a/example/fusexmp.c b/example/fusexmp.c
index 58b77a8fd04b9a37dca6c0aed9f5af93d56a6cb9..fa3fb4d8072d5bcbaa605e0485259c66463f168e 100644 (file)
--- a/example/fusexmp.c
+++ b/example/fusexmp.c
@@ -213,16 +213,19 @@ static int xmp_truncate(const char *path, off_t size)
        return 0;
 }
 
+#ifdef HAVE_UTIMENSAT
 static int xmp_utimens(const char *path, const struct timespec ts[2])
 {
        int res;
 
+       /* don't use utime/utimes since they follow symlinks */
        res = utimensat(0, path, ts, AT_SYMLINK_NOFOLLOW);
        if (res == -1)
                return -errno;
 
        return 0;
 }
+#endif
 
 static int xmp_open(const char *path, struct fuse_file_info *fi)
 {
@@ -359,7 +362,9 @@ static struct fuse_operations xmp_oper = {
        .chmod          = xmp_chmod,
        .chown          = xmp_chown,
        .truncate       = xmp_truncate,
+#ifdef HAVE_UTIMENSAT
        .utimens        = xmp_utimens,
+#endif
        .open           = xmp_open,
        .read           = xmp_read,
        .write          = xmp_write,

diff --git a/example/fusexmp_fh.c b/example/fusexmp_fh.c
index 046185c92a34ec4f67d04edf8ced93bffc924dc4..57053caef81b5757145421af6e2b0d68d730883a 100644 (file)
--- a/example/fusexmp_fh.c
+++ b/example/fusexmp_fh.c
@@ -283,16 +283,19 @@ static int xmp_ftruncate(const char *path, off_t size,
        return 0;
 }
 
+#ifdef HAVE_UTIMENSAT
 static int xmp_utimens(const char *path, const struct timespec ts[2])
 {
        int res;
 
+       /* don't use utime/utimes since they follow symlinks */
        res = utimensat(0, path, ts, AT_SYMLINK_NOFOLLOW);
        if (res == -1)
                return -errno;
 
        return 0;
 }
+#endif
 
 static int xmp_create(const char *path, mode_t mode, struct fuse_file_info *fi)
 {
@@ -513,7 +516,9 @@ static struct fuse_operations xmp_oper = {
        .chown          = xmp_chown,
        .truncate       = xmp_truncate,
        .ftruncate      = xmp_ftruncate,
+#ifdef HAVE_UTIMENSAT
        .utimens        = xmp_utimens,
+#endif
        .create         = xmp_create,
        .open           = xmp_open,
        .read           = xmp_read,