[myserver-commit] [SCM] GNU MyServer branch, master, updated. v0.9.2-282-g4d0ba86

[Giuseppe Scrivano]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  4d0ba86918a76435b88e904ca41e1ef4e1ad7d1e (commit)
       via  d9c9a770be9b1ff1475d426ca44dc48a34abb6ac (commit)
      from  886b9317e5afc566d4d16d0566f1a8e0d4e08aef (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit 4d0ba86918a76435b88e904ca41e1ef4e1ad7d1e
Author: Giuseppe Scrivano <address@hidden>
Date:   Fri Aug 6 21:23:28 2010 +0200

    Use the gnulib version for dirfd and mkostemp.

diff --git a/myserver/src/base/file/file.cpp b/myserver/src/base/file/file.cpp
index 106422b..1b4e85c 100644
--- a/myserver/src/base/file/file.cpp
+++ b/myserver/src/base/file/file.cpp
@@ -157,7 +157,7 @@ int File::openFile (const char* nfilename, u_long opt, 
mode_t mask)
   if (opt & (File::TEMPORARY_DELAYED | File::TEMPORARY))
     {
       auto_ptr <char> templatefn (checked::strdup (nfilename));
-      handle = mkostemp (templatefn.get (), flags);
+      handle = gnulib::mkostemp (templatefn.get (), flags);
       if (handle < 0)
         checked::raiseException ();
 
diff --git a/myserver/src/base/read_directory/read_directory.cpp 
b/myserver/src/base/read_directory/read_directory.cpp
index 0d87d74..1f29600 100644
--- a/myserver/src/base/read_directory/read_directory.cpp
+++ b/myserver/src/base/read_directory/read_directory.cpp
@@ -157,7 +157,7 @@ int ReadDirectory::find (const char *filename)
 # endif
 
 # ifdef HAVE_FSTATAT
-   if (checked::fstatat (dirfd (dh), name.c_str (), &stats, 0))
+   if (checked::fstatat (gnulib::dirfd (dh), name.c_str (), &stats, 0))
      return -1;
 # else
    string tempName;



commit d9c9a770be9b1ff1475d426ca44dc48a34abb6ac
Author: Giuseppe Scrivano <address@hidden>
Date:   Fri Aug 6 21:23:12 2010 +0200

    CachedFileBuffer: Make the equality tests more robust.  Consider the inode 
value.

diff --git a/myserver/src/base/files_cache/cached_file_buffer.cpp 
b/myserver/src/base/files_cache/cached_file_buffer.cpp
index d1a96b1..c114c4a 100644
--- a/myserver/src/base/files_cache/cached_file_buffer.cpp
+++ b/myserver/src/base/files_cache/cached_file_buffer.cpp
@@ -168,5 +168,12 @@ CachedFileBuffer::~CachedFileBuffer ()
  */
 bool CachedFileBuffer::revalidate (const char *res)
 {
-  return FilesUtility::getLastModTime (res) == getMtime ();
+  struct stat st;
+  int ret = stat (res, &st);
+  if (ret < 0)
+    return false;
+
+  return st.st_ino == fstat.st_ino
+    && st.st_dev == fstat.st_dev
+    && st.st_mtime == fstat.st_mtime;
 }

-----------------------------------------------------------------------

Summary of changes:
 myserver/src/base/file/file.cpp                    |    2 +-
 .../src/base/files_cache/cached_file_buffer.cpp    |    9 ++++++++-
 .../src/base/read_directory/read_directory.cpp     |    2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GNU MyServer