Check write(2) return value to avoid warnings, because in this context failing write...

[redis.git] / src / redis.c

diff --git a/src/redis.c b/src/redis.c
index ea5525dcfb875737ccb43ec54dbafab9fa66b8cc..eaa41a5dfe64d8d47ea4edd08b607cbb4d949475 100644 (file)
--- a/src/redis.c
+++ b/src/redis.c
@@ -318,14 +318,15 @@ void redisLogFromHandler(int level, const char *msg) {
         STDOUT_FILENO;
     if (fd == -1) return;
     ll2string(buf,sizeof(buf),getpid());
         STDOUT_FILENO;
     if (fd == -1) return;
     ll2string(buf,sizeof(buf),getpid());

-    write(fd,"[",1);
-    write(fd,buf,strlen(buf));
-    write(fd," | signal handler] (",20);
+    if (write(fd,"[",1) == -1) goto err;
+    if (write(fd,buf,strlen(buf)) == -1) goto err;
+    if (write(fd," | signal handler] (",20) == -1) goto err;

     ll2string(buf,sizeof(buf),time(NULL));
     ll2string(buf,sizeof(buf),time(NULL));

-    write(fd,buf,strlen(buf));
-    write(fd,") ",2);
-    write(fd,msg,strlen(msg));
-    write(fd,"\n",1);
+    if (write(fd,buf,strlen(buf)) == -1) goto err;
+    if (write(fd,") ",2) == -1) goto err;
+    if (write(fd,msg,strlen(msg)) == -1) goto err;
+    if (write(fd,"\n",1) == -1) goto err;
+err:

     if (server.logfile) close(fd);
 }
 
     if (server.logfile) close(fd);
 }