X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=bspc.c;h=ee6432d523c2337a1d9cf56e37f0956be2965b5f;hb=c1fb3ac48483852a125112eac78205e3709ae2cd;hp=578604027fff2c946a0918430b0029dbdd29deb7;hpb=46e8061d915f94a46219c328d18c94170af5a550;p=bspwm.git

diff --git a/bspc.c b/bspc.c
index 5786040..ee6432d 100644
--- a/bspc.c
+++ b/bspc.c
@@ -15,38 +15,38 @@ int main(int argc, char *argv[])
     char rsp[BUFSIZ];
 
     if (argc < 2)
-        die("no arguments given\n");
+        err("No arguments given.\n");
 
     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);
+        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))
-        die("value too long for environmental variable '%s'\n", SOCKET_ENV_VAR);
+        err("The string can't fit in the socket address: '%s'.\n", sock_path);
 
     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 (int offset = 0, len = BUFSIZ, n = 0; --argc && ++argv && len > 0; offset += n, len -= n)
+    for (int offset = 0, len = sizeof(msg), n = 0; --argc && ++argv && len > 0; offset += n, len -= n)
         n = snprintf(msg + offset, len, "%s ", *argv);
 
     msglen = strlen(msg);
-    if (msg[msglen - 1] ==  ' ')
+    if (msg[msglen - 1] == ' ')
         msg[--msglen] = '\0';
 
     sock_fd = socket(AF_UNIX, SOCK_STREAM, 0);
     if (sock_fd == -1)
-        die("failed to create socket\n");
+        err("Failed to create the socket.\n");
 
     if (connect(sock_fd, (struct sockaddr *) &sock_address, sizeof(sock_address)) == -1)
-        die("failed to connect to socket\n");
+        err("Failed to connect to the socket.\n");
 
     if (send(sock_fd, msg, msglen, 0) == -1)
-        die("failed to send data\n");
+        err("Failed to send the data.\n");
 
     int n = recv(sock_fd, rsp, sizeof(rsp), 0);
     if (n == -1) {
-        die("failed to get response\n");
+        err("Failed to get the response.\n");
     } else if (n > 0) {
         rsp[n] = '\0';
         printf("%s\n", rsp);