r941 - in branches/stable-1.0: . platform

[DONOTREPLY at icculus.org]

Author: icculus
Date: 2008-04-03 01:07:35 -0400 (Thu, 03 Apr 2008)
New Revision: 941

Modified:
   branches/stable-1.0/CHANGELOG
   branches/stable-1.0/platform/posix.c
Log:
Merged r939:940 from trunk: Fix PHYSFS_openAppend() on Unix.


Modified: branches/stable-1.0/CHANGELOG
===================================================================
--- branches/stable-1.0/CHANGELOG	2008-04-03 05:05:48 UTC (rev 940)
+++ branches/stable-1.0/CHANGELOG	2008-04-03 05:07:35 UTC (rev 941)
@@ -4,6 +4,7 @@
 
 -- 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.
 03112008 - Fixed wrong array index in Windows platform layer (thanks, James!).
 03082008 - Fixed compiler warnings in Windows platform layer (thanks, Dennis!).

Modified: branches/stable-1.0/platform/posix.c
===================================================================
--- branches/stable-1.0/platform/posix.c	2008-04-03 05:05:48 UTC (rev 940)
+++ branches/stable-1.0/platform/posix.c	2008-04-03 05:07:35 UTC (rev 941)
@@ -344,13 +344,26 @@
 
 static void *doOpen(const char *filename, int mode)
 {
+    const int appending = (mode & O_APPEND);
     int fd;
     int *retval;
     errno = 0;
 
+    /* O_APPEND doesn't actually behave as we'd like. */
+    mode &= ~O_APPEND;
+
     fd = open(filename, mode, S_IRUSR | S_IWUSR);
     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));
     if (retval == NULL)
     {