*
* 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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/* Some faulty libcs have a broken struct dirent when _FILE_OFFSET_BITS
#include "vlc_image.h"
#include "vlc_osd.h"
+#include "vlc_update.h"
+#include "vlc_strings.h"
+
#if defined( _MSC_VER ) && defined( UNDER_CE )
# include "modules_builtin_evc.h"
#elif defined( _MSC_VER )
if( p_module != NULL )
{
- msg_Dbg( p_module, "using %s module \"%s\"",
+ msg_Dbg( p_this, "using %s module \"%s\"",
psz_capability, p_module->psz_object_name );
}
else if( p_first == NULL )
p_module->pf_deactivate( p_this );
}
- msg_Dbg( p_module, "removing module \"%s\"", p_module->psz_object_name );
+ msg_Dbg( p_this, "removing module \"%s\"", p_module->psz_object_name );
vlc_object_release( p_module );
{
if( !(*ppsz_path)[0] ) continue;
-#if defined( SYS_BEOS ) || defined( SYS_DARWIN ) || defined( WIN32 )
+#if defined( SYS_BEOS ) || defined( __APPLE__ ) || defined( WIN32 )
/* Handle relative as well as absolute paths */
#ifdef WIN32
sprintf( psz_path, "%s\\%s", psz_dir, finddata.cFileName );
#endif
- /* Skip ".", ".." and anything starting with "." */
- if( !*finddata.cFileName || *finddata.cFileName == '.' )
+ /* Skip ".", ".." */
+ if( !*finddata.cFileName || !strcmp( finddata.cFileName, "." )
+ || !strcmp( finddata.cFileName, ".." ) )
{
if( !FindNextFile( handle, &finddata ) ) break;
continue;
unsigned int i_len;
int i_stat;
- /* Skip ".", ".." and anything starting with "." */
- if( !*file->d_name || *file->d_name == '.' )
+ /* Skip ".", ".." */
+ if( !*file->d_name || !strcmp( file->d_name, "." )
+ || !strcmp( file->d_name, ".." ) )
{
continue;
}
{
/* With a well-written module we shouldn't have to print an
* additional error message here, but just make sure. */
- msg_Err( p_module, "failed calling symbol \"%s\" in file `%s'",
+ msg_Err( p_module, "Failed to call symbol \"%s\" in file `%s'",
psz_name, p_module->psz_filename );
return -1;
}
msg_Dbg( p_this, "loading plugins cache file %s", psz_filename );
- file = fopen( psz_filename, "rb" );
+ file = utf8_fopen( psz_filename, "rb" );
if( !file )
{
msg_Warn( p_this, "could not open plugins cache file %s for reading",
strcat( psz_filename, "/CACHEDIR.TAG" );
- file = fopen( psz_filename, "wb" );
+ file = utf8_fopen( psz_filename, "wb" );
if( file )
{
fwrite( psz_tag, 1, strlen(psz_tag), file );
msg_Dbg( p_this, "saving plugins cache file %s", psz_filename );
- file = fopen( psz_filename, "wb" );
+ file = utf8_fopen( psz_filename, "wb" );
if( !file )
{
msg_Warn( p_this, "could not open plugins cache file %s for writing",
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;
- }
+ /* 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] );
return psz_cachename;
}