Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #2753 from Voyager1/libdvdread-fix

Better Libdvdread fix for SMB/NFS VIDEO_TS dvd files (non-Windows and now including Android) with special thanks to @theuni !
  • Loading branch information...
commit 86b587baf43a930cc02a6d9ec0a4cc88816facd4 2 parents c2debe6 + 7401bbf
Voyager1 Voyager1 authored
14 lib/libdvd/libdvdread/src/dvd_reader.c
View
@@ -425,21 +425,15 @@ dvd_reader_t *DVDOpen( const char *ppath )
if( !(path_copy = strdup( path ) ) )
goto DVDOpen_error;
-#ifndef WIN32 /* don't have fchdir, and getcwd( NULL, ... ) is strange */
+#if !defined(WIN32) && !defined(_XBMC) /* don't have fchdir, and getcwd( NULL, ... ) is strange */
/* Also WIN32 does not have symlinks, so we don't need this bit of code. */
+ /* XBMC also doesn't need symlink resolution */
/* Resolve any symlinks and get the absolute dir name. */
-#if defined(_XBMC) /* for XBMC, only do symlink resolution for (real) non-xbmc-VFS paths */
- if ( path[0] == '/' )
-#endif // _XBMC
{
if( ( cdir = open( ".", O_RDONLY ) ) >= 0 ) {
if( chdir( path_copy ) == -1 ) {
-#if defined(_XBMC)
- fprintf( stderr, "libdvdread: failed to change working directory to \"%s\": %s\n", path_copy, strerror(errno)); /* but ignore error */
-#else
goto DVDOpen_error;
-#endif // _XBMC
}
new_path = malloc(PATH_MAX+1);
if(!new_path) {
@@ -452,11 +446,7 @@ dvd_reader_t *DVDOpen( const char *ppath )
close( cdir );
cdir = -1;
if( retval == -1 ) {
-#if defined(_XBMC)
- fprintf( stderr, "libdvdread: failed to reset working directory to \".\": %s\n", strerror(errno)); /* but ignore error */
-#else
goto DVDOpen_error;
-#endif // _XBMC
}
path_copy = new_path;
new_path = NULL;
35 lib/libdvd/patches/02-libdvdread_fix_symlinks_resolution_vfs.diff
View
@@ -1,34 +1,15 @@
diff --git a/lib/libdvd/libdvdread/src/dvd_reader.c b/lib/libdvd/libdvdread/src/dvd_reader.c
-index d9544b3..f5ee550 100644
+index d9544b3..57dd2d0 100644
--- a/lib/libdvd/libdvdread/src/dvd_reader.c
+++ b/lib/libdvd/libdvdread/src/dvd_reader.c
-@@ -429,10 +429,17 @@ dvd_reader_t *DVDOpen( const char *ppath )
+@@ -425,8 +425,9 @@ dvd_reader_t *DVDOpen( const char *ppath )
+ if( !(path_copy = strdup( path ) ) )
+ goto DVDOpen_error;
+
+-#ifndef WIN32 /* don't have fchdir, and getcwd( NULL, ... ) is strange */
++#if !defined(WIN32) && !defined(_XBMC) /* don't have fchdir, and getcwd( NULL, ... ) is strange */
/* Also WIN32 does not have symlinks, so we don't need this bit of code. */
++ /* XBMC also doesn't need symlink resolution */
/* Resolve any symlinks and get the absolute dir name. */
-+#if defined(_XBMC) /* for XBMC, only do symlink resolution for (real) non-xbmc-VFS paths */
-+ if ( path[0] == '/' )
-+#endif // _XBMC
{
- if( ( cdir = open( ".", O_RDONLY ) ) >= 0 ) {
- if( chdir( path_copy ) == -1 ) {
-+#if defined(_XBMC)
-+ fprintf( stderr, "libdvdread: failed to change working directory to \"%s\": %s\n", path_copy, strerror(errno)); /* but ignore error */
-+#else
- goto DVDOpen_error;
-+#endif // _XBMC
- }
- new_path = malloc(PATH_MAX+1);
- if(!new_path) {
-@@ -445,7 +452,11 @@ dvd_reader_t *DVDOpen( const char *ppath )
- close( cdir );
- cdir = -1;
- if( retval == -1 ) {
-+#if defined(_XBMC)
-+ fprintf( stderr, "libdvdread: failed to reset working directory to \".\": %s\n", strerror(errno)); /* but ignore error */
-+#else
- goto DVDOpen_error;
-+#endif // _XBMC
- }
- path_copy = new_path;
- new_path = NULL;
5 xbmc/cores/DllLoader/exports/wrapper.c
View
@@ -405,6 +405,11 @@ int __wrap__stat(const char *path, struct _stat *buffer)
return dll_stat(path, buffer);
}
+int __wrap_stat(const char *path, struct _stat *buffer)
+{
+ return dll_stat(path, buffer);
+}
+
int __wrap___xstat64(int __ver, const char *__filename, struct stat64 *__stat_buf)
{
return dll_stat64(__filename, __stat_buf);
Please sign in to comment.
Something went wrong with that request. Please try again.