yetangitu/deltachat-core
1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-core.git synced 2025-10-06 03:50:08 +02:00
Code Issues Releases Wiki Activity

allow using blobdir during dc_sqlite3_open()

Browse source
This commit is contained in:
B. Petersen 2018-09-02 17:14:19 +02:00
parent 06f139a699
commit 9b9cbac1a4
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/dc_context.c
View file

@ -230,8 +230,7 @@ static void update_config_cache(dc_context_t* context, const char* key)
* @param context The context object as created by dc_context_new(). * @param context The context object as created by dc_context_new().
* @param dbfile The file to use to store the database, something like `~/file` won't * @param dbfile The file to use to store the database, something like `~/file` won't
* work on all systems, if in doubt, use absolute paths. * work on all systems, if in doubt, use absolute paths.
* @param blobdir A directory to store the blobs in. The trailing slash is added * @param blobdir A directory to store the blobs in; a trailing slash is not needed.
* by deltachat-core, so if you want to avoid double slashes, do not add one.
* If you pass NULL or the empty string, deltachat-core creates a directory * If you pass NULL or the empty string, deltachat-core creates a directory
* beside _dbfile_ with the same name and the suffix `-blobs`. * beside _dbfile_ with the same name and the suffix `-blobs`.
* @return 1 on success, 0 on failure * @return 1 on success, 0 on failure
@ -247,24 +246,25 @@ int dc_open(dc_context_t* context, const char* dbfile, const char* blobdir)
/* Open() sets up the object and connects to the given database /* Open() sets up the object and connects to the given database
from which all configuration is read/written to. */ from which all configuration is read/written to. */
/* Create/open sqlite database */
if (!dc_sqlite3_open(context->sql, dbfile, 0)) {
goto cleanup;
}
/* backup dbfile name */ /* backup dbfile name */
context->dbfile = dc_strdup(dbfile); context->dbfile = dc_strdup(dbfile);
/* set blob-directory /* set blob-directory
(to avoid double slashed, the given directory should not end with an slash) */ (to avoid double slashes, the given directory should not end with an slash) */
if (blobdir && blobdir[0]) { if (blobdir && blobdir[0]) {
context->blobdir = dc_strdup(blobdir); context->blobdir = dc_strdup(blobdir);
dc_ensure_no_slash(context->blobdir);
} }
else { else {
context->blobdir = dc_mprintf("%s-blobs", dbfile); context->blobdir = dc_mprintf("%s-blobs", dbfile);
dc_create_folder(context->blobdir, context); dc_create_folder(context->blobdir, context);
} }
/* Create/open sqlite database, this may already use the blobdir */
if (!dc_sqlite3_open(context->sql, dbfile, 0)) {
goto cleanup;
}
update_config_cache(context, NULL); update_config_cache(context, NULL);
success = 1; success = 1;