Merge branch 'master' into status

[bspwm.git] / bspc.c

diff --git a/bspc.c b/bspc.c
index f4e3f31bcd2b1ff4702249fa9e0231bc75b5b331..e0f88071768b5d509b6f98ef5a7eb3ea0df1bd87 100644 (file)
--- a/bspc.c
+++ b/bspc.c
@@ -1,49 +1,59 @@
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <unistd.h>
+#include "helpers.h"
 #include "common.h"
 
 int main(int argc, char *argv[])
 {
-    int sock_fd, nbr, i;
+    int sock_fd;
     struct sockaddr_un sock_address;
-    char *socket_path;
+    size_t msglen = 0;
     char msg[BUFSIZ];
     char rsp[BUFSIZ];
 
     if (argc < 2)
-        return -1;
+        err("no arguments given\n");
 
-    socket_path = getenv(SOCKET_ENV_VAR);
+    char *sock_path = getenv(SOCKET_ENV_VAR);
+    if (sock_path == NULL || strlen(sock_path) == 0)
+        warn("environmental variable '%s' is not set or empty - using default value: %s\n", SOCKET_ENV_VAR, DEFAULT_SOCKET_PATH);
+    else if (sizeof(sock_address.sun_path) <= strlen(sock_path))
+        err("value too long for environmental variable '%s'\n", SOCKET_ENV_VAR);
 
-    if (socket_path == NULL)
-        return -1;
-
-    msg[0] = '\0';
+    sock_address.sun_family = AF_UNIX;
+    strncpy(sock_address.sun_path, (sock_path == NULL ? DEFAULT_SOCKET_PATH : sock_path), sizeof(sock_address.sun_path));
+    sock_address.sun_path[sizeof(sock_address.sun_path) - 1] = 0;
 
-    for (i = 1; i < argc; i++) {
-        strcat(msg, argv[i]);
-        if (i < (argc - 1))
-            strcat(msg, TOKEN_SEP);
-    }
+    for (int offset = 0, len = sizeof(msg), n = 0; --argc && ++argv && len > 0; offset += n, len -= n)
+        n = snprintf(msg + offset, len, "%s ", *argv);
 
-    sock_address.sun_family = AF_UNIX;
-    strcpy(sock_address.sun_path, socket_path);
+    msglen = strlen(msg);
+    if (msg[msglen - 1] == ' ')
+        msg[--msglen] = '\0';
 
     sock_fd = socket(AF_UNIX, SOCK_STREAM, 0);
-    connect(sock_fd, (struct sockaddr *) &sock_address, sizeof(sock_address));
+    if (sock_fd == -1)
+        err("failed to create socket\n");
+
+    if (connect(sock_fd, (struct sockaddr *) &sock_address, sizeof(sock_address)) == -1)
+        err("failed to connect to socket\n");
 
-    send(sock_fd, msg, strlen(msg), 0);
+    if (send(sock_fd, msg, msglen, 0) == -1)
+        err("failed to send data\n");
 
-    if ((nbr = recv(sock_fd, rsp, sizeof(rsp), 0)) > 0) {
-        rsp[nbr] = '\0';
-        if (strcmp(rsp, EMPTY_RESPONSE) != 0)
-            printf("%s", rsp);
+    int n = recv(sock_fd, rsp, sizeof(rsp), 0);
+    if (n == -1) {
+        err("failed to get response\n");
+    } else if (n > 0) {
+        rsp[n] = '\0';
+        printf("%s\n", rsp);
     }
 
-    close(sock_fd);
-    return 0;
+    if (sock_fd)
+        close(sock_fd);
+
+    return EXIT_SUCCESS;
 }