From 1f1e44096daa4928649808997b3d9bf5efee6cc8 Mon Sep 17 00:00:00 2001
From: Curtis McEnroe <programble@gmail.com>
Date: Sun, 18 Sep 2016 13:15:05 -0400
Subject: Clean up error handling in pbd

---
 .bin/pbd.c | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

(limited to '.bin/pbd.c')

diff --git a/.bin/pbd.c b/.bin/pbd.c
index 47fdedc4..9e716d6d 100755
--- a/.bin/pbd.c
+++ b/.bin/pbd.c
@@ -8,6 +8,7 @@ exec clang -Weverything $@ -o $(dirname $0)/pbd $0
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/socket.h>
+#include <sys/wait.h>
 #include <sysexits.h>
 #include <unistd.h>
 
@@ -17,19 +18,23 @@ static void spawn(const char *cmd, int child_fd, int parent_fd) {
 
     if (pid) {
         int status;
-        if (waitpid(pid, &status, 0) < 0)
-            err(EX_OSERR, "waitpid");
+        pid_t wait = waitpid(pid, &status, 0);
+        if (wait < 0) err(EX_OSERR, "waitpid");
+
         if (status)
             warnx("child %s status %d", cmd, status);
     } else {
-        if (dup2(parent_fd, child_fd) < 0)
-            err(EX_OSERR, "dup2");
-        if (execlp(cmd, cmd) < 0)
-            err(EX_OSERR, "execlp");
+        int fd = dup2(parent_fd, child_fd);
+        if (fd < 0) err(EX_OSERR, "dup2");
+
+        int error = execlp(cmd, cmd);
+        if (error) err(EX_OSERR, "execlp");
     }
 }
 
 int main() {
+    int error;
+
     int server = socket(PF_INET, SOCK_STREAM, 0);
     if (server < 0) err(EX_OSERR, "socket");
 
@@ -39,11 +44,11 @@ int main() {
         .sin_addr = { .s_addr = htonl(0x7f000001) },
     };
 
-    if (bind(server, (struct sockaddr *) &addr, sizeof(addr)) < 0)
-        err(EX_OSERR, "bind");
+    error = bind(server, (struct sockaddr *) &addr, sizeof(addr));
+    if (error) err(EX_OSERR, "bind");
 
-    if (listen(server, 1) < 0)
-        err(EX_OSERR, "listen");
+    error = listen(server, 1);
+    if (error) err(EX_OSERR, "listen");
 
     for (;;) {
         int client = accept(server, NULL, NULL);
@@ -57,7 +62,7 @@ int main() {
 
         if (peek) spawn("pbcopy", STDIN_FILENO, client);
 
-        if (close(client) < 0)
-            err(EX_IOERR, "close");
+        error = close(client);
+        if (error) err(EX_IOERR, "close");
     }
 }
-- 
cgit 1.4.1

47e3ba76c63abd736db52448ca&amp;follow=1'>config</a> (<a href='/src/log/home/.ssh/config?id=30132e89f935e247e3ba76c63abd736db52448ca'>unfollow</a>)</div><div class='content'><table class='list nowrap'><tr class='nohover'><th></th><th class='left'>Commit message (<a href='/src/log/home/.ssh/config?id=30132e89f935e247e3ba76c63abd736db52448ca&amp;showmsg=1&amp;follow=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-02-15 15:26:05 -0500'>2019-02-15</span></td><td><a href='/src/commit/home/.config/nvim/init.vim?id=f8ab260a0693218701d44bd87c4f2c0a5d11f88b&amp;follow=1'>Add nmap gp</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2019-02-14 02:16:27 -0500'>2019-02-14</span></td><td><a href='/src/commit/bin/up.sh?id=656e95683afe196e53ce1bd96ac75fe8a6dea5b8&amp;follow=1'>Avoid newline when copying URL to pasteboard</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2019-02-13 23:30:53 -0500'>2019-02-13</span></td><td><a href='/src/commit/txt/books.txt?id=a9024581ad338b0cbd4282a4fc5e44fee943fe34&amp;follow=1'>Add forgotten "sixth" book of H2G2</a></td><td>June McEnroe