From DONOTREPLY at icculus.org  Sun Jan  1 07:19:44 2006
From: DONOTREPLY at icculus.org (DONOTREPLY at icculus.org)
Date: 1 Jan 2006 07:19:44 -0500
Subject: r778 - in trunk: . platform
Message-ID: <20060101121944.23246.qmail@icculus.org>

Author: icculus
Date: 2006-01-01 07:19:44 -0500 (Sun, 01 Jan 2006)
New Revision: 778

Modified:
   trunk/CHANGELOG
   trunk/physfs_internal.h
   trunk/platform/macclassic.c
   trunk/platform/os2.c
   trunk/platform/pocketpc.c
   trunk/platform/posix.c
   trunk/platform/skeleton.c
   trunk/platform/win32.c
Log:

Cleaned up overflow checks in platform memory allocators (thanks to Nicolas
 Lebedenco for pointing out the original issue with long long literals).



Modified: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	2005-11-28 13:28:33 UTC (rev 777)
+++ trunk/CHANGELOG	2006-01-01 12:19:44 UTC (rev 778)
@@ -2,6 +2,9 @@
  * CHANGELOG.
  */
 
+01012006 - Cleaned up overflow checks in platform memory allocators (thanks to
+           Nicolas Lebedenco for pointing out the original issue with
+           long long literals).
 11282005 - Corrected docs on PHYSFS_setWriteDir().
 10122005 - Fixed locateInStringList() in physfs.c (thanks, Matze!). Patched
            archivers/wad.c to compile.

Modified: trunk/physfs_internal.h
===================================================================
--- trunk/physfs_internal.h	2005-11-28 13:28:33 UTC (rev 777)
+++ trunk/physfs_internal.h	2006-01-01 12:19:44 UTC (rev 778)
@@ -1253,8 +1253,25 @@
 #define GOTO_MACRO_MUTEX(e, m, g) { __PHYSFS_setError(e); __PHYSFS_platformReleaseMutex(m); goto g; }
 #define GOTO_IF_MACRO_MUTEX(c, e, m, g) if (c) { __PHYSFS_setError(e); __PHYSFS_platformReleaseMutex(m); goto g; }
 
+#ifdef __GNUC__
+#define LONGLONGLITERAL(x) x##LL
+#else
+#define LONGLONGLITERAL(x) x
+#endif
 
 /*
+ * Check if a ui64 will fit in the platform's address space.
+ *  The initial sizeof check will optimize this macro out entirely on
+ *  64-bit (and larger?!) platforms, and the other condition will
+ *  return zero or non-zero if the variable will fit in the platform's
+ *  size_t, suitable to pass to malloc. This is kinda messy, but effective.
+ */
+#define __PHYSFS_ui64FitsAddressSpace(s) ( \
+    (sizeof (PHYSFS_uint64) > sizeof (size_t)) && \
+    ((s) > (LONGLONGLITERAL(0xFFFFFFFFFFFFFFFF) >> (64-(sizeof(size_t)*8)))) \
+)
+
+/*
  * The current allocator. Not valid before PHYSFS_init is called!
  */
 extern PHYSFS_Allocator __PHYSFS_AllocatorHooks;

Modified: trunk/platform/macclassic.c
===================================================================
--- trunk/platform/macclassic.c	2005-11-28 13:28:33 UTC (rev 777)
+++ trunk/platform/macclassic.c	2006-01-01 12:19:44 UTC (rev 778)
@@ -944,9 +944,7 @@
 
 void *__PHYSFS_platformAllocatorMalloc(PHYSFS_uint64 s)
 {
-    /* make sure s isn't larger than the address space of the platform... */
-    if ( s > (0xFFFFFFFFFFFFFFFF >> (64-(sizeof (size_t) * 8))) )
-        BAIL_MACRO(ERR_OUT_OF_MEMORY, NULL);
+    BAIL_IF_MACRO(__PHYSFS_ui64FitsAddressSpace(s), ERR_OUT_OF_MEMORY, NULL);
     #undef malloc
     return(malloc((size_t) s));
 } /* __PHYSFS_platformMalloc */
@@ -954,9 +952,7 @@
 
 void *__PHYSFS_platformAllocatorRealloc(void *ptr, PHYSFS_uint64 s)
 {
-    /* make sure s isn't larger than the address space of the platform... */
-    if ( s > (0xFFFFFFFFFFFFFFFF >> (64-(sizeof (size_t) * 8))) )
-        BAIL_MACRO(ERR_OUT_OF_MEMORY, NULL);
+    BAIL_IF_MACRO(__PHYSFS_ui64FitsAddressSpace(s), ERR_OUT_OF_MEMORY, NULL);
     #undef realloc
     return(realloc(ptr, (size_t) s));
 } /* __PHYSFS_platformRealloc */

Modified: trunk/platform/os2.c
===================================================================
--- trunk/platform/os2.c	2005-11-28 13:28:33 UTC (rev 777)
+++ trunk/platform/os2.c	2006-01-01 12:19:44 UTC (rev 778)
@@ -757,9 +757,7 @@
 
 void *__PHYSFS_platformAllocatorMalloc(PHYSFS_uint64 s)
 {
-    /* make sure s isn't larger than the address space of the platform... */
-    if ( s > (0xFFFFFFFFFFFFFFFF >> (64-(sizeof (size_t) * 8))) )
-        BAIL_MACRO(ERR_OUT_OF_MEMORY, NULL);
+    BAIL_IF_MACRO(__PHYSFS_ui64FitsAddressSpace(s), ERR_OUT_OF_MEMORY, NULL);
     #undef malloc
     return(malloc((size_t) s));
 } /* __PHYSFS_platformMalloc */
@@ -767,9 +765,7 @@
 
 void *__PHYSFS_platformAllocatorRealloc(void *ptr, PHYSFS_uint64 s)
 {
-    /* make sure s isn't larger than the address space of the platform... */
-    if ( s > (0xFFFFFFFFFFFFFFFF >> (64-(sizeof (size_t) * 8))) )
-        BAIL_MACRO(ERR_OUT_OF_MEMORY, NULL);
+    BAIL_IF_MACRO(__PHYSFS_ui64FitsAddressSpace(s), ERR_OUT_OF_MEMORY, NULL);
     #undef realloc
     return(realloc(ptr, (size_t) s));
 } /* __PHYSFS_platformRealloc */

Modified: trunk/platform/pocketpc.c
===================================================================
--- trunk/platform/pocketpc.c	2005-11-28 13:28:33 UTC (rev 777)
+++ trunk/platform/pocketpc.c	2006-01-01 12:19:44 UTC (rev 778)
@@ -675,9 +675,7 @@
 
 void *__PHYSFS_platformAllocatorMalloc(PHYSFS_uint64 s)
 {
-    /* make sure s isn't larger than the address space of the platform... */
-    if ( s > (0xFFFFFFFFFFFFFFFF >> (64-(sizeof (size_t) * 8))) )
-        BAIL_MACRO(ERR_OUT_OF_MEMORY, NULL);
+    BAIL_IF_MACRO(__PHYSFS_ui64FitsAddressSpace(s), ERR_OUT_OF_MEMORY, NULL);
     #undef malloc
     return(malloc((size_t) s));
 } /* __PHYSFS_platformMalloc */
@@ -685,9 +683,7 @@
 
 void *__PHYSFS_platformAllocatorRealloc(void *ptr, PHYSFS_uint64 s)
 {
-    /* make sure s isn't larger than the address space of the platform... */
-    if ( s > (0xFFFFFFFFFFFFFFFF >> (64-(sizeof (size_t) * 8))) )
-        BAIL_MACRO(ERR_OUT_OF_MEMORY, NULL);
+    BAIL_IF_MACRO(__PHYSFS_ui64FitsAddressSpace(s), ERR_OUT_OF_MEMORY, NULL);
     #undef realloc
     return(realloc(ptr, (size_t) s));
 } /* __PHYSFS_platformRealloc */

Modified: trunk/platform/posix.c
===================================================================
--- trunk/platform/posix.c	2005-11-28 13:28:33 UTC (rev 777)
+++ trunk/platform/posix.c	2006-01-01 12:19:44 UTC (rev 778)
@@ -517,9 +517,7 @@
 
 void *__PHYSFS_platformAllocatorMalloc(PHYSFS_uint64 s)
 {
-    /* make sure s isn't larger than the address space of the platform... */
-    if ( s > (0xFFFFFFFFFFFFFFFF >> (64-(sizeof (size_t) * 8))) )
-        BAIL_MACRO(ERR_OUT_OF_MEMORY, NULL);
+    BAIL_IF_MACRO(__PHYSFS_ui64FitsAddressSpace(s), ERR_OUT_OF_MEMORY, NULL);
     #undef malloc
     return(malloc((size_t) s));
 } /* __PHYSFS_platformMalloc */
@@ -527,9 +525,7 @@
 
 void *__PHYSFS_platformAllocatorRealloc(void *ptr, PHYSFS_uint64 s)
 {
-    /* make sure s isn't larger than the address space of the platform... */
-    if ( s > (0xFFFFFFFFFFFFFFFF >> (64-(sizeof (size_t) * 8))) )
-        BAIL_MACRO(ERR_OUT_OF_MEMORY, NULL);
+    BAIL_IF_MACRO(__PHYSFS_ui64FitsAddressSpace(s), ERR_OUT_OF_MEMORY, NULL);
     #undef realloc
     return(realloc(ptr, (size_t) s));
 } /* __PHYSFS_platformRealloc */

Modified: trunk/platform/skeleton.c
===================================================================
--- trunk/platform/skeleton.c	2005-11-28 13:28:33 UTC (rev 777)
+++ trunk/platform/skeleton.c	2006-01-01 12:19:44 UTC (rev 778)
@@ -249,9 +249,7 @@
 
 void *__PHYSFS_platformAllocatorMalloc(PHYSFS_uint64 s)
 {
-    /* make sure s isn't larger than the address space of the platform... */
-    if ( s > (0xFFFFFFFFFFFFFFFF >> (64-(sizeof (size_t) * 8))) )
-        BAIL_MACRO(ERR_OUT_OF_MEMORY, NULL);
+    BAIL_IF_MACRO(__PHYSFS_ui64FitsAddressSpace(s), ERR_OUT_OF_MEMORY, NULL);
     #undef malloc
     return(malloc((size_t) s));
 } /* __PHYSFS_platformMalloc */
@@ -259,9 +257,7 @@
 
 void *__PHYSFS_platformAllocatorRealloc(void *ptr, PHYSFS_uint64 s)
 {
-    /* make sure s isn't larger than the address space of the platform... */
-    if ( s > (0xFFFFFFFFFFFFFFFF >> (64-(sizeof (size_t) * 8))) )
-        BAIL_MACRO(ERR_OUT_OF_MEMORY, NULL);
+    BAIL_IF_MACRO(__PHYSFS_ui64FitsAddressSpace(s), ERR_OUT_OF_MEMORY, NULL);
     #undef realloc
     return(realloc(ptr, (size_t) s));
 } /* __PHYSFS_platformRealloc */

Modified: trunk/platform/win32.c
===================================================================
--- trunk/platform/win32.c	2005-11-28 13:28:33 UTC (rev 777)
+++ trunk/platform/win32.c	2006-01-01 12:19:44 UTC (rev 778)
@@ -1125,9 +1125,7 @@
 
 void *__PHYSFS_platformAllocatorMalloc(PHYSFS_uint64 s)
 {
-    /* make sure s isn't larger than the address space of the platform... */
-    if ( s > (0xFFFFFFFFFFFFFFFF >> (64-(sizeof (size_t) * 8))) )
-        BAIL_MACRO(ERR_OUT_OF_MEMORY, NULL);
+    BAIL_IF_MACRO(__PHYSFS_ui64FitsAddressSpace(s), ERR_OUT_OF_MEMORY, NULL);
     #undef malloc
     return(malloc((size_t) s));
 } /* __PHYSFS_platformMalloc */
@@ -1135,9 +1133,7 @@
 
 void *__PHYSFS_platformAllocatorRealloc(void *ptr, PHYSFS_uint64 s)
 {
-    /* make sure s isn't larger than the address space of the platform... */
-    if ( s > (0xFFFFFFFFFFFFFFFF >> (64-(sizeof (size_t) * 8))) )
-        BAIL_MACRO(ERR_OUT_OF_MEMORY, NULL);
+    BAIL_IF_MACRO(__PHYSFS_ui64FitsAddressSpace(s), ERR_OUT_OF_MEMORY, NULL);
     #undef realloc
     return(realloc(ptr, (size_t) s));
 } /* __PHYSFS_platformRealloc */



From DONOTREPLY at icculus.org  Sun Jan  1 07:28:53 2006
From: DONOTREPLY at icculus.org (DONOTREPLY at icculus.org)
Date: 1 Jan 2006 07:28:53 -0500
Subject: r779 - trunk
Message-ID: <20060101122853.25434.qmail@icculus.org>

Author: icculus
Date: 2006-01-01 07:28:53 -0500 (Sun, 01 Jan 2006)
New Revision: 779

Added:
   trunk/physfs.rc
Modified:
   trunk/CHANGELOG
   trunk/CREDITS
Log:
Added physfs.rc for Windows builds (thanks, Dennis!).


Modified: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	2006-01-01 12:19:44 UTC (rev 778)
+++ trunk/CHANGELOG	2006-01-01 12:28:53 UTC (rev 779)
@@ -4,7 +4,7 @@
 
 01012006 - Cleaned up overflow checks in platform memory allocators (thanks to
            Nicolas Lebedenco for pointing out the original issue with
-           long long literals).
+           long long literals). Added physfs.rc (thanks, Dennis!).
 11282005 - Corrected docs on PHYSFS_setWriteDir().
 10122005 - Fixed locateInStringList() in physfs.c (thanks, Matze!). Patched
            archivers/wad.c to compile.

Modified: trunk/CREDITS
===================================================================
--- trunk/CREDITS	2006-01-01 12:19:44 UTC (rev 778)
+++ trunk/CREDITS	2006-01-01 12:28:53 UTC (rev 779)
@@ -91,6 +91,9 @@
 Bug fixes:
     J?rg Walter
 
+Windows .rc file:
+    Dennis Schridde
+
 Other stuff:
     Your name here! Patches go to icculus at clutteredmind.org ...
 

Added: trunk/physfs.rc
===================================================================
--- trunk/physfs.rc	2006-01-01 12:19:44 UTC (rev 778)
+++ trunk/physfs.rc	2006-01-01 12:28:53 UTC (rev 779)
@@ -0,0 +1,27 @@
+
+1 VERSIONINFO
+FILEVERSION 1,0,1,0
+PRODUCTVERSION 1,0,1,0
+FILEOS 0x40004
+FILETYPE 0x2
+{
+BLOCK "StringFileInfo"
+{
+	BLOCK "040904B0"
+	{
+		VALUE "CompanyName", ""
+		VALUE "FileDescription", "PhysicsFS"
+		VALUE "FileVersion", "1, 0, 1, 0"
+		VALUE "InternalName", "PhysFS"
+		VALUE "LegalCopyright", "Copyright ? 2006 Ryan C. Gordon"
+		VALUE "OriginalFilename", "phyfs.dll"
+		VALUE "ProductName", "PhysicsFS"
+		VALUE "ProductVersion", "1, 0, 1, 0"
+	}
+}
+
+BLOCK "VarFileInfo"
+{
+	VALUE "Translation", 0x0409 0x04B0
+}
+}



From DONOTREPLY at icculus.org  Sun Jan  1 07:29:18 2006
From: DONOTREPLY at icculus.org (DONOTREPLY at icculus.org)
Date: 1 Jan 2006 07:29:18 -0500
Subject: r780 - branches/stable-1.0
Message-ID: <20060101122918.25570.qmail@icculus.org>

Author: icculus
Date: 2006-01-01 07:29:18 -0500 (Sun, 01 Jan 2006)
New Revision: 780

Added:
   branches/stable-1.0/physfs.rc
Modified:
   branches/stable-1.0/CHANGELOG
   branches/stable-1.0/CREDITS
Log:
Added physfs.rc for Windows builds (thanks, Dennis!)


Modified: branches/stable-1.0/CHANGELOG
===================================================================
--- branches/stable-1.0/CHANGELOG	2006-01-01 12:28:53 UTC (rev 779)
+++ branches/stable-1.0/CHANGELOG	2006-01-01 12:29:18 UTC (rev 780)
@@ -4,6 +4,7 @@
 
 -- stuff in the stable-1.0 branch, backported from 2.0.0 dev branch, etc ---
 
+01012006 - Added physfs.rc (thanks, Dennis!).
 11282005 - Whitespace fix, and corrected docs on PHYSFS_setWriteDir().
 09062005 - Happy September. Minor MingW fixes (but it's still broken, I think).
 07232005 - Fixed bug in zip archiver (thanks, J?rg Walter!). Updated zlib to

Modified: branches/stable-1.0/CREDITS
===================================================================
--- branches/stable-1.0/CREDITS	2006-01-01 12:28:53 UTC (rev 779)
+++ branches/stable-1.0/CREDITS	2006-01-01 12:29:18 UTC (rev 780)
@@ -79,6 +79,9 @@
 Bug fixes:
     J?rg Walter
 
+Windows .rc file:
+    Dennis Schridde
+
 Other stuff:
     Your name here! Patches go to icculus at clutteredmind.org ...
 

Added: branches/stable-1.0/physfs.rc
===================================================================
--- branches/stable-1.0/physfs.rc	2006-01-01 12:28:53 UTC (rev 779)
+++ branches/stable-1.0/physfs.rc	2006-01-01 12:29:18 UTC (rev 780)
@@ -0,0 +1,27 @@
+
+1 VERSIONINFO
+FILEVERSION 1,0,1,0
+PRODUCTVERSION 1,0,1,0
+FILEOS 0x40004
+FILETYPE 0x2
+{
+BLOCK "StringFileInfo"
+{
+	BLOCK "040904B0"
+	{
+		VALUE "CompanyName", ""
+		VALUE "FileDescription", "PhysicsFS"
+		VALUE "FileVersion", "1, 0, 1, 0"
+		VALUE "InternalName", "PhysFS"
+		VALUE "LegalCopyright", "Copyright ? 2006 Ryan C. Gordon"
+		VALUE "OriginalFilename", "phyfs.dll"
+		VALUE "ProductName", "PhysicsFS"
+		VALUE "ProductVersion", "1, 0, 1, 0"
+	}
+}
+
+BLOCK "VarFileInfo"
+{
+	VALUE "Translation", 0x0409 0x04B0
+}
+}



From DONOTREPLY at icculus.org  Sun Jan  1 07:31:35 2006
From: DONOTREPLY at icculus.org (DONOTREPLY at icculus.org)
Date: 1 Jan 2006 07:31:35 -0500
Subject: r781 - in branches/stable-1.0: . archivers extras extras/physfs_rb/physfs
Message-ID: <20060101123135.26075.qmail@icculus.org>

Author: icculus
Date: 2006-01-01 07:31:34 -0500 (Sun, 01 Jan 2006)
New Revision: 781

Modified:
   branches/stable-1.0/CHANGELOG
   branches/stable-1.0/CREDITS
   branches/stable-1.0/INSTALL
   branches/stable-1.0/LICENSE
   branches/stable-1.0/archivers/dir.c
   branches/stable-1.0/archivers/grp.c
   branches/stable-1.0/archivers/qpak.c
   branches/stable-1.0/archivers/zip.c
   branches/stable-1.0/extras/physfs_rb/physfs/physfsrwops.c
   branches/stable-1.0/extras/physfs_rb/physfs/physfsrwops.h
   branches/stable-1.0/extras/physfshttpd.c
   branches/stable-1.0/extras/physfsrwops.c
   branches/stable-1.0/extras/physfsrwops.h
   branches/stable-1.0/makeos2.cmd
   branches/stable-1.0/physfs_internal.h
Log:
Changed my email address.


Modified: branches/stable-1.0/CHANGELOG
===================================================================
--- branches/stable-1.0/CHANGELOG	2006-01-01 12:29:18 UTC (rev 780)
+++ branches/stable-1.0/CHANGELOG	2006-01-01 12:31:34 UTC (rev 781)
@@ -4,7 +4,7 @@
 
 -- stuff in the stable-1.0 branch, backported from 2.0.0 dev branch, etc ---
 
-01012006 - Added physfs.rc (thanks, Dennis!).
+01012006 - Added physfs.rc (thanks, Dennis!). Changed my email address.
 11282005 - Whitespace fix, and corrected docs on PHYSFS_setWriteDir().
 09062005 - Happy September. Minor MingW fixes (but it's still broken, I think).
 07232005 - Fixed bug in zip archiver (thanks, J?rg Walter!). Updated zlib to
@@ -433,7 +433,7 @@
 08012001 - Added a safety memset in error setting, fixed URLs and email addr.
 07282001 - Initial release.
 
---ryan. (icculus at clutteredmind.org)
+--ryan. (icculus at icculus.org)
 
 /* end of CHANGELOG ... */
 

Modified: branches/stable-1.0/CREDITS
===================================================================
--- branches/stable-1.0/CREDITS	2006-01-01 12:29:18 UTC (rev 780)
+++ branches/stable-1.0/CREDITS	2006-01-01 12:31:34 UTC (rev 781)
@@ -83,7 +83,7 @@
     Dennis Schridde
 
 Other stuff:
-    Your name here! Patches go to icculus at clutteredmind.org ...
+    Your name here! Patches go to icculus at icculus.org ...
 
 /* end of CREDITS ... */
 

Modified: branches/stable-1.0/INSTALL
===================================================================
--- branches/stable-1.0/INSTALL	2006-01-01 12:29:18 UTC (rev 780)
+++ branches/stable-1.0/INSTALL	2006-01-01 12:31:34 UTC (rev 781)
@@ -31,7 +31,7 @@
 
 Primary Unix development is done with GNU/Linux, but PhysicsFS is known to
 work out of the box with several flavors of Unix. It it doesn't work, patches
-to get it running can be sent to icculus at clutteredmind.org.
+to get it running can be sent to icculus at icculus.org.
 
 
 BeOS:
@@ -76,7 +76,7 @@
 may not work. Patches are welcome.
 
 If someone is willing to maintain prebuilt PhysicsFS DLLs, I'd like to hear
-from you; send an email to icculus at clutteredmind.org.
+from you; send an email to icculus at icculus.org.
 
 MACOS 8/9:
 Double-click on "CWProjects.sit" in the root of the source tree. This will
@@ -91,7 +91,7 @@
 DLLs you built previously.
 
 If someone is willing to maintain prebuilt PhysicsFS Shared Libraries for
-the Mac, I'd like to hear from you; send an email to icculus at clutteredmind.org.
+the Mac, I'd like to hear from you; send an email to icculus at icculus.org.
 
 
 
@@ -103,7 +103,7 @@
 Follow the Unix directions, above (configure, make, make install).
 
 If someone is willing to maintain prebuilt PhysicsFS Shared Libraries for
-MacOS X, I'd like to hear from you; send an email to icculus at clutteredmind.org.
+MacOS X, I'd like to hear from you; send an email to icculus at icculus.org.
 
 
 OS/2:
@@ -117,7 +117,7 @@
 more piccky about recompiling, I'll accept the patch.
 
 If someone is willing to maintain prebuilt PhysicsFS Shared Libraries for
-OS/2, I'd like to hear from you; send an email to icculus at clutteredmind.org.
+OS/2, I'd like to hear from you; send an email to icculus at icculus.org.
 
 
 OTHER PLATFORMS:
@@ -129,5 +129,5 @@
 heavily-commented physfs_internal.h and look in the platform/ and archiver/
 directories for examples.
 
---ryan. (icculus at clutteredmind.org)
+--ryan. (icculus at icculus.org)
 

Modified: branches/stable-1.0/LICENSE
===================================================================
--- branches/stable-1.0/LICENSE	2006-01-01 12:29:18 UTC (rev 780)
+++ branches/stable-1.0/LICENSE	2006-01-01 12:31:34 UTC (rev 781)
@@ -19,7 +19,7 @@
 
    3. This notice may not be removed or altered from any source distribution.
 
-       Ryan C. Gordon <icculus at clutteredmind.org>
+       Ryan C. Gordon <icculus at icculus.org>
 
 
 (Please note that versions of PhysicsFS prior to 0.1.9 are licensed under

Modified: branches/stable-1.0/archivers/dir.c
===================================================================
--- branches/stable-1.0/archivers/dir.c	2006-01-01 12:29:18 UTC (rev 780)
+++ branches/stable-1.0/archivers/dir.c	2006-01-01 12:31:34 UTC (rev 781)
@@ -52,7 +52,7 @@
 {
     "",
     DIR_ARCHIVE_DESCRIPTION,
-    "Ryan C. Gordon <icculus at clutteredmind.org>",
+    "Ryan C. Gordon <icculus at icculus.org>",
     "http://icculus.org/physfs/",
 };
 

Modified: branches/stable-1.0/archivers/grp.c
===================================================================
--- branches/stable-1.0/archivers/grp.c	2006-01-01 12:29:18 UTC (rev 780)
+++ branches/stable-1.0/archivers/grp.c	2006-01-01 12:31:34 UTC (rev 781)
@@ -90,7 +90,7 @@
 {
     "GRP",
     GRP_ARCHIVE_DESCRIPTION,
-    "Ryan C. Gordon <icculus at clutteredmind.org>",
+    "Ryan C. Gordon <icculus at icculus.org>",
     "http://icculus.org/physfs/",
 };
 

Modified: branches/stable-1.0/archivers/qpak.c
===================================================================
--- branches/stable-1.0/archivers/qpak.c	2006-01-01 12:29:18 UTC (rev 780)
+++ branches/stable-1.0/archivers/qpak.c	2006-01-01 12:31:34 UTC (rev 781)
@@ -107,7 +107,7 @@
 {
     "PAK",
     QPAK_ARCHIVE_DESCRIPTION,
-    "Ryan C. Gordon <icculus at clutteredmind.org>",
+    "Ryan C. Gordon <icculus at icculus.org>",
     "http://icculus.org/physfs/",
 };
 

Modified: branches/stable-1.0/archivers/zip.c
===================================================================
--- branches/stable-1.0/archivers/zip.c	2006-01-01 12:29:18 UTC (rev 780)
+++ branches/stable-1.0/archivers/zip.c	2006-01-01 12:31:34 UTC (rev 781)
@@ -147,7 +147,7 @@
 {
     "ZIP",
     ZIP_ARCHIVE_DESCRIPTION,
-    "Ryan C. Gordon <icculus at clutteredmind.org>",
+    "Ryan C. Gordon <icculus at icculus.org>",
     "http://icculus.org/physfs/",
 };
 

Modified: branches/stable-1.0/extras/physfs_rb/physfs/physfsrwops.c
===================================================================
--- branches/stable-1.0/extras/physfs_rb/physfs/physfsrwops.c	2006-01-01 12:29:18 UTC (rev 780)
+++ branches/stable-1.0/extras/physfs_rb/physfs/physfsrwops.c	2006-01-01 12:31:34 UTC (rev 781)
@@ -16,7 +16,7 @@
  *
  * SDL falls under the LGPL, too. You can get SDL at http://www.libsdl.org/
  *
- *  This file was written by Ryan C. Gordon. (icculus at clutteredmind.org).
+ *  This file was written by Ryan C. Gordon. (icculus at icculus.org).
  */
 
 #include <stdio.h>  /* used for SEEK_SET, SEEK_CUR, SEEK_END ... */

Modified: branches/stable-1.0/extras/physfs_rb/physfs/physfsrwops.h
===================================================================
--- branches/stable-1.0/extras/physfs_rb/physfs/physfsrwops.h	2006-01-01 12:29:18 UTC (rev 780)
+++ branches/stable-1.0/extras/physfs_rb/physfs/physfsrwops.h	2006-01-01 12:31:34 UTC (rev 781)
@@ -16,7 +16,7 @@
  *
  * SDL falls under the LGPL, too. You can get SDL at http://www.libsdl.org/
  *
- *  This file was written by Ryan C. Gordon. (icculus at clutteredmind.org).
+ *  This file was written by Ryan C. Gordon. (icculus at icculus.org).
  */
 
 #ifndef _INCLUDE_PHYSFSRWOPS_H_

Modified: branches/stable-1.0/extras/physfshttpd.c
===================================================================
--- branches/stable-1.0/extras/physfshttpd.c	2006-01-01 12:29:18 UTC (rev 780)
+++ branches/stable-1.0/extras/physfshttpd.c	2006-01-01 12:31:34 UTC (rev 781)
@@ -29,7 +29,7 @@
  * Unless otherwise stated, the rest of PhysicsFS falls under the zlib license.
  *  Please see LICENSE in the root of the source tree.
  *
- *  This file was written by Ryan C. Gordon. (icculus at clutteredmind.org).
+ *  This file was written by Ryan C. Gordon. (icculus at icculus.org).
  */
 
 #include <stdio.h>

Modified: branches/stable-1.0/extras/physfsrwops.c
===================================================================
--- branches/stable-1.0/extras/physfsrwops.c	2006-01-01 12:29:18 UTC (rev 780)
+++ branches/stable-1.0/extras/physfsrwops.c	2006-01-01 12:31:34 UTC (rev 781)
@@ -17,7 +17,7 @@
  *
  * SDL falls under the LGPL license. You can get SDL at http://www.libsdl.org/
  *
- *  This file was written by Ryan C. Gordon. (icculus at clutteredmind.org).
+ *  This file was written by Ryan C. Gordon. (icculus at icculus.org).
  */
 
 #include <stdio.h>  /* used for SEEK_SET, SEEK_CUR, SEEK_END ... */

Modified: branches/stable-1.0/extras/physfsrwops.h
===================================================================
--- branches/stable-1.0/extras/physfsrwops.h	2006-01-01 12:29:18 UTC (rev 780)
+++ branches/stable-1.0/extras/physfsrwops.h	2006-01-01 12:31:34 UTC (rev 781)
@@ -17,7 +17,7 @@
  *
  * SDL falls under the LGPL license. You can get SDL at http://www.libsdl.org/
  *
- *  This file was written by Ryan C. Gordon. (icculus at clutteredmind.org).
+ *  This file was written by Ryan C. Gordon. (icculus at icculus.org).
  */
 
 #ifndef _INCLUDE_PHYSFSRWOPS_H_

Modified: branches/stable-1.0/makeos2.cmd
===================================================================
--- branches/stable-1.0/makeos2.cmd	2006-01-01 12:29:18 UTC (rev 780)
+++ branches/stable-1.0/makeos2.cmd	2006-01-01 12:31:34 UTC (rev 781)
@@ -3,7 +3,7 @@
 rem  the EMX development tools installed for this to work.
 rem
 rem This script (and, indeed, our OS/2 support) could use some tweaking.
-rem  Patches go to icculus at clutteredmind.org ...
+rem  Patches go to icculus at icculus.org ...
 
 set PHYSFSLANG=PHYSFS_LANG_ENGLISH
 set DEBUGFLAGS=-D_NDEBUG -O2 -s

Modified: branches/stable-1.0/physfs_internal.h
===================================================================
--- branches/stable-1.0/physfs_internal.h	2006-01-01 12:29:18 UTC (rev 780)
+++ branches/stable-1.0/physfs_internal.h	2006-01-01 12:31:34 UTC (rev 781)
@@ -28,7 +28,7 @@
 
 
 /* The LANG section. */
-/*  please send questions/translations to Ryan: icculus at clutteredmind.org. */
+/*  please send questions/translations to Ryan: icculus at icculus.org. */
 
 #if (!defined PHYSFS_LANG)
 #  define PHYSFS_LANG PHYSFS_LANG_ENGLISH



From DONOTREPLY at icculus.org  Sun Jan  1 07:33:20 2006
From: DONOTREPLY at icculus.org (DONOTREPLY at icculus.org)
Date: 1 Jan 2006 07:33:20 -0500
Subject: r782 - in trunk: . archivers extras extras/physfs_rb/physfs
Message-ID: <20060101123320.26460.qmail@icculus.org>

Author: icculus
Date: 2006-01-01 07:33:19 -0500 (Sun, 01 Jan 2006)
New Revision: 782

Modified:
   trunk/CHANGELOG
   trunk/CREDITS
   trunk/INSTALL
   trunk/LICENSE
   trunk/archivers/dir.c
   trunk/archivers/grp.c
   trunk/archivers/qpak.c
   trunk/archivers/zip.c
   trunk/extras/physfs_rb/physfs/physfsrwops.c
   trunk/extras/physfs_rb/physfs/physfsrwops.h
   trunk/extras/physfshttpd.c
   trunk/extras/physfsrwops.c
   trunk/extras/physfsrwops.h
   trunk/extras/selfextract.c
   trunk/makeos2.cmd
   trunk/physfs_internal.h
Log:
Changed my email address.


Modified: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	2006-01-01 12:31:34 UTC (rev 781)
+++ trunk/CHANGELOG	2006-01-01 12:33:19 UTC (rev 782)
@@ -4,7 +4,8 @@
 
 01012006 - Cleaned up overflow checks in platform memory allocators (thanks to
            Nicolas Lebedenco for pointing out the original issue with
-           long long literals). Added physfs.rc (thanks, Dennis!).
+           long long literals). Added physfs.rc (thanks, Dennis!). Changed my
+           email address.
 11282005 - Corrected docs on PHYSFS_setWriteDir().
 10122005 - Fixed locateInStringList() in physfs.c (thanks, Matze!). Patched
            archivers/wad.c to compile.
@@ -496,7 +497,7 @@
 08012001 - Added a safety memset in error setting, fixed URLs and email addr.
 07282001 - Initial release.
 
---ryan. (icculus at clutteredmind.org)
+--ryan. (icculus at icculus.org)
 
 /* end of CHANGELOG ... */
 

Modified: trunk/CREDITS
===================================================================
--- trunk/CREDITS	2006-01-01 12:31:34 UTC (rev 781)
+++ trunk/CREDITS	2006-01-01 12:33:19 UTC (rev 782)
@@ -95,7 +95,7 @@
     Dennis Schridde
 
 Other stuff:
-    Your name here! Patches go to icculus at clutteredmind.org ...
+    Your name here! Patches go to icculus at icculus.org ...
 
 /* end of CREDITS ... */
 

Modified: trunk/INSTALL
===================================================================
--- trunk/INSTALL	2006-01-01 12:31:34 UTC (rev 781)
+++ trunk/INSTALL	2006-01-01 12:33:19 UTC (rev 782)
@@ -31,7 +31,7 @@
 
 Primary Unix development is done with GNU/Linux, but PhysicsFS is known to
 work out of the box with several flavors of Unix. It it doesn't work, patches
-to get it running can be sent to icculus at clutteredmind.org.
+to get it running can be sent to icculus at icculus.org.
 
 
 BeOS:
@@ -76,7 +76,7 @@
 may not work. Patches are welcome.
 
 If someone is willing to maintain prebuilt PhysicsFS DLLs, I'd like to hear
-from you; send an email to icculus at clutteredmind.org.
+from you; send an email to icculus at icculus.org.
 
 MACOS 8/9:
 Double-click on "CWProjects.sit" in the root of the source tree. This will
@@ -91,7 +91,7 @@
 DLLs you built previously.
 
 If someone is willing to maintain prebuilt PhysicsFS Shared Libraries for
-the Mac, I'd like to hear from you; send an email to icculus at clutteredmind.org.
+the Mac, I'd like to hear from you; send an email to icculus at icculus.org.
 
 
 
@@ -103,7 +103,7 @@
 Follow the Unix directions, above (configure, make, make install).
 
 If someone is willing to maintain prebuilt PhysicsFS Shared Libraries for
-MacOS X, I'd like to hear from you; send an email to icculus at clutteredmind.org.
+MacOS X, I'd like to hear from you; send an email to icculus at icculus.org.
 
 
 OS/2:
@@ -117,7 +117,7 @@
 more picky about recompiling, I'll accept the patch.
 
 If someone is willing to maintain prebuilt PhysicsFS Shared Libraries for
-OS/2, I'd like to hear from you; send an email to icculus at clutteredmind.org.
+OS/2, I'd like to hear from you; send an email to icculus at icculus.org.
 
 
 OTHER PLATFORMS:
@@ -129,5 +129,5 @@
 heavily-commented physfs_internal.h and look in the platform/ and archiver/
 directories for examples.
 
---ryan. (icculus at clutteredmind.org)
+--ryan. (icculus at icculus.org)
 

Modified: trunk/LICENSE
===================================================================
--- trunk/LICENSE	2006-01-01 12:31:34 UTC (rev 781)
+++ trunk/LICENSE	2006-01-01 12:33:19 UTC (rev 782)
@@ -19,7 +19,7 @@
 
    3. This notice may not be removed or altered from any source distribution.
 
-       Ryan C. Gordon <icculus at clutteredmind.org>
+       Ryan C. Gordon <icculus at icculus.org>
 
 
 (Please note that versions of PhysicsFS prior to 0.1.9 are licensed under

Modified: trunk/archivers/dir.c
===================================================================
--- trunk/archivers/dir.c	2006-01-01 12:31:34 UTC (rev 781)
+++ trunk/archivers/dir.c	2006-01-01 12:33:19 UTC (rev 782)
@@ -252,7 +252,7 @@
 {
     "",
     DIR_ARCHIVE_DESCRIPTION,
-    "Ryan C. Gordon <icculus at clutteredmind.org>",
+    "Ryan C. Gordon <icculus at icculus.org>",
     "http://icculus.org/physfs/",
 };
 

Modified: trunk/archivers/grp.c
===================================================================
--- trunk/archivers/grp.c	2006-01-01 12:31:34 UTC (rev 781)
+++ trunk/archivers/grp.c	2006-01-01 12:33:19 UTC (rev 782)
@@ -435,7 +435,7 @@
 {
     "GRP",
     GRP_ARCHIVE_DESCRIPTION,
-    "Ryan C. Gordon <icculus at clutteredmind.org>",
+    "Ryan C. Gordon <icculus at icculus.org>",
     "http://icculus.org/physfs/",
 };
 

Modified: trunk/archivers/qpak.c
===================================================================
--- trunk/archivers/qpak.c	2006-01-01 12:31:34 UTC (rev 781)
+++ trunk/archivers/qpak.c	2006-01-01 12:33:19 UTC (rev 782)
@@ -589,7 +589,7 @@
 {
     "PAK",
     QPAK_ARCHIVE_DESCRIPTION,
-    "Ryan C. Gordon <icculus at clutteredmind.org>",
+    "Ryan C. Gordon <icculus at icculus.org>",
     "http://icculus.org/physfs/",
 };
 

Modified: trunk/archivers/zip.c
===================================================================
--- trunk/archivers/zip.c	2006-01-01 12:31:34 UTC (rev 781)
+++ trunk/archivers/zip.c	2006-01-01 12:33:19 UTC (rev 782)
@@ -1408,7 +1408,7 @@
 {
     "ZIP",
     ZIP_ARCHIVE_DESCRIPTION,
-    "Ryan C. Gordon <icculus at clutteredmind.org>",
+    "Ryan C. Gordon <icculus at icculus.org>",
     "http://icculus.org/physfs/",
 };
 

Modified: trunk/extras/physfs_rb/physfs/physfsrwops.c
===================================================================
--- trunk/extras/physfs_rb/physfs/physfsrwops.c	2006-01-01 12:31:34 UTC (rev 781)
+++ trunk/extras/physfs_rb/physfs/physfsrwops.c	2006-01-01 12:33:19 UTC (rev 782)
@@ -16,7 +16,7 @@
  *
  * SDL falls under the LGPL, too. You can get SDL at http://www.libsdl.org/
  *
- *  This file was written by Ryan C. Gordon. (icculus at clutteredmind.org).
+ *  This file was written by Ryan C. Gordon. (icculus at icculus.org).
  */
 
 #include <stdio.h>  /* used for SEEK_SET, SEEK_CUR, SEEK_END ... */

Modified: trunk/extras/physfs_rb/physfs/physfsrwops.h
===================================================================
--- trunk/extras/physfs_rb/physfs/physfsrwops.h	2006-01-01 12:31:34 UTC (rev 781)
+++ trunk/extras/physfs_rb/physfs/physfsrwops.h	2006-01-01 12:33:19 UTC (rev 782)
@@ -16,7 +16,7 @@
  *
  * SDL falls under the LGPL, too. You can get SDL at http://www.libsdl.org/
  *
- *  This file was written by Ryan C. Gordon. (icculus at clutteredmind.org).
+ *  This file was written by Ryan C. Gordon. (icculus at icculus.org).
  */
 
 #ifndef _INCLUDE_PHYSFSRWOPS_H_

Modified: trunk/extras/physfshttpd.c
===================================================================
--- trunk/extras/physfshttpd.c	2006-01-01 12:31:34 UTC (rev 781)
+++ trunk/extras/physfshttpd.c	2006-01-01 12:33:19 UTC (rev 782)
@@ -29,7 +29,7 @@
  * Unless otherwise stated, the rest of PhysicsFS falls under the zlib license.
  *  Please see LICENSE in the root of the source tree.
  *
- *  This file was written by Ryan C. Gordon. (icculus at clutteredmind.org).
+ *  This file was written by Ryan C. Gordon. (icculus at icculus.org).
  */
 
 #include <stdio.h>

Modified: trunk/extras/physfsrwops.c
===================================================================
--- trunk/extras/physfsrwops.c	2006-01-01 12:31:34 UTC (rev 781)
+++ trunk/extras/physfsrwops.c	2006-01-01 12:33:19 UTC (rev 782)
@@ -17,7 +17,7 @@
  *
  * SDL falls under the LGPL license. You can get SDL at http://www.libsdl.org/
  *
- *  This file was written by Ryan C. Gordon. (icculus at clutteredmind.org).
+ *  This file was written by Ryan C. Gordon. (icculus at icculus.org).
  */
 
 #include <stdio.h>  /* used for SEEK_SET, SEEK_CUR, SEEK_END ... */

Modified: trunk/extras/physfsrwops.h
===================================================================
--- trunk/extras/physfsrwops.h	2006-01-01 12:31:34 UTC (rev 781)
+++ trunk/extras/physfsrwops.h	2006-01-01 12:33:19 UTC (rev 782)
@@ -17,7 +17,7 @@
  *
  * SDL falls under the LGPL license. You can get SDL at http://www.libsdl.org/
  *
- *  This file was written by Ryan C. Gordon. (icculus at clutteredmind.org).
+ *  This file was written by Ryan C. Gordon. (icculus at icculus.org).
  */
 
 #ifndef _INCLUDE_PHYSFSRWOPS_H_

Modified: trunk/extras/selfextract.c
===================================================================
--- trunk/extras/selfextract.c	2006-01-01 12:31:34 UTC (rev 781)
+++ trunk/extras/selfextract.c	2006-01-01 12:33:19 UTC (rev 782)
@@ -14,7 +14,7 @@
  * Unless otherwise stated, the rest of PhysicsFS falls under the zlib license.
  *  Please see LICENSE in the root of the source tree.
  *
- *  This file was written by Ryan C. Gordon. (icculus at clutteredmind.org).
+ *  This file was written by Ryan C. Gordon. (icculus at icculus.org).
  */
 
 /*

Modified: trunk/makeos2.cmd
===================================================================
--- trunk/makeos2.cmd	2006-01-01 12:31:34 UTC (rev 781)
+++ trunk/makeos2.cmd	2006-01-01 12:33:19 UTC (rev 782)
@@ -3,7 +3,7 @@
 rem  the EMX development tools installed for this to work.
 rem
 rem This script (and, indeed, our OS/2 support) could use some tweaking.
-rem  Patches go to icculus at clutteredmind.org ...
+rem  Patches go to icculus at icculus.org ...
 
 set PHYSFSLANG=PHYSFS_LANG_ENGLISH
 set DEBUGFLAGS=-D_NDEBUG -O2 -s

Modified: trunk/physfs_internal.h
===================================================================
--- trunk/physfs_internal.h	2006-01-01 12:31:34 UTC (rev 781)
+++ trunk/physfs_internal.h	2006-01-01 12:33:19 UTC (rev 782)
@@ -33,7 +33,7 @@
 
 
 /* The LANG section. */
-/*  please send questions/translations to Ryan: icculus at clutteredmind.org. */
+/*  please send questions/translations to Ryan: icculus at icculus.org. */
 
 #if (!defined PHYSFS_LANG)
 #  define PHYSFS_LANG PHYSFS_LANG_ENGLISH



From DONOTREPLY at icculus.org  Sun Jan  1 08:03:22 2006
From: DONOTREPLY at icculus.org (DONOTREPLY at icculus.org)
Date: 1 Jan 2006 08:03:22 -0500
Subject: r783 - trunk
Message-ID: <20060101130322.32262.qmail@icculus.org>

Author: icculus
Date: 2006-01-01 08:03:22 -0500 (Sun, 01 Jan 2006)
New Revision: 783

Removed:
   trunk/acconfig.h
Modified:
   trunk/CHANGELOG
Log:
Removed acconfig.h.


Modified: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	2006-01-01 12:33:19 UTC (rev 782)
+++ trunk/CHANGELOG	2006-01-01 13:03:22 UTC (rev 783)
@@ -5,7 +5,7 @@
 01012006 - Cleaned up overflow checks in platform memory allocators (thanks to
            Nicolas Lebedenco for pointing out the original issue with
            long long literals). Added physfs.rc (thanks, Dennis!). Changed my
-           email address.
+           email address. Removed acconfig.h.
 11282005 - Corrected docs on PHYSFS_setWriteDir().
 10122005 - Fixed locateInStringList() in physfs.c (thanks, Matze!). Patched
            archivers/wad.c to compile.

Deleted: trunk/acconfig.h
===================================================================
--- trunk/acconfig.h	2006-01-01 12:33:19 UTC (rev 782)
+++ trunk/acconfig.h	2006-01-01 13:03:22 UTC (rev 783)
@@ -1,12 +0,0 @@
-
-#undef DEBUG
-#undef DEBUG_CHATTER
-#undef NDEBUG
-#undef PHYSFS_SUPPORTS_ZIP
-#undef PHYSFS_SUPPORTS_GRP
-#undef PHYSFS_SUPPORTS_MIX
-#undef PHYSFS_SUPPORTS_HOG
-#undef PHYSFS_SUPPORTS_MVL
-#undef PHYSFS_HAVE_READLINE
-#undef PHYSFS_HAVE_LLSEEK
-