mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-12-23 01:44:52 +01:00
cli/insert: use a single recursive mkdir function
Combine make_directory() and make_directory_and_parents() into a single recursive mkdir_recursive() function. Clarify the code and improve error handling. Improve error messages. Switch to using the new function in maildir_create_folder(). Constify talloc context.
This commit is contained in:
parent
eab18a61a9
commit
cd3d4e62d6
1 changed files with 56 additions and 77 deletions
133
notmuch-insert.c
133
notmuch-insert.c
|
@ -104,96 +104,78 @@ is_valid_folder_name (const char *folder)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Make the given directory, succeeding if it already exists. */
|
/*
|
||||||
|
* Make the given directory and its parents as necessary, using the
|
||||||
|
* given mode. Return TRUE on success, FALSE otherwise. Partial
|
||||||
|
* results are not cleaned up on errors.
|
||||||
|
*/
|
||||||
static notmuch_bool_t
|
static notmuch_bool_t
|
||||||
make_directory (char *path, int mode)
|
mkdir_recursive (const void *ctx, const char *path, int mode)
|
||||||
{
|
|
||||||
notmuch_bool_t ret;
|
|
||||||
char *slash;
|
|
||||||
|
|
||||||
if (mkdir (path, mode) != 0)
|
|
||||||
return (errno == EEXIST);
|
|
||||||
|
|
||||||
/* Sync the parent directory for durability. */
|
|
||||||
ret = TRUE;
|
|
||||||
slash = strrchr (path, '/');
|
|
||||||
if (slash) {
|
|
||||||
*slash = '\0';
|
|
||||||
ret = sync_dir (path);
|
|
||||||
*slash = '/';
|
|
||||||
}
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Make the given directory including its parent directories as necessary.
|
|
||||||
* Return TRUE on success, FALSE on error. */
|
|
||||||
static notmuch_bool_t
|
|
||||||
make_directory_and_parents (char *path, int mode)
|
|
||||||
{
|
{
|
||||||
struct stat st;
|
struct stat st;
|
||||||
char *start;
|
int r;
|
||||||
char *end;
|
char *parent = NULL, *slash;
|
||||||
notmuch_bool_t ret;
|
|
||||||
|
|
||||||
/* First check the common case: directory already exists. */
|
/* First check the common case: directory already exists. */
|
||||||
if (stat (path, &st) == 0)
|
r = stat (path, &st);
|
||||||
return S_ISDIR (st.st_mode) ? TRUE : FALSE;
|
if (r == 0) {
|
||||||
|
if (! S_ISDIR (st.st_mode)) {
|
||||||
for (start = path; *start != '\0'; start = end + 1) {
|
fprintf (stderr, "Error: '%s' is not a directory: %s\n",
|
||||||
/* start points to the first unprocessed character.
|
path, strerror (EEXIST));
|
||||||
* Find the next slash from start onwards. */
|
return FALSE;
|
||||||
end = strchr (start, '/');
|
|
||||||
|
|
||||||
/* If there are no more slashes then all the parent directories
|
|
||||||
* have been made. Now attempt to make the whole path. */
|
|
||||||
if (end == NULL)
|
|
||||||
return make_directory (path, mode);
|
|
||||||
|
|
||||||
/* Make the path up to the next slash, unless the current
|
|
||||||
* directory component is actually empty. */
|
|
||||||
if (end > start) {
|
|
||||||
*end = '\0';
|
|
||||||
ret = make_directory (path, mode);
|
|
||||||
*end = '/';
|
|
||||||
if (! ret)
|
|
||||||
return FALSE;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return TRUE;
|
||||||
|
} else if (errno != ENOENT) {
|
||||||
|
fprintf (stderr, "Error: stat '%s': %s\n", path, strerror (errno));
|
||||||
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
return TRUE;
|
/* mkdir parents, if any */
|
||||||
|
slash = strrchr (path, '/');
|
||||||
|
if (slash && slash != path) {
|
||||||
|
parent = talloc_strndup (ctx, path, slash - path);
|
||||||
|
if (! parent) {
|
||||||
|
fprintf (stderr, "Error: %s\n", strerror (ENOMEM));
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (! mkdir_recursive (ctx, parent, mode))
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (mkdir (path, mode)) {
|
||||||
|
fprintf (stderr, "Error: mkdir '%s': %s\n", path, strerror (errno));
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
|
return parent ? sync_dir (parent) : TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Create the given maildir folder, i.e. dir and its subdirectories
|
/*
|
||||||
* 'cur', 'new', 'tmp'. */
|
* Create the given maildir folder, i.e. maildir and its
|
||||||
|
* subdirectories cur/new/tmp. Return TRUE on success, FALSE
|
||||||
|
* otherwise. Partial results are not cleaned up on errors.
|
||||||
|
*/
|
||||||
static notmuch_bool_t
|
static notmuch_bool_t
|
||||||
maildir_create_folder (void *ctx, const char *dir)
|
maildir_create_folder (const void *ctx, const char *maildir)
|
||||||
{
|
{
|
||||||
|
const char *subdirs[] = { "cur", "new", "tmp" };
|
||||||
const int mode = 0700;
|
const int mode = 0700;
|
||||||
char *subdir;
|
char *subdir;
|
||||||
char *tail;
|
unsigned int i;
|
||||||
|
|
||||||
/* Create 'cur' directory, including parent directories. */
|
for (i = 0; i < ARRAY_SIZE (subdirs); i++) {
|
||||||
subdir = talloc_asprintf (ctx, "%s/cur", dir);
|
subdir = talloc_asprintf (ctx, "%s/%s", maildir, subdirs[i]);
|
||||||
if (! subdir) {
|
if (! subdir) {
|
||||||
fprintf (stderr, "Out of memory.\n");
|
fprintf (stderr, "Error: %s\n", strerror (ENOMEM));
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (! mkdir_recursive (ctx, subdir, mode))
|
||||||
|
return FALSE;
|
||||||
}
|
}
|
||||||
if (! make_directory_and_parents (subdir, mode))
|
|
||||||
return FALSE;
|
|
||||||
|
|
||||||
tail = subdir + strlen (subdir) - 3;
|
|
||||||
|
|
||||||
/* Create 'new' directory. */
|
|
||||||
strcpy (tail, "new");
|
|
||||||
if (! make_directory (subdir, mode))
|
|
||||||
return FALSE;
|
|
||||||
|
|
||||||
/* Create 'tmp' directory. */
|
|
||||||
strcpy (tail, "tmp");
|
|
||||||
if (! make_directory (subdir, mode))
|
|
||||||
return FALSE;
|
|
||||||
|
|
||||||
talloc_free (subdir);
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -463,11 +445,8 @@ notmuch_insert_command (notmuch_config_t *config, int argc, char *argv[])
|
||||||
fprintf (stderr, "Out of memory\n");
|
fprintf (stderr, "Out of memory\n");
|
||||||
return EXIT_FAILURE;
|
return EXIT_FAILURE;
|
||||||
}
|
}
|
||||||
if (create_folder && ! maildir_create_folder (config, maildir)) {
|
if (create_folder && ! maildir_create_folder (config, maildir))
|
||||||
fprintf (stderr, "Error: creating maildir %s: %s\n",
|
|
||||||
maildir, strerror (errno));
|
|
||||||
return EXIT_FAILURE;
|
return EXIT_FAILURE;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Setup our handler for SIGINT. We do not set SA_RESTART so that copying
|
/* Setup our handler for SIGINT. We do not set SA_RESTART so that copying
|
||||||
|
|
Loading…
Reference in a new issue