[Pkg-gnupg-commit] [gnupg2] 18/180: g10: Use es_fopen instead of open.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit bfeafe2d3f9bbaa7f11f3ad870a446141c038b0d
Author: Neal H. Walfield <neal at g10code.com>
Date:   Tue Nov 22 17:12:38 2016 +0100

    g10: Use es_fopen instead of open.
    
    * g10/tofu.c: Don't include <utime.h>, <fcntl.h> or <unistd.h>.
    (busy_handler): Replace use of open with es_fopen.
    
    --
    Signed-off-by: Neal H. Walfield <neal at g10code.com>
    
    Thanks for Werner for pointing this out: es_fopen is more portable
    than open.
---
 g10/tofu.c | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/g10/tofu.c b/g10/tofu.c
index d7730a3..8575947 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -29,9 +29,6 @@
 #include <stdarg.h>
 #include <sqlite3.h>
 #include <time.h>
-#include <utime.h>
-#include <fcntl.h>
-#include <unistd.h>
 
 #include "gpg.h"
 #include "types.h"
@@ -909,21 +906,23 @@ busy_handler (void *cookie, int call_count)
 
   (void) call_count;
 
-  /* Update the lock file time stamp so that the current owner knows
-     that we want the lock.  */
+  /* Update the want-lock-file time stamp (specifically, the ctime) so
+   * that the current owner knows that we (well, someone) want the
+   * lock.  */
   if (dbs)
     {
       /* Note: we don't fail if we can't create the lock file: this
-         process will have to wait a bit longer, but otherwise nothing
-         horrible should happen.  */
+       * process will have to wait a bit longer, but otherwise nothing
+       * horrible should happen.  */
 
-      int fd = open (dbs->want_lock_file, O_CREAT|O_WRONLY|O_TRUNC,
-                     S_IRUSR|S_IRGRP|S_IROTH|S_IWUSR);
-      if (fd == -1)
+      estream_t fp;
+
+      fp = es_fopen (dbs->want_lock_file, "w");
+      if (! fp)
         log_debug ("TOFU: Error opening '%s': %s\n",
                    dbs->want_lock_file, strerror (errno));
       else
-        close (fd);
+        es_fclose (fp);
     }
 
   /* Call again.  */

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git