From: RĂ©mi Duraffort Date: Fri, 1 Aug 2008 10:04:26 +0000 (+0200) Subject: Fix [10fcb9f9c3c73d13340c0bd4153fc4c9c87b7186] (win doesn't have setenv). X-Git-Tag: 0.9.0-test3~66 X-Git-Url: https://git.sesse.net/?p=vlc;a=commitdiff_plain;h=5ad6561ceab66b046b648e7651ed63c071d6012d Fix [10fcb9f9c3c73d13340c0bd4153fc4c9c87b7186] (win doesn't have setenv). --- diff --git a/modules/access/dvdread.c b/modules/access/dvdread.c index 25638523b8..a918dc9558 100644 --- a/modules/access/dvdread.c +++ b/modules/access/dvdread.c @@ -225,7 +225,23 @@ static int Open( vlc_object_t *p_this ) /* Override environment variable DVDCSS_METHOD with config option */ psz_dvdcss_env = config_GetPsz( p_demux, "dvdread-css-method" ); if( psz_dvdcss_env && *psz_dvdcss_env ) +#ifdef HAVE_SETENV setenv( "DVDCSS_METHOD", psz_dvdcss_env, 1 ); +#else + { + /* FIXME: this create a small memory leak */ + char *psz_env; + psz_env = malloc( strlen("DVDCSS_METHOD=") + + strlen( psz_dvdcss_env ) + 1 ); + if( !psz_env ) + { + free( psz_dvdcss_env ); + return VLC_ENOMEM; + } + sprintf( psz_env, "%s%s", "DVDCSS_METHOD=", psz_dvdcss_env ); + putenv( psz_env ); + } +#endif free( psz_dvdcss_env ); /* Open dvdread */