# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#if defined( WIN32 )
-# define _WIN32_IE IE5
+# ifndef _WIN32_IE
+# define _WIN32_IE 0x0501
+# endif
# include <w32api.h>
+#ifndef UNDER_CE
# include <direct.h>
+#endif
# include <shlobj.h>
#else
# include <unistd.h>
#include <assert.h>
#include <limits.h>
+#if defined( WIN32 )
+# define DIR_SHARE ""
+#else
+# define DIR_SHARE "share"
+#endif
+
+
/**
* config_GetDataDir: find directory where shared data is installed
*
if( *path == '\0' )
{
- snprintf( path, sizeof( path ), "%s/share",
- vlc_global()->psz_vlcpath );
+ snprintf( path, sizeof( path ), "%s" DIR_SEP DIR_SHARE, psz_vlcpath );
path[sizeof( path ) - 1] = '\0';
}
return path;
#endif
}
+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;
+}
+
/**
* Determines the system configuration directory.
*
*/
const char *config_GetConfDir( void )
{
-#if defined (WIN32) || defined(__APPLE__) || defined (SYS_BEOS)
+#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/share", /* FIXME: Duh? */
- vlc_global()->psz_vlcpath );
+ snprintf( path, sizeof( path ), "%s"DIR_SEP DIR_SHARE, /* FIXME: Duh? */
+ psz_vlcpath );
path[sizeof( path ) - 1] = '\0';
}
return path;
#endif
}
-static char *GetDir( bool b_appdata )
-{
- const char *psz_localhome = NULL;
-
-#if defined(WIN32) && !defined(UNDER_CE)
- wchar_t whomedir[MAX_PATH];
- /* Get the "Application Data" folder for the current user */
- if( S_OK == SHGetFolderPathW( NULL,
- (b_appdata ? CSIDL_APPDATA : CSIDL_PROFILE) | CSIDL_FLAG_CREATE,
- NULL, SHGFP_TYPE_CURRENT, whomedir ) )
- return FromWide( whomedir );
-
-#elif defined(UNDER_CE)
- (void)b_appdata;
-#ifndef CSIDL_APPDATA
-# define CSIDL_APPDATA 0x1A
-#endif
-
- wchar_t whomedir[MAX_PATH];
-
- /* get the "Application Data" folder for the current user */
- if( SHGetSpecialFolderPath( NULL, whomedir, CSIDL_APPDATA, 1 ) )
- return FromWide( whomedir );
-#else
- (void)b_appdata;
-#endif
-
- 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";
-
- return FromLocaleDup( psz_localhome );
-}
-
/**
* Get the user's home directory
*/
-char *config_GetHomeDir( void )
+const char *config_GetHomeDir( void )
{
- return GetDir( false );
+ return GetDir (false, false);
}
static char *config_GetFooDir (const char *xdg_name, const char *xdg_default)
{
char *psz_dir;
#if defined(WIN32) || defined(__APPLE__) || defined(SYS_BEOS)
- char *psz_parent = GetDir (true);
+ const char *psz_parent = GetDir (true, false);
if( asprintf( &psz_dir, "%s" DIR_SEP CONFIG_DIR, psz_parent ) == -1 )
psz_dir = NULL;
- free (psz_parent);
(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 = getenv( var );
- psz_home = psz_home ? FromLocaleDup( psz_home ) : NULL;
+
+ const char *psz_home = getenv (var);
+ psz_home = psz_home ? FromLocale (psz_home) : NULL;
if( psz_home )
{
if( asprintf( &psz_dir, "%s/vlc", psz_home ) == -1 )
psz_dir = NULL;
- goto out;
+ LocaleFree (psz_home);
+ return psz_dir;
}
/* Try HOME, then fallback to non-XDG dirs */
psz_home = config_GetHomeDir();
if( asprintf( &psz_dir, "%s/%s/vlc", psz_home, xdg_default ) == -1 )
psz_dir = NULL;
-
-out:
- free (psz_home);
#endif
return psz_dir;
}
*/
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
}
projects / vlc / blobdiff