From: Jani Nikula <jani@nikula.org>
To: notmuch@notmuchmail.org
Subject: [PATCH 05/11] cli/insert: clean up sync_dir
Date: Mon, 22 Sep 2014 11:54:56 +0200 [thread overview]
Message-ID: <7d3e24291b8d4cc0d11b1a87249bbebed4e78648.1411379395.git.jani@nikula.org> (raw)
In-Reply-To: <cover.1411379395.git.jani@nikula.org>
In-Reply-To: <cover.1411379395.git.jani@nikula.org>
Clarify the code slightly, improve error messages. Apart from the
error message changes, no functional changes.
---
notmuch-insert.c | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/notmuch-insert.c b/notmuch-insert.c
index 5d47806..7375c54 100644
--- a/notmuch-insert.c
+++ b/notmuch-insert.c
@@ -67,20 +67,21 @@ safe_gethostname (char *hostname, size_t len)
static notmuch_bool_t
sync_dir (const char *dir)
{
- notmuch_bool_t ret;
- int fd;
+ int fd, r;
fd = open (dir, O_RDONLY);
if (fd == -1) {
- fprintf (stderr, "Error: open() dir failed: %s\n", strerror (errno));
+ fprintf (stderr, "Error: open %s: %s\n", dir, strerror (errno));
return FALSE;
}
- ret = (fsync (fd) == 0);
- if (! ret) {
- fprintf (stderr, "Error: fsync() dir failed: %s\n", strerror (errno));
- }
+
+ r = fsync (fd);
+ if (r)
+ fprintf (stderr, "Error: fsync %s: %s\n", dir, strerror (errno));
+
close (fd);
- return ret;
+
+ return r == 0;
}
/*
--
1.7.2.5
next prev parent reply other threads:[~2014-09-22 9:55 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-22 9:54 [PATCH 00/11] notmuch insert updates Jani Nikula
2014-09-22 9:54 ` [PATCH 01/11] lib: actually return failures from notmuch_message_tags_to_maildir_flags Jani Nikula
2014-09-22 9:54 ` [PATCH 02/11] cli/insert: rename check_folder_name to is_valid_folder_name Jani Nikula
2014-09-22 9:54 ` [PATCH 03/11] cli/insert: move add_file_to_database to a better place Jani Nikula
2014-09-22 9:54 ` [PATCH 04/11] cli/insert: rename file copy function Jani Nikula
2014-09-22 9:54 ` Jani Nikula [this message]
2014-09-22 9:54 ` [PATCH 06/11] cli/insert: use a single recursive mkdir function Jani Nikula
2014-09-22 9:54 ` [PATCH 07/11] cli/insert: abstract temporary filename generation Jani Nikula
2014-09-22 9:54 ` [PATCH 08/11] cli/insert: rehash file writing functions Jani Nikula
2014-09-22 9:55 ` [PATCH 09/11] cli/insert: add fail path to add_file_to_database Jani Nikula
2014-09-26 20:09 ` David Bremner
2014-09-22 9:55 ` [PATCH 10/11] cli/insert: require succesful message indexing for success status Jani Nikula
2014-09-22 9:55 ` [PATCH 11/11] cli/insert: add post-insert hook Jani Nikula
2014-09-25 8:13 ` [PATCH 00/11] notmuch insert updates David Bremner
2014-09-25 19:54 ` Tomi Ollila
2014-09-26 6:48 ` David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7d3e24291b8d4cc0d11b1a87249bbebed4e78648.1411379395.git.jani@nikula.org \
--to=jani@nikula.org \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).