Try using O_NOATIME when sniffing for mime types. Based on a patch by A.

        * glocalfileinfo.c (get_content_type): Try using O_NOATIME when
        sniffing for mime types. Based on a patch by A. Walton

svn path=/trunk/; revision=7773

diff --git a/gio/ChangeLog b/gio/ChangeLog
index 6736067ab45eaf2f24ffd060a520a9d90a7886bf..43ed5e4865218831d8fc910293cfbdd94e47b421 100644 (file)
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,10 @@
+2009-01-05  Matthias Clasen <mclasen@redhat.com>
+
+       Bug 566064 – Add NOATIME flag to query_info_flags
+
+       * glocalfileinfo.c (get_content_type): Try using O_NOATIME when
+       sniffing for mime types. Based on a patch by A. Walton
+
 2009-01-05  Ryan Lortie  <desrt@desrt.ca>
 
        * tests/.gitignore: improve

diff --git a/gio/glocalfileinfo.c b/gio/glocalfileinfo.c
index 60d4686a231ae64469a6a29a81cef19fdaf426d2..299fc2d62593e998d18b19c6fdb903bfd75dfc2e 100644 (file)
--- a/gio/glocalfileinfo.c
+++ b/gio/glocalfileinfo.c
@@ -33,6 +33,7 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+#define _GNU_SOURCE
 #include <fcntl.h>
 #include <errno.h>
 #ifdef HAVE_GRP_H
@@ -1234,8 +1235,13 @@ get_content_type (const char          *basename,
          sniff_length = _g_unix_content_type_get_sniff_len ();
          if (sniff_length > 4096)
            sniff_length = 4096;
-         
-         fd = open (path, O_RDONLY);
+
+#ifdef O_NOATIME         
+          fd = open (path, O_RDONLY | O_NOATIME);
+          if (fd < 0 && errno == EPERM)
+#endif
+           fd = open (path, O_RDONLY);
+
          if (fd != -1)
            {
              ssize_t res;