* make mu_util_create_dir_maybe potentially not warn (useful when the logging

system is not initialized yet)
This commit is contained in:
Dirk-Jan C. Binnema
2011-08-09 07:53:50 +03:00
parent a3b627f866
commit 785a09ef76
2 changed files with 13 additions and 7 deletions

View File

@ -128,7 +128,7 @@ mu_util_create_tmpdir (void)
G_DIR_SEPARATOR,
(int)random()*getpid()*(int)time(NULL));
if (!mu_util_create_dir_maybe (dirname, 0700)) {
if (!mu_util_create_dir_maybe (dirname, 0700, FALSE)) {
g_free (dirname);
return NULL;
}
@ -237,7 +237,7 @@ mu_util_guess_mu_homedir (void)
}
gboolean
mu_util_create_dir_maybe (const gchar *path, mode_t mode)
mu_util_create_dir_maybe (const gchar *path, mode_t mode, gboolean nowarn)
{
struct stat statbuf;
@ -247,14 +247,17 @@ mu_util_create_dir_maybe (const gchar *path, mode_t mode)
if (stat (path, &statbuf) == 0) {
if ((!S_ISDIR(statbuf.st_mode)) ||
(access (path, W_OK|R_OK) != 0)) {
g_warning ("not a read-writable directory: %s", path);
if (!nowarn)
g_warning ("not a read-writable"
"directory: %s", path);
return FALSE;
}
}
if (g_mkdir_with_parents (path, mode) != 0) {
g_warning ("failed to create %s: %s",
path, strerror(errno));
if (!nowarn)
g_warning ("failed to create %s: %s",
path, strerror(errno));
return FALSE;
}