liminix

commit aa2160dd05dc4a0db52b29ba098f5554704898e3
parent df414b796ff82c29a8dcbab12579f52fa2b8f231
Author: Daniel Barlow <dan@telent.net>
Date:   Thu,  2 Jan 2025 22:45:00 +0000

logtap: fix indentation

spaces not tabs

Diffstat:
M
pkgs/logshipper/logtap.c
 | 
114
++++++++++++++++++++++++++++++++++++++++----------------------------------------

1 file changed, 57 insertions(+), 57 deletions(-)
diff --git a/pkgs/logshipper/logtap.c b/pkgs/logshipper/logtap.c
@@ -35,24 +35,24 @@ int open_shipper_socket(char *pathname) {
     static int fail_count = 0;
 
     struct sockaddr_un sa = {
-	.sun_family = AF_LOCAL
+        .sun_family = AF_LOCAL
     };
     strncpy(sa.sun_path, pathname, sizeof(sa.sun_path) - 1);
 
     fd = socket(AF_LOCAL, SOCK_STREAM, 0);
     if(fd >= 0) {
-	if(connect(fd, (struct sockaddr *) &sa, sizeof sa)) {
-	    if((fail_count % 30) == 0)
-		printf(PROGRAM_NAME ": cannot connect socket \"%s\": %s\n",
-		       pathname,
-		       strerror(errno));
-
-	    fail_count++;
-	    close(fd);
-	    return -1;
-	}
-	int flags = fcntl(fd, F_GETFL);
-	fcntl(fd, F_SETFL, flags | O_NONBLOCK);
+        if(connect(fd, (struct sockaddr *) &sa, sizeof sa)) {
+            if((fail_count % 30) == 0) {
+                printf(PROGRAM_NAME ": cannot connect socket \"%s\": %s\n",
+                       pathname,
+                       strerror(errno));
+	    }
+            fail_count++;
+            close(fd);
+            return -1;
+        }
+        int flags = fcntl(fd, F_GETFL);
+        fcntl(fd, F_SETFL, flags | O_NONBLOCK);
     }
     return fd;
 }
@@ -75,7 +75,7 @@ int main(int argc, char * argv[]) {
     int tee_bytes = 0;
 
     if(argc != 3) {
-	error(1, 0, "usage: " PROGRAM_NAME " /path/to/socket cookie-text");
+        error(1, 0, "usage: " PROGRAM_NAME " /path/to/socket cookie-text");
     }
     char * socket_pathname = argv[1];
     char * cookie = argv[2];
@@ -83,8 +83,8 @@ int main(int argc, char * argv[]) {
     char * stop_cookie = malloc(strlen(cookie) + 7);
 
     if(strlen(socket_pathname) > 108) {
-	error(1, 0, "socket pathname \"%s\" is too long, max 108 bytes",
-	      socket_pathname);
+        error(1, 0, "socket pathname \"%s\" is too long, max 108 bytes",
+              socket_pathname);
     };
 
     strcpy(start_cookie, cookie); strcat(start_cookie, " START\n");
@@ -97,46 +97,46 @@ int main(int argc, char * argv[]) {
 
     int quitting = 0;
     while(! quitting) {
-	int nfds = poll(fds, 3, 2000);
-	if(nfds > 0) {
-	    if((fds[0].revents & (POLLIN|POLLHUP)) &&
-	       (out_bytes == 0) &&
-	       (tee_bytes == 0)) {
-		out_bytes = read(fds[0].fd, buf, 8192);
-		if(out_bytes == 0) {
-		    quitting = 1;
-		    buf = PROGRAM_NAME " detected eof of file on stdin, exiting\n";
-		    out_bytes = strlen(buf);
-		};
-		if(is_connected()) tee_bytes = out_bytes;
-	    };
-
-	    if(out_bytes) {
-		out_bytes -= write(fds[1].fd, buf, out_bytes);
-	    };
-	    if(fds[1].revents & (POLLERR|POLLHUP)) {
-		exit(1); // can't even log an error if the logging stream fails
-	    };
-	    if(is_connected()) {
-		if(tee_bytes) {
-		    tee_bytes -= write(fds[2].fd, buf, tee_bytes);
-		};
-		if(fds[2].revents & (POLLERR|POLLHUP)) {
-		    close(fds[2].fd);
-		    fds[2].fd = -1;
-		    (void) write(1, stop_cookie, strlen(stop_cookie));
-		};
-	    };
-	} else {
-	    if(! is_connected()) {
-		fds[2].fd = open_shipper_socket(argv[1]);
-		if(is_connected()) {
-		    /* write cookie to stdout so that the backfill
-		     * process knows we are now logging realtime
-		     */
-		    write(fds[1].fd, start_cookie, strlen(start_cookie));
-		}
-	    }
-	};
+        int nfds = poll(fds, 3, 2000);
+        if(nfds > 0) {
+            if((fds[0].revents & (POLLIN|POLLHUP)) &&
+               (out_bytes == 0) &&
+               (tee_bytes == 0)) {
+                out_bytes = read(fds[0].fd, buf, 8192);
+                if(out_bytes == 0) {
+                    quitting = 1;
+                    buf = PROGRAM_NAME " detected eof of file on stdin, exiting\n";
+                    out_bytes = strlen(buf);
+                };
+                if(is_connected()) tee_bytes = out_bytes;
+            };
+
+            if(out_bytes) {
+                out_bytes -= write(fds[1].fd, buf, out_bytes);
+            };
+            if(fds[1].revents & (POLLERR|POLLHUP)) {
+                exit(1); // can't even log an error if the logging stream fails
+            };
+            if(is_connected()) {
+                if(tee_bytes) {
+                    tee_bytes -= write(fds[2].fd, buf, tee_bytes);
+                };
+                if(fds[2].revents & (POLLERR|POLLHUP)) {
+                    close(fds[2].fd);
+                    fds[2].fd = -1;
+                    (void) write(1, stop_cookie, strlen(stop_cookie));
+                };
+            };
+        } else {
+            if(! is_connected()) {
+                fds[2].fd = open_shipper_socket(argv[1]);
+                if(is_connected()) {
+                    /* write cookie to stdout so that the backfill
+                     * process knows we are now logging realtime
+                     */
+                    write(fds[1].fd, start_cookie, strlen(start_cookie));
+                }
+            }
+        };
     };
 }