fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-02-15 16:41:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Host_Loadgame_f: fix for arrow characters appearing in multiline messages

Browse source 
on Windows, a regression introduced in the Host_Loadgame_f rewrite r1398

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1405 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
ewasylishen 2017-05-09 00:01:41 +00:00
parent 14dec7d4a3
commit 0b55e95c79
3 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
quakespasm/Quake/common.c
View file

@ -1872,13 +1872,17 @@ byte *COM_LoadMallocFile (const char *path, unsigned int *path_id)
return COM_LoadFile (path, LOADFILE_MALLOC, path_id); return COM_LoadFile (path, LOADFILE_MALLOC, path_id);
} }
byte *COM_LoadMallocFile_OSPath (const char *path, long *len_out) byte *COM_LoadMallocFile_TextMode_OSPath (const char *path, long *len_out)
{ {
FILE *f; FILE *f;
byte *data; byte *data;
long len; long len, actuallen;
f = fopen (path, "rb"); // ericw -- this is used by Host_Loadgame_f. Translate CRLF to LF on load games,
// othewise multiline messages have a garbage character at the end of each line.
// TODO: could handle in a way that allows loading CRLF savegames on mac/linux
// without the junk characters appearing.
f = fopen (path, "rt");
if (f == NULL) if (f == NULL)
return NULL; return NULL;
@ -1889,15 +1893,18 @@ byte *COM_LoadMallocFile_OSPath (const char *path, long *len_out)
data = (byte *) malloc (len + 1); data = (byte *) malloc (len + 1);
if (data == NULL) if (data == NULL)
return NULL; return NULL;
if (fread (data, 1, len, f) != len)
// (actuallen < len) if CRLF to LF translation was performed
actuallen = fread (data, 1, len, f);
if (ferror(f))
{ {
free (data); free (data);
return NULL; return NULL;
} }
data[len] = '\0'; data[actuallen] = '\0';
if (len_out != NULL) if (len_out != NULL)
*len_out = len; *len_out = actuallen;
return data; return data;
} }

3
quakespasm/Quake/common.h
View file

@ -257,7 +257,8 @@ byte *COM_LoadMallocFile (const char *path, unsigned int *path_id);
// Opens the given path directly, ignoring search paths. // Opens the given path directly, ignoring search paths.
// Returns NULL on failure, or else a '\0'-terminated malloc'ed buffer. // Returns NULL on failure, or else a '\0'-terminated malloc'ed buffer.
byte *COM_LoadMallocFile_OSPath (const char *path, long *len_out); // Loads in "t" mode so CRLF to LF translation is performed on Windows.
byte *COM_LoadMallocFile_TextMode_OSPath (const char *path, long *len_out);
// Attempts to parse an int, followed by a newline. // Attempts to parse an int, followed by a newline.
// Returns advanced buffer position. // Returns advanced buffer position.

2
quakespasm/Quake/host_cmd.c
View file

@ -1147,7 +1147,7 @@ void Host_Loadgame_f (void)
if (start != NULL) if (start != NULL)
free (start); free (start);
start = (char *) COM_LoadMallocFile_OSPath(name, NULL); start = (char *) COM_LoadMallocFile_TextMode_OSPath(name, NULL);
if (start == NULL) if (start == NULL)
{ {
Con_Printf ("ERROR: couldn't open.\n"); Con_Printf ("ERROR: couldn't open.\n");