Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2723 from Voyager1/libdvdread-fix
Libdvdread fix for SMB, NFS, VIDEO_TS files (non-Windows platforms). fixes #14316
- Loading branch information
Showing
3 changed files
with
37 additions
and
87 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
34 changes: 34 additions & 0 deletions
34
lib/libdvd/patches/02-libdvdread_fix_symlinks_resolution_vfs.diff
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
diff --git a/lib/libdvd/libdvdread/src/dvd_reader.c b/lib/libdvd/libdvdread/src/dvd_reader.c | ||
index d9544b3..f5ee550 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 ) | ||
/* Also WIN32 does not have symlinks, so we don't need this bit of code. */ | ||
|
||
/* 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; |