X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmodules%2Fcache.c;h=6b5d247dfc36b65655285ce76057c4f97d6b93a7;hb=648a4893c5fe1f7bebb8e90cf31cf1e31124a1ac;hp=f55d43175237eccdd8c771760160f1840a26960d;hpb=0b574db7fddd22289bedd007e6b382f92f96ea31;p=vlc

diff --git a/src/modules/cache.c b/src/modules/cache.c
index f55d431752..6b5d247dfc 100644
--- a/src/modules/cache.c
+++ b/src/modules/cache.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * cache.c: Plugins cache
  *****************************************************************************
- * Copyright (C) 2001-2007 the VideoLAN team
+ * Copyright (C) 2001-2007 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Sam Hocevar <sam@zoy.org>
@@ -9,41 +9,41 @@
  *          Hans-Peter Jansen <hpj@urpla.net>
  *          Gildas Bazin <gbazin@videolan.org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
-#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 <vlc_cpu.h>
-#include <errno.h>
-
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 #include <sys/types.h>
+#include <sys/stat.h>
 #ifdef HAVE_UNISTD_H
 #   include <unistd.h>
 #endif
 #include <assert.h>
 
+#include <vlc_common.h>
+#include "libvlc.h"
+
+#include <vlc_plugin.h>
+#include <errno.h>
+
 #include "config/configuration.h"
 
 #include <vlc_fs.h>
@@ -55,18 +55,13 @@
  * Local prototypes
  *****************************************************************************/
 #ifdef HAVE_DYNAMIC_PLUGINS
-static int    CacheLoadConfig  ( module_t *, FILE * );
-
 /* Sub-version number
  * (only used to avoid breakage in dev version when cache structure changes) */
-#define CACHE_SUBVERSION_NUM 11
+#define CACHE_SUBVERSION_NUM 22
 
-/* Format string for the cache filename */
-#define CACHENAME_FORMAT \
-    "plugins-%.2zx%.2zx%.2"PRIx8"-%x.dat"
+/* Cache filename */
+#define CACHE_NAME "plugins.dat"
 /* 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
 
 
@@ -76,40 +71,174 @@ void CacheDelete( vlc_object_t *obj, const char *dir )
 
     assert( dir != NULL );
 
-    if( asprintf( &path, "%s"DIR_SEP CACHENAME_FORMAT,
-                  dir, CACHENAME_VALUES ) == -1 )
+    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 );
 }
 
-/*****************************************************************************
- * LoadPluginsCache: loads the plugins cache file
- *****************************************************************************
+#define LOAD_IMMEDIATE(a) \
+    if (fread (&(a), sizeof (char), sizeof (a), file) != sizeof (a)) \
+        goto error
+#define LOAD_FLAG(a) \
+    do { \
+        unsigned char b; \
+        LOAD_IMMEDIATE(b); \
+        if (b > 1) \
+            goto error; \
+        (a) = b; \
+    } while (0)
+
+static int CacheLoadString (char **p, FILE *file)
+{
+    char *psz = NULL;
+    uint16_t size;
+
+    LOAD_IMMEDIATE (size);
+    if (size > 16384)
+    {
+error:
+        return -1;
+    }
+
+    if (size > 0)
+    {
+        psz = malloc (size+1);
+        if (unlikely(psz == NULL))
+            goto error;
+        if (fread (psz, 1, size, file) != size)
+        {
+            free (psz);
+            goto error;
+        }
+        psz[size] = '\0';
+    }
+    *p = psz;
+    return 0;
+}
+
+#define LOAD_STRING(a) \
+    if (CacheLoadString (&(a), file)) goto error
+
+static int CacheLoadConfig (module_config_t *cfg, FILE *file)
+{
+    LOAD_IMMEDIATE (cfg->i_type);
+    LOAD_IMMEDIATE (cfg->i_short);
+    LOAD_FLAG (cfg->b_advanced);
+    LOAD_FLAG (cfg->b_internal);
+    LOAD_FLAG (cfg->b_unsaveable);
+    LOAD_FLAG (cfg->b_safe);
+    LOAD_FLAG (cfg->b_removed);
+    LOAD_STRING (cfg->psz_type);
+    LOAD_STRING (cfg->psz_name);
+    LOAD_STRING (cfg->psz_text);
+    LOAD_STRING (cfg->psz_longtext);
+    LOAD_IMMEDIATE (cfg->list_count);
+
+    if (IsConfigStringType (cfg->i_type))
+    {
+        LOAD_STRING (cfg->orig.psz);
+        if (cfg->orig.psz != NULL)
+            cfg->value.psz = strdup (cfg->orig.psz);
+        else
+            cfg->value.psz = NULL;
+
+        if (cfg->list_count)
+            cfg->list.psz = xmalloc (cfg->list_count * sizeof (char *));
+        else /* TODO: fix config_GetPszChoices() instead of this hack: */
+            LOAD_IMMEDIATE(cfg->list.psz_cb);
+        for (unsigned i = 0; i < cfg->list_count; i++)
+        {
+            LOAD_STRING (cfg->list.psz[i]);
+            if (cfg->list.psz[i] == NULL /* NULL -> empty string */
+             && (cfg->list.psz[i] = calloc (1, 1)) == NULL)
+                goto error;
+        }
+    }
+    else
+    {
+        LOAD_IMMEDIATE (cfg->orig);
+        LOAD_IMMEDIATE (cfg->min);
+        LOAD_IMMEDIATE (cfg->max);
+        cfg->value = cfg->orig;
+
+        if (cfg->list_count)
+            cfg->list.i = xmalloc (cfg->list_count * sizeof (int));
+        else /* TODO: fix config_GetPszChoices() instead of this hack: */
+            LOAD_IMMEDIATE(cfg->list.i_cb);
+        for (unsigned i = 0; i < cfg->list_count; i++)
+             LOAD_IMMEDIATE (cfg->list.i[i]);
+    }
+    cfg->list_text = xmalloc (cfg->list_count * sizeof (char *));
+    for (unsigned i = 0; i < cfg->list_count; i++)
+    {
+        LOAD_STRING (cfg->list_text[i]);
+        if (cfg->list_text[i] == NULL /* NULL -> empty string */
+         && (cfg->list_text[i] = calloc (1, 1)) == NULL)
+            goto error;
+    }
+
+    return 0;
+error:
+    return -1; /* FIXME: leaks */
+}
+
+static int CacheLoadModuleConfig (module_t *module, FILE *file)
+{
+    uint16_t lines;
+
+    /* Calculate the structure length */
+    LOAD_IMMEDIATE (module->i_config_items);
+    LOAD_IMMEDIATE (module->i_bool_items);
+    LOAD_IMMEDIATE (lines);
+
+    /* Allocate memory */
+    if (lines)
+    {
+        module->p_config = malloc (lines * sizeof (module_config_t));
+        if (unlikely(module->p_config == NULL))
+        {
+            module->confsize = 0;
+            return -1;
+        }
+    }
+    else
+        module->p_config = NULL;
+    module->confsize = lines;
+
+    /* Do the duplication job */
+    for (size_t i = 0; i < lines; i++)
+        if (CacheLoadConfig (module->p_config + i, file))
+            return -1;
+    return 0;
+error:
+    return -1; /* FIXME: leaks */
+}
+
+
+/**
+ * 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, module_bank_t *p_bank, const char *dir )
+ */
+size_t CacheLoad( vlc_object_t *p_this, const char *dir, module_cache_t **r )
 {
     char *psz_filename;
     FILE *file;
-    int j, i_size, i_read;
+    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;
+    int32_t i_marker;
 
     assert( dir != NULL );
 
-    if( !p_bank->b_cache )
-        return;
-
-    if( asprintf( &psz_filename, "%s"DIR_SEP CACHENAME_FORMAT,
-                  dir, CACHENAME_VALUES ) == -1 )
-        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 );
 
@@ -119,30 +248,10 @@ void CacheLoad( vlc_object_t *p_this, module_bank_t *p_bank, const char *dir )
         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 )
-    {
-        msg_Warn( p_this, "This doesn't look like a valid plugins cache "
-                  "(corrupted size)" );
-        fclose( file );
-        return;
-    }
-    fseek( file, sizeof(i_file_size), SEEK_SET );
-
     /* Check the file is a plugins cache */
     i_size = sizeof(CACHE_STRING) - 1;
     i_read = fread( p_cachestring, 1, i_size, file );
@@ -151,7 +260,7 @@ void CacheLoad( vlc_object_t *p_this, module_bank_t *p_bank, const char *dir )
     {
         msg_Warn( p_this, "This doesn't look like a valid plugins cache" );
         fclose( file );
-        return;
+        return 0;
     }
 
 #ifdef DISTRO_VERSION
@@ -164,7 +273,7 @@ void CacheLoad( vlc_object_t *p_this, module_bank_t *p_bank, const char *dir )
     {
         msg_Warn( p_this, "This doesn't look like a valid plugins cache" );
         fclose( file );
-        return;
+        return 0;
     }
 #endif
 
@@ -175,7 +284,7 @@ void CacheLoad( vlc_object_t *p_this, module_bank_t *p_bank, const char *dir )
         msg_Warn( p_this, "This doesn't look like a valid plugins cache "
                   "(corrupted header)" );
         fclose( file );
-        return;
+        return 0;
     }
 
     /* Check header marker */
@@ -186,7 +295,7 @@ void CacheLoad( vlc_object_t *p_this, module_bank_t *p_bank, const char *dir )
         msg_Warn( p_this, "This doesn't look like a valid plugins cache "
                   "(corrupted header)" );
         fclose( file );
-        return;
+        return 0;
     }
 
     if (fread( &i_cache, 1, sizeof(i_cache), file ) != sizeof(i_cache) )
@@ -194,286 +303,196 @@ void CacheLoad( vlc_object_t *p_this, module_bank_t *p_bank, const char *dir )
         msg_Warn( p_this, "This doesn't look like a valid plugins cache "
                   "(file too short)" );
         fclose( file );
-        return;
+        return 0;
     }
 
-    if( i_cache )
-    {
-        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
-#define LOAD_STRING(a) \
-{ \
-    a = NULL; \
-    if( ( fread( &i_size, sizeof(i_size), 1, file ) != 1 ) \
-     || ( i_size > 16384 ) ) \
-        goto error; \
-    if( i_size ) { \
-        char *psz = xmalloc( i_size ); \
-        if( fread( psz, i_size, 1, file ) != 1 ) { \
-            free( psz ); \
-            goto error; \
-        } \
-        if( psz[i_size-1] ) { \
-            free( psz ); \
-            goto error; \
-        } \
-        a = psz; \
-    } \
-}
+    module_cache_t *cache = NULL;
 
-    for( size_t i = 0; i < i_cache; i++ )
+    for (size_t count = 0; count < i_cache;)
     {
-        uint16_t i_size;
+        module_t *module;
         int i_submodules;
 
-        pp_cache[i] = xmalloc( sizeof(module_cache_t) );
-
-        /* 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_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 );
-
-        LOAD_IMMEDIATE( pp_cache[i]->p_module->i_shortcuts );
-        if( pp_cache[i]->p_module->i_shortcuts > MODULE_SHORTCUT_MAX )
+        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 if( pp_cache[i]->p_module->i_shortcuts == 0 )
-            pp_cache[i]->p_module->pp_shortcuts = NULL;
         else
         {
-            pp_cache[i]->p_module->pp_shortcuts =
-                    xmalloc( sizeof( char ** ) * pp_cache[i]->p_module->i_shortcuts );
-            for( j = 0; j < pp_cache[i]->p_module->i_shortcuts; j++ )
-                LOAD_STRING( pp_cache[i]->p_module->pp_shortcuts[j] );
+            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->b_unloadable );
-        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 (CacheLoadModuleConfig (module, file) != VLC_SUCCESS)
             goto error;
 
-        LOAD_STRING( pp_cache[i]->p_module->psz_filename );
-        LOAD_STRING( pp_cache[i]->p_module->domain );
-        if( pp_cache[i]->p_module->domain != NULL )
-            vlc_bindtextdomain( pp_cache[i]->p_module->domain );
+        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 );
-            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 );
-
-            LOAD_IMMEDIATE( p_module->i_shortcuts );
-            if( p_module->i_shortcuts > MODULE_SHORTCUT_MAX )
+            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 if( p_module->i_shortcuts == 0 )
-                p_module->pp_shortcuts = NULL;
             else
             {
-                p_module->pp_shortcuts = xmalloc( sizeof( char ** ) * p_module->i_shortcuts );
-                for( j = 0; j < p_module->i_shortcuts; j++ )
-                    LOAD_STRING( p_module->pp_shortcuts[j] );
+                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->b_unloadable );
-            LOAD_STRING( p_module->domain );
+            LOAD_STRING(submodule->psz_capability);
+            LOAD_IMMEDIATE(submodule->i_score);
         }
-    }
-    p_bank->i_loaded_cache += i_cache;
 
+        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 */
     fclose( file );
-    return;
+    return 0;
 }
 
+#define SAVE_IMMEDIATE( a ) \
+    if (fwrite (&(a), sizeof(a), 1, file) != 1) \
+        goto error
+#define SAVE_FLAG(a) \
+    do { \
+        char b = (a); \
+        SAVE_IMMEDIATE(b); \
+    } while (0)
 
-/* This function should never be called.
- * It is only used as a non-NULL vlc_callback_t value for comparison. */
-static int dummy_callback (vlc_object_t *obj, const char *name,
-                           vlc_value_t oldval, vlc_value_t newval, void *data)
+static int CacheSaveString (FILE *file, const char *str)
 {
-    (void) obj; (void)name; (void)oldval; (void)newval; (void)data;
-    assert (0);
+    uint16_t size = (str != NULL) ? strlen (str) : 0;
+
+    SAVE_IMMEDIATE (size);
+    if (size != 0 && fwrite (str, 1, size, file) != size)
+    {
+error:
+        return -1;
+    }
+    return 0;
 }
 
+#define SAVE_STRING( a ) \
+    if (CacheSaveString (file, (a))) \
+        goto error
 
-static int CacheLoadConfig( module_t *p_module, FILE *file )
+static int CacheSaveConfig (FILE *file, const module_config_t *cfg)
 {
-    uint32_t i_lines;
-    uint16_t i_size;
-
-    /* Calculate the structure length */
-    LOAD_IMMEDIATE( p_module->i_config_items );
-    LOAD_IMMEDIATE( p_module->i_bool_items );
-
-    LOAD_IMMEDIATE( i_lines );
-
-    /* Allocate memory */
-    if (i_lines)
+    SAVE_IMMEDIATE (cfg->i_type);
+    SAVE_IMMEDIATE (cfg->i_short);
+    SAVE_FLAG (cfg->b_advanced);
+    SAVE_FLAG (cfg->b_internal);
+    SAVE_FLAG (cfg->b_unsaveable);
+    SAVE_FLAG (cfg->b_safe);
+    SAVE_FLAG (cfg->b_removed);
+    SAVE_STRING (cfg->psz_type);
+    SAVE_STRING (cfg->psz_name);
+    SAVE_STRING (cfg->psz_text);
+    SAVE_STRING (cfg->psz_longtext);
+    SAVE_IMMEDIATE (cfg->list_count);
+
+    if (IsConfigStringType (cfg->i_type))
     {
-        p_module->p_config =
-            (module_config_t *)calloc( i_lines, sizeof(module_config_t) );
-        if( p_module->p_config == NULL )
-        {
-            p_module->confsize = 0;
-            return VLC_ENOMEM;
-        }
+        SAVE_STRING (cfg->orig.psz);
+        if (cfg->list_count == 0)
+            SAVE_IMMEDIATE (cfg->list.psz_cb); /* XXX: see CacheLoadConfig() */
+        for (unsigned i = 0; i < cfg->list_count; i++)
+            SAVE_STRING (cfg->list.psz[i]);
     }
-    p_module->confsize = i_lines;
-
-    /* Do the duplication job */
-    for (size_t i = 0; i < i_lines; i++ )
+    else
     {
-        LOAD_IMMEDIATE( p_module->p_config[i] );
-
-        LOAD_STRING( p_module->p_config[i].psz_type );
-        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))
-        {
-            LOAD_STRING (p_module->p_config[i].orig.psz);
-            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;
-
-        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 =
-                    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++ )
-                        LOAD_STRING( p_module->p_config[i].ppsz_list[j] );
-                    p_module->p_config[i].ppsz_list[j] = NULL;
-                }
-            }
-            if( p_module->p_config[i].ppsz_list_text )
-            {
-                int j;
-                p_module->p_config[i].ppsz_list_text =
-                    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++ )
-                      LOAD_STRING( p_module->p_config[i].ppsz_list_text[j] );
-                  p_module->p_config[i].ppsz_list_text[j] = NULL;
-                }
-            }
-            if( p_module->p_config[i].pi_list )
-            {
-                p_module->p_config[i].pi_list =
-                    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++)
-                        LOAD_IMMEDIATE( p_module->p_config[i].pi_list[j] );
-                }
-            }
-        }
-
-        if( p_module->p_config[i].i_action )
-        {
-            p_module->p_config[i].ppf_action =
-                xmalloc( p_module->p_config[i].i_action * sizeof(void *) );
-            p_module->p_config[i].ppsz_action_text =
-                xmalloc( p_module->p_config[i].i_action * sizeof(char *) );
+        SAVE_IMMEDIATE (cfg->orig);
+        SAVE_IMMEDIATE (cfg->min);
+        SAVE_IMMEDIATE (cfg->max);
+        if (cfg->list_count == 0)
+            SAVE_IMMEDIATE (cfg->list.i_cb); /* XXX: see CacheLoadConfig() */
+        for (unsigned i = 0; i < cfg->list_count; i++)
+             SAVE_IMMEDIATE (cfg->list.i[i]);
+    }
+    for (unsigned i = 0; i < cfg->list_count; i++)
+        SAVE_STRING (cfg->list_text[i]);
 
-            for (int j = 0; j < p_module->p_config[i].i_action; j++)
-            {
-                p_module->p_config[i].ppf_action[j] = NULL;
-                LOAD_STRING( p_module->p_config[i].ppsz_action_text[j] );
-            }
-        }
+    return 0;
+error:
+    return -1;
+}
 
-        bool has_callback;
-        LOAD_IMMEDIATE( has_callback );
-        if (has_callback)
-            p_module->p_config[i].pf_callback = dummy_callback;
-    }
+static int CacheSaveModuleConfig (FILE *file, const module_t *module)
+{
+    uint16_t lines = module->confsize;
 
-    return VLC_SUCCESS;
+    SAVE_IMMEDIATE (module->i_config_items);
+    SAVE_IMMEDIATE (module->i_bool_items);
+    SAVE_IMMEDIATE (lines);
 
- error:
+    for (size_t i = 0; i < lines; i++)
+        if (CacheSaveConfig (file, module->p_config + i))
+           goto error;
 
-    return VLC_EGENERIC;
+    return 0;
+error:
+    return -1;
 }
 
-static int CacheSaveBank( FILE *file, module_cache_t *const *, size_t );
+static int CacheSaveBank( FILE *file, const module_cache_t *, size_t );
 
-/*****************************************************************************
- * SavePluginsCache: saves the plugins cache to a file
- *****************************************************************************/
+/**
+ * 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 *const *pp_cache, size_t n)
+               module_cache_t *entries, size_t n)
 {
-    char *filename, *tmpname;
+    char *filename = NULL, *tmpname = NULL;
 
-    if (asprintf (&filename, "%s"DIR_SEP CACHENAME_FORMAT, dir,
-                  CACHENAME_VALUES ) == -1)
-        return;
+    if (asprintf (&filename, "%s"DIR_SEP CACHE_NAME, dir ) == -1)
+        goto out;
 
     if (asprintf (&tmpname, "%s.%"PRIu32, filename, (uint32_t)getpid ()) == -1)
-    {
-        free (filename);
-        return;
-    }
+        goto out;
     msg_Dbg (p_this, "saving plugins cache %s", filename);
 
     FILE *file = vlc_fopen (tmpname, "wb");
@@ -484,7 +503,7 @@ void CacheSave (vlc_object_t *p_this, const char *dir,
         goto out;
     }
 
-    if (CacheSaveBank (file, pp_cache, n))
+    if (CacheSaveBank (file, entries, n))
     {
         msg_Warn (p_this, "cannot write %s (%m)", tmpname);
         clearerr (file);
@@ -493,7 +512,7 @@ void CacheSave (vlc_object_t *p_this, const char *dir,
         goto out;
     }
 
-#ifndef WIN32
+#if !defined( _WIN32 ) && !defined( __OS2__ )
     vlc_rename (tmpname, filename); /* atomically replace old cache */
     fclose (file);
 #else
@@ -504,20 +523,19 @@ void CacheSave (vlc_object_t *p_this, const char *dir,
 out:
     free (filename);
     free (tmpname);
+
+    for (size_t i = 0; i < n; i++)
+        free (entries[i].path);
+    free (entries);
 }
 
-static int CacheSaveConfig (FILE *, const module_t *);
 static int CacheSaveSubmodule (FILE *, const module_t *);
 
-static int CacheSaveBank (FILE *file, module_cache_t *const *pp_cache,
+static int CacheSaveBank (FILE *file, const module_cache_t *cache,
                           size_t i_cache)
 {
     uint32_t i_file_size = 0;
 
-    /* Empty space for file size */
-    if (fwrite (&i_file_size, sizeof (i_file_size), 1, file) != 1)
-        goto error;
-
     /* Contains version number */
     if (fputs (CACHE_STRING, file) == EOF)
         goto error;
@@ -540,58 +558,41 @@ static int CacheSaveBank (FILE *file, module_cache_t *const *pp_cache,
     if (fwrite( &i_cache, sizeof (i_cache), 1, file) != 1)
         goto error;
 
-#define SAVE_IMMEDIATE( a ) \
-    if (fwrite (&a, sizeof(a), 1, file) != 1) \
-        goto error
-#define SAVE_STRING( a ) \
-    { \
-        uint16_t i_size = (a != NULL) ? (strlen (a) + 1) : 0; \
-        if ((fwrite (&i_size, sizeof (i_size), 1, file) != 1) \
-         || (a && (fwrite (a, 1, i_size, file) != i_size))) \
-            goto error; \
-    } while(0)
-
     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 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 );
-        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_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 (file, pp_cache[i]->p_module))
+        if (CacheSaveModuleConfig (file, module))
             goto error;
 
-        SAVE_STRING( pp_cache[i]->p_module->psz_filename );
-        SAVE_STRING( pp_cache[i]->p_module->domain );
+        SAVE_STRING(module->domain);
 
-        i_submodule = pp_cache[i]->p_module->submodule_count;
+        i_submodule = module->submodule_count;
         SAVE_IMMEDIATE( i_submodule );
-        if( CacheSaveSubmodule( file, pp_cache[i]->p_module->submodule ) )
+        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
-     || fflush (file)) /* flush libc buffers */
+    if (fflush (file)) /* flush libc buffers */
         goto error;
     return 0; /* success! */
 
@@ -606,73 +607,14 @@ static int CacheSaveSubmodule( FILE *file, const module_t *p_module )
     if( CacheSaveSubmodule( file, p_module->next ) )
         goto error;
 
-    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 );
     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 );
-    SAVE_IMMEDIATE( p_module->b_unloadable );
-    SAVE_STRING( p_module->domain );
-    return 0;
-
-error:
-    return -1;
-}
-
-
-static int CacheSaveConfig (FILE *file, const module_t *p_module)
-{
-    uint32_t i_lines = p_module->confsize;
-
-    SAVE_IMMEDIATE( p_module->i_config_items );
-    SAVE_IMMEDIATE( p_module->i_bool_items );
-    SAVE_IMMEDIATE( i_lines );
-
-    for (size_t i = 0; i < i_lines ; i++)
-    {
-        SAVE_IMMEDIATE( p_module->p_config[i] );
-
-        SAVE_STRING( p_module->p_config[i].psz_type );
-        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 );
-
-        if( p_module->p_config[i].i_list )
-        {
-            if( p_module->p_config[i].ppsz_list )
-            {
-                for (int j = 0; j < p_module->p_config[i].i_list; j++)
-                    SAVE_STRING( p_module->p_config[i].ppsz_list[j] );
-            }
-
-            if( p_module->p_config[i].ppsz_list_text )
-            {
-                for (int j = 0; j < p_module->p_config[i].i_list; j++)
-                    SAVE_STRING( p_module->p_config[i].ppsz_list_text[j] );
-            }
-            if( p_module->p_config[i].pi_list )
-            {
-                for (int j = 0; j < p_module->p_config[i].i_list; j++)
-                    SAVE_IMMEDIATE( p_module->p_config[i].pi_list[j] );
-            }
-        }
-
-        for (int j = 0; j < p_module->p_config[i].i_action; j++)
-            SAVE_STRING( p_module->p_config[i].ppsz_action_text[j] );
-
-        bool has_callback = p_module->p_config[i].pf_callback != NULL;
-        SAVE_IMMEDIATE( has_callback );
-    }
     return 0;
 
 error:
@@ -707,26 +649,50 @@ void CacheMerge( vlc_object_t *p_this, module_t *p_cache, module_t *p_module )
     p_module->b_loaded = false;
 }
 
-/*****************************************************************************
- * CacheFind: finds the cache entry corresponding to a file
- *****************************************************************************/
-module_cache_t *CacheFind( module_bank_t *p_bank, 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;
-
-    pp_cache = p_bank->pp_loaded_cache;
-    i_cache = p_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 */