[svn] GnuPG - r4962 - branches/STABLE-BRANCH-1-4/util

[svn author dshaw]

Author: dshaw
Date: 2009-03-20 21:33:14 +0100 (Fri, 20 Mar 2009)
New Revision: 4962

Modified:
   branches/STABLE-BRANCH-1-4/util/ChangeLog
   branches/STABLE-BRANCH-1-4/util/iobuf.c
Log:
* iobuf.c (fd_cache_synchronize): New.  fsync() a file in cache.
(iobuf_ioctl): Called here, for ioctl 4.  (fd_cache_invalidate): Pass
return code from close() back to iobuf_ioctl().


Modified: branches/STABLE-BRANCH-1-4/util/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/util/ChangeLog	2009-03-20 19:04:47 UTC (rev 4961)
+++ branches/STABLE-BRANCH-1-4/util/ChangeLog	2009-03-20 20:33:14 UTC (rev 4962)
@@ -1,3 +1,10 @@
+2009-03-20  David Shaw  <dshaw at jabberwocky.com>
+
+	* iobuf.c (fd_cache_synchronize): New.  fsync() a file in cache.
+	(iobuf_ioctl): Called here, for ioctl 4.
+	(fd_cache_invalidate): Pass return code from close() back to
+	iobuf_ioctl().
+
 2009-03-13  David Shaw  <dshaw at jabberwocky.com>
 
 	* http.c (do_parse_uri): Properly handle IPv6 literal addresses as

Modified: branches/STABLE-BRANCH-1-4/util/iobuf.c
===================================================================
--- branches/STABLE-BRANCH-1-4/util/iobuf.c	2009-03-20 19:04:47 UTC (rev 4961)
+++ branches/STABLE-BRANCH-1-4/util/iobuf.c	2009-03-20 20:33:14 UTC (rev 4962)
@@ -1,6 +1,6 @@
 /* iobuf.c  -  file handling
- * Copyright (C) 1998, 1999, 2000, 2001, 2003,
- *               2004, 2008 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2008,
+ *               2009 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -162,10 +162,11 @@
  * Invalidate (i.e. close) a cached iobuf or all iobufs if NULL is
  * used for FNAME.
  */
-static void
+static int
 fd_cache_invalidate (const char *fname)
 {
     CLOSE_CACHE cc;
+    int err=0;
 
     if (!fname) {
         if( DBG_IOBUF )
@@ -181,7 +182,7 @@
                 cc->fp = INVALID_FP;
             }
         }
-        return;
+        return err;
     }
 
     if( DBG_IOBUF )
@@ -192,17 +193,44 @@
             if( DBG_IOBUF )
                 log_debug ("                did (%s)\n", cc->fname);
 #ifdef HAVE_DOSISH_SYSTEM
-            CloseHandle (cc->fp);
+            if(CloseHandle (cc->fp)==0)
+	      err=-1;
 #else
-	    close(cc->fp);
+	    err=close(cc->fp);
 #endif
             cc->fp = INVALID_FP;
         }
     }
+
+    return err;
 }
 
+static int
+fd_cache_synchronize(const char *fname)
+{
+  int err=0;
 
+#ifndef HAVE_DOSISH_SYSTEM
+  CLOSE_CACHE cc;
 
+  if( DBG_IOBUF )
+    log_debug ("fd_cache_synchronize (%s)\n", fname);
+
+  for (cc=close_cache; cc; cc = cc->next )
+    {
+      if ( cc->fp != INVALID_FP && !fd_cache_strcmp (cc->fname, fname) )
+	{
+	  if( DBG_IOBUF )
+	    log_debug ("                did (%s)\n", cc->fname);
+
+	  err=fsync(cc->fp);
+	}
+    }
+#endif
+
+  return err;
+}
+
 static FILEP_OR_FD
 direct_open (const char *fname, const char *mode)
 {
@@ -1298,10 +1326,10 @@
                       ptrval? (char*)ptrval:"[all]");
         if ( !a && !intval ) {
 #ifndef FILE_FILTER_USES_STDIO
-            fd_cache_invalidate (ptrval);
+	    return fd_cache_invalidate (ptrval);
 #endif
             return 0;
-        }
+	 }
     }
     else if ( cmd == 3 ) {  /* disallow/allow caching */
         if( DBG_IOBUF )
@@ -1322,7 +1350,24 @@
             }
 #endif
     }
+    else if(cmd==4)
+      {
+	/* Do a fsync on the open fd and return any errors to the
+	   caller of iobuf_ioctl */
+        if( DBG_IOBUF )
+	  log_debug("iobuf-*.*: ioctl `%s' fsync\n",
+                      ptrval? (char*)ptrval:"<null>");
 
+	if(!a && !intval && ptrval)
+	  {
+#ifndef FILE_FILTER_USES_STDIO
+	    return fd_cache_synchronize (ptrval);
+#else
+	    return 0;
+#endif
+	  }
+      }
+
     return -1;
 }