X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fconfig%2Fdirs.c;h=22a5bdcab54f9fa0c4a07a7a50abebc1d45a96bf;hb=6edb2da8f463a74490a6a16ddaef86ea6ddb4417;hp=a6314baa90ee6a683f8e0509e89a44dd0cce5275;hpb=08d89300a6a09b812a406ecdf12c598fdf581d5d;p=vlc diff --git a/src/config/dirs.c b/src/config/dirs.c index a6314baa90..22a5bdcab5 100644 --- a/src/config/dirs.c +++ b/src/config/dirs.c @@ -1,10 +1,9 @@ /***************************************************************************** - * dirs.c: directories configuration + * dirs.c: crossplatform directories configuration ***************************************************************************** - * Copyright (C) 2001-2007 the VideoLAN team - * Copyright © 2007-2008 Rémi Denis-Courmont + * Copyright (C) 2009 the VideoLAN team * - * Authors: Gildas Bazin + * Authors: Antoine Cellerier * * 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 @@ -27,266 +26,19 @@ #include -#if defined( WIN32 ) -# ifndef _WIN32_IE -# define _WIN32_IE 0x0501 -# endif -# include -#ifndef UNDER_CE -# include -#endif -# include -#else -# include -# include -#endif - #include "../libvlc.h" -#include "configuration.h" -#include -#include - -#include /* errno */ -#include -#include - -#if defined( WIN32 ) -# define DIR_SHARE "" -#else -# define DIR_SHARE "share" -#endif - - -/** - * config_GetDataDir: find directory where shared data is installed - * - * @return a string (always succeeds). - */ -const char *config_GetDataDir( void ) -{ -#if defined (WIN32) || defined(__APPLE__) || defined (SYS_BEOS) - static char path[PATH_MAX] = ""; - - if( *path == '\0' ) - { - snprintf( path, sizeof( path ), "%s" DIR_SEP DIR_SHARE, psz_vlcpath ); - path[sizeof( path ) - 1] = '\0'; - } - return path; -#else - return DATA_PATH; -#endif -} - -#if defined (WIN32) || defined(__APPLE__) || defined (SYS_BEOS) -static const char *GetDir( bool b_appdata, bool b_common_appdata ) -{ - /* FIXME: a full memory page here - quite a waste... */ - static char homedir[PATH_MAX] = ""; -#if defined (WIN32) - wchar_t wdir[MAX_PATH]; - -# if defined (UNDER_CE) - /*There are some errors in cegcc headers*/ -#undef SHGetSpecialFolderPath - BOOL WINAPI SHGetSpecialFolderPath(HWND,LPWSTR,int,BOOL); - if( SHGetSpecialFolderPath( NULL, wdir, CSIDL_APPDATA, 1 ) ) -# else - /* Get the "Application Data" folder for the current user */ - if( S_OK == SHGetFolderPathW( NULL, - ( b_appdata ? CSIDL_APPDATA : - ( b_common_appdata ? CSIDL_COMMON_APPDATA: CSIDL_PERSONAL ) ) - | CSIDL_FLAG_CREATE, - NULL, SHGFP_TYPE_CURRENT, wdir ) ) -# endif - { - static char appdir[PATH_MAX] = ""; - static char comappdir[PATH_MAX] = ""; - WideCharToMultiByte (CP_UTF8, 0, wdir, -1, - b_appdata ? appdir : - (b_common_appdata ? comappdir :homedir), - PATH_MAX, NULL, NULL); - return b_appdata ? appdir : (b_common_appdata ? comappdir :homedir); - } -#else - (void)b_appdata; - (void)b_common_appdata; -#endif - -#ifdef LIBVLC_USE_PTHREAD - static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER; - pthread_mutex_lock (&lock); -#endif - - 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; - - 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); - } -#ifdef LIBVLC_USE_PTHREAD - pthread_mutex_unlock (&lock); -#endif - return homedir; -} -#endif +#include "configuration.h" +#undef config_GetDataDir /** - * Determines the system configuration directory. + * Determines the shared architecture-independent data directory * - * @return a string (always succeeds). + * @return a string or NULL. Use free() to release. */ -const char *config_GetConfDir( void ) +char *config_GetDataDir( vlc_object_t *p_obj ) { -#if defined (WIN32) - return GetDir( false, true ); -#elif defined(__APPLE__) || defined (SYS_BEOS) - static char path[PATH_MAX] = ""; - - if( *path == '\0' ) - { - snprintf( path, sizeof( path ), "%s"DIR_SEP DIR_SHARE, /* FIXME: Duh? */ - psz_vlcpath ); - path[sizeof( path ) - 1] = '\0'; - } - return path; -#else - return SYSCONFDIR; -#endif + char *psz_path = var_InheritString( p_obj, "data-path" ); + return psz_path ? psz_path : config_GetDataDirDefault(); } -static char *config_GetHomeDir (void) -{ -#ifndef WIN32 - /* 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); - -#else /* WIN32 */ - wchar_t wdir[MAX_PATH]; - -# if defined (UNDER_CE) - /*There are some errors in cegcc headers*/ -#undef SHGetSpecialFolderPath - BOOL WINAPI SHGetSpecialFolderPath(HWND,LPWSTR,int,BOOL); - if (SHGetSpecialFolderPath (NULL, wdir, CSIDL_APPDATA, 1)) -# else - if (SHGetFolderPathW (NULL, CSIDL_PERSONAL | CSIDL_FLAG_CREATE, - NULL, SHGFP_TYPE_CURRENT, wdir ) == S_OK) -# endif - return FromWide (wdir); - return NULL; -#endif -} - -char *config_GetUserDir (vlc_userdir_t type) -{ - char *home = config_GetHomeDir (); - (void)type; - return home; -} - -static char *config_GetFooDir (const char *xdg_name, const char *xdg_default) -{ - char *psz_dir; -#if defined(WIN32) || defined(__APPLE__) || defined(SYS_BEOS) - const char *psz_parent = GetDir (true, false); - - if( asprintf( &psz_dir, "%s" DIR_SEP CONFIG_DIR, psz_parent ) == -1 ) - psz_dir = NULL; - - (void)xdg_name; (void)xdg_default; -#else - char var[sizeof ("XDG__HOME") + strlen (xdg_name)]; - /* XDG Base Directory Specification - Version 0.6 */ - snprintf (var, sizeof (var), "XDG_%s_HOME", xdg_name); - - char *psz_home = FromLocale (getenv (var)); - if( psz_home ) - { - if( asprintf( &psz_dir, "%s/vlc", psz_home ) == -1 ) - psz_dir = NULL; - LocaleFree (psz_home); - return psz_dir; - } - - psz_home = config_GetUserDir (VLC_HOME_DIR); - if( psz_home == NULL - || asprintf( &psz_dir, "%s/%s/vlc", psz_home, xdg_default ) == -1 ) - psz_dir = NULL; - free (psz_home); -#endif - return psz_dir; -} - -/** - * Get the user's VLC configuration directory - */ -char *config_GetUserConfDir( void ) -{ - return config_GetFooDir ("CONFIG", ".config"); -} - -/** - * Get the user's VLC data directory - * (used for stuff like the skins, custom lua modules, ...) - */ -char *config_GetUserDataDir( void ) -{ - return config_GetFooDir ("DATA", ".local/share"); -} - -/** - * Get the user's VLC cache directory - * (used for stuff like the modules cache, the album art cache, ...) - */ -char *config_GetCacheDir( void ) -{ -#if defined(__APPLE__) - char *psz_dir; - const char *psz_parent = GetDir (true, false); - - if( asprintf( &psz_dir, "%s" DIR_SEP CACHES_DIR, psz_parent ) == -1 ) - psz_dir = NULL; - - return psz_dir; -#else - return config_GetFooDir ("CACHE", ".cache"); -#endif -}