From 845c336ca9148d1fab732f731e97fbc99c4db193 Mon Sep 17 00:00:00 2001
From: Tom Smeding <tom.smeding@gmail.com>
Date: Tue, 18 Aug 2020 08:19:40 +0200
Subject: Less debug logging

---
 lib/libintercept.c | 26 +++-----------------------
 main.c             |  1 -
 2 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/lib/libintercept.c b/lib/libintercept.c
index 8503308..9a18d78 100644
--- a/lib/libintercept.c
+++ b/lib/libintercept.c
@@ -27,20 +27,12 @@ static bool sendall(int sock, const char *buffer, size_t length) {
 }
 
 static void try_transmit_invocation(const char *pathname, char *const argv[]) {
-	fprintf(stderr, "try_transmit_invocation: %s ...\n", pathname);
-
 	const char *socketpath = getenv(COMM_SOCKET_ENVVAR);
-	if (socketpath == NULL) {
-		fprintf(stderr, "  socket path not given\n");
-		return;
-	}
+	if (socketpath == NULL) return;
 
 	// The SOCK_CLOEXEC option is technically unnecessary, but let's be careful.
 	int sock = socket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0);
-	if (sock < 0) {
-		fprintf(stderr, "  cannot create socket: %s\n", strerror(errno));
-		return;
-	}
+	if (sock < 0) return;
 
 	struct sockaddr_un addr;
 	memset(&addr, 0, sizeof addr);
@@ -48,33 +40,21 @@ static void try_transmit_invocation(const char *pathname, char *const argv[]) {
 	strncpy(addr.sun_path, socketpath, sizeof(addr.sun_path) - 1);
 
 	int ret = connect(sock, (const struct sockaddr*)&addr, sizeof addr);
-	if (ret < 0) {
-		fprintf(stderr, "  cannot connect to socket\n");
-		return;
-	}
+	if (ret < 0) return;
 
 	size_t nargs = 0;
 	while (argv[nargs] != NULL) nargs++;
 
-	bool ok = false;
 	if (!sendall(sock, (const char*)&nargs, 8)) goto cleanup;
 	if (!sendall(sock, pathname, strlen(pathname) + 1)) goto cleanup;
 	for (size_t i = 0; i < nargs; i++) {
 		if (!sendall(sock, argv[i], strlen(argv[i]) + 1)) goto cleanup;
 	}
 
-	ok = true;
-
 cleanup:
-	if (!ok) fprintf(stderr, "  failed to write to socket\n");
 	close(sock);
 }
 
-__attribute__((constructor))
-static void constructor(void) {
-	fprintf(stderr, "constructor...\n");
-}
-
 // Abridged from glibc posix/execl.c, LGPL copyright FSF
 int execl(const char *pathname, const char *arg, ...) {
 	size_t argc;
diff --git a/main.c b/main.c
index 650dde5..2782980 100644
--- a/main.c
+++ b/main.c
@@ -56,7 +56,6 @@ static int create_socket(const char *path) {
 	memset(&addr, 0, sizeof addr);
 	addr.sun_family = AF_UNIX;
 	strncpy(addr.sun_path, path, sizeof addr.sun_path - 1);
-	fprintf(stderr, "Binding to <%s>\n", addr.sun_path);
 
 	if (bind(sock, (const struct sockaddr*)&addr, sizeof addr) < 0) {
 		perror("Cannot create unix socket: bind");
-- 
cgit v1.2.3-54-g00ecf