filesystem: added FS_Getc, FS_UnGetc, FS_Gets functions;

engine: GAME_API_VERSION 30

Author: Crow-bar

game/game.h

@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 // game.h -- game dll information visible to server
 
-#define	GAME_API_VERSION	3
+#define	GAME_API_VERSION	30
 
 // edict->svflags
 
@@ -185,6 +185,12 @@ typedef struct
 	const char	*(*GetWriteDir) (int flags);
 
 	vec3_t		*monster_flash_offset;
+
+	// (API V3) END
+
+	int			(*FileGetc) (file_t *file);
+	int			(*FileUnGetc) (file_t *file, byte c);
+	int			(*FileGets) (file_t *file, byte *buffer, size_t size);
 } game_import_t;
 
 //

qcommon/files.c

@@ -64,6 +64,7 @@ struct file_s
 	off_t	length;
 	off_t	position;
 	off_t	offset;
+	int		ungetc;
 	struct
 	{
 		off_t	position;
@@ -427,6 +428,9 @@ file_t *FS_FOpen (const char *filename, int flags)
 	file = (file_t *)Z_Malloc(sizeof(file_t) + FS_BUFFER_SIZE + 64);
 	memset(file, 0, sizeof(file_t) + FS_BUFFER_SIZE + 64);
 
+	// ungetc invalidation
+	file->ungetc = FS_EOF;
+
 	// cache buffer
 	file->buffer.ptr = (byte *)(((uintptr_t)file + sizeof(file_t) + 63) & (~63));
 
@@ -636,14 +640,29 @@ off_t FS_FRead (file_t *file, const void *buffer, size_t size)
 	completed = 0;
 	remaining = (off_t)size;
 
+	// the pushed back character by ungetc function
+	if(file->ungetc != FS_EOF)
+	{
+		buf[completed] = (byte)file->ungetc;
+
+		completed++;
+		remaining--;
+
+		file->ungetc = FS_EOF;
+
+		if(remaining == 0)
+			return completed;
+
+	}
+
 	// check cache
 	if(file->buffer.position < file->buffer.length)
 	{
 		readlength = file->buffer.length - file->buffer.position;
 		if(readlength > remaining)
 			readlength = remaining;
 
-		memcpy(buf, &file->buffer.ptr[file->buffer.position], readlength);
+		memcpy(&buf[completed], &file->buffer.ptr[file->buffer.position], readlength);
 		file->buffer.position += readlength;
 
 		completed += readlength;
@@ -789,6 +808,72 @@ int FS_FPrintf (file_t *file, const char *format, ...)
 	return FS_FWrite (file, outbuff, length);
 }
 
+/*
+====================
+FS_Getc
+
+Get the next character of a file
+====================
+*/
+int FS_Getc (file_t *file)
+{
+	char	c;
+
+	if (FS_FRead( file, &c, 1 ) != 1)
+		return FS_EOF;
+
+	return c;
+}
+
+/*
+====================
+FS_UnGetc
+
+Put a character back into the read buffer (only supports one character!)
+====================
+*/
+int FS_UnGetc (file_t *file, byte c)
+{
+	// If there's already a character waiting to be read
+	if (file->ungetc != FS_EOF)
+		return FS_EOF;
+
+	file->ungetc = c;
+	return c;
+}
+
+/*
+====================
+FS_Gets
+
+Same as fgets
+====================
+*/
+int FS_Gets (file_t *file, byte *buffer, size_t size)
+{
+	int	i, c;
+
+	for (i = 0; i < size - 1; i++)
+	{
+		c = FS_Getc (file);
+		if (c == '\r' || c == '\n' || c < 0)
+			break;
+		buffer[i] = c;
+	}
+	buffer[i] = 0;
+
+	// remove \n following \r
+	if (c == '\r')
+	{
+		c = FS_Getc (file);
+
+		if (c != '\n')
+			FS_UnGetc (file, (byte)c);
+	}
+
+	return c;
+}
+
 /*
 =================
 FS_FSeek
@@ -815,6 +900,9 @@ int FS_FSeek (file_t *file, off_t offset, int whence)
 	if(offset < 0 || offset > file->length)
 		return -1;
 
+	// ungetc invalidation
+	file->ungetc = FS_EOF;
+
 	// check cache
 	if(file->position - file->buffer.length <= offset && offset <= file->position)
 	{

qcommon/qcommon.h

@@ -732,6 +732,9 @@ off_t		FS_FLength (file_t *file);
 off_t		FS_FRead (file_t *file, const void *buffer, size_t size);
 off_t		FS_FWrite (file_t *file, const void *buffer, size_t size);
 int			FS_FPrintf (file_t *file, const char *format, ...);
+int			FS_Getc (file_t *file);
+int			FS_UnGetc (file_t *file, byte c);
+int			FS_Gets (file_t *file, byte *buffer, size_t size);
 int			FS_FSeek (file_t *file, off_t offset, int whence);
 off_t		FS_FTell (file_t *file);
 qboolean	FS_FCopy (file_t *outfile, file_t *infile);

server/sv_game.c

@@ -394,12 +394,18 @@ void SV_InitGameProgs (void)
 
 	import.monster_flash_offset = monster_flash_offset;
 
+	// v0.1 API END
+
+	import.FileGetc = FS_Getc;
+	import.FileUnGetc = FS_UnGetc;
+	import.FileGets = FS_Gets;
+
 	ge = (game_export_t *)Sys_GetGameAPI (&import);
 
 	if (!ge)
 		Com_Error (ERR_DROP, "failed to load game DLL");
-	if (ge->apiversion != GAME_API_VERSION)
-		Com_Error (ERR_DROP, "game is version %i, not %i", ge->apiversion,
+	if (ge->apiversion > GAME_API_VERSION)
+		Com_Error (ERR_DROP, "game is version %i, not <= %i", ge->apiversion,
 		GAME_API_VERSION);
 
 	ge->Init ();

shared/q_shared.h

@@ -434,6 +434,9 @@ typedef struct file_s	file_t;
 #define FS_SEEK_CUR         1
 #define FS_SEEK_END         2
 
+// misc
+#define FS_EOF              -1
+
 /*
 ==========================================================