[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[paragui-cvs] CVS: paragui/src/physfs CHANGELOG,1.1.1.1.6.10,1.1.1.1.6.1
|
From: |
Alexander Pipelka <address@hidden> |
|
Subject: |
[paragui-cvs] CVS: paragui/src/physfs CHANGELOG,1.1.1.1.6.10,1.1.1.1.6.11 CREDITS,1.1.2.6,1.1.2.7 CWProjects.sit,1.1.2.2,1.1.2.3 Doxyfile,1.1.2.2,1.1.2.3 Makefile.am.newautomake,1.1.4.3,1.1.4.4 TODO,1.1.1.1.6.7,1.1.1.1.6.8 configure.in,1.1.2.11,1.1.2.12 makeos2.cmd,1.1.4.1,1.1.4.2 physfs.c,1.1.1.1.6.9,1.1.1.1.6.10 physfs.dsp,1.1.2.3,1.1.2.4 physfs.h,1.1.1.1.6.5,1.1.1.1.6.6 physfs_byteorder.c,1.1.2.5,1.1.2.6 physfs_internal.h,1.1.1.1.6.8,1.1.1.1.6.9 |
|
Date: |
Mon, 26 May 2003 03:39:56 -0400 |
Update of /cvsroot/paragui/paragui/src/physfs
In directory subversions:/tmp/cvs-serv8619/src/physfs
Modified Files:
Tag: devel-1-0
CHANGELOG CREDITS CWProjects.sit Doxyfile
Makefile.am.newautomake TODO configure.in makeos2.cmd physfs.c
physfs.dsp physfs.h physfs_byteorder.c physfs_internal.h
Log Message:
- updated physfs version
- updated README files
Index: CHANGELOG
===================================================================
RCS file: /cvsroot/paragui/paragui/src/physfs/CHANGELOG,v
retrieving revision 1.1.1.1.6.10
retrieving revision 1.1.1.1.6.11
diff -C2 -r1.1.1.1.6.10 -r1.1.1.1.6.11
*** CHANGELOG 3 Jan 2003 09:53:04 -0000 1.1.1.1.6.10
--- CHANGELOG 26 May 2003 07:39:53 -0000 1.1.1.1.6.11
***************
*** 3,6 ****
--- 3,32 ----
*/
+ 05232003 - Rewrote MacOSX/Darwin CD-ROM detection code to use IOKit, which is
+ much much more accurate than the previous code. Updated
+ configure.in and Makefile.am.newautomake for some MacOSX stuff.
+ 05222003 - Fixed win32 crash if PHYSFS_init() is called with a NULL.
+ 05182003 - PocketPC fixes (thanks, David Hedbor!)
+ 05162003 - Compiler warning cleanup in HOG and MVL archivers (Thanks,
Bradley!)
+ 04082003 - Minor changes to extras/abs-file.h (Thanks, Adam!)
+ 03302003 - Fixed seeking in uncompressed ZIP entries, and handle a
+ misbehaviour in Java's JAR creation tools. Thanks to "Tree" for
+ pointing these bugs out. Added HOG and MVL archive support for
+ Descent I and II (Thanks, Bradley Bell!). Added example code to
+ do case-insensitive file searches ("extras/ignorecase.*").
+ 03192003 - Fixed problem in PHYSFS_mkdir() when dirs to be created already
+ exist. Fixed problem where PHYSFS_mkdir() incorrectly tripped an
+ alarm in __PHYSFS_verifySecurity().
+ 03122003 - Attempt at cleaning up some type correctness for VC++6. Made QPAK
+ archiver case-insensitive (since Quake2 has problems without it).
+ 01302003 - Added buffering API to OS/2 build's exported symbol list. Updated
+ CWProjects.sit and made several fixes to get physfs building on
+ MacOS Classic again.
+ 01282003 - Fixed seeking in buffered files opened for read.
+ 01072003 - .NET assembly and C# wrapper by Gregory S. Read in the extras dir.
+ 01042003 - Added a hack for dealing with OSX bundles and newer PBProjects
+ (thanks, Eric Wing!). Added some missing files to "make dist".
+ Fixed minor Doxygen typo in PHYSFS_flush() docs. Upped version to
+ 0.1.8.
12172002 - Added Apple Project Builder support files (thanks, Eric Wing!).
12112002 - Added Ruby bindings to extras directory (thanks, Ed Sinjiashvili!).
Index: CREDITS
===================================================================
RCS file: /cvsroot/paragui/paragui/src/physfs/CREDITS,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -C2 -r1.1.2.6 -r1.1.2.7
*** CREDITS 3 Jan 2003 09:53:04 -0000 1.1.2.6
--- CREDITS 26 May 2003 07:39:53 -0000 1.1.2.7
***************
*** 59,63 ****
Michael Renner
! Apple Project Builder support:
Eric Wing
--- 59,64 ----
Michael Renner
! Apple Project Builder support,
! MacOS X improvements:
Eric Wing
Index: CWProjects.sit
===================================================================
RCS file: /cvsroot/paragui/paragui/src/physfs/CWProjects.sit,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
Binary files /tmp/cvs3hOy0Y and /tmp/cvsAGAGpN differ
Index: Doxyfile
===================================================================
RCS file: /cvsroot/paragui/paragui/src/physfs/Doxyfile,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** Doxyfile 11 Jul 2002 08:59:29 -0000 1.1.2.2
--- Doxyfile 26 May 2003 07:39:53 -0000 1.1.2.3
***************
*** 24,28 ****
# if some version control system is used.
! PROJECT_NUMBER = 0.1.7
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
--- 24,28 ----
# if some version control system is used.
! PROJECT_NUMBER = 0.1.8
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
Index: Makefile.am.newautomake
===================================================================
RCS file: /cvsroot/paragui/paragui/src/physfs/Attic/Makefile.am.newautomake,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -C2 -r1.1.4.3 -r1.1.4.4
*** Makefile.am.newautomake 9 Feb 2003 15:48:40 -0000 1.1.4.3
--- Makefile.am.newautomake 26 May 2003 07:39:53 -0000 1.1.4.4
***************
*** 49,52 ****
--- 49,54 ----
archivers/dir.c \
archivers/grp.c \
+ archivers/hog.c \
+ archivers/mvl.c \
archivers/zip.c \
archivers/qpak.c \
***************
*** 143,145 ****
--- 145,148 ----
echo " or can be read online at http://icculus.org/physfs/docs/"; >>
$(distdir)/docs/README
echo >> $(distdir)/docs/README
+ rm -rf `find $(distdir) -name "CVS" -type d`
Index: TODO
===================================================================
RCS file: /cvsroot/paragui/paragui/src/physfs/TODO,v
retrieving revision 1.1.1.1.6.7
retrieving revision 1.1.1.1.6.8
diff -C2 -r1.1.1.1.6.7 -r1.1.1.1.6.8
*** TODO 6 Dec 2002 17:54:51 -0000 1.1.1.1.6.7
--- TODO 26 May 2003 07:39:53 -0000 1.1.1.1.6.8
***************
*** 12,22 ****
it.
- I'm a little nervous about the use of linked lists in qpak.c.
! - Add qpak.c and PHYSFS_SUPPORTS_QPAK to mac classic projects.
- macclassic.c :
"/* (Hmm. Default behaviour is broken in the base library. :) ) */"
! - Platforms to be verified as working: Solaris, WinNT 3.1, WinME, WinXP,
! MacOS 8.1
! - Platforms to port to: PocketPC (Maybe can just use win32.c?),
! Amiga (needs platform driver), DOS4GW (platform driver).
- profile string list interpolation.
- We have two different ways to find dir entries in zip.c.
--- 12,19 ----
it.
- I'm a little nervous about the use of linked lists in qpak.c.
! - Stack allocate in stripAppleBundle() (platform/unix.c) instead of calloc().
- macclassic.c :
"/* (Hmm. Default behaviour is broken in the base library. :) ) */"
! - Platforms to port to: Amiga (needs platform driver), DOS4GW (platform
driver).
- profile string list interpolation.
- We have two different ways to find dir entries in zip.c.
Index: configure.in
===================================================================
RCS file: /cvsroot/paragui/paragui/src/physfs/configure.in,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -C2 -r1.1.2.11 -r1.1.2.12
*** configure.in 3 Jan 2003 09:53:04 -0000 1.1.2.11
--- configure.in 26 May 2003 07:39:53 -0000 1.1.2.12
***************
*** 16,20 ****
MAJOR_VERSION=0
MINOR_VERSION=1
! MICRO_VERSION=7
INTERFACE_AGE=0
BINARY_AGE=0
--- 16,20 ----
MAJOR_VERSION=0
MINOR_VERSION=1
! MICRO_VERSION=8
INTERFACE_AGE=0
BINARY_AGE=0
***************
*** 129,132 ****
--- 129,150 ----
+ dnl Check for hog archiver inclusion...
+ AC_ARG_ENABLE(hog,
+ [ --enable-hog enable Descent I/II HOG support [default=yes]],
+ , enable_hog=yes)
+ if test x$enable_hog = xyes; then
+ AC_DEFINE([PHYSFS_SUPPORTS_HOG], 1, [define if hog support is enabled])
+ fi
+
+
+ dnl Check for mvl archiver inclusion...
+ AC_ARG_ENABLE(mvl,
+ [ --enable-mvl enable Descent II MVL support [default=yes]],
+ , enable_mvl=yes)
+ if test x$enable_mvl = xyes; then
+ AC_DEFINE([PHYSFS_SUPPORTS_MVL], 1, [define if mvl support is enabled])
+ fi
+
+
dnl Check for qpak archiver inclusion...
AC_ARG_ENABLE(qpak,
***************
*** 316,324 ****
AC_MSG_WARN([*** --enable-language=english])
AC_MSG_WARN([*** --enable-language=spanish])
AC_MSG_WARN([*** --enable-language=russian-koi8-r])
AC_MSG_WARN([*** --enable-language=russian-cp1251])
AC_MSG_WARN([*** --enable-language=russian-cp866])
AC_MSG_WARN([*** --enable-language=russian-iso-8859-5])
- AC_MSG_WARN([*** --enable-language=french])
AC_MSG_WARN([***])
AC_MSG_ERROR([*** unsupported language. stop.])
--- 334,343 ----
AC_MSG_WARN([*** --enable-language=english])
AC_MSG_WARN([*** --enable-language=spanish])
+ AC_MSG_WARN([*** --enable-language=german])
+ AC_MSG_WARN([*** --enable-language=french])
AC_MSG_WARN([*** --enable-language=russian-koi8-r])
AC_MSG_WARN([*** --enable-language=russian-cp1251])
AC_MSG_WARN([*** --enable-language=russian-cp866])
AC_MSG_WARN([*** --enable-language=russian-iso-8859-5])
AC_MSG_WARN([***])
AC_MSG_ERROR([*** unsupported language. stop.])
***************
*** 357,360 ****
--- 376,380 ----
if test x$x = xdarwin -a x$build_vendor = xapple; then
this_is_macosx=yes
+ PHYSFSLDFLAGS="$PHYSFSLDFLAGS -Wl,-framework -Wl,Carbon -Wl,-framework
-Wl,IOKit"
fi
Index: makeos2.cmd
===================================================================
RCS file: /cvsroot/paragui/paragui/src/physfs/Attic/makeos2.cmd,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -C2 -r1.1.4.1 -r1.1.4.2
*** makeos2.cmd 1 Nov 2002 10:43:36 -0000 1.1.4.1
--- makeos2.cmd 26 May 2003 07:39:53 -0000 1.1.4.2
***************
*** 8,12 ****
set PHYSFSLANG=PHYSFS_LANG_ENGLISH
set DEBUGFLAGS=-D_NDEBUG -O2 -s
! set CFLAGS=%DEBUGFLAGS% -Wall -Werror -Zomf -Zmt -Zmtd -I. -Izlib114 -c
-D__ST_MT_ERRNO__ -DOS2 -DPHYSFS_SUPPORTS_ZIP -DPHYSFS_SUPPORTS_GRP
-DPHYSFS_SUPPORTS_QPAK -DPHYSFS_LANG=%PHYSFSLANG%
@echo on
--- 8,12 ----
set PHYSFSLANG=PHYSFS_LANG_ENGLISH
set DEBUGFLAGS=-D_NDEBUG -O2 -s
! set CFLAGS=%DEBUGFLAGS% -Wall -Werror -Zomf -Zmt -Zmtd -I. -Izlib114 -c
-D__ST_MT_ERRNO__ -DOS2 -DPHYSFS_SUPPORTS_ZIP -DPHYSFS_SUPPORTS_GRP
-DPHYSFS_SUPPORTS_QPAK -DPHYSFS_SUPPORTS_HOG -DPHYSFS_SUPPORTS_MVL
-DPHYSFS_LANG=%PHYSFSLANG% -DHAVE_ASSERT_H=1
@echo on
***************
*** 99,102 ****
--- 99,104 ----
@echo "PHYSFS_writeSBE64" >> bin\physfs.def
@echo "PHYSFS_writeUBE64" >> bin\physfs.def
+ @echo "PHYSFS_setBuffer" >> bin\physfs.def
+ @echo "PHYSFS_flush" >> bin\physfs.def
emximp -o bin/physfs.lib bin/physfs.def
***************
*** 109,112 ****
--- 111,116 ----
gcc %CFLAGS% -o bin/zip.obj archivers/zip.c
gcc %CFLAGS% -o bin/qpak.obj archivers/qpak.c
+ gcc %CFLAGS% -o bin/hog.obj archivers/hog.c
+ gcc %CFLAGS% -o bin/mvl.obj archivers/mvl.c
gcc %CFLAGS% -o bin/adler32.obj zlib114/adler32.c
Index: physfs.c
===================================================================
RCS file: /cvsroot/paragui/paragui/src/physfs/physfs.c,v
retrieving revision 1.1.1.1.6.9
retrieving revision 1.1.1.1.6.10
diff -C2 -r1.1.1.1.6.9 -r1.1.1.1.6.10
*** physfs.c 27 Jan 2003 13:39:07 -0000 1.1.1.1.6.9
--- physfs.c 26 May 2003 07:39:53 -0000 1.1.1.1.6.10
***************
*** 60,63 ****
--- 60,73 ----
#endif
+ #if (defined PHYSFS_SUPPORTS_HOG)
+ extern const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_HOG;
+ extern const DirFunctions __PHYSFS_DirFunctions_HOG;
+ #endif
+
+ #if (defined PHYSFS_SUPPORTS_MVL)
+ extern const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_MVL;
+ extern const DirFunctions __PHYSFS_DirFunctions_MVL;
+ #endif
+
#if (defined PHYSFS_SUPPORTS_QPAK)
extern const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_QPAK;
***************
*** 78,81 ****
--- 88,99 ----
#endif
+ #if (defined PHYSFS_SUPPORTS_HOG)
+ &__PHYSFS_ArchiveInfo_HOG,
+ #endif
+
+ #if (defined PHYSFS_SUPPORTS_MVL)
+ &__PHYSFS_ArchiveInfo_MVL,
+ #endif
+
#if (defined PHYSFS_SUPPORTS_QPAK)
&__PHYSFS_ArchiveInfo_QPAK,
***************
*** 95,98 ****
--- 113,124 ----
#endif
+ #if (defined PHYSFS_SUPPORTS_HOG)
+ &__PHYSFS_DirFunctions_HOG,
+ #endif
+
+ #if (defined PHYSFS_SUPPORTS_MVL)
+ &__PHYSFS_DirFunctions_MVL,
+ #endif
+
#if (defined PHYSFS_SUPPORTS_QPAK)
&__PHYSFS_DirFunctions_QPAK,
***************
*** 123,127 ****
/* functions ... */
! void __PHYSFS_bubble_sort(void *a, PHYSFS_uint32 lo, PHYSFS_uint32 hi,
int (*cmpfn)(void *, PHYSFS_uint32, PHYSFS_uint32),
void (*swapfn)(void *, PHYSFS_uint32, PHYSFS_uint32))
--- 149,153 ----
/* functions ... */
! static void __PHYSFS_bubble_sort(void *a, PHYSFS_uint32 lo, PHYSFS_uint32 hi,
int (*cmpfn)(void *, PHYSFS_uint32, PHYSFS_uint32),
void (*swapfn)(void *, PHYSFS_uint32, PHYSFS_uint32))
***************
*** 145,149 ****
! void __PHYSFS_quick_sort(void *a, PHYSFS_uint32 lo, PHYSFS_uint32 hi,
int (*cmpfn)(void *, PHYSFS_uint32, PHYSFS_uint32),
void (*swapfn)(void *, PHYSFS_uint32, PHYSFS_uint32))
--- 171,175 ----
! static void __PHYSFS_quick_sort(void *a, PHYSFS_uint32 lo, PHYSFS_uint32 hi,
int (*cmpfn)(void *, PHYSFS_uint32, PHYSFS_uint32),
void (*swapfn)(void *, PHYSFS_uint32, PHYSFS_uint32))
***************
*** 1192,1196 ****
! int __PHYSFS_verifySecurity(DirHandle *h, const char *fname)
{
int retval = 1;
--- 1218,1222 ----
! int __PHYSFS_verifySecurity(DirHandle *h, const char *fname, int allowMissing)
{
int retval = 1;
***************
*** 1240,1244 ****
* for writing...
*/
! if (end == NULL)
retval = 1;
break;
--- 1266,1270 ----
* for writing...
*/
! if ((end == NULL) || (allowMissing))
retval = 1;
break;
***************
*** 1265,1268 ****
--- 1291,1295 ----
char *end;
int retval = 0;
+ int exists = 1; /* force existance check on first path element. */
BAIL_IF_MACRO(dname == NULL, ERR_INVALID_ARGUMENT, 0);
***************
*** 1273,1277 ****
BAIL_IF_MACRO_MUTEX(writeDir == NULL, ERR_NO_WRITE_DIR, stateLock, 0);
h = writeDir->dirHandle;
! BAIL_IF_MACRO_MUTEX(!__PHYSFS_verifySecurity(h, dname), NULL, stateLock,
0);
start = str = malloc(strlen(dname) + 1);
BAIL_IF_MACRO_MUTEX(str == NULL, ERR_OUT_OF_MEMORY, stateLock, 0);
--- 1300,1304 ----
BAIL_IF_MACRO_MUTEX(writeDir == NULL, ERR_NO_WRITE_DIR, stateLock, 0);
h = writeDir->dirHandle;
! BAIL_IF_MACRO_MUTEX(!__PHYSFS_verifySecurity(h,dname,1),NULL,stateLock,0);
start = str = malloc(strlen(dname) + 1);
BAIL_IF_MACRO_MUTEX(str == NULL, ERR_OUT_OF_MEMORY, stateLock, 0);
***************
*** 1284,1288 ****
*end = '\0';
! retval = h->funcs->mkdir(h, str);
if (!retval)
break;
--- 1311,1321 ----
*end = '\0';
! /* only check for existance if all parent dirs existed, too... */
! if (exists)
! retval = h->funcs->isDirectory(h, str, &exists);
!
! if (!exists)
! retval = h->funcs->mkdir(h, str);
!
if (!retval)
break;
***************
*** 1315,1319 ****
BAIL_IF_MACRO_MUTEX(writeDir == NULL, ERR_NO_WRITE_DIR, stateLock, 0);
h = writeDir->dirHandle;
! BAIL_IF_MACRO_MUTEX(!__PHYSFS_verifySecurity(h, fname), NULL, stateLock,
0);
retval = h->funcs->remove(h, fname);
--- 1348,1352 ----
BAIL_IF_MACRO_MUTEX(writeDir == NULL, ERR_NO_WRITE_DIR, stateLock, 0);
h = writeDir->dirHandle;
! BAIL_IF_MACRO_MUTEX(!__PHYSFS_verifySecurity(h,fname,0),NULL,stateLock,0);
retval = h->funcs->remove(h, fname);
***************
*** 1335,1339 ****
{
DirHandle *h = i->dirHandle;
! if (__PHYSFS_verifySecurity(h, filename))
{
if (h->funcs->exists(h, filename))
--- 1368,1372 ----
{
DirHandle *h = i->dirHandle;
! if (__PHYSFS_verifySecurity(h, filename, 0))
{
if (h->funcs->exists(h, filename))
***************
*** 1452,1456 ****
{
DirHandle *h = i->dirHandle;
! if (__PHYSFS_verifySecurity(h, path))
{
rc = h->funcs->enumerateFiles(h, path, omitSymLinks);
--- 1485,1489 ----
{
DirHandle *h = i->dirHandle;
! if (__PHYSFS_verifySecurity(h, path, 0))
{
rc = h->funcs->enumerateFiles(h, path, omitSymLinks);
***************
*** 1492,1496 ****
{
DirHandle *h = i->dirHandle;
! if (__PHYSFS_verifySecurity(h, fname))
retval = h->funcs->getLastModTime(h, fname, &fileExists);
} /* for */
--- 1525,1529 ----
{
DirHandle *h = i->dirHandle;
! if (__PHYSFS_verifySecurity(h, fname, 0))
retval = h->funcs->getLastModTime(h, fname, &fileExists);
} /* for */
***************
*** 1517,1521 ****
{
DirHandle *h = i->dirHandle;
! if (__PHYSFS_verifySecurity(h, fname))
retval = h->funcs->isDirectory(h, fname, &fileExists);
} /* for */
--- 1550,1554 ----
{
DirHandle *h = i->dirHandle;
! if (__PHYSFS_verifySecurity(h, fname, 0))
retval = h->funcs->isDirectory(h, fname, &fileExists);
} /* for */
***************
*** 1544,1548 ****
{
DirHandle *h = i->dirHandle;
! if (__PHYSFS_verifySecurity(h, fname))
retval = h->funcs->isSymLink(h, fname, &fileExists);
} /* for */
--- 1577,1581 ----
{
DirHandle *h = i->dirHandle;
! if (__PHYSFS_verifySecurity(h, fname, 0))
retval = h->funcs->isSymLink(h, fname, &fileExists);
} /* for */
***************
*** 1568,1572 ****
h = (writeDir == NULL) ? NULL : writeDir->dirHandle;
BAIL_IF_MACRO_MUTEX(!h, ERR_NO_WRITE_DIR, stateLock, NULL);
! BAIL_IF_MACRO_MUTEX(!__PHYSFS_verifySecurity(h, fname), NULL,
stateLock, NULL);
--- 1601,1605 ----
h = (writeDir == NULL) ? NULL : writeDir->dirHandle;
BAIL_IF_MACRO_MUTEX(!h, ERR_NO_WRITE_DIR, stateLock, NULL);
! BAIL_IF_MACRO_MUTEX(!__PHYSFS_verifySecurity(h, fname, 0), NULL,
stateLock, NULL);
***************
*** 1623,1627 ****
{
DirHandle *h = i->dirHandle;
! if (__PHYSFS_verifySecurity(h, fname))
rc = h->funcs->openRead(h, fname, &fileExists);
} /* for */
--- 1656,1660 ----
{
DirHandle *h = i->dirHandle;
! if (__PHYSFS_verifySecurity(h, fname, 0))
rc = h->funcs->openRead(h, fname, &fileExists);
} /* for */
***************
*** 1711,1715 ****
while (objCount > 0)
{
! PHYSFS_uint64 buffered = h->buffill - h->bufpos;
PHYSFS_uint64 mustread = (objSize * objCount) - remainder;
PHYSFS_uint32 copied;
--- 1744,1748 ----
while (objCount > 0)
{
! PHYSFS_uint32 buffered = h->buffill - h->bufpos;
PHYSFS_uint64 mustread = (objSize * objCount) - remainder;
PHYSFS_uint32 copied;
***************
*** 1717,1721 ****
if (buffered == 0) /* need to refill buffer? */
{
! PHYSFS_sint64 rc = h->funcs->read(h, h->buffer, 1,
(PHYSFS_uint32)h->bufsize);
if (rc <= 0)
{
--- 1750,1754 ----
if (buffered == 0) /* need to refill buffer? */
{
! PHYSFS_sint64 rc = h->funcs->read(h, h->buffer, 1, h->bufsize);
if (rc <= 0)
{
***************
*** 1724,1733 ****
} /* if */
! buffered = h->buffill = rc;
h->bufpos = 0;
} /* if */
if (buffered > mustread)
! buffered = mustread;
memcpy(buffer, h->buffer + h->bufpos, (size_t) buffered);
--- 1757,1766 ----
} /* if */
! buffered = h->buffill = (PHYSFS_uint32) rc;
h->bufpos = 0;
} /* if */
if (buffered > mustread)
! buffered = (PHYSFS_uint32) mustread;
memcpy(buffer, h->buffer + h->bufpos, (size_t) buffered);
***************
*** 1735,1740 ****
h->bufpos += buffered;
buffered += remainder; /* take remainder into account. */
! copied = (PHYSFS_uint32)(buffered / objSize);
! remainder = (PHYSFS_uint32)(buffered % objSize);
retval += copied;
objCount -= copied;
--- 1768,1773 ----
h->bufpos += buffered;
buffered += remainder; /* take remainder into account. */
! copied = (buffered / objSize);
! remainder = (buffered % objSize);
retval += copied;
objCount -= copied;
***************
*** 1817,1820 ****
--- 1850,1854 ----
FileHandle *h = (FileHandle *) handle->opaque;
BAIL_IF_MACRO(!PHYSFS_flush(handle), NULL, 0);
+ h->buffill = h->bufpos = 0; /* just in case. */
return(h->funcs->seek(h, pos));
} /* PHYSFS_seek */
***************
*** 1828,1835 ****
! int PHYSFS_setBuffer(PHYSFS_file *handle, PHYSFS_uint64 bufsize)
{
FileHandle *h = (FileHandle *) handle->opaque;
BAIL_IF_MACRO(!PHYSFS_flush(handle), NULL, 0);
--- 1862,1871 ----
! int PHYSFS_setBuffer(PHYSFS_file *handle, PHYSFS_uint64 _bufsize)
{
FileHandle *h = (FileHandle *) handle->opaque;
+ PHYSFS_uint32 bufsize = (PHYSFS_uint32) _bufsize;
+ BAIL_IF_MACRO(_bufsize > 0xFFFFFFFF, "buffer must fit in 32-bits", 0);
BAIL_IF_MACRO(!PHYSFS_flush(handle), NULL, 0);
***************
*** 1859,1863 ****
else
{
! PHYSFS_uint8 *newbuf = realloc(h->buffer, (PHYSFS_uint32)bufsize);
BAIL_IF_MACRO(newbuf == NULL, ERR_OUT_OF_MEMORY, 0);
h->buffer = newbuf;
--- 1895,1899 ----
else
{
! PHYSFS_uint8 *newbuf = realloc(h->buffer, bufsize);
BAIL_IF_MACRO(newbuf == NULL, ERR_OUT_OF_MEMORY, 0);
h->buffer = newbuf;
***************
*** 1879,1885 ****
/* dump buffer to disk. */
! rc = h->funcs->write(h, h->buffer + h->bufpos, (PHYSFS_uint32)(h->buffill
- h->bufpos), 1);
BAIL_IF_MACRO(rc <= 0, NULL, 0);
-
h->bufpos = h->buffill = 0;
return(1);
--- 1915,1920 ----
/* dump buffer to disk. */
! rc = h->funcs->write(h, h->buffer + h->bufpos, h->buffill - h->bufpos, 1);
BAIL_IF_MACRO(rc <= 0, NULL, 0);
h->bufpos = h->buffill = 0;
return(1);
Index: physfs.dsp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/physfs/physfs.dsp,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -r1.1.2.3 -r1.1.2.4
*** physfs.dsp 1 Nov 2002 10:43:36 -0000 1.1.2.3
--- physfs.dsp 26 May 2003 07:39:53 -0000 1.1.2.4
***************
*** 5,9 ****
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
! CFG=physfs - Win32 Debug Multithreaded DLL
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
--- 5,9 ----
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
! CFG=physfs - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
***************
*** 14,23 ****
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
! !MESSAGE NMAKE /f "physfs.mak" CFG="physfs - Win32 Debug Multithreaded DLL"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
! !MESSAGE "physfs - Win32 Debug Multithreaded DLL" (based on "Win32 (x86)
Dynamic-Link Library")
! !MESSAGE "physfs - Win32 Release Multithreaded DLL" (based on "Win32 (x86)
Dynamic-Link Library")
!MESSAGE
--- 14,23 ----
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
! !MESSAGE NMAKE /f "physfs.mak" CFG="physfs - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
! !MESSAGE "physfs - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
! !MESSAGE "physfs - Win32 Release" (based on "Win32 (x86) Dynamic-Link
Library")
!MESSAGE
***************
*** 30,34 ****
RSC=rc.exe
! !IF "$(CFG)" == "physfs - Win32 Debug Multithreaded DLL"
# PROP BASE Use_MFC 0
--- 30,34 ----
RSC=rc.exe
! !IF "$(CFG)" == "physfs - Win32 Debug"
# PROP BASE Use_MFC 0
***************
*** 45,49 ****
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /WX /Gm /ZI /Od /I "." /I "zlibwin32" /D
"_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHYSFS_EXPORTS"
/D "PHYSFS_SUPPORTS_GRP" /D "PHYSFS_SUPPORTS_ZIP" /YX /FD /GZ /c
! # ADD CPP /nologo /MDd /W3 /WX /Gm /ZI /Od /I "." /I "zlib114" /D "_DEBUG" /D
"WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHYSFS_EXPORTS" /D
"PHYSFS_SUPPORTS_GRP" /D "PHYSFS_SUPPORTS_ZIP" /D "PHYSFS_SUPPORTS_QPAK" /YX
/FD /GZ /c
# SUBTRACT CPP /X
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
--- 45,49 ----
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /WX /Gm /ZI /Od /I "." /I "zlibwin32" /D
"_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHYSFS_EXPORTS"
/D "PHYSFS_SUPPORTS_GRP" /D "PHYSFS_SUPPORTS_ZIP" /YX /FD /GZ /c
! # ADD CPP /nologo /MTd /W3 /WX /Gm- /GX- /Zi /Od /I "." /I "zlib114" /D
"_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHYSFS_EXPORTS"
/D "PHYSFS_SUPPORTS_GRP" /D "PHYSFS_SUPPORTS_ZIP" /D "PHYSFS_SUPPORTS_QPAK" /FR
/YX /FD /GZ /c
# SUBTRACT CPP /X
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
***************
*** 57,64 ****
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
# SUBTRACT BASE LINK32 /incremental:no
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib /nologo /dll /debug /machine:I386
# SUBTRACT LINK32 /pdb:none /force
! !ELSEIF "$(CFG)" == "physfs - Win32 Release Multithreaded DLL"
# PROP BASE Use_MFC 0
--- 57,64 ----
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
# SUBTRACT BASE LINK32 /incremental:no
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib /nologo /dll /debug /machine:I386 /out:"../src/Debug/physfs.dll"
# SUBTRACT LINK32 /pdb:none /force
! !ELSEIF "$(CFG)" == "physfs - Win32 Release"
# PROP BASE Use_MFC 0
***************
*** 91,96 ****
# Begin Target
! # Name "physfs - Win32 Debug Multithreaded DLL"
! # Name "physfs - Win32 Release Multithreaded DLL"
# Begin Group "Source Files"
--- 91,96 ----
# Begin Target
! # Name "physfs - Win32 Debug"
! # Name "physfs - Win32 Release"
# Begin Group "Source Files"
Index: physfs.h
===================================================================
RCS file: /cvsroot/paragui/paragui/src/physfs/physfs.h,v
retrieving revision 1.1.1.1.6.5
retrieving revision 1.1.1.1.6.6
diff -C2 -r1.1.1.1.6.5 -r1.1.1.1.6.6
*** physfs.h 6 Dec 2002 17:54:51 -0000 1.1.1.1.6.5
--- physfs.h 26 May 2003 07:39:53 -0000 1.1.1.1.6.6
***************
*** 129,132 ****
--- 129,135 ----
* - .ZIP (pkZip/WinZip/Info-ZIP compatible)
* - .GRP (Build Engine groupfile archives)
+ * - .PAK (Quake I/II archive format)
+ * - .HOG (Descent I/II HOG file archives)
+ * - .MVL (Descent II movielib archives)
*
* Please see the file LICENSE in the source's root directory for licensing
***************
*** 316,320 ****
#define PHYSFS_VER_MAJOR 0
#define PHYSFS_VER_MINOR 1
! #define PHYSFS_VER_PATCH 7
#endif /* DOXYGEN_SHOULD_IGNORE_THIS */
--- 319,323 ----
#define PHYSFS_VER_MAJOR 0
#define PHYSFS_VER_MINOR 1
! #define PHYSFS_VER_PATCH 8
#endif /* DOXYGEN_SHOULD_IGNORE_THIS */
***************
*** 1231,1235 ****
/**
! * \fn int PHYSFS_flush(PHYSFS_file *handle, PHYSFS_uint64 bufsize)
* \brief Flush a buffered PhysicsFS file handle.
*
--- 1234,1238 ----
/**
! * \fn int PHYSFS_flush(PHYSFS_file *handle)
* \brief Flush a buffered PhysicsFS file handle.
*
Index: physfs_byteorder.c
===================================================================
RCS file: /cvsroot/paragui/paragui/src/physfs/physfs_byteorder.c,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -r1.1.2.5 -r1.1.2.6
*** physfs_byteorder.c 6 Dec 2002 17:54:51 -0000 1.1.2.5
--- physfs_byteorder.c 26 May 2003 07:39:53 -0000 1.1.2.6
***************
*** 25,29 ****
#if defined(__i386__) || defined(__ia64__) || defined(WIN32) || \
(defined(__alpha__) || defined(__alpha)) || \
! defined(__arm__) || \
(defined(__mips__) && defined(__MIPSEL__)) || \
defined(__SYMBIAN32__) || \
--- 25,29 ----
#if defined(__i386__) || defined(__ia64__) || defined(WIN32) || \
(defined(__alpha__) || defined(__alpha)) || \
! defined(__arm__) || defined(ARM) || \
(defined(__mips__) && defined(__MIPSEL__)) || \
defined(__SYMBIAN32__) || \
Index: physfs_internal.h
===================================================================
RCS file: /cvsroot/paragui/paragui/src/physfs/physfs_internal.h,v
retrieving revision 1.1.1.1.6.8
retrieving revision 1.1.1.1.6.9
diff -C2 -r1.1.1.1.6.8 -r1.1.1.1.6.9
*** physfs_internal.h 6 Dec 2002 17:54:51 -0000 1.1.1.1.6.8
--- physfs_internal.h 26 May 2003 07:39:53 -0000 1.1.1.1.6.9
***************
*** 47,50 ****
--- 47,52 ----
#define DIR_ARCHIVE_DESCRIPTION "Non-archive, direct filesystem I/O"
#define GRP_ARCHIVE_DESCRIPTION "Build engine Groupfile format"
+ #define HOG_ARCHIVE_DESCRIPTION "Descent I/II HOG file format"
+ #define MVL_ARCHIVE_DESCRIPTION "Descent II Movielib format"
#define ZIP_ARCHIVE_DESCRIPTION "PkZip/WinZip/Info-Zip compatible"
***************
*** 141,144 ****
--- 143,148 ----
#define DIR_ARCHIVE_DESCRIPTION "Kein Archiv, direkte Ein/Ausgabe in das
Dateisystem"
#define GRP_ARCHIVE_DESCRIPTION "Build engine Groupfile Format"
+ #define HOG_ARCHIVE_DESCRIPTION "Descent I/II HOG file format"
+ #define MVL_ARCHIVE_DESCRIPTION "Descent II Movielib format"
#define ZIP_ARCHIVE_DESCRIPTION "PkZip/WinZip/Info-Zip kompatibel"
***************
*** 235,238 ****
--- 239,244 ----
#define DIR_ARCHIVE_DESCRIPTION "îÅ ÁÒÈÉ×, ÎÅÐÏÓÒÅÄÓÔ×ÅÎÎÙÊ ××ÏÄ/×Ù×ÏÄ
ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ"
#define GRP_ARCHIVE_DESCRIPTION "æÏÒÍÁÔ ÇÒÕÐÐÏ×ÏÇÏ ÆÁÊÌÁ Build engine"
+ #define HOG_ARCHIVE_DESCRIPTION "Descent I/II HOG file format"
+ #define MVL_ARCHIVE_DESCRIPTION "Descent II Movielib format"
#define ZIP_ARCHIVE_DESCRIPTION "PkZip/WinZip/Info-Zip ÓÏ×ÍÅÓÔÉÍÙÊ"
***************
*** 329,332 ****
--- 335,340 ----
#define DIR_ARCHIVE_DESCRIPTION "Íå àðõèâ, íåïîñðåäñòâåííûé ââîä/âûâîä
ôàéëîâîé ñèñòåìû"
#define GRP_ARCHIVE_DESCRIPTION "Ôîðìàò ãðóïïîâîãî ôàéëà Build engine"
+ #define HOG_ARCHIVE_DESCRIPTION "Descent I/II HOG file format"
+ #define MVL_ARCHIVE_DESCRIPTION "Descent II Movielib format"
#define ZIP_ARCHIVE_DESCRIPTION "PkZip/WinZip/Info-Zip ñîâìåñòèìûé"
***************
*** 423,426 ****
--- 431,436 ----
#define DIR_ARCHIVE_DESCRIPTION "¥ à娢, ¥¯®á।áâ¢¥ë© ¢¢®¤/¢ë¢®¤ ä
©«®¢®© á¨á⥬ë"
#define GRP_ARCHIVE_DESCRIPTION "®à¬ â £à㯯®¢®£® ä ©« Build engine"
+ #define HOG_ARCHIVE_DESCRIPTION "Descent I/II HOG file format"
+ #define MVL_ARCHIVE_DESCRIPTION "Descent II Movielib format"
#define ZIP_ARCHIVE_DESCRIPTION "PkZip/WinZip/Info-Zip ᮢ¬¥á⨬ë©"
***************
*** 517,520 ****
--- 527,532 ----
#define DIR_ARCHIVE_DESCRIPTION "½Õ ÐàåØÒ, ÝÕßÞáàÕÔáâÒÕÝÝëÙ ÒÒÞÔ/ÒëÒÞÔ
äÐÙÛÞÒÞÙ áØáâÕÜë"
#define GRP_ARCHIVE_DESCRIPTION "ÄÞàÜÐâ ÓàãßßÞÒÞÓÞ äÐÙÛÐ Build engine"
+ #define HOG_ARCHIVE_DESCRIPTION "Descent I/II HOG file format"
+ #define MVL_ARCHIVE_DESCRIPTION "Descent II Movielib format"
#define ZIP_ARCHIVE_DESCRIPTION "PkZip/WinZip/Info-Zip áÞÒÜÕáâØÜëÙ"
***************
*** 611,614 ****
--- 623,628 ----
#define DIR_ARCHIVE_DESCRIPTION "No es un archivo, E/S directa al sistema
de ficheros"
#define GRP_ARCHIVE_DESCRIPTION "Formato Build engine Groupfile"
+ #define HOG_ARCHIVE_DESCRIPTION "Descent I/II HOG file format"
+ #define MVL_ARCHIVE_DESCRIPTION "Descent II Movielib format"
#define ZIP_ARCHIVE_DESCRIPTION "Compatible con PkZip/WinZip/Info-Zip"
***************
*** 705,708 ****
--- 719,724 ----
#define DIR_ARCHIVE_DESCRIPTION "Pas d'archive, E/S directes sur système de
fichiers"
#define GRP_ARCHIVE_DESCRIPTION "Format Groupfile du moteur Build"
+ #define HOG_ARCHIVE_DESCRIPTION "Descent I/II HOG file format"
+ #define MVL_ARCHIVE_DESCRIPTION "Descent II Movielib format"
#define ZIP_ARCHIVE_DESCRIPTION "Compatible PkZip/WinZip/Info-Zip"
***************
*** 833,847 ****
* This is the buffer size, if one is set (0 otherwise). Don't touch.
*/
! PHYSFS_uint64 bufsize;
/*
* This is the buffer fill size. Don't touch.
*/
! PHYSFS_uint64 buffill;
/*
* This is the buffer position. Don't touch.
*/
! PHYSFS_uint64 bufpos;
/*
--- 849,863 ----
* This is the buffer size, if one is set (0 otherwise). Don't touch.
*/
! PHYSFS_uint32 bufsize;
/*
* This is the buffer fill size. Don't touch.
*/
! PHYSFS_uint32 buffill;
/*
* This is the buffer position. Don't touch.
*/
! PHYSFS_uint32 bufpos;
/*
***************
*** 1109,1116 ****
* ".", "..", or ":" are flagged.
*
* Returns non-zero if string is safe, zero if there's a security issue.
* PHYSFS_getLastError() will specify what was wrong.
*/
! int __PHYSFS_verifySecurity(DirHandle *h, const char *fname);
--- 1125,1135 ----
* ".", "..", or ":" are flagged.
*
+ * With some exceptions (like PHYSFS_mkdir(), which builds multiple subdirs
+ * at a time), you should always pass zero for "allowMissing" for efficiency.
+ *
* Returns non-zero if string is safe, zero if there's a security issue.
* PHYSFS_getLastError() will specify what was wrong.
*/
! int __PHYSFS_verifySecurity(DirHandle *h, const char *fname, int
allowMissing);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [paragui-cvs] CVS: paragui/src/physfs CHANGELOG,1.1.1.1.6.10,1.1.1.1.6.11 CREDITS,1.1.2.6,1.1.2.7 CWProjects.sit,1.1.2.2,1.1.2.3 Doxyfile,1.1.2.2,1.1.2.3 Makefile.am.newautomake,1.1.4.3,1.1.4.4 TODO,1.1.1.1.6.7,1.1.1.1.6.8 configure.in,1.1.2.11,1.1.2.12 makeos2.cmd,1.1.4.1,1.1.4.2 physfs.c,1.1.1.1.6.9,1.1.1.1.6.10 physfs.dsp,1.1.2.3,1.1.2.4 physfs.h,1.1.1.1.6.5,1.1.1.1.6.6 physfs_byteorder.c,1.1.2.5,1.1.2.6 physfs_internal.h,1.1.1.1.6.8,1.1.1.1.6.9,
Alexander Pipelka <address@hidden> <=
- Prev by Date:
[paragui-cvs] CVS: paragui/src/physfs/platform macclassic.c,1.1.2.6,1.1.2.7 pocketpc.c,1.1.2.1,1.1.2.2 posix.c,1.1.2.7,1.1.2.8 unix.c,1.1.1.1.6.9,1.1.1.1.6.10 win32.c,1.1.1.1.6.17,1.1.1.1.6.18
- Next by Date:
[paragui-cvs] CVS: paragui/src/physfs/archivers hog.c,NONE,1.1.2.1 mvl.c,NONE,1.1.2.1 Makefile.am,1.1.1.1.6.6,1.1.1.1.6.7 grp.c,1.1.1.1.6.8,1.1.1.1.6.9 qpak.c,1.1.4.2,1.1.4.3 zip.c,1.1.1.1.6.10,1.1.1.1.6.11
- Previous by thread:
[paragui-cvs] CVS: paragui/src/physfs/platform macclassic.c,1.1.2.6,1.1.2.7 pocketpc.c,1.1.2.1,1.1.2.2 posix.c,1.1.2.7,1.1.2.8 unix.c,1.1.1.1.6.9,1.1.1.1.6.10 win32.c,1.1.1.1.6.17,1.1.1.1.6.18
- Next by thread:
[paragui-cvs] CVS: paragui/src/physfs/archivers hog.c,NONE,1.1.2.1 mvl.c,NONE,1.1.2.1 Makefile.am,1.1.1.1.6.6,1.1.1.1.6.7 grp.c,1.1.1.1.6.8,1.1.1.1.6.9 qpak.c,1.1.4.2,1.1.4.3 zip.c,1.1.1.1.6.10,1.1.1.1.6.11
- Index(es):