diff options
author | Austin Clements <amdragon@MIT.EDU> | 2012-05-18 00:13:36 -0400 |
---|---|---|
committer | David Bremner <bremner@debian.org> | 2012-05-23 22:30:43 -0300 |
commit | 67ae2377a9ec2da296a2e012352f962664a4d1a8 (patch) | |
tree | aa2f6316c207673715b7936d62148547cb07a7eb /lib/database.cc | |
parent | 0c950146a14fa2bb0a0bf542073b2cdca141afd1 (diff) |
lib: Perform the same transformation to _notmuch_database_filename_to_direntry
Now _notmuch_database_filename_to_direntry takes a flags argument and
can indicate if the necessary directory documents do not exist.
Again, callers have been updated, but retain their original behavior.
Diffstat (limited to 'lib/database.cc')
-rw-r--r-- | lib/database.cc | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/lib/database.cc b/lib/database.cc index 716982d0..b4c76b4e 100644 --- a/lib/database.cc +++ b/lib/database.cc @@ -1248,13 +1248,16 @@ _notmuch_database_get_directory_path (void *ctx, * database path), return a new string (with 'ctx' as the talloc * owner) suitable for use as a direntry term value. * - * The necessary directory documents will be created in the database - * as needed. + * If (flags & NOTMUCH_FIND_CREATE), the necessary directory documents + * will be created in the database as needed. Otherwise, if the + * necessary directory documents do not exist, this sets + * *direntry to NULL and returns NOTMUCH_STATUS_SUCCESS. */ notmuch_status_t _notmuch_database_filename_to_direntry (void *ctx, notmuch_database_t *notmuch, const char *filename, + notmuch_find_flags_t flags, char **direntry) { const char *relative, *directory, *basename; @@ -1268,10 +1271,12 @@ _notmuch_database_filename_to_direntry (void *ctx, if (status) return status; - status = _notmuch_database_find_directory_id (notmuch, directory, NOTMUCH_FIND_CREATE, + status = _notmuch_database_find_directory_id (notmuch, directory, flags, &directory_id); - if (status) + if (status || directory_id == (unsigned int)-1) { + *direntry = NULL; return status; + } *direntry = talloc_asprintf (ctx, "%u:%s", directory_id, basename); @@ -1892,8 +1897,8 @@ notmuch_database_find_message_by_filename (notmuch_database_t *notmuch, local = talloc_new (notmuch); try { - status = _notmuch_database_filename_to_direntry (local, notmuch, - filename, &direntry); + status = _notmuch_database_filename_to_direntry ( + local, notmuch, filename, NOTMUCH_FIND_CREATE, &direntry); if (status) goto DONE; |