cpp/openttd-patchpack/source Changeset - r9100:cfc164ed4480

Changeset - r9100:cfc164ed4480

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

rubidium - 16 years ago 2008-05-05 21:54:05
rubidium@openttd.org

(svn r12960) -Codechange: handle return values of (some) file system related functions.

4 files changed with 19 insertions and 14 deletions:

src/console.cpp

src/fileio.cpp

src/network/network_client.cpp

src/saveload.cpp

0 comments (0 inline, 0 general)

src/console.cpp

➞

Show inline comments

@@ @@ -271,8 +271,12 @@ static void IConsoleWriteToLogFile(const @@
+{
 	if (_iconsole_output_file != NULL) {
 		/* if there is an console output file ... also print it there */
 		fwrite(string, strlen(string), 1, _iconsole_output_file);
 		fwrite("\n", 1, 1, _iconsole_output_file);
 		if (fwrite(string, strlen(string), 1, _iconsole_output_file) != 1 ||
 				fwrite("\n", 1, 1, _iconsole_output_file) != 1) {
 			fclose(_iconsole_output_file);
 			_iconsole_output_file = NULL;
 			IConsolePrintF(_icolour_def, "cannot write to log file");
+		}
+	}
+}

src/fileio.cpp

➞

Show inline comments

@@ @@ -91,8 +91,8 @@ void FioSeekToFile(uint8 slot, uint32 po @@
 byte FioReadByte()
+{
 	if (_fio.buffer == _fio.buffer_end) {
 		_fio.pos += FIO_BUFFER_SIZE;
 		fread(_fio.buffer = _fio.buffer_start, 1, FIO_BUFFER_SIZE, _fio.cur_fh);
 		_fio.buffer = _fio.buffer_start;
 		_fio.pos += fread(_fio.buffer, 1, FIO_BUFFER_SIZE, _fio.cur_fh);
+	}
 	return *_fio.buffer++;
+}
@@ @@ -124,8 +124,7 @@ uint32 FioReadDword() @@
 void FioReadBlock(void *ptr, uint size)
+{
 	FioSeekTo(FioGetPos(), SEEK_SET);
 	_fio.pos += size;
 	fread(ptr, 1, size, _fio.cur_fh);
 	_fio.pos += fread(ptr, 1, size, _fio.cur_fh);
+}
 static inline void FioCloseFile(int slot)
@@ @@ -430,7 +429,7 @@ char *BuildWithFullPath(const char *dir) @@
 	/* Add absolute path */
 	if (s == NULL || dest != s) {
 		getcwd(dest, MAX_PATH);
+		if (getcwd(dest, MAX_PATH) == NULL) *dest = '\0';
 		AppendPathSeparator(dest, MAX_PATH);
 		ttd_strlcat(dest, dir, MAX_PATH);
+	}
@@ @@ -484,8 +483,7 @@ static bool TarListAddFile(const char *f @@
 	memset(&empty[0], 0, sizeof(empty));
 	while (!feof(f)) {
 		fread(&th, 1, 512, f);
 		pos += 512;
 		pos += fread(&th, 1, 512, f);
 		/* Check if we have the new tar-format (ustar) or the old one (a lot of zeros after 'link' field) */
 		if (strncmp(th.magic, "ustar", 5) != 0 && memcmp(&th.magic, &empty[0], 512 - offsetof(TarHeader, magic)) != 0) {
@@ @@ -629,7 +627,7 @@ void ChangeWorkingDirectory(const char * @@
 	char *s = strrchr(exe, PATHSEPCHAR);
 	if (s != NULL) {
 		*s = '\0';
 		chdir(exe);
+		if (chdir(exe) != 0) DEBUG(misc, 0, "Directory with the binary does not exist?");
 		*s = PATHSEPCHAR;
+	}
 #ifdef WITH_COCOA
@@ @@ -671,14 +669,14 @@ void DetermineBasePaths(const char *exe) @@
 #if defined(__MORPHOS__) || defined(__AMIGA__)
 	_searchpaths[SP_WORKING_DIR] = NULL;
 #else
 	getcwd(tmp, MAX_PATH);
+	if (getcwd(tmp, MAX_PATH) == NULL) *tmp = '\0';
 	AppendPathSeparator(tmp, MAX_PATH);
 	_searchpaths[SP_WORKING_DIR] = strdup(tmp);
 #endif
 	/* Change the working directory to that one of the executable */
 	ChangeWorkingDirectory((char*)exe);
 	getcwd(tmp, MAX_PATH);
+	if (getcwd(tmp, MAX_PATH) == NULL) *tmp = '\0';
 	AppendPathSeparator(tmp, MAX_PATH);
 	_searchpaths[SP_BINARY_DIR] = strdup(tmp);

src/network/network_client.cpp

➞

Show inline comments

@@ @@ -595,7 +595,10 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER @@
 	if (maptype == MAP_PACKET_NORMAL) {
 		// We are still receiving data, put it to the file
 		fwrite(p->buffer + p->pos, 1, p->size - p->pos, file_pointer);
 		if (fwrite(p->buffer + p->pos, 1, p->size - p->pos, file_pointer) != p->size - p->pos) {
 			_switch_mode_errorstr = STR_NETWORK_ERR_SAVEGAMEERROR;
 			return NETWORK_RECV_STATUS_SAVEGAME;
+		}
 		_network_join_kbytes = ftell(file_pointer) / 1024;
 		InvalidateWindow(WC_NETWORK_STATUS_WINDOW, 0);

src/saveload.cpp

➞

Show inline comments

@@ @@ -1114,7 +1114,7 @@ static uint ReadNoComp() @@
 static void WriteNoComp(uint size)
+{
 	fwrite(_sl.buf, 1, size, _sl.fh);
+	if (fwrite(_sl.buf, 1, size, _sl.fh) != size) SlError(STR_GAME_SAVELOAD_ERROR_FILE_NOT_WRITEABLE);
+}
 static bool InitNoComp()

0 comments (0 inline, 0 general)