Commit c041421d authored by Ilkka Ollakka's avatar Ilkka Ollakka

playlist.c: change FindPrefix to include access on returned string

parent 7308685e
...@@ -182,7 +182,17 @@ char *FindPrefix( demux_t *p_demux ) ...@@ -182,7 +182,17 @@ char *FindPrefix( demux_t *p_demux )
{ {
char *psz_file; char *psz_file;
char *psz_prefix; char *psz_prefix;
const char *psz_path = p_demux->psz_path; char *psz_path;
if( p_demux->psz_access )
{
if( asprintf( &psz_path,"%s://%s", p_demux->psz_access, p_demux->psz_path ) == -1 )
return NULL;
}
else
{
if( asprintf( &psz_path,"%s", p_demux->psz_path ) == -1 )
return NULL;
}
#ifdef WIN32 #ifdef WIN32
psz_file = strrchr( psz_path, '\\' ); psz_file = strrchr( psz_path, '\\' );
...@@ -194,6 +204,7 @@ char *FindPrefix( demux_t *p_demux ) ...@@ -194,6 +204,7 @@ char *FindPrefix( demux_t *p_demux )
psz_prefix = strndup( psz_path, psz_file - psz_path + 1 ); psz_prefix = strndup( psz_path, psz_file - psz_path + 1 );
else else
psz_prefix = strdup( "" ); psz_prefix = strdup( "" );
free( psz_path );
return psz_prefix; return psz_prefix;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment