Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
9b334071
Commit
9b334071
authored
May 10, 2010
by
Christophe Mutricy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Compile fix
parent
f22a1f3f
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
11 deletions
+11
-11
modules/access/rtsp/access.c
modules/access/rtsp/access.c
+1
-1
modules/access/smb.c
modules/access/smb.c
+10
-10
No files found.
modules/access/rtsp/access.c
View file @
9b334071
...
@@ -196,7 +196,7 @@ static int Open( vlc_object_t *p_this )
...
@@ -196,7 +196,7 @@ static int Open( vlc_object_t *p_this )
i_result
=
rtsp_connect
(
p_sys
->
p_rtsp
,
p_access
->
psz_location
,
0
);
i_result
=
rtsp_connect
(
p_sys
->
p_rtsp
,
p_access
->
psz_location
,
0
);
if
(
i_result
)
if
(
i_result
)
{
{
msg_Dbg
(
p_access
,
"could not connect to: %s"
,
p_access
->
psz_
path
);
msg_Dbg
(
p_access
,
"could not connect to: %s"
,
p_access
->
psz_
location
);
free
(
p_sys
->
p_rtsp
);
free
(
p_sys
->
p_rtsp
);
p_sys
->
p_rtsp
=
NULL
;
p_sys
->
p_rtsp
=
NULL
;
goto
error
;
goto
error
;
...
...
modules/access/smb.c
View file @
9b334071
...
@@ -131,15 +131,15 @@ static int Open( vlc_object_t *p_this )
...
@@ -131,15 +131,15 @@ static int Open( vlc_object_t *p_this )
access_t
*
p_access
=
(
access_t
*
)
p_this
;
access_t
*
p_access
=
(
access_t
*
)
p_this
;
access_sys_t
*
p_sys
;
access_sys_t
*
p_sys
;
struct
stat
filestat
;
struct
stat
filestat
;
char
*
psz_
path
,
*
psz_uri
;
char
*
psz_
location
,
*
psz_uri
;
char
*
psz_user
=
NULL
,
*
psz_pwd
=
NULL
,
*
psz_domain
=
NULL
;
char
*
psz_user
=
NULL
,
*
psz_pwd
=
NULL
,
*
psz_domain
=
NULL
;
int
i_ret
;
int
i_ret
;
int
i_smb
;
int
i_smb
;
/* Parse input URI
/* Parse input URI
* [[[domain;]user[:password@]]server[/share[/path[/file]]]] */
* [[[domain;]user[:password@]]server[/share[/path[/file]]]] */
psz_
path
=
strchr
(
p_access
->
psz_location
,
'/'
);
psz_
location
=
strchr
(
p_access
->
psz_location
,
'/'
);
if
(
!
psz_
path
)
if
(
!
psz_
location
)
{
{
msg_Err
(
p_access
,
"invalid SMB URI: smb://%s"
,
psz_location
);
msg_Err
(
p_access
,
"invalid SMB URI: smb://%s"
,
psz_location
);
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
...
@@ -149,14 +149,14 @@ static int Open( vlc_object_t *p_this )
...
@@ -149,14 +149,14 @@ static int Open( vlc_object_t *p_this )
char
*
psz_tmp
=
strdup
(
p_access
->
psz_location
);
char
*
psz_tmp
=
strdup
(
p_access
->
psz_location
);
char
*
psz_parser
;
char
*
psz_parser
;
psz_tmp
[
psz_
path
-
p_access
->
psz_location
]
=
0
;
psz_tmp
[
psz_
location
-
p_access
->
psz_location
]
=
0
;
psz_
path
=
p_access
->
psz_location
;
psz_
location
=
p_access
->
psz_location
;
psz_parser
=
strchr
(
psz_tmp
,
'@'
);
psz_parser
=
strchr
(
psz_tmp
,
'@'
);
if
(
psz_parser
)
if
(
psz_parser
)
{
{
/* User info is there */
/* User info is there */
*
psz_parser
=
0
;
*
psz_parser
=
0
;
psz_
path
=
p_access
->
psz_location
+
(
psz_parser
-
psz_tmp
)
+
1
;
psz_
location
=
p_access
->
psz_location
+
(
psz_parser
-
psz_tmp
)
+
1
;
psz_parser
=
strchr
(
psz_tmp
,
':'
);
psz_parser
=
strchr
(
psz_tmp
,
':'
);
if
(
psz_parser
)
if
(
psz_parser
)
...
@@ -193,16 +193,16 @@ static int Open( vlc_object_t *p_this )
...
@@ -193,16 +193,16 @@ static int Open( vlc_object_t *p_this )
#ifdef WIN32
#ifdef WIN32
if
(
psz_user
)
if
(
psz_user
)
Win32AddConnection
(
p_access
,
psz_
path
,
psz_user
,
psz_pwd
,
psz_domain
);
Win32AddConnection
(
p_access
,
psz_
location
,
psz_user
,
psz_pwd
,
psz_domain
);
i_ret
=
asprintf
(
&
psz_uri
,
"//%s"
,
psz_
path
);
i_ret
=
asprintf
(
&
psz_uri
,
"//%s"
,
psz_
location
);
#else
#else
if
(
psz_user
)
if
(
psz_user
)
i_ret
=
asprintf
(
&
psz_uri
,
"smb://%s%s%s%s%s@%s"
,
i_ret
=
asprintf
(
&
psz_uri
,
"smb://%s%s%s%s%s@%s"
,
psz_domain
?
psz_domain
:
""
,
psz_domain
?
";"
:
""
,
psz_domain
?
psz_domain
:
""
,
psz_domain
?
";"
:
""
,
psz_user
,
psz_pwd
?
":"
:
""
,
psz_user
,
psz_pwd
?
":"
:
""
,
psz_pwd
?
psz_pwd
:
""
,
psz_
path
);
psz_pwd
?
psz_pwd
:
""
,
psz_
location
);
else
else
i_ret
=
asprintf
(
&
psz_uri
,
"smb://%s"
,
psz_
path
);
i_ret
=
asprintf
(
&
psz_uri
,
"smb://%s"
,
psz_
location
);
#endif
#endif
free
(
psz_user
);
free
(
psz_user
);
...
...
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