Enhance external rules example scripts

[bspwm.git] / bspc.c

diff --git a/bspc.c b/bspc.c
index 2f85bd6b8b0ad2ef8d6ea1d7e551ed3e3fd1c454..5a5b1511c42ecb1b8f2171e35a8ab6c229af72ab 100644 (file)
--- a/bspc.c
+++ b/bspc.c
@@ -1,17 +1,43 @@
+/* * Copyright (c) 2012-2013 Bastien Dejean
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *  * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation and/or
+ * other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 #include <stdlib.h>
-#include <string.h>
+#ifdef __OpenBSD__
+#include <sys/types.h>
+#endif
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <unistd.h>
+#include <ctype.h>
 #include "helpers.h"
 #include "common.h"
 
 int main(int argc, char *argv[])
 {
-    int sock_fd;
+    int fd;
     struct sockaddr_un sock_address;
-    char msg[BUFSIZ];
-    char rsp[BUFSIZ];
+    char msg[BUFSIZ], rsp[BUFSIZ];
 
     if (argc < 2)
         err("No arguments given.\n");
@@ -29,31 +55,29 @@ int main(int argc, char *argv[])
         msg_len += n;
     }
 
-    if ((sock_fd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1)
+    if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1)
         err("Failed to create the socket.\n");
 
-    if (connect(sock_fd, (struct sockaddr *) &sock_address, sizeof(sock_address)) == -1)
+    if (connect(fd, (struct sockaddr *) &sock_address, sizeof(sock_address)) == -1)
         err("Failed to connect to the socket.\n");
 
-    if (send(sock_fd, msg, msg_len, 0) == -1)
+    if (send(fd, msg, msg_len, 0) == -1)
         err("Failed to send the data.\n");
 
-    int ret = EXIT_SUCCESS;
-
-    int n = recv(sock_fd, rsp, sizeof(rsp), 0);
-    if (n == -1) {
-        err("Failed to get the response.\n");
-    } else if (n > 0) {
-        if (n == 1 && rsp[0] == MESSAGE_FAILURE) {
+    int ret = EXIT_SUCCESS, nb;
+    while ((nb = recv(fd, rsp, sizeof(rsp), 0)) > 0) {
+        if (nb == 1 && rsp[0] == MESSAGE_FAILURE) {
             ret = EXIT_FAILURE;
         } else {
-            rsp[n] = '\0';
+            int end = MIN(nb, (int) sizeof(rsp) - 1);
+            rsp[end--] = '\0';
+            while (end >= 0 && isspace(rsp[end]))
+                rsp[end--] = '\0';
             printf("%s\n", rsp);
+            fflush(stdout);
         }
     }
 
-    if (sock_fd)
-        close(sock_fd);
-
+    close(fd);
     return ret;
 }