From bfeafe2d3f9bbaa7f11f3ad870a446141c038b0d Mon Sep 17 00:00:00 2001 From: "Neal H. Walfield" Date: Tue, 22 Nov 2016 17:12:38 +0100 Subject: [PATCH] g10: Use es_fopen instead of open. * g10/tofu.c: Don't include , or . (busy_handler): Replace use of open with es_fopen. -- Signed-off-by: Neal H. Walfield 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 d7730a360..85759479d 100644 --- a/g10/tofu.c +++ b/g10/tofu.c @@ -29,9 +29,6 @@ #include #include #include -#include -#include -#include #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. */