valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

fix iso-name parsing for special long file names

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3160
This commit is contained in:
Sebastian Strohhäcker 2008-05-24 18:50:39 +00:00
parent 7df6298433
commit 65e9118e27
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/dos/drive_iso.cpp
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2002-2007 The DOSBox Team
* Copyright (C) 2002-2008 The DOSBox Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* $Id: drive_iso.cpp,v 1.22 2007-11-01 12:15:34 qbix79 Exp $ */
/* $Id: drive_iso.cpp,v 1.23 2008-05-24 18:50:39 c2woody Exp $ */
#include <cctype>
#include <cstring>
@ -501,11 +501,11 @@ int isoDrive :: readDirEntry(isoDirEntry *de, Bit8u *data)
if (de->fileIdentLength == 1 && de->ident[0] == 0) strcpy((char*)de->ident, ".");
else if (de->fileIdentLength == 1 && de->ident[0] == 1) strcpy((char*)de->ident, "..");
else {
if (de->fileIdentLength > 31) return -1;
if (de->fileIdentLength > 200) return -1;
de->ident[de->fileIdentLength] = 0;
}
} else {
if (de->fileIdentLength > 37) return -1;
if (de->fileIdentLength > 200) return -1;
de->ident[de->fileIdentLength] = 0;
// remove any file version identifiers as there are some cdroms that don't have them
strreplace((char*)de->ident, ';', 0);
@ -513,6 +513,13 @@ int isoDrive :: readDirEntry(isoDirEntry *de, Bit8u *data)
int tmp = strlen((char*)de->ident);
if (tmp > 0 && de->ident[tmp - 1] == '.') de->ident[tmp - 1] = 0;
}
const char* dotpos = strchr((char*)de->ident, '.');
if (dotpos!=NULL) {
if (dotpos-(char*)de->ident>8) {
strcpy((char*)(&de->ident[8]),dotpos);
}
}
if (strlen((char*)de->ident)>12) de->ident[12]=0;
return de->length;
}