#include <vlc_tls.h>
#include <vlc_charset.h>
+#include <vlc_fs.h>
#include <vlc_block.h>
#include <gcrypt.h>
if( *psz_dirname == '\0' )
psz_dirname = ".";
- dir = utf8_opendir( psz_dirname );
+ dir = vlc_opendir( psz_dirname );
if( dir == NULL )
{
if (errno != ENOENT)
msg_Dbg (p_this, "creating empty certificate directory: %s",
psz_dirname);
- utf8_mkdir (psz_dirname, b_priv ? 0700 : 0755);
+ vlc_mkdir (psz_dirname, b_priv ? 0700 : 0755);
return VLC_SUCCESS;
}
#ifdef S_ISLNK
for (;;)
{
- char *ent = utf8_readdir (dir);
+ char *ent = vlc_readdir (dir);
if (ent == NULL)
break;
if ((strcmp (ent, ".") == 0) || (strcmp (ent, "..") == 0))
+ {
+ free( ent );
continue;
+ }
char path[strlen (psz_dirname) + strlen (ent) + 2];
sprintf (path, "%s"DIR_SEP"%s", psz_dirname, ent);
{
struct stat st;
- int fd = utf8_open (psz_path, O_RDONLY, 0);
+ int fd = vlc_open (psz_path, O_RDONLY);
if (fd == -1)
goto error;
goto error;
}
- char *userdir = config_GetUserDataDir ();
+ char *userdir = config_GetUserDir ( VLC_DATA_DIR );
if (userdir != NULL)
{
char path[strlen (userdir) + sizeof ("/ssl/private")];
sprintf (path, "%s/ssl", userdir);
- utf8_mkdir (path, 0755);
+ vlc_mkdir (path, 0755);
sprintf (path, "%s/ssl/certs", userdir);
gnutls_Addx509Directory (VLC_OBJECT (p_session),
gnutls_bye( p_sys->session, GNUTLS_SHUT_WR );
gnutls_deinit( p_sys->session );
- vlc_object_detach( p_session );
vlc_object_release( p_session );
free( p_sys );
gnutls_certificate_server_set_request (session, GNUTLS_CERT_REQUIRE);
/* Session resumption support */
- i_val = config_GetInt (p_server, "gnutls-cache-timeout");
+ i_val = var_InheritInteger (p_server, "gnutls-cache-timeout");
if (i_val >= 0)
gnutls_db_set_cache_expiration (session, i_val);
gnutls_db_set_retrieve_function( session, cb_fetch );
error:
free( p_session->p_sys );
- vlc_object_detach( p_session );
vlc_object_release( p_session );
return NULL;
}
if( p_sys == NULL )
return VLC_ENOMEM;
- p_sys->i_cache_size = config_GetInt (obj, "gnutls-cache-size");
+ p_sys->i_cache_size = var_InheritInteger (obj, "gnutls-cache-size");
if (p_sys->i_cache_size == -1) /* Duh, config subsystem exploded?! */
p_sys->i_cache_size = 0;
p_sys->p_cache = calloc (p_sys->i_cache_size,