/*****************************************************************************
- * dirs_macos.c: MacOS directories configuration
+ * dirs_macos.c: Mac OS X directories configuration
*****************************************************************************
- * Copyright (C) 2001-2007 the VideoLAN team
+ * Copyright (C) 2001-2009 the VideoLAN team
* Copyright © 2007-2009 Rémi Denis-Courmont
*
* Authors: Gildas Bazin <gbazin@videolan.org>
+ * Felix Paul Kühne <fkuehne at videolan dot org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+#include <CoreFoundation/CoreFoundation.h>
+
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include "../libvlc.h"
#include <vlc_charset.h>
#include <vlc_configuration.h>
+#include "configuration.h"
-#include <unistd.h>
-#include <pwd.h>
-#include <assert.h>
-#include <limits.h>
+static char *configdir = NULL;
-const char *config_GetDataDir( void )
-{
- static char path[PATH_MAX] = "";
+static pthread_once_t once = PTHREAD_ONCE_INIT;
-#warning FIXME: thread-safety!
- if( *path == '\0' )
- {
- snprintf( path, sizeof( path ), "%s" DIR_SEP DIR_SHARE, psz_vlcpath );
- path[sizeof( path ) - 1] = '\0';
- }
- return path;
+static void init_dirs( void )
+{
+ configdir = config_GetUserDir(VLC_CONFIG_DIR);
}
-static const char *GetDir(void)
+const char *config_GetConfDir( void )
{
- /* FIXME: a full memory page here - quite a waste... */
- static char homedir[PATH_MAX] = "";
-
- static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
- pthread_mutex_lock (&lock);
+ pthread_once(&once, init_dirs);
+ return configdir;
+}
- if (!*homedir)
- {
- const char *psz_localhome = getenv( "HOME" );
-#if defined(HAVE_GETPWUID_R)
- char buf[sysconf (_SC_GETPW_R_SIZE_MAX)];
- if (psz_localhome == NULL)
- {
- struct passwd pw, *res;
+char *config_GetDataDirDefault (void)
+{
+ char *datadir;
- if (!getpwuid_r (getuid (), &pw, buf, sizeof (buf), &res) && res)
- psz_localhome = pw.pw_dir;
- }
-#endif
- if (psz_localhome == NULL)
- psz_localhome = getenv( "TMP" );
- if (psz_localhome == NULL)
- psz_localhome = "/tmp";
-
- const char *uhomedir = FromLocale (psz_localhome);
- strncpy (homedir, uhomedir, sizeof (homedir) - 1);
- homedir[sizeof (homedir) - 1] = '\0';
- LocaleFree (uhomedir);
- }
- pthread_mutex_unlock (&lock);
- return homedir;
+ if (asprintf (&datadir, "%s/share", psz_vlcpath) == -1)
+ return NULL;
+ return datadir;
}
-const char *config_GetConfDir( void )
+const char *config_GetLibDir (void)
{
- static char path[PATH_MAX] = "";
-
-#warning FIXME: system config is not the same as shared app data...
- if( *path == '\0' )
- {
- snprintf( path, sizeof( path ), "%s"DIR_SEP DIR_SHARE, /* FIXME: Duh? */
- psz_vlcpath );
- path[sizeof( path ) - 1] = '\0';
- }
- return path;
+ abort ();
}
static char *config_GetHomeDir (void)
{
- /* 1/ Try $HOME */
const char *home = getenv ("HOME");
-#if defined(HAVE_GETPWUID_R)
- /* 2/ Try /etc/passwd */
- char buf[sysconf (_SC_GETPW_R_SIZE_MAX)];
- if (home == NULL)
- {
- struct passwd pw, *res;
- if (!getpwuid_r (getuid (), &pw, buf, sizeof (buf), &res) && res)
- home = pw.pw_dir;
- }
-#endif
- /* 3/ Desperately try $TMP */
- if (home == NULL)
- home = getenv( "TMP" );
- /* 4/ Beyond hope, hard-code /tmp */
if (home == NULL)
home = "/tmp";
return FromLocaleDup (home);
}
-static char *config_GetAppDir (void)
+static char *getAppDependentDir(vlc_userdir_t type)
{
- char *psz_dir;
- const char *psz_parent = GetDir (false);
+ const char *psz_path;
+ switch (type)
+ {
+ case VLC_CONFIG_DIR:
+ psz_path = "%s/Library/Preferences/%s";
+ break;
+ case VLC_TEMPLATES_DIR:
+ case VLC_DATA_DIR:
+ psz_path = "%s/Library/Application Support/%s";
+ break;
+ case VLC_CACHE_DIR:
+ psz_path = "%s/Library/Caches/%s";
+ break;
+ default:
+ assert(0);
+ break;
+ }
+
+ // Default fallback
+ const char *name = "org.videolan.vlc";
+
+ CFBundleRef mainBundle = CFBundleGetMainBundle();
+ if (mainBundle)
+ {
+ CFStringRef identifierAsNS = CFBundleGetIdentifier(mainBundle);
+ if (identifierAsNS)
+ {
+ char identifier[256];
+ Boolean ret = CFStringGetCString(identifierAsNS, identifier, sizeof(identifier), kCFStringEncodingUTF8);
+ if (ret)
+ name = identifier;
+ }
+ }
- if( asprintf( &psz_dir, "%s/Library/Preferences/VLC", psz_parent ) == -1 )
+ char *psz_parent = config_GetHomeDir ();
+ char *psz_dir;
+ if( asprintf( &psz_dir, psz_path, psz_parent, name) == -1 )
psz_dir = NULL;
- return psz_dir;
+ free(psz_parent);
+
+ return psz_dir;
}
char *config_GetUserDir (vlc_userdir_t type)
{
+ const char *psz_path;
switch (type)
{
- case VLC_HOME_DIR:
- return config_GetHomeDir ();
case VLC_CONFIG_DIR:
+ case VLC_TEMPLATES_DIR:
case VLC_DATA_DIR:
case VLC_CACHE_DIR:
- return config_GetAppDir ();
+ return getAppDependentDir(type);
case VLC_DESKTOP_DIR:
+ psz_path = "%s/Desktop";
+ break;
case VLC_DOWNLOAD_DIR:
- case VLC_TEMPLATES_DIR:
- case VLC_PUBLICSHARE_DIR:
+ psz_path = "%s/Downloads";
+ break;
case VLC_DOCUMENTS_DIR:
+ psz_path = "%s/Documents";
+ break;
case VLC_MUSIC_DIR:
+ psz_path = "%s/Music";
+ break;
case VLC_PICTURES_DIR:
+ psz_path = "%s/Pictures";
+ break;
case VLC_VIDEOS_DIR:
-#warning FIXME not implemented
- return config_GetUserDir (VLC_HOME_DIR);;
+ psz_path = "%s/Movies";
+ break;
+ case VLC_PUBLICSHARE_DIR:
+ psz_path = "%s/Public";
+ break;
+ case VLC_HOME_DIR:
+ default:
+ psz_path = "%s";
}
- assert (0);
+ char *psz_parent = config_GetHomeDir ();
+ char *psz_dir;
+ if( asprintf( &psz_dir, psz_path, psz_parent ) == -1 )
+ psz_dir = NULL;
+ free(psz_parent);
+ return psz_dir;
}
projects / vlc / blobdiff