#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"
/* Magic for the cache filename */
#define CACHENAME_VALUES \
sizeof(int), sizeof(void *), *(uint8_t *)&(uint16_t){ 0xbe1e }, vlc_CPU()
+#define CACHE_STRING "cache "PACKAGE_NAME" "PACKAGE_VERSION
void CacheDelete( vlc_object_t *obj, const char *dir )
dir, CACHENAME_VALUES ) == -1 )
return;
msg_Dbg( obj, "removing plugins cache file %s", path );
- utf8_unlink( path );
+ vlc_unlink( path );
free( path );
}
{
char *psz_filename;
FILE *file;
- int j, i_size, i_read;
- char p_cachestring[sizeof("cache " COPYRIGHT_MESSAGE)];
+ int i_size, i_read;
+ char p_cachestring[sizeof(CACHE_STRING)];
size_t i_cache;
module_cache_t **pp_cache = NULL;
int32_t i_file_size, i_marker;
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, "cannot read %s (%m)",
fseek( file, sizeof(i_file_size), SEEK_SET );
/* Check the file is a plugins cache */
- i_size = sizeof("cache " COPYRIGHT_MESSAGE) - 1;
+ i_size = sizeof(CACHE_STRING) - 1;
i_read = fread( p_cachestring, 1, i_size, file );
if( i_read != i_size ||
- memcmp( p_cachestring, "cache " COPYRIGHT_MESSAGE, i_size ) )
+ memcmp( p_cachestring, CACHE_STRING, i_size ) )
{
msg_Warn( p_this, "This doesn't look like a valid plugins cache" );
fclose( file );
LOAD_STRING( pp_cache[i]->p_module->psz_shortname );
LOAD_STRING( pp_cache[i]->p_module->psz_longname );
LOAD_STRING( pp_cache[i]->p_module->psz_help );
- for( j = 0; j < MODULE_SHORTCUT_MAX; j++ )
+
+ LOAD_IMMEDIATE( pp_cache[i]->p_module->i_shortcuts );
+ if( pp_cache[i]->p_module->i_shortcuts > MODULE_SHORTCUT_MAX )
+ goto error;
+ else if( pp_cache[i]->p_module->i_shortcuts == 0 )
+ pp_cache[i]->p_module->pp_shortcuts = NULL;
+ else
{
- LOAD_STRING( pp_cache[i]->p_module->pp_shortcuts[j] ); // FIX
+ pp_cache[i]->p_module->pp_shortcuts =
+ xmalloc( sizeof( char ** ) * pp_cache[i]->p_module->i_shortcuts );
+ for( unsigned j = 0; j < pp_cache[i]->p_module->i_shortcuts; j++ )
+ LOAD_STRING( pp_cache[i]->p_module->pp_shortcuts[j] );
}
+
LOAD_STRING( pp_cache[i]->p_module->psz_capability );
LOAD_IMMEDIATE( pp_cache[i]->p_module->i_score );
LOAD_IMMEDIATE( pp_cache[i]->p_module->b_unloadable );
{
module_t *p_module = vlc_submodule_create( pp_cache[i]->p_module );
free( p_module->psz_object_name );
+ free( p_module->pp_shortcuts );
LOAD_STRING( p_module->psz_object_name );
LOAD_STRING( p_module->psz_shortname );
LOAD_STRING( p_module->psz_longname );
LOAD_STRING( p_module->psz_help );
- for( j = 0; j < MODULE_SHORTCUT_MAX; j++ )
+
+ LOAD_IMMEDIATE( p_module->i_shortcuts );
+ if( p_module->i_shortcuts > MODULE_SHORTCUT_MAX )
+ goto error;
+ else if( p_module->i_shortcuts == 0 )
+ p_module->pp_shortcuts = NULL;
+ else
{
- LOAD_STRING( p_module->pp_shortcuts[j] ); // FIX
+ p_module->pp_shortcuts = xmalloc( sizeof( char ** ) * p_module->i_shortcuts );
+ for( unsigned j = 0; j < p_module->i_shortcuts; j++ )
+ LOAD_STRING( p_module->pp_shortcuts[j] );
}
+
LOAD_STRING( p_module->psz_capability );
LOAD_IMMEDIATE( p_module->i_score );
LOAD_IMMEDIATE( p_module->b_unloadable );
free (filename);
return;
}
+ msg_Dbg (p_this, "saving plugins cache %s", filename);
- FILE *file = utf8_fopen (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", tmpname);
if (CacheSaveBank (file, pp_cache, n))
- goto error;
+ {
+ msg_Warn (p_this, "cannot write %s (%m)", tmpname);
+ clearerr (file);
+ fclose (file);
+ vlc_unlink (tmpname);
+ goto out;
+ }
#ifndef WIN32
- utf8_rename (tmpname, filename); /* atomically replace old cache */
+ vlc_rename (tmpname, filename); /* atomically replace old cache */
fclose (file);
#else
- utf8_unlink (filename);
+ vlc_unlink (filename);
fclose (file);
- utf8_rename (tmpname, filename);
+ vlc_rename (tmpname, filename);
#endif
- return; /* success! */
-
-error:
- msg_Warn (p_this, "cannot write %s (%m)", tmpname);
+out:
free (filename);
free (tmpname);
- if (file != NULL)
- {
- clearerr (file);
- fclose (file);
- }
}
static int CacheSaveConfig (FILE *, const module_t *);
goto error;
/* Contains version number */
- if (fputs ("cache "COPYRIGHT_MESSAGE, file) == EOF)
+ if (fputs (CACHE_STRING, file) == EOF)
goto error;
#ifdef DISTRO_VERSION
/* Allow binary maintaner to pass a string to detect new binary version*/
SAVE_STRING( pp_cache[i]->p_module->psz_shortname );
SAVE_STRING( pp_cache[i]->p_module->psz_longname );
SAVE_STRING( pp_cache[i]->p_module->psz_help );
- for (unsigned j = 0; j < MODULE_SHORTCUT_MAX; j++)
- {
- SAVE_STRING( pp_cache[i]->p_module->pp_shortcuts[j] ); // FIX
- }
+ SAVE_IMMEDIATE( pp_cache[i]->p_module->i_shortcuts );
+ for (unsigned j = 0; j < pp_cache[i]->p_module->i_shortcuts; j++)
+ SAVE_STRING( pp_cache[i]->p_module->pp_shortcuts[j] );
+
SAVE_STRING( pp_cache[i]->p_module->psz_capability );
SAVE_IMMEDIATE( pp_cache[i]->p_module->i_score );
SAVE_IMMEDIATE( pp_cache[i]->p_module->b_unloadable );
SAVE_STRING( p_module->psz_shortname );
SAVE_STRING( p_module->psz_longname );
SAVE_STRING( p_module->psz_help );
- for( unsigned j = 0; j < MODULE_SHORTCUT_MAX; j++ )
- SAVE_STRING( p_module->pp_shortcuts[j] ); // FIXME
+ SAVE_IMMEDIATE( p_module->i_shortcuts );
+ for( unsigned j = 0; j < p_module->i_shortcuts; j++ )
+ SAVE_STRING( p_module->pp_shortcuts[j] );
SAVE_STRING( p_module->psz_capability );
SAVE_IMMEDIATE( p_module->i_score );