walkero
/
physfs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Patched to compile on OS/2 again.

This commit is contained in:
Ryan C. Gordon 2005-07-21 18:10:17 +00:00
parent f114094fa8
commit 507b099d5d
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -2,6 +2,7 @@
* CHANGELOG. * CHANGELOG.
*/ */
07212005 - Patched to compile on OS/2 again.
07132005 - Updated zlib to 1.2.2, and patched it for this security hole: 07132005 - Updated zlib to 1.2.2, and patched it for this security hole:
http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2005-2096 http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2005-2096
06122005 - Added support for mingw to Unix build process (thanks, Matze!). 06122005 - Added support for mingw to Unix build process (thanks, Matze!).

15
platform/os2.c
View File

@ -260,7 +260,8 @@ void __PHYSFS_platformDetectAvailableCDs(PHYSFS_StringCallback cb, void *data)
ULONG drivemap = 0; ULONG drivemap = 0;
ULONG i, bit; ULONG i, bit;
APIRET rc = DosQueryCurrentDisk(&dummy, &drivemap); APIRET rc = DosQueryCurrentDisk(&dummy, &drivemap);
BAIL_IF_MACRO(os2err(rc) != NO_ERROR, NULL, retval); if (os2err(rc) != NO_ERROR)
return;
for (i = 0, bit = 1; i < 26; i++, bit <<= 1) for (i = 0, bit = 1; i < 26; i++, bit <<= 1)
{ {
@ -406,7 +407,12 @@ void __PHYSFS_platformEnumerateFiles(const char *dirname,
ULONG count = 1; ULONG count = 1;
APIRET rc; APIRET rc;
BAIL_IF_MACRO(strlen(dirname) > sizeof (spec) - 5, ERR_BAD_FILENAME, NULL); if (strlen(dirname) > sizeof (spec) - 5)
{
__PHYSFS_setError(ERR_BAD_FILENAME);
return;
} /* if */
strcpy(spec, dirname); strcpy(spec, dirname);
strcat(spec, (spec[strlen(spec) - 1] != '\\') ? "\\*.*" : "*.*"); strcat(spec, (spec[strlen(spec) - 1] != '\\') ? "\\*.*" : "*.*");
@ -414,7 +420,10 @@ void __PHYSFS_platformEnumerateFiles(const char *dirname,
FILE_DIRECTORY | FILE_ARCHIVED | FILE_DIRECTORY | FILE_ARCHIVED |
FILE_READONLY | FILE_HIDDEN | FILE_SYSTEM, FILE_READONLY | FILE_HIDDEN | FILE_SYSTEM,
&fb, sizeof (fb), &count, FIL_STANDARD); &fb, sizeof (fb), &count, FIL_STANDARD);
BAIL_IF_MACRO(os2err(rc) != NO_ERROR, NULL, 0);
if (os2err(rc) != NO_ERROR)
return;
while (count == 1) while (count == 1)
{ {
if ((strcmp(fb.achName, ".") != 0) && (strcmp(fb.achName, "..") != 0)) if ((strcmp(fb.achName, ".") != 0) && (strcmp(fb.achName, "..") != 0))