sockread: cleanup code and allow arguments

* cleanup code style
* allow arguments to be passed from the command line

Signed-off-by: Moritz Warning <moritzwarning@web.de>

1 files changed, 61 insertions, 53 deletions

diff --git a/utils/sockread/src/main.c b/utils/sockread/src/main.c
index c685bce71..b6d0713a9 100644
--- a/utils/sockread/src/main.c
+++ b/utils/sockread/src/main.c
@@ -7,57 +7,65 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 
-int main(int argc, char *argv[]) {
-	char buf[1024];
-	ssize_t r;
-
-	if (argc != 2) {
-		fprintf(stderr, "Write to and read from a Unix domain socket.\n\nUsage: %s <socket>\n", argv[0]);
-		return 1;
-	}
-
-	size_t addrlen = strlen(argv[1]);
-
-	/* Allocate enough space for arbitrary-length paths */
-	char addrbuf[offsetof(struct sockaddr_un, sun_path) + addrlen + 1];
-	memset(addrbuf, 0, sizeof(addrbuf));
-
-	struct sockaddr_un *addr = (struct sockaddr_un *)addrbuf;
-	addr->sun_family = AF_UNIX;
-	memcpy(addr->sun_path, argv[1], addrlen+1);
-
-	int fd = socket(AF_UNIX, SOCK_STREAM, 0);
-	if (fd < 0) {
-		fprintf(stderr, "Failed to create socket: %s\n", strerror(errno));
-		return 1;
-	}
-
-	if (connect(fd, (struct sockaddr*)addr, sizeof(addrbuf)) < 0) {
-		fprintf(stderr, "Can't connect to `%s': %s\n", argv[1], strerror(errno));
-		return 1;
-	}
-
-	/* Check if stdin refers to a terminal */
-	if (!isatty(fileno(stdin))) {
-		/* Read from stdin and write to socket */
-		while (0 < (r = fread(buf, 1, sizeof(buf), stdin))) {
-			send(fd, buf, r, 0);
-		}
-	}
-
-	/* Read from socket and write to stdout */
-	while (1) {
-		r = recv(fd, buf, sizeof(buf), 0);
-		if (r < 0) {
-			fprintf(stderr, "read: %s\n", strerror(errno));
-			return 1;
-		}
-
-		if (r == 0)
-			return 0;
-
-		fwrite(buf, r, 1, stdout);
-	}
-
-	return 0;
+const char *usage =
+    "Write to and read from a Unix domain socket.\n"
+    "Add commands to send as arguments or pass by pipe.\n"
+    "\n"
+    "Usage: sockread <path> [<commands>]\n";
+
+int main(int argc, char *argv[])
+{
+    char buffer[1024];
+    ssize_t r;
+
+    if (argc < 2) {
+        fprintf(stderr, "%s", usage);
+        return EXIT_FAILURE;
+    }
+
+    struct sockaddr_un address = {0};
+    address.sun_family = AF_UNIX;
+    strcpy((char*) &address.sun_path, argv[1]);
+
+    int sock = socket(AF_UNIX, SOCK_STREAM, 0);
+    if (sock < 0) {
+        fprintf(stderr, "socket() %s\n", strerror(errno));
+        return EXIT_FAILURE;
+    }
+
+    if (connect(sock, (struct sockaddr*)&address, sizeof(address)) < 0) {
+        fprintf(stderr, "connect() %s\n", strerror(errno));
+        return EXIT_FAILURE;
+    }
+
+    /* Check if stdin refers to a terminal */
+    if (!isatty(fileno(stdin))) {
+        /* Read from stdin and write to socket */
+        while (0 < (r = fread(buffer, 1, sizeof(buffer), stdin))) {
+            send(sock, buffer, r, 0);
+        }
+    } else {
+        for (size_t i = 2; i < argc; i++) {
+            if (i > 2) {
+                send(sock, " ", 1, 0);
+            }
+            send(sock, argv[i], strlen(argv[i]), 0);
+        }
+    }
+
+    /* Read from socket and write to stdout */
+    while (1) {
+        r = recv(sock, buffer, sizeof(buffer), 0);
+        if (r < 0) {
+            fprintf(stderr, "recv() %s\n", strerror(errno));
+            return EXIT_FAILURE;
+        }
+
+        if (r == 0)
+            break;
+
+        fwrite(buffer, r, 1, stdout);
+    }
+
+    return EXIT_SUCCESS;
 }