Merged r939:940 from trunk: Fix PHYSFS_openAppend() on Unix.
This commit is contained in:
parent
f1ba7f8112
commit
ab4e94c49e
|
@ -4,6 +4,7 @@
|
||||||
|
|
||||||
-- stuff in the stable-1.0 branch, backported from 2.0.0 dev branch, etc ---
|
-- stuff in the stable-1.0 branch, backported from 2.0.0 dev branch, etc ---
|
||||||
|
|
||||||
|
04032008 - Fixed PHYSFS_openAppend() to work as documented on Unix.
|
||||||
03122008 - Removed a FIXME.
|
03122008 - Removed a FIXME.
|
||||||
03112008 - Fixed wrong array index in Windows platform layer (thanks, James!).
|
03112008 - Fixed wrong array index in Windows platform layer (thanks, James!).
|
||||||
03082008 - Fixed compiler warnings in Windows platform layer (thanks, Dennis!).
|
03082008 - Fixed compiler warnings in Windows platform layer (thanks, Dennis!).
|
||||||
|
|
|
@ -344,13 +344,26 @@ int __PHYSFS_platformMkDir(const char *path)
|
||||||
|
|
||||||
static void *doOpen(const char *filename, int mode)
|
static void *doOpen(const char *filename, int mode)
|
||||||
{
|
{
|
||||||
|
const int appending = (mode & O_APPEND);
|
||||||
int fd;
|
int fd;
|
||||||
int *retval;
|
int *retval;
|
||||||
errno = 0;
|
errno = 0;
|
||||||
|
|
||||||
|
/* O_APPEND doesn't actually behave as we'd like. */
|
||||||
|
mode &= ~O_APPEND;
|
||||||
|
|
||||||
fd = open(filename, mode, S_IRUSR | S_IWUSR);
|
fd = open(filename, mode, S_IRUSR | S_IWUSR);
|
||||||
BAIL_IF_MACRO(fd < 0, strerror(errno), NULL);
|
BAIL_IF_MACRO(fd < 0, strerror(errno), NULL);
|
||||||
|
|
||||||
|
if (appending)
|
||||||
|
{
|
||||||
|
if (lseek(fd, 0, SEEK_END) < 0)
|
||||||
|
{
|
||||||
|
close(fd);
|
||||||
|
BAIL_MACRO(strerror(errno), NULL);
|
||||||
|
} /* if */
|
||||||
|
} /* if */
|
||||||
|
|
||||||
retval = (int *) malloc(sizeof (int));
|
retval = (int *) malloc(sizeof (int));
|
||||||
if (retval == NULL)
|
if (retval == NULL)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue