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
37de4458
Commit
37de4458
authored
Feb 11, 2010
by
Erwan Tulou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
core: debug make_path for windows
- infinite loop and typo fixed - remove leading slash forgotten
parent
e2262479
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
28 additions
and
6 deletions
+28
-6
src/text/strings.c
src/text/strings.c
+28
-6
No files found.
src/text/strings.c
View file @
37de4458
...
...
@@ -1166,6 +1166,20 @@ char *make_path (const char *url)
size_t
schemelen
=
((
end
!=
NULL
)
?
end
:
path
)
-
url
;
path
+=
3
;
/* skip "://" */
#ifdef WIN32
/* skip leading slash before disk drive
* when format is file:///C:/path/file.ext
*/
if
(
schemelen
==
4
&&
!
strncasecmp
(
url
,
"file"
,
4
))
{
char
*
search
=
strstr
(
path
,
":/"
);
if
(
search
&&
*
path
==
'/'
&&
search
==
path
+
2
)
path
++
;
}
#endif
/* Remove HTML anchor if present */
end
=
strchr
(
path
,
'#'
);
if
(
end
)
...
...
@@ -1182,8 +1196,21 @@ char *make_path (const char *url)
{
#if (DIR_SEP_CHAR != '/')
for
(
char
*
p
=
strchr
(
path
,
'/'
);
p
;
p
=
strchr
(
p
,
'/'
))
*
p
=
=
DIR_SEP_CHAR
;
*
p
++
=
DIR_SEP_CHAR
;
#endif
#ifdef WIN32
/* check for disk drive in the form 'C:\...' */
char
*
search
=
strstr
(
path
,
":"
DIR_SEP
);
if
(
search
&&
search
==
path
+
1
)
return
path
;
if
(
*
path
&&
asprintf
(
&
ret
,
"
\\\\
%s"
,
path
)
==
-
1
)
ret
=
NULL
;
goto
out
;
#else
if
(
*
path
==
DIR_SEP_CHAR
)
return
path
;
...
...
@@ -1193,12 +1220,7 @@ char *make_path (const char *url)
memmove
(
path
,
path
+
9
,
strlen
(
path
+
9
)
+
1
);
return
path
;
}
#ifdef WIN32
if
(
*
path
&&
asprintf
(
&
ret
,
"
\\\\
%s"
,
path
)
==
-
1
)
ret
=
NULL
;
#endif
/* non-local path :-( */
}
else
if
(
schemelen
==
2
&&
!
strncasecmp
(
url
,
"fd"
,
2
))
...
...
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