pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SDL_CDOpen() fails on Linux if data track on disc is mounted in the

Browse source 
filesystem. Removing O_EXCL from open() call fixes this.

Problem and solution noted by "Fosters":
 http://www.libsdl.org/pipermail/sdl/2005-March/068028.html

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401052
This commit is contained in:
Ryan C. Gordon 2005-04-17 10:36:03 +00:00
parent 901515a5d4
commit ec77fa9503
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/cdrom/linux/SDL_syscdrom.c
View file

@ -132,7 +132,7 @@ static int CheckDrive(char *drive, char *mnttype, struct stat *stbuf)
/* If it does exist, verify that it's an available CD-ROM */ /* If it does exist, verify that it's an available CD-ROM */
is_cd = 0; is_cd = 0;
if ( S_ISCHR(stbuf->st_mode) || S_ISBLK(stbuf->st_mode) ) { if ( S_ISCHR(stbuf->st_mode) || S_ISBLK(stbuf->st_mode) ) {
cdfd = open(drive, (O_RDONLY|O_EXCL|O_NONBLOCK), 0); cdfd = open(drive, (O_RDONLY|O_NONBLOCK), 0);
if ( cdfd >= 0 ) { if ( cdfd >= 0 ) {
info.cdsc_format = CDROM_MSF; info.cdsc_format = CDROM_MSF;
/* Under Linux, EIO occurs when a disk is not present. /* Under Linux, EIO occurs when a disk is not present.
@ -393,7 +393,7 @@ static const char *SDL_SYS_CDName(int drive)
static int SDL_SYS_CDOpen(int drive) static int SDL_SYS_CDOpen(int drive)
{ {
return(open(SDL_cdlist[drive], (O_RDONLY|O_EXCL|O_NONBLOCK), 0)); return(open(SDL_cdlist[drive], (O_RDONLY|O_NONBLOCK), 0));
} }
static int SDL_SYS_CDGetTOC(SDL_CD *cdrom) static int SDL_SYS_CDGetTOC(SDL_CD *cdrom)