qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-17 22:50:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

get Qseek working properly (d'oh) and Qtell (forgot it needed adjusting)

Browse source
This commit is contained in:
Bill Currie 2002-09-27 05:46:30 +00:00
parent 9d8d570269
commit 979d885776
1 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
libs/util/quakeio.c
View file

@ -59,6 +59,7 @@ static const char rcsid[] =
#include <limits.h>
#include <stdarg.h>
#include <stdlib.h>
#include <errno.h>
#include "QF/dstring.h"
#include "QF/qendian.h"
@ -408,11 +409,30 @@ int
Qseek (QFile *file, long offset, int whence)
{
if (file->file) {
return fseek (file->file, file->start + offset, whence);
int res;
switch (whence) {
case SEEK_SET:
res = fseek (file->file, file->start + offset, whence);
break;
case SEEK_CUR:
res = fseek (file->file, offset, whence);
break;
case SEEK_END:
res = fseek (file->file,
file->start + file->size - offset, SEEK_SET);
break;
default:
errno = EINVAL;
return -1;
}
if (res != -1)
res = ftell (file->file) - file->start;
return res;
}
#ifdef HAVE_ZLIB
else {
// libz seems to keep track of the true start position itself
// doesn't support SEEK_END, though
return gzseek (file->gzfile, offset, whence);
}
#else
@ -424,10 +444,10 @@ long
Qtell (QFile *file)
{
if (file->file)
return ftell (file->file);
return ftell (file->file) - file->start;
#ifdef HAVE_ZLIB
else
return gztell (file->gzfile);
return gztell (file->gzfile); //FIXME does gztell do the right thing?
#else
return -1;
#endif