mirror of
https://git.notmuchmail.org/git/notmuch
synced 2025-01-03 07:11:41 +01:00
cli/insert: rehash file writing functions
Make the function calls make more sense as independent building blocks of the big picture, with clear inputs and outputs. Split up write_message into two. Improve function documentation. Cleanup and clarify the error paths.
This commit is contained in:
parent
dcfcb4ba7b
commit
0d597f6889
1 changed files with 74 additions and 51 deletions
125
notmuch-insert.c
125
notmuch-insert.c
|
@ -204,47 +204,37 @@ tempfilename (const void *ctx)
|
||||||
return filename;
|
return filename;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Open a unique file in the 'tmp' sub-directory of dir.
|
/*
|
||||||
* Returns the file descriptor on success, or -1 on failure.
|
* Create a unique temporary file in maildir/tmp, return fd and full
|
||||||
* On success, file paths for the message in the 'tmp' and 'new'
|
* path to file in *path_out, or -1 on errors (in which case *path_out
|
||||||
* directories are returned via tmppath and newpath,
|
* is not touched).
|
||||||
* and the path of the 'new' directory itself in newdir. */
|
*/
|
||||||
static int
|
static int
|
||||||
maildir_open_tmp_file (void *ctx, const char *dir,
|
maildir_mktemp (const void *ctx, const char *maildir, char **path_out)
|
||||||
char **tmppath, char **newpath, char **newdir)
|
|
||||||
{
|
{
|
||||||
char *filename;
|
char *filename, *path;
|
||||||
int fd = -1;
|
int fd;
|
||||||
|
|
||||||
do {
|
do {
|
||||||
filename = tempfilename (ctx);
|
filename = tempfilename (ctx);
|
||||||
if (! filename)
|
if (! filename)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
*tmppath = talloc_asprintf (ctx, "%s/tmp/%s", dir, filename);
|
path = talloc_asprintf (ctx, "%s/tmp/%s", maildir, filename);
|
||||||
if (! *tmppath) {
|
if (! path) {
|
||||||
fprintf (stderr, "Out of memory\n");
|
fprintf (stderr, "Error: %s\n", strerror (ENOMEM));
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
fd = open (*tmppath, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600);
|
fd = open (path, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600);
|
||||||
} while (fd == -1 && errno == EEXIST);
|
} while (fd == -1 && errno == EEXIST);
|
||||||
|
|
||||||
if (fd == -1) {
|
if (fd == -1) {
|
||||||
fprintf (stderr, "Error: opening %s: %s\n", *tmppath, strerror (errno));
|
fprintf (stderr, "Error: open '%s': %s\n", path, strerror (errno));
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
*newdir = talloc_asprintf (ctx, "%s/new", dir);
|
*path_out = path;
|
||||||
*newpath = talloc_asprintf (ctx, "%s/new/%s", dir, filename);
|
|
||||||
if (! *newdir || ! *newpath) {
|
|
||||||
fprintf (stderr, "Out of memory\n");
|
|
||||||
close (fd);
|
|
||||||
unlink (*tmppath);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
talloc_free (filename);
|
|
||||||
|
|
||||||
return fd;
|
return fd;
|
||||||
}
|
}
|
||||||
|
@ -293,53 +283,85 @@ copy_fd (int fdout, int fdin)
|
||||||
return (!interrupted && !empty);
|
return (!interrupted && !empty);
|
||||||
}
|
}
|
||||||
|
|
||||||
static notmuch_bool_t
|
/*
|
||||||
write_message (void *ctx, int fdin, const char *dir, char **newpath)
|
* Write fdin to a new temp file in maildir/tmp, return full path to
|
||||||
|
* the file, or NULL on errors.
|
||||||
|
*/
|
||||||
|
static char *
|
||||||
|
maildir_write_tmp (const void *ctx, int fdin, const char *maildir)
|
||||||
{
|
{
|
||||||
char *tmppath;
|
char *path;
|
||||||
char *newdir;
|
|
||||||
char *cleanup_path;
|
|
||||||
int fdout;
|
int fdout;
|
||||||
|
|
||||||
fdout = maildir_open_tmp_file (ctx, dir, &tmppath, newpath, &newdir);
|
fdout = maildir_mktemp (ctx, maildir, &path);
|
||||||
if (fdout < 0)
|
if (fdout < 0)
|
||||||
return FALSE;
|
return NULL;
|
||||||
|
|
||||||
cleanup_path = tmppath;
|
|
||||||
|
|
||||||
if (! copy_fd (fdout, fdin))
|
if (! copy_fd (fdout, fdin))
|
||||||
goto FAIL;
|
goto FAIL;
|
||||||
|
|
||||||
if (fsync (fdout) != 0) {
|
if (fsync (fdout)) {
|
||||||
fprintf (stderr, "Error: fsync failed: %s\n", strerror (errno));
|
fprintf (stderr, "Error: fsync '%s': %s\n", path, strerror (errno));
|
||||||
goto FAIL;
|
goto FAIL;
|
||||||
}
|
}
|
||||||
|
|
||||||
close (fdout);
|
close (fdout);
|
||||||
fdout = -1;
|
|
||||||
|
|
||||||
/* Atomically move the new message file from the Maildir 'tmp' directory
|
return path;
|
||||||
* to the 'new' directory. We follow the Dovecot recommendation to
|
|
||||||
* simply use rename() instead of link() and unlink().
|
FAIL:
|
||||||
* See also: http://wiki.dovecot.org/MailboxFormat/Maildir#Mail_delivery
|
close (fdout);
|
||||||
*/
|
unlink (path);
|
||||||
if (rename (tmppath, *newpath) != 0) {
|
|
||||||
fprintf (stderr, "Error: rename() failed: %s\n", strerror (errno));
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Write fdin to a new file in maildir/new, using an intermediate temp
|
||||||
|
* file in maildir/tmp, return full path to the new file, or NULL on
|
||||||
|
* errors.
|
||||||
|
*/
|
||||||
|
static char *
|
||||||
|
maildir_write_new (const void *ctx, int fdin, const char *maildir)
|
||||||
|
{
|
||||||
|
char *cleanpath, *tmppath, *newpath, *newdir;
|
||||||
|
|
||||||
|
tmppath = maildir_write_tmp (ctx, fdin, maildir);
|
||||||
|
if (! tmppath)
|
||||||
|
return NULL;
|
||||||
|
cleanpath = tmppath;
|
||||||
|
|
||||||
|
newpath = talloc_strdup (ctx, tmppath);
|
||||||
|
if (! newpath) {
|
||||||
|
fprintf (stderr, "Error: %s\n", strerror (ENOMEM));
|
||||||
goto FAIL;
|
goto FAIL;
|
||||||
}
|
}
|
||||||
|
|
||||||
cleanup_path = *newpath;
|
/* sanity checks needed? */
|
||||||
|
memcpy (newpath + strlen (maildir) + 1, "new", 3);
|
||||||
|
|
||||||
|
if (rename (tmppath, newpath)) {
|
||||||
|
fprintf (stderr, "Error: rename '%s' '%s': %s\n",
|
||||||
|
tmppath, newpath, strerror (errno));
|
||||||
|
goto FAIL;
|
||||||
|
}
|
||||||
|
cleanpath = newpath;
|
||||||
|
|
||||||
|
newdir = talloc_asprintf (ctx, "%s/%s", maildir, "new");
|
||||||
|
if (! newdir) {
|
||||||
|
fprintf (stderr, "Error: %s\n", strerror (ENOMEM));
|
||||||
|
goto FAIL;
|
||||||
|
}
|
||||||
|
|
||||||
if (! sync_dir (newdir))
|
if (! sync_dir (newdir))
|
||||||
goto FAIL;
|
goto FAIL;
|
||||||
|
|
||||||
return TRUE;
|
return newpath;
|
||||||
|
|
||||||
FAIL:
|
FAIL:
|
||||||
if (fdout >= 0)
|
unlink (cleanpath);
|
||||||
close (fdout);
|
|
||||||
unlink (cleanup_path);
|
return NULL;
|
||||||
return FALSE;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Add the specified message file to the notmuch database, applying tags.
|
/* Add the specified message file to the notmuch database, applying tags.
|
||||||
|
@ -477,7 +499,8 @@ notmuch_insert_command (notmuch_config_t *config, int argc, char *argv[])
|
||||||
return EXIT_FAILURE;
|
return EXIT_FAILURE;
|
||||||
|
|
||||||
/* Write the message to the Maildir new directory. */
|
/* Write the message to the Maildir new directory. */
|
||||||
if (! write_message (config, STDIN_FILENO, maildir, &newpath)) {
|
newpath = maildir_write_new (config, STDIN_FILENO, maildir);
|
||||||
|
if (! newpath) {
|
||||||
notmuch_database_destroy (notmuch);
|
notmuch_database_destroy (notmuch);
|
||||||
return EXIT_FAILURE;
|
return EXIT_FAILURE;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue