[Scummvm-cvs-logs] SF.net SVN: scummvm: [21547] scummvm/trunk/base

[fingolfin at users.sourceforge.net]

Revision: 21547
Author:   fingolfin
Date:     2006-04-01 18:23:29 -0800 (Sat, 01 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21547&view=rev

Log Message:
-----------
Moved the Win/Symbian specific stdout/stderr redirect code from base/main.cpp to sdl.cpp, where it belongs (considering that it is backend specific code)

Modified Paths:
--------------
    scummvm/trunk/backends/sdl/sdl.cpp
    scummvm/trunk/base/main.cpp
Modified: scummvm/trunk/backends/sdl/sdl.cpp
===================================================================
--- scummvm/trunk/backends/sdl/sdl.cpp	2006-04-02 01:08:16 UTC (rev 21546)
+++ scummvm/trunk/backends/sdl/sdl.cpp	2006-04-02 02:23:29 UTC (rev 21547)
@@ -32,9 +32,69 @@
 
 #include "scummvm.xpm"
 
+#if defined(WIN32) && defined(NO_CONSOLE)
+#include <cstdio>
+#define STDOUT_FILE	TEXT("stdout.txt")
+#define STDERR_FILE	TEXT("stderr.txt")
+#endif
 
-#if !defined(_WIN32_WCE) && !defined(__SYMBIAN32__) && !defined(__MAEMO__)
+
+#if !defined(_WIN32_WCE) && !defined(__MAEMO__)
+
 int main(int argc, char *argv[]) {
+
+
+#if (defined(WIN32) && defined(NO_CONSOLE)) || defined(__SYMBIAN32__)
+	//
+	// Set up redirects for stdout/stderr under Windows and Symbian.
+	// Code copied from SDL_main.
+	//
+	
+	// Symbian does not like any output to the console through any *print* function
+#if defined(__SYMBIAN32__)
+	char STDOUT_FILE[256], STDERR_FILE[256]; // shhh, don't tell anybody :)
+	strcpy(STDOUT_FILE, Symbian::GetExecutablePath());
+	strcpy(STDERR_FILE, Symbian::GetExecutablePath());
+	strcat(STDOUT_FILE, "scummvm.stdout.txt");
+	strcat(STDERR_FILE, "scummvm.stderr.txt");
+#endif
+
+	/* Flush the output in case anything is queued */
+	fclose(stdout);
+	fclose(stderr);
+
+	/* Redirect standard input and standard output */
+	FILE *newfp = freopen(STDOUT_FILE, "w", stdout);
+	if (newfp == NULL) {	/* This happens on NT */
+#if !defined(stdout)
+		stdout = fopen(STDOUT_FILE, "w");
+#else
+		newfp = fopen(STDOUT_FILE, "w");
+		if (newfp) {
+			*stdout = *newfp;
+		}
+#endif
+	}
+	newfp = freopen(STDERR_FILE, "w", stderr);
+	if (newfp == NULL) {	/* This happens on NT */
+#if !defined(stderr)
+		stderr = fopen(STDERR_FILE, "w");
+#else
+		newfp = fopen(STDERR_FILE, "w");
+		if (newfp) {
+			*stderr = *newfp;
+		}
+#endif
+	}
+#ifndef __SYMBIAN32__ // fcn not supported on Symbian
+	setlinebuf(stdout);	/* Line buffered */
+#endif
+	setbuf(stderr, NULL);			/* No buffering */
+
+#endif // (defined(WIN32) && defined(NO_CONSOLE)) || defined(__SYMBIAN32__)
+
+
+	// Invoke the actual ScummVM main entry point:
 	return scummvm_main(argc, argv);
 }
 #endif

Modified: scummvm/trunk/base/main.cpp
===================================================================
--- scummvm/trunk/base/main.cpp	2006-04-02 01:08:16 UTC (rev 21546)
+++ scummvm/trunk/base/main.cpp	2006-04-02 02:23:29 UTC (rev 21547)
@@ -148,12 +148,6 @@
 const char* stackCookie = "$STACK: 655360\0";
 #endif
 
-#if defined(WIN32) && defined(NO_CONSOLE)
-#include <cstdio>
-#define STDOUT_FILE	TEXT("stdout.txt")
-#define STDERR_FILE	TEXT("stderr.txt")
-#endif
-
 #if defined(UNIX)
 #include <signal.h>
 
@@ -342,51 +336,6 @@
 	do_memory_test();
 #endif
 
-// Code copied from SDL_main
-#if (defined(WIN32) && defined(NO_CONSOLE)) || defined(__SYMBIAN32__)
-// Symbian does not like any output to the console through any *print* function
-#if defined(__SYMBIAN32__)
-	char STDOUT_FILE[255], STDERR_FILE[255]; // shhh, don't tell anybody :)
-	strcpy(STDOUT_FILE, Symbian::GetExecutablePath());
-	strcpy(STDERR_FILE, Symbian::GetExecutablePath());
-	strcat(STDOUT_FILE, "scummvm.stdout.txt");
-	strcat(STDERR_FILE, "scummvm.stderr.txt");
-#endif
-
-	/* Flush the output in case anything is queued */
-	fclose(stdout);
-	fclose(stderr);
-
-	/* Redirect standard input and standard output */
-	FILE *newfp = freopen(STDOUT_FILE, "w", stdout);
-	if (newfp == NULL) {	/* This happens on NT */
-#if !defined(stdout)
-		stdout = fopen(STDOUT_FILE, "w");
-#else
-		newfp = fopen(STDOUT_FILE, "w");
-		if (newfp) {
-			*stdout = *newfp;
-		}
-#endif
-	}
-	newfp = freopen(STDERR_FILE, "w", stderr);
-	if (newfp == NULL) {	/* This happens on NT */
-#if !defined(stderr)
-		stderr = fopen(STDERR_FILE, "w");
-#else
-		newfp = fopen(STDERR_FILE, "w");
-		if (newfp) {
-			*stderr = *newfp;
-		}
-#endif
-	}
-#ifndef __SYMBIAN32__ // fcn not supported on Symbian
-	setlinebuf(stdout);	/* Line buffered */
-#endif
-	setbuf(stderr, NULL);			/* No buffering */
-
-#endif // (defined(WIN32) && defined(NO_CONSOLE)) || defined(__SYMBIAN32__)
-
 	// Quick preparse of command-line, looking for alt configfile path
 	for (int i = argc - 1; i >= 1; i--) {
 		s = argv[i];


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.