1 files changed, 7 insertions, 3 deletions
diff --git a/os/log.c b/os/log.c
index 4820e9a77..0ff076a64 100644
--- a/os/log.c
+++ b/os/log.c
@@ -216,6 +216,9 @@ LogInit(const char *fname, const char *backup)
                 free(oldLog);
             }
         }
+        else {
+            unlink(logFileName);
+        }
         if ((logFile = fopen(logFileName, "w")) == NULL)
             FatalError("Cannot open log file \"%s\"\n", logFileName);
         setvbuf(logFile, NULL, _IONBF, 0);
@@ -763,9 +766,9 @@ FatalError(const char *f, ...)
     static Bool beenhere = FALSE;
 
     if (beenhere)
-        ErrorF("\nFatalError re-entered, aborting\n");
+        ErrorF("FatalError re-entered, aborting\n");
     else
-        ErrorF("\nFatal server error:\n");
+        ErrorF("Fatal server error: ");
 
     va_start(args, f);
 
@@ -784,7 +787,8 @@ FatalError(const char *f, ...)
 #endif
     VErrorF(f, args);
     va_end(args);
-    ErrorF("\n");
+    if (f[strlen(f) - 1] != '\n')
+        ErrorF("\n");
     if (!beenhere)
         OsVendorFatalError(f, args2);
     va_end(args2);