alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* mu-msg-part.c, mu-runtime.c: updates for mu_util_create_dir_maybe change

Browse Source
This commit is contained in:
Dirk-Jan C. Binnema
2011-08-09 07:54:23 +03:00
parent 785a09ef76
commit 56086b2f4b
2 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mu-msg-part.c
View File

@ -232,7 +232,7 @@ mu_msg_part_filepath_cache (MuMsg *msg, guint partid)
g_str_hash (path), G_DIR_SEPARATOR, g_str_hash (path), G_DIR_SEPARATOR,
partid); partid);
if (!mu_util_create_dir_maybe (dirname, 0700)) { if (!mu_util_create_dir_maybe (dirname, 0700, FALSE)) {
g_free (dirname); g_free (dirname);
return NULL; return NULL;
} }

24
src/mu-runtime.c
View File

@ -55,18 +55,6 @@ static gboolean init_paths (const char* muhome, MuRuntimeData *data);
static const char* runtime_path (MuRuntimePath path); static const char* runtime_path (MuRuntimePath path);
static gboolean
mu_dir_is_readable_and_writable (const char *muhome)
{
if (mu_util_create_dir_maybe (muhome, 0700))
return TRUE;
g_warning ("cannot use '%s' as a mu homedir", muhome);
g_warning ("use --muhome= to set a different one");
return FALSE;
}
static gboolean static gboolean
init_log (const char *muhome, const char *name, init_log (const char *muhome, const char *name,
gboolean log_stderr, gboolean quiet, gboolean debug) gboolean log_stderr, gboolean quiet, gboolean debug)
@ -107,7 +95,9 @@ mu_runtime_init (const char* muhome_arg, const char *name)
else else
muhome = mu_util_guess_mu_homedir (); muhome = mu_util_guess_mu_homedir ();
if (!mu_dir_is_readable_and_writable (muhome)) { if (!mu_util_create_dir_maybe (muhome, 0700, TRUE)) {
g_printerr ("mu: invalid mu homedir specified;"
" use --muhome=<dir>\n");
runtime_free (); runtime_free ();
return FALSE; return FALSE;
} }
@ -144,7 +134,9 @@ mu_runtime_init_from_cmdline (int *pargc, char ***pargv, const char *name)
return FALSE; return FALSE;
} }
if (!mu_dir_is_readable_and_writable (_data->_config->muhome)) { if (!mu_util_create_dir_maybe (_data->_config->muhome, 0700, TRUE)) {
g_printerr ("mu: invalid mu homedir specified;"
" use --muhome=<dir>\n");
runtime_free (); runtime_free ();
return FALSE; return FALSE;
} }
@ -198,13 +190,13 @@ static gboolean
create_dirs_maybe (MuRuntimeData *data) create_dirs_maybe (MuRuntimeData *data)
{ {
if (!mu_util_create_dir_maybe if (!mu_util_create_dir_maybe
(data->_str[MU_RUNTIME_PATH_CACHE], 0700)) { (data->_str[MU_RUNTIME_PATH_CACHE], 0700, TRUE)) {
g_warning ("failed to create cache dir"); g_warning ("failed to create cache dir");
return FALSE; return FALSE;
} }
if (!mu_util_create_dir_maybe if (!mu_util_create_dir_maybe
(data->_str[MU_RUNTIME_PATH_LOG], 0700)) { (data->_str[MU_RUNTIME_PATH_LOG], 0700, TRUE)) {
g_warning ("failed to create log dir"); g_warning ("failed to create log dir");
return FALSE; return FALSE;
} }