Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
937fb9bc
Commit
937fb9bc
authored
Mar 01, 2010
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
SplitMRL: warn if we get a path instead of a MRL/URI
parent
2d9dbfb9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
11 deletions
+21
-11
src/input/input.c
src/input/input.c
+21
-11
No files found.
src/input/input.c
View file @
937fb9bc
...
@@ -3073,11 +3073,11 @@ static void input_ChangeState( input_thread_t *p_input, int i_state )
...
@@ -3073,11 +3073,11 @@ static void input_ChangeState( input_thread_t *p_input, int i_state )
* MRLSplit: parse the access, demux and url part of the
* MRLSplit: parse the access, demux and url part of the
* Media Resource Locator.
* Media Resource Locator.
*****************************************************************************/
*****************************************************************************/
void
input_SplitMRL
(
const
char
**
ppsz_access
,
const
char
**
ppsz_demux
,
char
**
ppsz_path
,
void
input_SplitMRL
(
const
char
**
ppsz_access
,
const
char
**
ppsz_demux
,
char
*
psz_dup
)
char
*
*
ppsz_path
,
char
*
psz_dup
)
{
{
c
har
*
psz_access
=
NULL
;
c
onst
char
*
psz_access
;
c
har
*
psz_demux
=
NULL
;
c
onst
char
*
psz_demux
=
""
;
char
*
psz_path
;
char
*
psz_path
;
/* Either there is an access/demux specification before ://
/* Either there is an access/demux specification before ://
...
@@ -3090,22 +3090,32 @@ void input_SplitMRL( const char **ppsz_access, const char **ppsz_demux, char **p
...
@@ -3090,22 +3090,32 @@ void input_SplitMRL( const char **ppsz_access, const char **ppsz_demux, char **p
/* Separate access from demux (<access>/<demux>://<path>) */
/* Separate access from demux (<access>/<demux>://<path>) */
psz_access
=
psz_dup
;
psz_access
=
psz_dup
;
psz_demux
=
strchr
(
psz_access
,
'/'
);
if
(
psz_demux
)
*
psz_demux
++
=
'\0'
;
/* We really don't want module name substitution here! */
/* We really don't want module name substitution here! */
if
(
psz_access
[
0
]
==
'$'
)
if
(
psz_access
[
0
]
==
'$'
)
psz_access
++
;
psz_access
++
;
if
(
psz_demux
&&
psz_demux
[
0
]
==
'$'
)
psz_demux
++
;
char
*
p
=
strchr
(
psz_access
,
'/'
);
if
(
p
)
{
*
p
=
'\0'
;
psz_demux
=
p
+
1
;
if
(
psz_demux
[
0
]
==
'$'
)
psz_demux
++
;
}
}
}
else
else
{
{
#ifndef NDEBUG
fprintf
(
stderr
,
"%s(
\"
%s
\"
): not a valid URI!
\n
"
,
__func__
,
psz_dup
);
#endif
psz_path
=
psz_dup
;
psz_path
=
psz_dup
;
psz_access
=
""
;
}
}
*
ppsz_access
=
psz_access
?
psz_access
:
""
;
*
ppsz_demux
=
psz_demux
?
psz_demux
:
""
;
*
ppsz_access
=
psz_access
;
*
ppsz_demux
=
psz_demux
;
*
ppsz_path
=
psz_path
;
*
ppsz_path
=
psz_path
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment