From: Eivind Næss <eivnaes@yahoo.com>
Date: Mon, 20 Sep 2021 16:44:50 +0000 (-0700)
Subject: Fixing compiler warning with GCC, -Wunused-result and write()
X-Git-Tag: ppp-2.5.0~56^2~18
X-Git-Url: http://git.ozlabs.org/?a=commitdiff_plain;h=cca2985138a03dcdf903bb5a485e0eb8db6a8c3d;p=ppp.git

Fixing compiler warning with GCC, -Wunused-result and write()

Signed-off-by: Eivind Næss <eivnaes@yahoo.com>
---

diff --git a/pppd/utils.c b/pppd/utils.c
index fd213c2..e75bb9c 100644
--- a/pppd/utils.c
+++ b/pppd/utils.c
@@ -819,7 +819,7 @@ lock(char *dev)
 #else /* LOCKLIB */
 
     char lock_buffer[12];
-    int fd, pid, n;
+    int fd, pid, n, siz;
 
 #ifdef SVR4
     struct stat sbuf;
@@ -906,11 +906,16 @@ lock(char *dev)
 
     pid = getpid();
 #ifndef LOCK_BINARY
+    siz = 11;
     slprintf(lock_buffer, sizeof(lock_buffer), "%10d\n", pid);
-    write (fd, lock_buffer, 11);
+    n = write (fd, lock_buffer, siz);
 #else
-    write(fd, &pid, sizeof (pid));
+    siz = sizeof (pid);
+    n = write(fd, &pid, siz);
 #endif
+    if (n != siz) {
+	error("Could not write pid to lock file when locking");
+    }
     close(fd);
     return 0;
 
@@ -934,7 +939,7 @@ relock(int pid)
     return -1;
 #else /* LOCKLIB */
 
-    int fd;
+    int fd, n, siz;
     char lock_buffer[12];
 
     if (lock_file[0] == 0)
@@ -947,11 +952,16 @@ relock(int pid)
     }
 
 #ifndef LOCK_BINARY
+    siz = 11;
     slprintf(lock_buffer, sizeof(lock_buffer), "%10d\n", pid);
-    write (fd, lock_buffer, 11);
+    n = write (fd, lock_buffer, siz);
 #else
-    write(fd, &pid, sizeof(pid));
+    siz = sizeof(pid);
+    n = write(fd, &pid, siz);
 #endif /* LOCK_BINARY */
+    if (n != siz) {
+	error("Could not write pid to lock file when locking");
+    }
     close(fd);
     return 0;