X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmodules%2Fcache.c;h=20108472bf0e3db55bf4a380755cbf04ad9c05cc;hb=a42fe7a14d00f05748bb751dc4cd8956e29c3335;hp=e15e890ff14476a085624995d535a9f022e42605;hpb=75c438d3302e2a816a473576a35e17989d05a42c;p=vlc

diff --git a/src/modules/cache.c b/src/modules/cache.c
index e15e890ff1..20108472bf 100644
--- a/src/modules/cache.c
+++ b/src/modules/cache.c
@@ -28,48 +28,25 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include "libvlc.h"
 
 #include <stdlib.h>                                      /* free(), strtol() */
 #include <stdio.h>                                              /* sprintf() */
 #include <string.h>                                              /* strdup() */
+#include <vlc_plugin.h>
+#include <errno.h>
 
-#ifdef HAVE_SYS_TYPES_H
-#   include <sys/types.h>
-#endif
+#include <sys/types.h>
+#include <sys/stat.h>
 #ifdef HAVE_UNISTD_H
 #   include <unistd.h>
 #endif
-
-#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
-#elif defined(HAVE_DL_BEOS)
-#   if defined(HAVE_IMAGE_H)
-#       include <image.h>
-#   endif
-#elif defined(HAVE_DL_WINDOWS)
-#   include <windows.h>
-#elif defined(HAVE_DL_DLOPEN)
-#   if defined(HAVE_DLFCN_H) /* Linux, BSD, Hurd */
-#       include <dlfcn.h>
-#   endif
-#   if defined(HAVE_SYS_DL_H)
-#       include <sys/dl.h>
-#   endif
-#elif defined(HAVE_DL_SHL_LOAD)
-#   if defined(HAVE_DL_H)
-#       include <dl.h>
-#   endif
-#endif
+#include <assert.h>
 
 #include "config/configuration.h"
 
-#include "vlc_charset.h"
+#include <vlc_fs.h>
 
 #include "modules/modules.h"
 
@@ -79,103 +56,89 @@
  *****************************************************************************/
 #ifdef HAVE_DYNAMIC_PLUGINS
 static int    CacheLoadConfig  ( module_t *, FILE * );
-static int    CacheSaveConfig  ( module_t *, FILE * );
-static char * CacheName        ( void );
 
 /* Sub-version number
  * (only used to avoid breakage in dev version when cache structure changes) */
-#define CACHE_SUBVERSION_NUM 3
+#define CACHE_SUBVERSION_NUM 18
 
-/*****************************************************************************
- * LoadPluginsCache: loads the plugins cache file
- *****************************************************************************
+/* Cache filename */
+#define CACHE_NAME "plugins.dat"
+/* Magic for the cache filename */
+#define CACHE_STRING "cache "PACKAGE_NAME" "PACKAGE_VERSION
+
+
+void CacheDelete( vlc_object_t *obj, const char *dir )
+{
+    char *path;
+
+    assert( dir != NULL );
+
+    if( asprintf( &path, "%s"DIR_SEP CACHE_NAME, dir ) == -1 )
+        return;
+    msg_Dbg( obj, "removing plugins cache file %s", path );
+    vlc_unlink( path );
+    free( path );
+}
+
+/**
+ * Loads a plugins cache file.
+ *
  * This function will load the plugin cache if present and valid. This cache
  * will in turn be queried by AllocateAllPlugins() to see if it needs to
  * 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 )
+ */
+size_t CacheLoad( vlc_object_t *p_this, const char *dir, module_cache_t **r )
 {
-    char *psz_filename, *psz_cachedir = config_GetCacheDir();
+    char *psz_filename;
     FILE *file;
-    int i, j, i_size, i_read;
-    char p_cachestring[sizeof("cache " COPYRIGHT_MESSAGE)];
-    char p_cachelang[6], p_lang[6];
-    int i_cache;
-    module_cache_t **pp_cache = 0;
-    int32_t i_file_size, i_marker;
-    libvlc_global_data_t *p_libvlc_global = vlc_global();
-
-    if( !psz_cachedir ) /* XXX: this should never happen */
-    {
-        msg_Err( p_this, "Unable to get cache directory" );
-        return;
-    }
+    int i_size, i_read;
+    char p_cachestring[sizeof(CACHE_STRING)];
+    size_t i_cache;
+    int32_t i_marker;
 
-    i_size = asprintf( &psz_filename, "%s"DIR_SEP"%s",
-                       psz_cachedir, CacheName() );
-    free( psz_cachedir );
-    if( i_size <= 0 )
-    {
-        return;
-    }
+    assert( dir != NULL );
 
-    if( p_libvlc_global->p_module_bank->b_cache_delete )
-    {
-#if !defined( UNDER_CE )
-        unlink( psz_filename );
-#else
-        wchar_t psz_wf[MAX_PATH];
-        MultiByteToWideChar( CP_ACP, 0, psz_filename, -1, psz_wf, MAX_PATH );
-        DeleteFile( psz_wf );
-#endif
-        msg_Dbg( p_this, "removing plugins cache file %s", psz_filename );
-        free( psz_filename );
-        return;
-    }
+    *r = NULL;
+    if( asprintf( &psz_filename, "%s"DIR_SEP CACHE_NAME, dir ) == -1 )
+        return 0;
 
     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 0;
     }
     free( psz_filename );
 
-    /* Check the file size */
-    i_read = fread( &i_file_size, 1, sizeof(i_file_size), file );
-    if( i_read != sizeof(i_file_size) )
-    {
-        msg_Warn( p_this, "This doesn't look like a valid plugins cache "
-                  "(too short)" );
-        fclose( file );
-        return;
-    }
-
-    fseek( file, 0, SEEK_END );
-    if( ftell( file ) != i_file_size )
+    /* Check the file is a plugins cache */
+    i_size = sizeof(CACHE_STRING) - 1;
+    i_read = fread( p_cachestring, 1, i_size, file );
+    if( i_read != i_size ||
+        memcmp( p_cachestring, CACHE_STRING, i_size ) )
     {
-        msg_Warn( p_this, "This doesn't look like a valid plugins cache "
-                  "(corrupted size)" );
+        msg_Warn( p_this, "This doesn't look like a valid plugins cache" );
         fclose( file );
-        return;
+        return 0;
     }
-    fseek( file, sizeof(i_file_size), SEEK_SET );
 
-    /* Check the file is a plugins cache */
-    i_size = sizeof("cache " COPYRIGHT_MESSAGE) - 1;
-    i_read = fread( p_cachestring, 1, i_size, file );
+#ifdef DISTRO_VERSION
+    /* Check for distribution specific version */
+    char p_distrostring[sizeof( DISTRO_VERSION )];
+    i_size = sizeof( DISTRO_VERSION ) - 1;
+    i_read = fread( p_distrostring, 1, i_size, file );
     if( i_read != i_size ||
-        memcmp( p_cachestring, "cache " COPYRIGHT_MESSAGE, i_size ) )
+        memcmp( p_distrostring, DISTRO_VERSION, i_size ) )
     {
         msg_Warn( p_this, "This doesn't look like a valid plugins cache" );
         fclose( file );
-        return;
+        return 0;
     }
+#endif
 
     /* Check Sub-version number */
     i_read = fread( &i_marker, 1, sizeof(i_marker), file );
@@ -184,18 +147,7 @@ void CacheLoad( vlc_object_t *p_this )
         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, 1, 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;
+        return 0;
     }
 
     /* Check header marker */
@@ -206,21 +158,18 @@ void CacheLoad( vlc_object_t *p_this )
         msg_Warn( p_this, "This doesn't look like a valid plugins cache "
                   "(corrupted header)" );
         fclose( file );
-        return;
+        return 0;
     }
 
-    p_libvlc_global->p_module_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 "
                   "(file too short)" );
         fclose( file );
-        return;
+        return 0;
     }
 
-    if( i_cache )
-        pp_cache = p_libvlc_global->p_module_bank->pp_loaded_cache =
-                   malloc( i_cache * sizeof(void *) );
+    module_cache_t *cache = NULL;
 
 #define LOAD_IMMEDIATE(a) \
     if( fread( (void *)&a, sizeof(char), sizeof(a), file ) != sizeof(a) ) goto error
@@ -231,7 +180,7 @@ void CacheLoad( vlc_object_t *p_this )
      || ( i_size > 16384 ) ) \
         goto error; \
     if( i_size ) { \
-        char *psz = malloc( i_size ); \
+        char *psz = xmalloc( i_size ); \
         if( fread( psz, i_size, 1, file ) != 1 ) { \
             free( psz ); \
             goto error; \
@@ -244,82 +193,91 @@ void CacheLoad( vlc_object_t *p_this )
     } \
 }
 
-    for( i = 0; i < i_cache; i++ )
+    for (size_t count = 0; count < i_cache;)
     {
+        module_t *module;
         uint16_t i_size;
         int i_submodules;
 
-        pp_cache[i] = malloc( sizeof(module_cache_t) );
-        p_libvlc_global->p_module_bank->i_loaded_cache++;
-
-        /* Load common info */
-        LOAD_STRING( pp_cache[i]->psz_file );
-        LOAD_IMMEDIATE( pp_cache[i]->i_time );
-        LOAD_IMMEDIATE( pp_cache[i]->i_size );
-        LOAD_IMMEDIATE( pp_cache[i]->b_junk );
-        pp_cache[i]->b_used = false;
-
-        if( pp_cache[i]->b_junk ) continue;
-
-        pp_cache[i]->p_module = vlc_module_create( p_this );
+        module = vlc_module_create (NULL);
 
         /* Load additional infos */
-        free( pp_cache[i]->p_module->psz_object_name );
-        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( pp_cache[i]->p_module->psz_help );
-        for( j = 0; j < MODULE_SHORTCUT_MAX; j++ )
+        LOAD_STRING(module->psz_shortname);
+        LOAD_STRING(module->psz_longname);
+        LOAD_STRING(module->psz_help);
+
+        LOAD_IMMEDIATE(module->i_shortcuts);
+        if (module->i_shortcuts > MODULE_SHORTCUT_MAX)
+            goto error;
+        else
         {
-            LOAD_STRING( pp_cache[i]->p_module->pp_shortcuts[j] ); // FIX
+            module->pp_shortcuts =
+                              xmalloc (sizeof (char **) * module->i_shortcuts);
+            for (unsigned j = 0; j < module->i_shortcuts; j++)
+                LOAD_STRING(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->i_cpu );
-        LOAD_IMMEDIATE( pp_cache[i]->p_module->b_unloadable );
-        LOAD_IMMEDIATE( pp_cache[i]->p_module->b_reentrant );
-        LOAD_IMMEDIATE( pp_cache[i]->p_module->b_submodule );
+
+        LOAD_STRING(module->psz_capability);
+        LOAD_IMMEDIATE(module->i_score);
+        LOAD_IMMEDIATE(module->b_unloadable);
 
         /* Config stuff */
-        if( CacheLoadConfig( pp_cache[i]->p_module, file ) != VLC_SUCCESS )
+        if (CacheLoadConfig (module, file) != VLC_SUCCESS)
             goto error;
 
-        LOAD_STRING( pp_cache[i]->p_module->psz_filename );
+        LOAD_STRING(module->domain);
+        if (module->domain != NULL)
+            vlc_bindtextdomain (module->domain);
 
         LOAD_IMMEDIATE( i_submodules );
 
         while( i_submodules-- )
         {
-            module_t *p_module = vlc_submodule_create( pp_cache[i]->p_module );
-            free( p_module->psz_object_name );
-            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++ )
+            module_t *submodule = vlc_module_create (module);
+            free (submodule->pp_shortcuts);
+            LOAD_STRING(submodule->psz_shortname);
+            LOAD_STRING(submodule->psz_longname);
+
+            LOAD_IMMEDIATE(submodule->i_shortcuts);
+            if (submodule->i_shortcuts > MODULE_SHORTCUT_MAX)
+                goto error;
+            else
             {
-                LOAD_STRING( p_module->pp_shortcuts[j] ); // FIX
+                submodule->pp_shortcuts =
+                           xmalloc (sizeof (char **) * submodule->i_shortcuts);
+                for (unsigned j = 0; j < submodule->i_shortcuts; j++)
+                    LOAD_STRING(submodule->pp_shortcuts[j]);
             }
-            LOAD_STRING( p_module->psz_capability );
-            LOAD_IMMEDIATE( p_module->i_score );
-            LOAD_IMMEDIATE( p_module->i_cpu );
-            LOAD_IMMEDIATE( p_module->b_unloadable );
-            LOAD_IMMEDIATE( p_module->b_reentrant );
+
+            LOAD_STRING(submodule->psz_capability);
+            LOAD_IMMEDIATE(submodule->i_score);
         }
-    }
 
+        char *path;
+        struct stat st;
+
+        /* Load common info */
+        LOAD_STRING(path);
+        if (path == NULL)
+            goto error;
+        LOAD_IMMEDIATE(st.st_mtime);
+        LOAD_IMMEDIATE(st.st_size);
+
+        CacheAdd (&cache, &count, path, &st, module);
+        free (path);
+        /* TODO: deal with errors */
+    }
     fclose( file );
-    return;
 
- error:
+    *r = cache;
+    return i_cache;
 
+error:
     msg_Warn( p_this, "plugins cache not loaded (corrupted)" );
 
     /* TODO: cleanup */
-    p_libvlc_global->p_module_bank->i_loaded_cache = 0;
-
     fclose( file );
-    return;
+    return 0;
 }
 
 
@@ -342,7 +300,6 @@ static int CacheLoadConfig( module_t *p_module, FILE *file )
         if( p_module->p_config == NULL )
         {
             p_module->confsize = 0;
-            msg_Err( p_module, "config error: can't duplicate p_config" );
             return VLC_ENOMEM;
         }
     }
@@ -357,8 +314,6 @@ static int CacheLoadConfig( module_t *p_module, FILE *file )
         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_oldname );
-        LOAD_IMMEDIATE( p_module->p_config[i].b_removed );
 
         if (IsConfigStringType (p_module->p_config[i].i_type))
         {
@@ -366,27 +321,20 @@ static int CacheLoadConfig( module_t *p_module, FILE *file )
             p_module->p_config[i].value.psz =
                     (p_module->p_config[i].orig.psz != NULL)
                         ? strdup (p_module->p_config[i].orig.psz) : NULL;
-            p_module->p_config[i].saved.psz = NULL;
         }
         else
-        {
             memcpy (&p_module->p_config[i].value, &p_module->p_config[i].orig,
                     sizeof (p_module->p_config[i].value));
-            memcpy (&p_module->p_config[i].saved, &p_module->p_config[i].orig,
-                    sizeof (p_module->p_config[i].saved));
-        }
 
         p_module->p_config[i].b_dirty = false;
 
-        p_module->p_config[i].p_lock = &p_module->object_lock;
-
         if( p_module->p_config[i].i_list )
         {
             if( p_module->p_config[i].ppsz_list )
             {
                 int j;
                 p_module->p_config[i].ppsz_list =
-                    malloc( (p_module->p_config[i].i_list+1) * sizeof(char *));
+                    xmalloc( (p_module->p_config[i].i_list+1) * sizeof(char *));
                 if( p_module->p_config[i].ppsz_list )
                 {
                     for( j = 0; j < p_module->p_config[i].i_list; j++ )
@@ -398,7 +346,7 @@ static int CacheLoadConfig( module_t *p_module, FILE *file )
             {
                 int j;
                 p_module->p_config[i].ppsz_list_text =
-                    malloc( (p_module->p_config[i].i_list+1) * sizeof(char *));
+                    xmalloc( (p_module->p_config[i].i_list+1) * sizeof(char *));
                 if( p_module->p_config[i].ppsz_list_text )
                 {
                   for( j = 0; j < p_module->p_config[i].i_list; j++ )
@@ -409,7 +357,7 @@ static int CacheLoadConfig( module_t *p_module, FILE *file )
             if( p_module->p_config[i].pi_list )
             {
                 p_module->p_config[i].pi_list =
-                    malloc( (p_module->p_config[i].i_list + 1) * sizeof(int) );
+                    xmalloc( (p_module->p_config[i].i_list + 1) * sizeof(int) );
                 if( p_module->p_config[i].pi_list )
                 {
                     for (int j = 0; j < p_module->p_config[i].i_list; j++)
@@ -421,18 +369,16 @@ static int CacheLoadConfig( module_t *p_module, FILE *file )
         if( p_module->p_config[i].i_action )
         {
             p_module->p_config[i].ppf_action =
-                malloc( p_module->p_config[i].i_action * sizeof(void *) );
+                xmalloc( p_module->p_config[i].i_action * sizeof(void *) );
             p_module->p_config[i].ppsz_action_text =
-                malloc( p_module->p_config[i].i_action * sizeof(char *) );
+                xmalloc( p_module->p_config[i].i_action * sizeof(char *) );
 
             for (int j = 0; j < p_module->p_config[i].i_action; j++)
             {
-                p_module->p_config[i].ppf_action[j] = 0;
+                p_module->p_config[i].ppf_action[j] = NULL;
                 LOAD_STRING( p_module->p_config[i].ppsz_action_text[j] );
             }
         }
-
-        LOAD_IMMEDIATE( p_module->p_config[i].pf_callback );
     }
 
     return VLC_SUCCESS;
@@ -442,78 +388,84 @@ static int CacheLoadConfig( module_t *p_module, FILE *file )
     return VLC_EGENERIC;
 }
 
-/*****************************************************************************
- * SavePluginsCache: saves the plugins cache to a file
- *****************************************************************************/
-void CacheSave( vlc_object_t *p_this )
+static int CacheSaveBank( FILE *file, const module_cache_t *, size_t );
+
+/**
+ * Saves a module cache to disk, and release cache data from memory.
+ */
+void CacheSave (vlc_object_t *p_this, const char *dir,
+               module_cache_t *entries, size_t n)
 {
-    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 *filename = NULL, *tmpname = NULL;
 
-    char *psz_cachedir = config_GetCacheDir();
-    FILE *file;
-    int i, j, i_cache;
-    module_cache_t **pp_cache;
-    uint32_t i_file_size = 0;
-    libvlc_global_data_t *p_libvlc_global = vlc_global();
+    if (asprintf (&filename, "%s"DIR_SEP CACHE_NAME, dir ) == -1)
+        goto out;
+
+    if (asprintf (&tmpname, "%s.%"PRIu32, filename, (uint32_t)getpid ()) == -1)
+        goto out;
+    msg_Dbg (p_this, "saving plugins cache %s", filename);
 
-    if( !psz_cachedir ) /* XXX: this should never happen */
+    FILE *file = vlc_fopen (tmpname, "wb");
+    if (file == NULL)
     {
-        msg_Err( p_this, "unable to get cache directory" );
-        return;
+        if (errno != EACCES && errno != ENOENT)
+            msg_Warn (p_this, "cannot create %s (%m)", tmpname);
+        goto out;
     }
 
-    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"CACHEDIR.TAG", psz_cachedir );
-    file = utf8_fopen( psz_filename, "wb" );
-    if (file != NULL)
+    if (CacheSaveBank (file, entries, n))
     {
-        if (fwrite (psz_tag, 1, sizeof (psz_tag) - 1, file) != 1)
-            clearerr (file); /* what else can we do? */
-        fclose( file );
+        msg_Warn (p_this, "cannot write %s (%m)", tmpname);
+        clearerr (file);
+        fclose (file);
+        vlc_unlink (tmpname);
+        goto out;
     }
 
-    snprintf( psz_filename, sizeof( psz_filename ),
-              "%s"DIR_SEP"%s", psz_cachedir, CacheName() );
-    free( psz_cachedir );
-    msg_Dbg( p_this, "writing plugins cache %s", psz_filename );
+#if !defined( WIN32 ) && !defined( __OS2__ )
+    vlc_rename (tmpname, filename); /* atomically replace old cache */
+    fclose (file);
+#else
+    vlc_unlink (filename);
+    fclose (file);
+    vlc_rename (tmpname, filename);
+#endif
+out:
+    free (filename);
+    free (tmpname);
 
-    file = utf8_fopen( psz_filename, "wb" );
-    if (file == NULL)
-        goto error;
+    for (size_t i = 0; i < n; i++)
+        free (entries[i].path);
+    free (entries);
+}
 
-    /* Empty space for file size */
-    if (fwrite (&i_file_size, sizeof (i_file_size), 1, file) != 1)
-        goto error;
+static int CacheSaveConfig (FILE *, const module_t *);
+static int CacheSaveSubmodule (FILE *, const module_t *);
+
+static int CacheSaveBank (FILE *file, const module_cache_t *cache,
+                          size_t i_cache)
+{
+    uint32_t i_file_size = 0;
 
     /* 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*/
+    if (fputs( DISTRO_VERSION, file ) == EOF)
+        goto error;
+#endif
     /* Sub-version number (to avoid breakage in the dev version when cache
      * structure changes) */
     i_file_size = CACHE_SUBVERSION_NUM;
     if (fwrite (&i_file_size, sizeof (i_file_size), 1, file) != 1 )
         goto error;
 
-    /* Language */
-    if (fprintf (file, "%5.5s", _("C")) == EOF)
-        goto error;
-
     /* Header marker */
     i_file_size = ftell( file );
     if (fwrite (&i_file_size, sizeof (i_file_size), 1, file) != 1)
         goto error;
 
-    i_cache = p_libvlc_global->p_module_bank->i_cache;
-    pp_cache = p_libvlc_global->p_module_bank->pp_cache;
-
     if (fwrite( &i_cache, sizeof (i_cache), 1, file) != 1)
         goto error;
 
@@ -528,86 +480,71 @@ void CacheSave( vlc_object_t *p_this )
             goto error; \
     } while(0)
 
-    for( i = 0; i < i_cache; i++ )
+    for (unsigned i = 0; i < i_cache; i++)
     {
+        module_t *module = cache[i].p_module;
         uint32_t i_submodule;
 
-        /* Save common info */
-        SAVE_STRING( pp_cache[i]->psz_file );
-        SAVE_IMMEDIATE( pp_cache[i]->i_time );
-        SAVE_IMMEDIATE( pp_cache[i]->i_size );
-        SAVE_IMMEDIATE( pp_cache[i]->b_junk );
-
-        if( pp_cache[i]->b_junk ) continue;
-
         /* Save additional infos */
-        SAVE_STRING( pp_cache[i]->p_module->psz_object_name );
-        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( j = 0; j < MODULE_SHORTCUT_MAX; j++ )
-        {
-            SAVE_STRING( pp_cache[i]->p_module->pp_shortcuts[j] ); // FIX
-        }
-        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->i_cpu );
-        SAVE_IMMEDIATE( pp_cache[i]->p_module->b_unloadable );
-        SAVE_IMMEDIATE( pp_cache[i]->p_module->b_reentrant );
-        SAVE_IMMEDIATE( pp_cache[i]->p_module->b_submodule );
+        SAVE_STRING(module->psz_shortname);
+        SAVE_STRING(module->psz_longname);
+        SAVE_STRING(module->psz_help);
+        SAVE_IMMEDIATE(module->i_shortcuts);
+        for (unsigned j = 0; j < module->i_shortcuts; j++)
+            SAVE_STRING(module->pp_shortcuts[j]);
+
+        SAVE_STRING(module->psz_capability);
+        SAVE_IMMEDIATE(module->i_score);
+        SAVE_IMMEDIATE(module->b_unloadable);
 
         /* Config stuff */
-        if (CacheSaveConfig (pp_cache[i]->p_module, file))
+        if (CacheSaveConfig (file, module))
             goto error;
 
-        SAVE_STRING( pp_cache[i]->p_module->psz_filename );
+        SAVE_STRING(module->domain);
 
-        i_submodule = pp_cache[i]->p_module->i_children;
+        i_submodule = module->submodule_count;
         SAVE_IMMEDIATE( i_submodule );
-        for( i_submodule = 0;
-             i_submodule < (unsigned)pp_cache[i]->p_module->i_children;
-             i_submodule++ )
-        {
-            module_t *p_module =
-                (module_t *)pp_cache[i]->p_module->pp_children[i_submodule];
-
-            SAVE_STRING( p_module->psz_object_name );
-            SAVE_STRING( p_module->psz_shortname );
-            SAVE_STRING( p_module->psz_longname );
-            SAVE_STRING( p_module->psz_help );
-            for( j = 0; j < MODULE_SHORTCUT_MAX; j++ )
-            {
-                SAVE_STRING( p_module->pp_shortcuts[j] ); // FIX
-            }
-            SAVE_STRING( p_module->psz_capability );
-            SAVE_IMMEDIATE( p_module->i_score );
-            SAVE_IMMEDIATE( p_module->i_cpu );
-            SAVE_IMMEDIATE( p_module->b_unloadable );
-            SAVE_IMMEDIATE( p_module->b_reentrant );
-        }
+        if (CacheSaveSubmodule (file, module->submodule))
+            goto error;
+
+        /* Save common info */
+        SAVE_STRING(cache[i].path);
+        SAVE_IMMEDIATE(cache[i].mtime);
+        SAVE_IMMEDIATE(cache[i].size);
     }
 
-    /* Fill-up file size */
-    i_file_size = ftell( file );
-    fseek( file, 0, SEEK_SET );
-    if (fwrite (&i_file_size, sizeof (i_file_size), 1, file) != 1)
+    if (fflush (file)) /* flush libc buffers */
         goto error;
+    return 0; /* success! */
 
-    if (fclose (file) == 0)
-        return; /* success! */
+error:
+    return -1;
+}
+
+static int CacheSaveSubmodule( FILE *file, const module_t *p_module )
+{
+    if( !p_module )
+        return 0;
+    if( CacheSaveSubmodule( file, p_module->next ) )
+        goto error;
+
+    SAVE_STRING( p_module->psz_shortname );
+    SAVE_STRING( p_module->psz_longname );
+    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 );
+    return 0;
 
-    file = NULL;
 error:
-    msg_Warn (p_this, "could not write plugins cache %s (%m)",
-              psz_filename);
-    if (file != NULL)
-    {
-        clearerr (file);
-        fclose (file);
-    }
+    return -1;
 }
 
-static int CacheSaveConfig( module_t *p_module, FILE *file )
+
+static int CacheSaveConfig (FILE *file, const module_t *p_module)
 {
     uint32_t i_lines = p_module->confsize;
 
@@ -623,8 +560,6 @@ static int CacheSaveConfig( module_t *p_module, FILE *file )
         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_oldname );
-        SAVE_IMMEDIATE( p_module->p_config[i].b_removed );
 
         if (IsConfigStringType (p_module->p_config[i].i_type))
             SAVE_STRING( p_module->p_config[i].orig.psz );
@@ -651,8 +586,6 @@ static int CacheSaveConfig( module_t *p_module, FILE *file )
 
         for (int j = 0; j < p_module->p_config[i].i_action; j++)
             SAVE_STRING( p_module->p_config[i].ppsz_action_text[j] );
-
-        SAVE_IMMEDIATE( p_module->p_config[i].pf_callback );
     }
     return 0;
 
@@ -660,65 +593,78 @@ error:
     return -1;
 }
 
-/*****************************************************************************
- * CacheName: Return the cache file name for this platform.
- *****************************************************************************/
-static char *CacheName( void )
-{
-    static char psz_cachename[32];
-
-    /* Code int size, pointer size and endianness in the filename */
-    int32_t x = 0xbe00001e;
-    sprintf( psz_cachename, "plugins-%.2x%.2x%.2x.dat", (int)sizeof(int),
-             (int)sizeof(void *), (unsigned int)((unsigned char *)&x)[0] );
-    return psz_cachename;
-}
-
 /*****************************************************************************
  * CacheMerge: Merge a cache module descriptor with a full module descriptor.
  *****************************************************************************/
 void CacheMerge( vlc_object_t *p_this, module_t *p_cache, module_t *p_module )
 {
-    int i_submodule;
     (void)p_this;
 
     p_cache->pf_activate = p_module->pf_activate;
     p_cache->pf_deactivate = p_module->pf_deactivate;
     p_cache->handle = p_module->handle;
 
-    for( i_submodule = 0; i_submodule < p_module->i_children; i_submodule++ )
+    /* FIXME: This looks too simplistic an algorithm to me. What if the module
+     * file was altered such that the number of order of submodules was
+     * altered... after VLC started -- Courmisch, 09/2008 */
+    module_t *p_child = p_module->submodule,
+             *p_cchild = p_cache->submodule;
+    while( p_child && p_cchild )
     {
-        module_t *p_child = (module_t*)p_module->pp_children[i_submodule];
-        module_t *p_cchild = (module_t*)p_cache->pp_children[i_submodule];
         p_cchild->pf_activate = p_child->pf_activate;
         p_cchild->pf_deactivate = p_child->pf_deactivate;
+        p_child = p_child->next;
+        p_cchild = p_cchild->next;
     }
 
     p_cache->b_loaded = true;
     p_module->b_loaded = false;
 }
 
-/*****************************************************************************
- * CacheFind: finds the cache entry corresponding to a file
- *****************************************************************************/
-module_cache_t *CacheFind( const char *psz_file,
-                           int64_t i_time, int64_t i_size )
+/**
+ * Looks up a plugin file in a table of cached plugins.
+ */
+module_t *CacheFind (module_cache_t *cache, size_t count,
+                     const char *path, const struct stat *st)
 {
-    module_cache_t **pp_cache;
-    int i_cache, i;
-    libvlc_global_data_t *p_libvlc_global = vlc_global();
-
-    pp_cache = p_libvlc_global->p_module_bank->pp_loaded_cache;
-    i_cache = p_libvlc_global->p_module_bank->i_loaded_cache;
-
-    for( i = 0; i < i_cache; i++ )
+    while (count > 0)
     {
-        if( !strcmp( pp_cache[i]->psz_file, psz_file ) &&
-            pp_cache[i]->i_time == i_time &&
-            pp_cache[i]->i_size == i_size ) return pp_cache[i];
+        if (cache->path != NULL
+         && !strcmp (cache->path, path)
+         && cache->mtime == st->st_mtime
+         && cache->size == st->st_size)
+       {
+            module_t *module = cache->p_module;
+            cache->p_module = NULL;
+            return module;
+       }
+       cache++;
+       count--;
     }
 
     return NULL;
 }
 
+/** Adds entry to the cache */
+int CacheAdd (module_cache_t **cachep, size_t *countp,
+              const char *path, const struct stat *st, module_t *module)
+{
+    module_cache_t *cache = *cachep;
+    const size_t count = *countp;
+
+    cache = realloc (cache, (count + 1) * sizeof (*cache));
+    if (unlikely(cache == NULL))
+        return -1;
+    *cachep = cache;
+
+    cache += count;
+    /* NOTE: strdup() could be avoided, but it would be a bit ugly */
+    cache->path = strdup (path);
+    cache->mtime = st->st_mtime;
+    cache->size = st->st_size;
+    cache->p_module = module;
+    *countp = count + 1;
+    return 0;
+}
+
 #endif /* HAVE_DYNAMIC_PLUGINS */