TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

use sprintf in PHYSFSX_getRealPath() because I couldn't figure out why the previous code kept segfaulting under linux.

Browse source
This commit is contained in:
Bradley Bell 2004-12-03 07:29:32 +00:00
parent 527b665a38
commit f26950bf6e
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2004-12-02 Bradley Bell <btb@icculus.org>
* include/physfsx.h: use sprintf in PHYSFSX_getRealPath() because
I couldn't figure out why the previous code kept segfaulting under
linux.
2004-12-02 Martin Schaffner <maschaffner@gmx.ch>
* configure.ac: require PhysicsFS header and library

15
include/physfsx.h
View file

@ -1,4 +1,4 @@
/* $Id: physfsx.h,v 1.4 2004-12-02 09:48:57 btb Exp $ */
/* $Id: physfsx.h,v 1.5 2004-12-03 07:29:32 btb Exp $ */
/*
*
@ -21,6 +21,8 @@
#include <physfs.h>
#include "error.h"
static inline int PHYSFSX_readString(PHYSFS_file *file, char *s)
{
char *ptr = s;
@ -77,19 +79,14 @@ static inline int PHYSFSX_putc(PHYSFS_file *file, int c)
static inline int PHYSFSX_getRealPath(char *stdPath, char *realPath)
{
const char *realDir = PHYSFS_getRealDir(stdPath);
char *p;
char sep = *PHYSFS_getDirSeparator();
if (!realDir)
return 0;
strncpy(realPath, realDir, PATH_MAX); // some compilers (like MPW) don't have snprintf
p = realPath + strlen(realPath);
*p++ = sep;
*p = '\0';
strncat(realPath, stdPath, PATH_MAX - strlen(realPath));
while ((p = strchr(p, '/')))
*p++ = sep;
Assert(strlen(realDir) + 1 + strlen(stdPath) < PATH_MAX);
sprintf(realPath, "%s%c%s", realDir, sep, stdPath);
return 1;
}