rnd-20060726-5-src

* changed output file "stderr.txt" on Windows platform now always to be
  created in the R'n'D sub-directory of the personal documents directory

diff --git a/ChangeLog b/ChangeLog
index 08579aa295915d90bf1552506e6c9debadd582ab..b00e1c84460fd4999ef7a80fa26d708661f34bd5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
        * added support for mouse scroll wheel (caused buggy behaviour before)
        * added support for scrolling horizontal scrollbars with mouse wheel by
          holding "Ctrl" button pressed while scrolling the wheel
+       * changed output file "stderr.txt" on Windows platform now always to be
+         created in the R'n'D sub-directory of the personal documents directory
 
 2006-07-25
        * improved general scrollbar handling (when jump-scrolling scrollbars)

diff --git a/src/conftime.h b/src/conftime.h
index 45b374e40d47af9ef84bbaa670ac2eb66d421f0d..c354faf78d76fcee9681812c552bf414e615f52b 100644 (file)
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2006-07-26 18:08]"
+#define COMPILE_DATE_STRING "[2006-07-26 19:58]"

diff --git a/src/libgame/misc.c b/src/libgame/misc.c
index a810b6d11072c89d0389712014ae6b54cfb3063f..6c8734405b33080dfae098d5128b23de904c531c 100644 (file)
--- a/src/libgame/misc.c
+++ b/src/libgame/misc.c
@@ -33,32 +33,134 @@
 #include "image.h"
 
 
-/* ------------------------------------------------------------------------- */
+/* ========================================================================= */
 /* some generic helper functions                                             */
+/* ========================================================================= */
+
+/* ------------------------------------------------------------------------- */
+/* platform independent wrappers for printf() et al. (newline aware)         */
 /* ------------------------------------------------------------------------- */
 
-void fprintf_line(FILE *stream, char *line_string, int line_length)
+static void vfprintf_newline(FILE *stream, char *format, va_list ap)
+{
+#if defined(PLATFORM_WIN32) || defined(PLATFORM_MSDOS)
+  char *newline = "\r\n";
+#else
+  char *newline = "\n";
+#endif
+
+  vfprintf(stream, format, ap);
+
+  fprintf(stream, "%s", newline);
+}
+
+static void vprintf_error_ext(char *format, va_list ap, boolean print_newline)
+{
+  FILE *error = stderr;
+
+#if defined(PLATFORM_WIN32) || defined(PLATFORM_MSDOS)
+  if ((error = openErrorFile()) == NULL)
+    program.exit_function(1);
+#endif
+
+  if (print_newline)
+    vfprintf_newline(error, format, ap);
+  else
+    vfprintf(error, format, ap);
+
+  if (error != stderr)
+    fclose(error);
+}
+
+static void vprintf_error(char *format, va_list ap)
+{
+  vprintf_error_ext(format, ap, FALSE);
+}
+
+static void vprintf_error_newline(char *format, va_list ap)
+{
+  vprintf_error_ext(format, ap, TRUE);
+}
+
+static void printf_error(char *format, ...)
+{
+  if (format)
+  {
+    va_list ap;
+
+    va_start(ap, format);
+    vprintf_error(format, ap);
+    va_end(ap);
+  }
+}
+
+static void printf_error_newline(char *format, ...)
 {
+  if (format)
+  {
+    va_list ap;
+
+    va_start(ap, format);
+    vprintf_error_newline(format, ap);
+    va_end(ap);
+  }
+}
+
+static void fprintf_newline(FILE *stream, char *format, ...)
+{
+  if (format)
+  {
+    va_list ap;
+
+    va_start(ap, format);
+    vfprintf_newline(stream, format, ap);
+    va_end(ap);
+  }
+}
+
+static char *get_line_string(char *line_chars, int line_length)
+{
+  static char *buffer = NULL;
+  int line_chars_length = strlen(line_chars);
   int i;
 
+  if (buffer != NULL)
+    checked_free(buffer);
+
+  buffer = checked_malloc(line_chars_length * line_length + 1);
+
   for (i = 0; i < line_length; i++)
-    fprintf(stream, "%s", line_string);
+    strcpy(&buffer[i * line_chars_length], line_chars);
+
+  return buffer;
+}
 
-  fprintf(stream, "\n");
+void fprintf_line(FILE *stream, char *line_chars, int line_length)
+{
+  fprintf_newline(stream, get_line_string(line_chars, line_length));
 }
 
-void printf_line(char *line_string, int line_length)
+void printf_line(char *line_chars, int line_length)
 {
-  fprintf_line(stdout, line_string, line_length);
+  fprintf_line(stdout, line_chars, line_length);
 }
 
-void printf_line_with_prefix(char *prefix, char *line_string, int line_length)
+void printf_line_error(char *line_chars, int line_length)
+{
+  printf_error_newline(get_line_string(line_chars, line_length));
+}
+
+void printf_line_with_prefix(char *prefix, char *line_chars, int line_length)
 {
   fprintf(stdout, "%s", prefix);
-  fprintf_line(stdout, line_string, line_length);
+  fprintf_line(stdout, line_chars, line_length);
 }
 
 
+/* ------------------------------------------------------------------------- */
+/* string functions                                                          */
+/* ------------------------------------------------------------------------- */
+
 /* int2str() returns a number converted to a string;
    the used memory is static, but will be overwritten by later calls,
    so if you want to save the result, copy it to a private string buffer;
@@ -832,6 +934,69 @@ char *GetError()
   return internal_error;
 }
 
+#if 1
+
+void Error(int mode, char *format, ...)
+{
+  static boolean last_line_was_separator = FALSE;
+  char *process_name = "";
+
+  /* display warnings only when running in verbose mode */
+  if (mode & ERR_WARN && !options.verbose)
+    return;
+
+  if (mode == ERR_RETURN_LINE)
+  {
+    if (!last_line_was_separator)
+      printf_line_error(format, 79);
+
+    last_line_was_separator = TRUE;
+
+    return;
+  }
+
+  last_line_was_separator = FALSE;
+
+  if (mode & ERR_SOUND_SERVER)
+    process_name = " sound server";
+  else if (mode & ERR_NETWORK_SERVER)
+    process_name = " network server";
+  else if (mode & ERR_NETWORK_CLIENT)
+    process_name = " network client **";
+
+  if (format)
+  {
+    va_list ap;
+
+    printf_error("%s%s: ", program.command_basename, process_name);
+
+    if (mode & ERR_WARN)
+      printf_error("warning: ");
+
+    va_start(ap, format);
+    vprintf_error_newline(format, ap);
+    va_end(ap);
+  }
+  
+  if (mode & ERR_HELP)
+    printf_error_newline("%s: Try option '--help' for more information.",
+                        program.command_basename);
+
+  if (mode & ERR_EXIT)
+    printf_error_newline("%s%s: aborting",
+                        program.command_basename, process_name);
+
+  if (mode & ERR_EXIT)
+  {
+    if (mode & ERR_FROM_SERVER)
+      exit(1);                         /* child process: normal exit */
+    else
+      program.exit_function(1);                /* main process: clean up stuff */
+  }
+}
+
+#else
+
 void Error(int mode, char *format, ...)
 {
   static boolean last_line_was_separator = FALSE;
@@ -855,12 +1020,13 @@ void Error(int mode, char *format, ...)
 
   last_line_was_separator = FALSE;
 
-#if defined(PLATFORM_MSDOS)
+#if defined(PLATFORM_WIN32) || defined(PLATFORM_MSDOS)
   newline = "\r\n";
 
   if ((error = openErrorFile()) == NULL)
   {
     printf("Cannot write to error output file!%s", newline);
+
     program.exit_function(1);
   }
 #endif
@@ -908,6 +1074,8 @@ void Error(int mode, char *format, ...)
   }
 }
 
+#endif
+
 
 /* ------------------------------------------------------------------------- */
 /* checked memory allocation and freeing functions                           */
@@ -2736,25 +2904,51 @@ void FreeCustomArtworkLists(struct ArtworkListInfo *artwork_info)
 /* ------------------------------------------------------------------------- */
 /* functions only needed for non-Unix (non-command-line) systems             */
 /* (MS-DOS only; SDL/Windows creates files "stdout.txt" and "stderr.txt")    */
+/* (now also added for Windows, to create files in user data directory)      */
 /* ------------------------------------------------------------------------- */
 
-#if defined(PLATFORM_MSDOS)
+#if defined(PLATFORM_WIN32) || defined(PLATFORM_MSDOS)
+
+#define ERROR_BASENAME         "stderr.txt"
+
+static char *error_filename = NULL;
+
+#if defined(PLATFORM_WIN32)
+
+void initErrorFile()
+{
+  if (error_filename == NULL)
+    error_filename = getPath2(getUserDataDir(), ERROR_BASENAME);
+
+  unlink(error_filename);
+}
 
-#define ERROR_FILENAME         "stderr.txt"
+#elif defined(PLATFORM_MSDOS)
 
 void initErrorFile()
 {
-  unlink(ERROR_FILENAME);
+  if (error_filename == NULL)
+    error_filename = ERROR_BASENAME;
+
+  unlink(error_filename);
 }
 
+#endif /* PLATFORM_MSDOS */
+
 FILE *openErrorFile()
 {
-  return fopen(ERROR_FILENAME, MODE_APPEND);
+  FILE *error_file = fopen(error_filename, MODE_APPEND);
+
+  if (error_file == NULL)
+    fprintf_newline(stderr, "ERROR: cannot open file '%s' for appending!",
+                   error_filename);
+
+  return error_file;
 }
 
 void dumpErrorFile()
 {
-  FILE *error_file = fopen(ERROR_FILENAME, MODE_READ);
+  FILE *error_file = fopen(error_filename, MODE_READ);
 
   if (error_file != NULL)
   {
@@ -2764,7 +2958,8 @@ void dumpErrorFile()
     fclose(error_file);
   }
 }
-#endif
+
+#endif /* PLATFORM_WIN32 || PLATFORM_MSDOS */
 
 
 /* ------------------------------------------------------------------------- */

diff --git a/src/libgame/system.c b/src/libgame/system.c
index 3c460375b03aa4ec67d7a0474413726a298a5d2f..1bc35d68cc55852748482c2b4efea814bf90d9fa 100644 (file)
--- a/src/libgame/system.c
+++ b/src/libgame/system.c
@@ -113,6 +113,9 @@ void InitPlatformDependentStuff(void)
 {
 #if defined(PLATFORM_MSDOS)
   _fmode = O_BINARY;
+#endif
+
+#if defined(PLATFORM_WIN32) || defined(PLATFORM_MSDOS)
   initErrorFile();
 #endif