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

Fix crash with Linux supermount fstab entries (thanks Erno!)

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40248
This commit is contained in:
Sam Lantinga 2001-12-05 23:49:09 +00:00
parent 0ed6cab836
commit 0d4c3555ab
1 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -203,21 +203,27 @@ static void CheckMounts(const char *mtab)
if ( strcmp(mnt_type, MNTTYPE_SUPER) == 0 ) { if ( strcmp(mnt_type, MNTTYPE_SUPER) == 0 ) {
tmp = strstr(mntent->mnt_opts, "fs="); tmp = strstr(mntent->mnt_opts, "fs=");
if ( tmp ) { if ( tmp ) {
strcpy(mnt_type, tmp+strlen("fs=")); free(mnt_type);
mnt_type = strdup(tmp + strlen("fs="));
if ( mnt_type ) {
tmp = strchr(mnt_type, ','); tmp = strchr(mnt_type, ',');
if ( tmp ) { if ( tmp ) {
*tmp = '\0'; *tmp = '\0';
} }
} }
}
tmp = strstr(mntent->mnt_opts, "dev="); tmp = strstr(mntent->mnt_opts, "dev=");
if ( tmp ) { if ( tmp ) {
strcpy(mnt_dev, tmp+strlen("dev=")); free(mnt_dev);
mnt_dev = strdup(tmp + strlen("dev="));
if ( mnt_dev ) {
tmp = strchr(mnt_dev, ','); tmp = strchr(mnt_dev, ',');
if ( tmp ) { if ( tmp ) {
*tmp = '\0'; *tmp = '\0';
} }
} }
} }
}
if ( strcmp(mnt_type, MNTTYPE_CDROM) == 0 ) { if ( strcmp(mnt_type, MNTTYPE_CDROM) == 0 ) {
#ifdef DEBUG_CDROM #ifdef DEBUG_CDROM
fprintf(stderr, "Checking mount path from %s: %s mounted on %s of %s\n", fprintf(stderr, "Checking mount path from %s: %s mounted on %s of %s\n",