#include <string.h> /* strdup() */
#include <vlc_plugin.h>
#include <vlc_cpu.h>
+#include <errno.h>
#include <sys/types.h>
#ifdef HAVE_UNISTD_H
#include "config/configuration.h"
-#include "vlc_charset.h"
+#include <vlc_fs.h>
#include "modules/modules.h"
/* Sub-version number
* (only used to avoid breakage in dev version when cache structure changes) */
-#define CACHE_SUBVERSION_NUM 10
+#define CACHE_SUBVERSION_NUM 11
/* Format string for the cache filename */
#define CACHENAME_FORMAT \
sizeof(int), sizeof(void *), *(uint8_t *)&(uint16_t){ 0xbe1e }, vlc_CPU()
+void CacheDelete( vlc_object_t *obj, const char *dir )
+{
+ char *path;
+
+ assert( dir != NULL );
+
+ if( asprintf( &path, "%s"DIR_SEP CACHENAME_FORMAT,
+ dir, CACHENAME_VALUES ) == -1 )
+ return;
+ msg_Dbg( obj, "removing plugins cache file %s", path );
+ vlc_unlink( path );
+ free( path );
+}
+
/*****************************************************************************
* LoadPluginsCache: loads the plugins cache file
*****************************************************************************
* actually load the dynamically loadable module.
* This allows us to only fully load plugins when they are actually used.
*****************************************************************************/
-void CacheLoad( vlc_object_t *p_this, module_bank_t *p_bank, bool b_delete )
+void CacheLoad( vlc_object_t *p_this, module_bank_t *p_bank, const char *dir )
{
- char *psz_filename, *psz_cachedir = config_GetUserDir(VLC_CACHE_DIR);
+ char *psz_filename;
FILE *file;
- int i, j, i_size, i_read;
+ int j, i_size, i_read;
char p_cachestring[sizeof("cache " COPYRIGHT_MESSAGE)];
- int i_cache;
- module_cache_t **pp_cache = 0;
+ size_t i_cache;
+ module_cache_t **pp_cache = NULL;
int32_t i_file_size, i_marker;
- if( !psz_cachedir ) /* XXX: this should never happen */
- {
- msg_Err( p_this, "Unable to get cache directory" );
- return;
- }
+ assert( dir != NULL );
- if( asprintf( &psz_filename, "%s"DIR_SEP CACHENAME_FORMAT,
- psz_cachedir, CACHENAME_VALUES ) == -1 )
- {
- free( psz_cachedir );
+ if( !p_bank->b_cache )
return;
- }
- free( psz_cachedir );
- if( b_delete )
- {
- msg_Dbg( p_this, "removing plugins cache file %s", psz_filename );
- utf8_unlink( psz_filename );
- free( psz_filename );
+ if( asprintf( &psz_filename, "%s"DIR_SEP CACHENAME_FORMAT,
+ dir, CACHENAME_VALUES ) == -1 )
return;
- }
msg_Dbg( p_this, "loading plugins cache file %s", psz_filename );
- file = utf8_fopen( psz_filename, "rb" );
+ file = vlc_fopen( psz_filename, "rb" );
if( !file )
{
- msg_Warn( p_this, "could not open plugins cache file %s for reading",
+ msg_Warn( p_this, "cannot read %s (%m)",
psz_filename );
free( psz_filename );
return;
return;
}
- p_bank->i_loaded_cache = 0;
if (fread( &i_cache, 1, sizeof(i_cache), file ) != sizeof(i_cache) )
{
msg_Warn( p_this, "This doesn't look like a valid plugins cache "
}
if( i_cache )
- pp_cache = p_bank->pp_loaded_cache =
- xmalloc( i_cache * sizeof(void *) );
+ {
+ size_t i_already = p_bank->i_loaded_cache;
+ pp_cache = realloc( p_bank->pp_loaded_cache,
+ (i_already + i_cache) * sizeof(*pp_cache) );
+ if( unlikely(pp_cache == NULL) )
+ i_cache = 0; /* don't load */
+ else
+ {
+ p_bank->pp_loaded_cache = pp_cache;
+ pp_cache += i_already;
+ }
+ }
#define LOAD_IMMEDIATE(a) \
if( fread( (void *)&a, sizeof(char), sizeof(a), file ) != sizeof(a) ) goto error
} \
}
- for( i = 0; i < i_cache; i++ )
+ for( size_t i = 0; i < i_cache; i++ )
{
uint16_t i_size;
int i_submodules;
pp_cache[i] = xmalloc( sizeof(module_cache_t) );
- p_bank->i_loaded_cache++;
/* Load common info */
LOAD_STRING( pp_cache[i]->psz_file );
LOAD_STRING( p_module->domain );
}
}
+ p_bank->i_loaded_cache += i_cache;
fclose( file );
return;
msg_Warn( p_this, "plugins cache not loaded (corrupted)" );
/* TODO: cleanup */
- p_bank->i_loaded_cache = 0;
-
fclose( file );
return;
}
return VLC_EGENERIC;
}
-static int CacheSaveBank( FILE *file, module_bank_t *p_bank );
+static int CacheSaveBank( FILE *file, module_cache_t *const *, size_t );
/*****************************************************************************
* SavePluginsCache: saves the plugins cache to a file
*****************************************************************************/
-void CacheSave( vlc_object_t *p_this, module_bank_t *p_bank )
+void CacheSave (vlc_object_t *p_this, const char *dir,
+ module_cache_t *const *pp_cache, size_t n)
{
- char *psz_cachedir = config_GetUserDir(VLC_CACHE_DIR);
- if( !psz_cachedir ) /* XXX: this should never happen */
+ char *filename, *tmpname;
+
+ if (asprintf (&filename, "%s"DIR_SEP CACHENAME_FORMAT, dir,
+ CACHENAME_VALUES ) == -1)
+ return;
+
+ if (asprintf (&tmpname, "%s.%"PRIu32, filename, (uint32_t)getpid ()) == -1)
{
- msg_Err( p_this, "unable to get cache directory" );
+ free (filename);
return;
}
+ msg_Dbg (p_this, "saving plugins cache %s", filename);
- char psz_filename[sizeof(DIR_SEP) + 32 + strlen(psz_cachedir)];
- config_CreateDir( p_this, psz_cachedir );
-
- snprintf( psz_filename, sizeof( psz_filename ),
- "%s"DIR_SEP CACHENAME_FORMAT, psz_cachedir,
- CACHENAME_VALUES );
- free( psz_cachedir );
-
- char psz_tmpname[sizeof (psz_filename) + 12];
- snprintf (psz_tmpname, sizeof (psz_tmpname), "%s.%"PRIu32, psz_filename,
- (uint32_t)getpid ());
- FILE *file = utf8_fopen( psz_tmpname, "wb" );
+ FILE *file = vlc_fopen (tmpname, "wb");
if (file == NULL)
- goto error;
+ {
+ if (errno != EACCES && errno != ENOENT)
+ msg_Warn (p_this, "cannot create %s (%m)", tmpname);
+ goto out;
+ }
- msg_Dbg (p_this, "saving plugins cache %s", psz_filename);
- if (CacheSaveBank (file, p_bank))
- goto error;
+ if (CacheSaveBank (file, pp_cache, n))
+ {
+ msg_Warn (p_this, "cannot write %s (%m)", tmpname);
+ clearerr (file);
+ fclose (file);
+ vlc_unlink (tmpname);
+ goto out;
+ }
#ifndef WIN32
- utf8_rename (psz_tmpname, psz_filename); /* atomically replace old cache */
+ vlc_rename (tmpname, filename); /* atomically replace old cache */
fclose (file);
#else
- utf8_unlink (psz_filename);
+ vlc_unlink (filename);
fclose (file);
- utf8_rename (psz_tmpname, psz_filename);
+ vlc_rename (tmpname, filename);
#endif
- return; /* success! */
-
-error:
- msg_Warn (p_this, "could not write plugins cache %s (%m)",
- psz_filename);
- if (file != NULL)
- {
- clearerr (file);
- fclose (file);
- }
+out:
+ free (filename);
+ free (tmpname);
}
-static int CacheSaveConfig (FILE *, module_t *);
-static int CacheSaveSubmodule (FILE *, module_t *);
+static int CacheSaveConfig (FILE *, const module_t *);
+static int CacheSaveSubmodule (FILE *, const module_t *);
-static int CacheSaveBank (FILE *file, module_bank_t *p_bank)
+static int CacheSaveBank (FILE *file, module_cache_t *const *pp_cache,
+ size_t i_cache)
{
uint32_t i_file_size = 0;
if (fwrite (&i_file_size, sizeof (i_file_size), 1, file) != 1)
goto error;
- module_cache_t **pp_cache = p_bank->pp_cache;
- uint32_t i_cache = p_bank->i_cache;
-
if (fwrite( &i_cache, sizeof (i_cache), 1, file) != 1)
goto error;
return -1;
}
-static int CacheSaveSubmodule( FILE *file, module_t *p_module )
+static int CacheSaveSubmodule( FILE *file, const module_t *p_module )
{
if( !p_module )
return 0;
}
-static int CacheSaveConfig (FILE *file, module_t *p_module)
+static int CacheSaveConfig (FILE *file, const module_t *p_module)
{
uint32_t i_lines = p_module->confsize;
projects / vlc / blobdiff