diff options
Diffstat (limited to 'gtk/xdgmime/xdgmime.c')
-rw-r--r-- | gtk/xdgmime/xdgmime.c | 39 |
1 files changed, 25 insertions, 14 deletions
diff --git a/gtk/xdgmime/xdgmime.c b/gtk/xdgmime/xdgmime.c index 23be62b04..1d2007cb7 100644 --- a/gtk/xdgmime/xdgmime.c +++ b/gtk/xdgmime/xdgmime.c @@ -281,7 +281,8 @@ xdg_run_command_on_dirs (XdgDirectoryFunc func, * FIXME: This doesn't protect against permission changes. */ static int -xdg_check_file (const char *file_path) +xdg_check_file (const char *file_path, + int *exists) { struct stat st; @@ -290,6 +291,9 @@ xdg_check_file (const char *file_path) { XdgDirTimeList *list; + if (exists) + *exists = TRUE; + for (list = dir_time_list; list; list = list->next) { if (! strcmp (list->directory_name, file_path) && @@ -306,6 +310,9 @@ xdg_check_file (const char *file_path) return TRUE; } + if (exists) + *exists = FALSE; + return FALSE; } @@ -313,26 +320,30 @@ static int xdg_check_dir (const char *directory, int *invalid_dir_list) { - int invalid; + int invalid, exists; char *file_name; assert (directory != NULL); - /* Check the globs file */ - file_name = malloc (strlen (directory) + strlen ("/mime/globs") + 1); - strcpy (file_name, directory); strcat (file_name, "/mime/globs"); - invalid = xdg_check_file (file_name); + /* Check the mime.cache file */ + file_name = malloc (strlen (directory) + strlen ("/mime/mime.cache") + 1); + strcpy (file_name, directory); strcat (file_name, "/mime/mime.cache"); + invalid = xdg_check_file (file_name, &exists); free (file_name); if (invalid) { *invalid_dir_list = TRUE; return TRUE; } + else if (exists) + { + return FALSE; + } - /* Check the magic file */ - file_name = malloc (strlen (directory) + strlen ("/mime/magic") + 1); - strcpy (file_name, directory); strcat (file_name, "/mime/magic"); - invalid = xdg_check_file (file_name); + /* Check the globs file */ + file_name = malloc (strlen (directory) + strlen ("/mime/globs") + 1); + strcpy (file_name, directory); strcat (file_name, "/mime/globs"); + invalid = xdg_check_file (file_name, NULL); free (file_name); if (invalid) { @@ -340,10 +351,10 @@ xdg_check_dir (const char *directory, return TRUE; } - /* Check the mime.cache file */ - file_name = malloc (strlen (directory) + strlen ("/mime/mime.cache") + 1); - strcpy (file_name, directory); strcat (file_name, "/mime/mime.cache"); - invalid = xdg_check_file (file_name); + /* Check the magic file */ + file_name = malloc (strlen (directory) + strlen ("/mime/magic") + 1); + strcpy (file_name, directory); strcat (file_name, "/mime/magic"); + invalid = xdg_check_file (file_name, NULL); free (file_name); if (invalid) { |