X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=bspc.c;h=ee6432d523c2337a1d9cf56e37f0956be2965b5f;hb=1432226ab6ac945741fce8cac038d496ce2fc7ae;hp=25ece9cdfe8544ae5736e9f0113f370f1cf7344b;hpb=36140fe1c3315ea6232d206302d1d3415bf5cc0b;p=bspwm.git

diff --git a/bspc.c b/bspc.c
index 25ece9c..ee6432d 100644
--- a/bspc.c
+++ b/bspc.c
@@ -1,52 +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[BUFSIZ];
+    size_t msglen = 0;
     char msg[BUFSIZ];
     char rsp[BUFSIZ];
 
     if (argc < 2)
-        return -1;
+        err("No arguments given.\n");
 
-    char *sp = getenv(SOCKET_ENV_VAR);
+    char *sock_path = getenv(SOCKET_ENV_VAR);
+    if (sock_path == NULL || strlen(sock_path) == 0)
+        warn("The environment variable '%s' is not set or empty, we will use: '%s'.\n", SOCKET_ENV_VAR, DEFAULT_SOCKET_PATH);
+    else if (sizeof(sock_address.sun_path) <= strlen(sock_path))
+        err("The string can't fit in the socket address: '%s'.\n", sock_path);
 
-    strncpy(socket_path, (sp == NULL ? DEFAULT_SOCKET_PATH : sp), sizeof(socket_path));
-
-    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;
 
-    int max = sizeof(msg);
-    for (i = 1; max > 0 && i < argc; i++) {
-        strncat(msg, argv[i], max);
-        max -= strlen(argv[i]);
-        if (i < (argc - 1)) {
-            strncat(msg, TOKEN_SEP, max);
-            max -= strlen(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;
-    strncpy(sock_address.sun_path, socket_path, sizeof(sock_address.sun_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 the socket.\n");
+
+    if (connect(sock_fd, (struct sockaddr *) &sock_address, sizeof(sock_address)) == -1)
+        err("Failed to connect to the socket.\n");
 
-    send(sock_fd, msg, strlen(msg), 0);
+    if (send(sock_fd, msg, msglen, 0) == -1)
+        err("Failed to send the 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 the 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;
 }