From: Keith Packard <keithp@keithp.com>
Date: Fri, 18 Apr 2014 22:09:50 +0000 (-0700)
Subject: os: Ignore log file write failures
X-Git-Tag: upstream/1.16~114
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0af8788579c2f52cc1172952c9004483bf863932;p=platform%2Fupstream%2Fxorg-server.git

os: Ignore log file write failures

There's no place to log the message if writing to the log file fails,
and we surely don't want to crash in that case, so just ignore errors
and keep going.

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
---

diff --git a/os/log.c b/os/log.c
index 38193ee..a0f2a81 100644
--- a/os/log.c
+++ b/os/log.c
@@ -491,13 +491,14 @@ static void
 LogSWrite(int verb, const char *buf, size_t len, Bool end_line)
 {
     static Bool newline = TRUE;
+    int ret;
 
     if (verb < 0 || logVerbosity >= verb)
-        write(2, buf, len);
+        ret = write(2, buf, len);
 
     if (verb < 0 || logFileVerbosity >= verb) {
         if (inSignalContext && logFileFd >= 0) {
-            write(logFileFd, buf, len);
+            ret = write(logFileFd, buf, len);
 #ifndef WIN32
             if (logFlush && logSync)
                 fsync(logFileFd);
@@ -529,6 +530,11 @@ LogSWrite(int verb, const char *buf, size_t len, Bool end_line)
             bufferPos += len;
         }
     }
+
+    /* There's no place to log an error message if the log write
+     * fails...
+     */
+    (void) ret;
 }
 
 void