From 17630f26782895c7b66ec132e0ee4894da2c0d69 Mon Sep 17 00:00:00 2001
From: Daniel Barlow <dan@telent.net>
Date: Wed, 18 Sep 2024 20:58:02 +0100
Subject: [PATCH] rename logtee->logtap

---
 pkgs/logshipper/Makefile               |  4 ++--
 pkgs/logshipper/{logtee.c => logtap.c} | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)
 rename pkgs/logshipper/{logtee.c => logtap.c} (92%)

diff --git a/pkgs/logshipper/Makefile b/pkgs/logshipper/Makefile
index 07b26df..2d85fa5 100644
--- a/pkgs/logshipper/Makefile
+++ b/pkgs/logshipper/Makefile
@@ -1,5 +1,5 @@
-TARGETS=logtee # ship-zinc backfill
+TARGETS=logtap
 default: $(TARGETS)
 
 install: $(TARGETS)
-	install -Dt $(PREFIX)/bin/ logtee
+	install -Dt $(PREFIX)/bin/ logtap
diff --git a/pkgs/logshipper/logtee.c b/pkgs/logshipper/logtap.c
similarity index 92%
rename from pkgs/logshipper/logtee.c
rename to pkgs/logshipper/logtap.c
index d5d9098..aeca4c1 100644
--- a/pkgs/logshipper/logtee.c
+++ b/pkgs/logshipper/logtap.c
@@ -11,6 +11,8 @@
 #include <sys/un.h>
 #include <errno.h>
 
+#define PROGRAM_NAME "logtap"
+
 #ifdef _GNU_SOURCE
 #include <error.h>
 #else
@@ -19,7 +21,7 @@ static void error(int status, int errnum, const char * fmt, ...) {
     va_list ap;
     va_start(ap, fmt);
 
-    fprintf(stderr, "logtee: ");
+    fprintf(stderr, PROGRAM_NAME  ": ");
     vfprintf(stderr, fmt, ap);
     if(errnum) fprintf(stderr, ": %s", strerror(errnum));
     fprintf(stderr, "\n");
@@ -41,7 +43,7 @@ int open_shipper_socket(char *pathname) {
     if(fd >= 0) {
 	if(connect(fd, (struct sockaddr *) &sa, sizeof sa)) {
 	    if((fail_count % 30) == 0)
-		printf("logtee: cannot connect socket \"%s\": %s\n",
+		printf(PROGRAM_NAME ": cannot connect socket \"%s\": %s\n",
 		       pathname,
 		       strerror(errno));
 
@@ -73,7 +75,7 @@ int main(int argc, char * argv[]) {
     int tee_bytes = 0;
 
     if(argc != 3) {
-	error(1, 0, "usage: logtee /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];
@@ -103,7 +105,7 @@ int main(int argc, char * argv[]) {
 		out_bytes = read(fds[0].fd, buf, 8192);
 		if(out_bytes == 0) {
 		    quitting = 1;
-		    buf = "logtee detected eof of file on stdin, exiting\n";
+		    buf = PROGRAM_NAME " detected eof of file on stdin, exiting\n";
 		    out_bytes = strlen(buf);
 		};
 		if(is_connected()) tee_bytes = out_bytes;