#ifdef HAVE_DIRENT_H
# include <dirent.h>
-#elif defined( UNDER_CE )
-# include <windows.h> /* GetFileAttributes() */
-#else
-# include "../extras/dirent.h"
#endif
#ifdef HAVE_SYS_TYPES_H
# include <unistd.h>
#endif
-#define HAVE_DYNAMIC_PLUGINS
-#if defined(HAVE_DL_DYLD)
+#if !defined(HAVE_DYNAMIC_PLUGINS)
+ /* no support for plugins */
+#elif defined(HAVE_DL_DYLD)
# if defined(HAVE_MACH_O_DYLD_H)
# include <mach-o/dyld.h>
# endif
# if defined(HAVE_DL_H)
# include <dl.h>
# endif
-#else
-# undef HAVE_DYNAMIC_PLUGINS
#endif
#include "vlc_error.h"
#include "stream_output.h"
#include "osd.h"
#include "vlc_httpd.h"
+#include "vlc_tls.h"
+#include "vlc_md5.h"
+#include "vlc_xml.h"
#include "iso_lang.h"
#include "charset.h"
#include "vlc_vlm.h"
-#ifdef HAVE_DYNAMIC_PLUGINS
-# include "modules_plugin.h"
-#endif
+#include "vlc_image.h"
-#if defined( UNDER_CE )
+#if defined( _MSC_VER ) && defined( UNDER_CE )
# include "modules_builtin_evc.h"
#elif defined( _MSC_VER )
# include "modules_builtin_msvc.h"
#endif
#include "network.h"
-#if defined( WIN32) || defined( UNDER_CE )
+#if defined( WIN32 ) || defined( UNDER_CE )
/* Avoid name collisions */
-# define LoadModule(a,b,c) _LoadModule(a,b,c)
+# define LoadModule(a,b,c) LoadVlcModule(a,b,c)
#endif
/*****************************************************************************
static int CacheLoadConfig ( module_t *, FILE * );
static void CacheSave ( vlc_object_t * );
static void CacheSaveConfig ( module_t *, FILE * );
+static char * CacheName ( void );
static void CacheMerge ( vlc_object_t *, module_t *, module_t * );
static module_cache_t * CacheFind( vlc_object_t *, char *, int64_t, int64_t );
#endif
#endif
+
+/* Sub-version number
+ * (only used to avoid breakage in dev version when cache structure changes) */
+#define CACHE_SUBVERSION_NUM 1
+
/*****************************************************************************
* module_InitBank: create the module bank.
*****************************************************************************
vlc_mutex_unlock( lockval.p_address );
var_Destroy( p_this->p_libvlc, "libvlc" );
+ config_AutoSaveConfigFile( p_this );
+
#ifdef HAVE_DYNAMIC_PLUGINS
#define p_bank p_this->p_libvlc->p_module_bank
if( p_bank->b_cache ) CacheSave( p_this );
}
vlc_object_destroy( p_this->p_libvlc->p_module_bank );
+ p_this->p_libvlc->p_module_bank = NULL;
return;
}
*****************************************************************************/
void __module_LoadMain( vlc_object_t *p_this )
{
+ vlc_value_t lockval;
+
+ var_Create( p_this->p_libvlc, "libvlc", VLC_VAR_MUTEX );
+ var_Get( p_this->p_libvlc, "libvlc", &lockval );
+ vlc_mutex_lock( lockval.p_address );
+ if( p_this->p_libvlc->p_module_bank->b_main )
+ {
+ vlc_mutex_unlock( lockval.p_address );
+ var_Destroy( p_this->p_libvlc, "libvlc" );
+ return;
+ }
+ p_this->p_libvlc->p_module_bank->b_main = VLC_TRUE;
+ vlc_mutex_unlock( lockval.p_address );
+ var_Destroy( p_this->p_libvlc, "libvlc" );
+
AllocateBuiltinModule( p_this, vlc_entry__main );
}
*****************************************************************************/
void __module_LoadBuiltins( vlc_object_t * p_this )
{
+ vlc_value_t lockval;
+
+ var_Create( p_this->p_libvlc, "libvlc", VLC_VAR_MUTEX );
+ var_Get( p_this->p_libvlc, "libvlc", &lockval );
+ vlc_mutex_lock( lockval.p_address );
+ if( p_this->p_libvlc->p_module_bank->b_builtins )
+ {
+ vlc_mutex_unlock( lockval.p_address );
+ var_Destroy( p_this->p_libvlc, "libvlc" );
+ return;
+ }
+ p_this->p_libvlc->p_module_bank->b_builtins = VLC_TRUE;
+ vlc_mutex_unlock( lockval.p_address );
+ var_Destroy( p_this->p_libvlc, "libvlc" );
+
msg_Dbg( p_this, "checking builtin modules" );
ALLOCATE_ALL_BUILTINS();
}
void __module_LoadPlugins( vlc_object_t * p_this )
{
#ifdef HAVE_DYNAMIC_PLUGINS
+ vlc_value_t lockval;
+
+ var_Create( p_this->p_libvlc, "libvlc", VLC_VAR_MUTEX );
+ var_Get( p_this->p_libvlc, "libvlc", &lockval );
+ vlc_mutex_lock( lockval.p_address );
+ if( p_this->p_libvlc->p_module_bank->b_plugins )
+ {
+ vlc_mutex_unlock( lockval.p_address );
+ var_Destroy( p_this->p_libvlc, "libvlc" );
+ return;
+ }
+ p_this->p_libvlc->p_module_bank->b_plugins = VLC_TRUE;
+ vlc_mutex_unlock( lockval.p_address );
+ var_Destroy( p_this->p_libvlc, "libvlc" );
+
msg_Dbg( p_this, "checking plugin modules" );
if( config_GetInt( p_this, "plugins-cache" ) )
int i_shortcuts = 0;
char *psz_shortcuts = NULL, *psz_var = NULL;
+ vlc_bool_t b_force_backup = p_this->b_force;
- msg_Dbg( p_this, "looking for %s module", psz_capability );
/* Deal with variables */
if( psz_name && psz_name[0] == '$' )
/* Special case: test if we requested a particular intf plugin */
if( !i_shortcuts && p_module->psz_program
+ && !strcmp( psz_capability, "interface" )
&& !strcmp( p_module->psz_program,
p_this->p_vlc->psz_object_name ) )
{
i_index++;
}
- msg_Dbg( p_this, "probing %i candidate%s",
- i_index, i_index == 1 ? "" : "s" );
+ msg_Dbg( p_this, "looking for %s module: %i candidate%s", psz_capability,
+ i_index, i_index == 1 ? "" : "s" );
/* Lock all candidate modules */
p_tmp = p_first;
}
free( p_list );
- p_this->b_force = VLC_FALSE;
+ p_this->b_force = b_force_backup;
if( p_module != NULL )
{
char psz_path[MAX_PATH + 256];
WIN32_FIND_DATA finddata;
HANDLE handle;
- unsigned int rc;
+ int rc;
#else
int i_dirlen;
DIR * dir;
MultiByteToWideChar( CP_ACP, 0, psz_dir, -1, psz_wdir, MAX_PATH );
rc = GetFileAttributes( psz_wdir );
- if( !(rc & FILE_ATTRIBUTE_DIRECTORY) ) return; /* Not a directory */
+ if( rc<0 || !(rc&FILE_ATTRIBUTE_DIRECTORY) ) return; /* Not a directory */
/* Parse all files in the directory */
swprintf( psz_wpath, L"%ls\\*", psz_wdir );
#else
rc = GetFileAttributes( psz_dir );
- if( !(rc & FILE_ATTRIBUTE_DIRECTORY) ) return; /* Not a directory */
+ if( rc<0 || !(rc&FILE_ATTRIBUTE_DIRECTORY) ) return; /* Not a directory */
#endif
/* Parse all files in the directory */
* module is unloaded. */
p_module->psz_object_name = strdup( p_module->psz_object_name );
p_module->psz_capability = strdup( p_module->psz_capability );
- p_module->psz_shortname = strdup( p_module->psz_shortname );
+ p_module->psz_shortname = p_module->psz_shortname ?
+ strdup( p_module->psz_shortname ) : NULL;
p_module->psz_longname = strdup( p_module->psz_longname );
if( p_module->psz_program != NULL )
free( p_module->psz_object_name );
free( p_module->psz_capability );
- free( p_module->psz_shortname );
+ if( p_module->psz_shortname ) free( p_module->psz_shortname );
free( p_module->psz_longname );
if( p_module->psz_program != NULL )
static char * GetWindowsError( void )
{
#if defined(UNDER_CE)
- wchar_t psz_tmp[256];
- char * psz_buffer = malloc( 256 );
+ wchar_t psz_tmp[MAX_PATH];
+ char * psz_buffer = malloc( MAX_PATH );
#else
- char * psz_tmp = malloc( 256 );
+ char * psz_tmp = malloc( MAX_PATH );
#endif
int i = 0, i_error = GetLastError();
FormatMessage( FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
NULL, i_error, MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT),
- (LPTSTR) psz_tmp, 256, NULL );
+ (LPTSTR)psz_tmp, MAX_PATH, NULL );
/* Go to the end of the string */
-#if defined(UNDER_CE)
- while( psz_tmp[i] && psz_tmp[i] != L'\r' && psz_tmp[i] != L'\n' )
-#else
- while( psz_tmp[i] && psz_tmp[i] != '\r' && psz_tmp[i] != '\n' )
-#endif
+ while( psz_tmp[i] && psz_tmp[i] != _T('\r') && psz_tmp[i] != _T('\n') )
{
i++;
}
}
#if defined(UNDER_CE)
- WideCharToMultiByte( CP_ACP, WC_DEFAULTCHAR, psz_tmp, -1,
- psz_buffer, 256, NULL, NULL );
+ wcstombs( psz_buffer, psz_tmp, MAX_PATH );
return psz_buffer;
#else
return psz_tmp;
char *psz_filename, *psz_homedir;
FILE *file;
int i, j, i_size, i_read;
- char p_cachestring[sizeof(PLUGINSCACHE_FILE COPYRIGHT_MESSAGE)];
+ char p_cachestring[sizeof(PLUGINSCACHE_DIR COPYRIGHT_MESSAGE)];
+ char p_cachelang[6], p_lang[6];
int i_cache;
module_cache_t **pp_cache = 0;
- int32_t i_file_size;
+ int32_t i_file_size, i_marker;
psz_homedir = p_this->p_vlc->psz_homedir;
if( !psz_homedir )
msg_Err( p_this, "psz_homedir is null" );
return;
}
- psz_filename =
- (char *)malloc( sizeof("/" CONFIG_DIR "/" PLUGINSCACHE_FILE) +
- strlen(psz_homedir) );
-
- if( psz_filename )
- sprintf( psz_filename, "%s/" CONFIG_DIR "/" PLUGINSCACHE_FILE,
- psz_homedir );
- if( !psz_filename )
+ i_size = asprintf( &psz_filename, "%s/%s/%s/%s", psz_homedir, CONFIG_DIR,
+ PLUGINSCACHE_DIR, CacheName() );
+ if( i_size <= 0 )
{
msg_Err( p_this, "out of memory" );
return;
DeleteFile( psz_wf );
#endif
msg_Dbg( p_this, "removing plugins cache file %s", psz_filename );
+ free( psz_filename );
return;
}
fseek( file, sizeof(i_file_size), SEEK_SET );
/* Check the file is a plugins cache */
- i_size = sizeof(PLUGINSCACHE_FILE COPYRIGHT_MESSAGE) - 1;
+ i_size = sizeof(PLUGINSCACHE_DIR COPYRIGHT_MESSAGE) - 1;
i_read = fread( p_cachestring, sizeof(char), i_size, file );
if( i_read != i_size ||
- memcmp( p_cachestring, PLUGINSCACHE_FILE COPYRIGHT_MESSAGE, i_size ) )
+ memcmp( p_cachestring, PLUGINSCACHE_DIR COPYRIGHT_MESSAGE, i_size ) )
{
msg_Warn( p_this, "This doesn't look like a valid plugins cache" );
fclose( file );
return;
}
+ /* Check Sub-version number */
+ i_read = fread( &i_marker, sizeof(char), sizeof(i_marker), file );
+ if( i_read != sizeof(i_marker) || i_marker != CACHE_SUBVERSION_NUM )
+ {
+ msg_Warn( p_this, "This doesn't look like a valid plugins cache "
+ "(corrupted header)" );
+ fclose( file );
+ return;
+ }
+
+ /* Check the language hasn't changed */
+ sprintf( p_lang, "%5.5s", _("C") ); i_size = 5;
+ i_read = fread( p_cachelang, sizeof(char), i_size, file );
+ if( i_read != i_size || memcmp( p_cachelang, p_lang, i_size ) )
+ {
+ msg_Warn( p_this, "This doesn't look like a valid plugins cache "
+ "(language changed)" );
+ fclose( file );
+ return;
+ }
+
+ /* Check header marker */
+ i_read = fread( &i_marker, sizeof(char), sizeof(i_marker), file );
+ if( i_read != sizeof(i_marker) ||
+ i_marker != ftell( file ) - (int)sizeof(i_marker) )
+ {
+ msg_Warn( p_this, "This doesn't look like a valid plugins cache "
+ "(corrupted header)" );
+ fclose( file );
+ return;
+ }
+
p_this->p_libvlc->p_module_bank->i_loaded_cache = 0;
fread( &i_cache, sizeof(char), sizeof(i_cache), file );
- pp_cache = p_this->p_libvlc->p_module_bank->pp_loaded_cache =
- malloc( i_cache * sizeof(void *) );
+ if( i_cache )
+ pp_cache = p_this->p_libvlc->p_module_bank->pp_loaded_cache =
+ malloc( i_cache * sizeof(void *) );
#define LOAD_IMMEDIATE(a) \
if( fread( &a, sizeof(char), sizeof(a), file ) != sizeof(a) ) goto error
#define LOAD_STRING(a) \
{ if( fread( &i_size, sizeof(char), sizeof(i_size), file ) \
!= sizeof(i_size) ) goto error; \
- if( i_size ) { \
+ if( i_size && i_size < 16384 ) { \
a = malloc( i_size ); \
if( fread( a, sizeof(char), i_size, file ) != (size_t)i_size ) \
goto error; \
+ if( a[i_size-1] ) { \
+ free( a ); a = 0; \
+ goto error; } \
} else a = 0; \
} while(0)
pp_cache[i] = malloc( sizeof(module_cache_t) );
p_this->p_libvlc->p_module_bank->i_loaded_cache++;
- /* Save common info */
+ /* Load common info */
LOAD_STRING( pp_cache[i]->psz_file );
LOAD_IMMEDIATE( pp_cache[i]->i_time );
LOAD_IMMEDIATE( pp_cache[i]->i_size );
pp_cache[i]->p_module = vlc_object_create( p_this, VLC_OBJECT_MODULE );
- /* Save additional infos */
+ /* Load additional infos */
LOAD_STRING( pp_cache[i]->p_module->psz_object_name );
LOAD_STRING( pp_cache[i]->p_module->psz_shortname );
LOAD_STRING( pp_cache[i]->p_module->psz_longname );
LOAD_STRING( p_module->p_config[i].psz_name );
LOAD_STRING( p_module->p_config[i].psz_text );
LOAD_STRING( p_module->p_config[i].psz_longtext );
+ LOAD_STRING( p_module->p_config[i].psz_current );
LOAD_STRING( p_module->p_config[i].psz_value_orig );
p_module->p_config[i].psz_value =
strdup( p_module->p_config[i].psz_value_orig ) : 0;
p_module->p_config[i].i_value = p_module->p_config[i].i_value_orig;
p_module->p_config[i].f_value = p_module->p_config[i].f_value_orig;
+ p_module->p_config[i].i_value_saved = p_module->p_config[i].i_value;
+ p_module->p_config[i].f_value_saved = p_module->p_config[i].f_value;
+ p_module->p_config[i].psz_value_saved = 0;
+ p_module->p_config[i].b_dirty = VLC_FALSE;
p_module->p_config[i].p_lock = &p_module->object_lock;
*****************************************************************************/
static void CacheSave( vlc_object_t *p_this )
{
+ static char const psz_tag[] =
+ "Signature: 8a477f597d28d172789f06886806bc55\r\n"
+ "# This file is a cache directory tag created by VLC.\r\n"
+ "# For information about cache directory tags, see:\r\n"
+ "# http://www.brynosaurus.com/cachedir/\r\n";
+
char *psz_filename, *psz_homedir;
FILE *file;
int i, j, i_cache;
return;
}
psz_filename =
- (char *)malloc( sizeof("/" CONFIG_DIR "/" PLUGINSCACHE_FILE) +
- strlen(psz_homedir) );
-
- if( psz_filename )
- sprintf( psz_filename, "%s/" CONFIG_DIR, psz_homedir );
+ (char *)malloc( sizeof("/" CONFIG_DIR "/" PLUGINSCACHE_DIR "/" ) +
+ strlen(psz_homedir) + strlen(CacheName()) );
if( !psz_filename )
{
return;
}
+ sprintf( psz_filename, "%s/%s", psz_homedir, CONFIG_DIR );
+
+ config_CreateDir( p_this, psz_filename );
+
+ strcat( psz_filename, "/" PLUGINSCACHE_DIR );
+
config_CreateDir( p_this, psz_filename );
- strcat( psz_filename, "/" PLUGINSCACHE_FILE );
+ strcat( psz_filename, "/CACHEDIR.TAG" );
+
+ file = fopen( psz_filename, "wb" );
+ if( file )
+ {
+ fwrite( psz_tag, 1, strlen(psz_tag), file );
+ fclose( file );
+ }
+
+ sprintf( psz_filename, "%s/%s/%s/%s", psz_homedir, CONFIG_DIR,
+ PLUGINSCACHE_DIR, CacheName() );
msg_Dbg( p_this, "saving plugins cache file %s", psz_filename );
fwrite( &i_file_size, sizeof(char), sizeof(i_file_size), file );
/* Contains version number */
- fprintf( file, PLUGINSCACHE_FILE COPYRIGHT_MESSAGE );
+ fprintf( file, "%s", PLUGINSCACHE_DIR COPYRIGHT_MESSAGE );
+
+ /* Sub-version number (to avoid breakage in the dev version when cache
+ * structure changes) */
+ i_file_size = CACHE_SUBVERSION_NUM;
+ fwrite( &i_file_size, sizeof(char), sizeof(i_file_size), file );
+
+ /* Language */
+ fprintf( file, "%5.5s", _("C") );
+
+ /* Header marker */
+ i_file_size = ftell( file );
+ fwrite( &i_file_size, sizeof(char), sizeof(i_file_size), file );
i_cache = p_this->p_libvlc->p_module_bank->i_cache;
pp_cache = p_this->p_libvlc->p_module_bank->pp_cache;
SAVE_STRING( p_module->p_config[i].psz_name );
SAVE_STRING( p_module->p_config[i].psz_text );
SAVE_STRING( p_module->p_config[i].psz_longtext );
+ SAVE_STRING( p_module->p_config[i].psz_current );
SAVE_STRING( p_module->p_config[i].psz_value_orig );
if( p_module->p_config[i].i_list )
}
}
+/*****************************************************************************
+ * CacheName: Return the cache file name for this platform.
+ *****************************************************************************/
+static char *CacheName( void )
+{
+ static char psz_cachename[32];
+ static vlc_bool_t b_initialised = VLC_FALSE;
+
+ if( !b_initialised )
+ {
+ /* Code int size, pointer size and endianness in the filename */
+ int32_t x = 0xbe00001e;
+ sprintf( psz_cachename, "plugins-%.2x%.2x%.2x.dat", sizeof(int),
+ sizeof(void *), (unsigned int)((unsigned char *)&x)[0] );
+ b_initialised = VLC_TRUE;
+ }
+
+ return psz_cachename;
+}
+
/*****************************************************************************
* CacheMerge: Merge a cache module descriptor with a full module descriptor.
*****************************************************************************/
projects / vlc / blobdiff