From: Kristoffer Grönlund <krig@koru.se>
Date: Fri, 22 Nov 2013 10:06:34 +0000 (+0100)
Subject: MEDIUM: haproxy-systemd-wrapper: Use haproxy in same directory
X-Git-Tag: v1.5-dev20~222
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b6e75fa84;p=thirdparty%2Fhaproxy.git

MEDIUM: haproxy-systemd-wrapper: Use haproxy in same directory

Locate the wrapper and use a haproxy executable found in the
same directory.

This patch lets the wrapper work in openSUSE.
---

diff --git a/src/haproxy-systemd-wrapper.c b/src/haproxy-systemd-wrapper.c
index fb1a7fd927..6546616b79 100644
--- a/src/haproxy-systemd-wrapper.c
+++ b/src/haproxy-systemd-wrapper.c
@@ -22,15 +22,30 @@ static char *pid_file = "/run/haproxy.pid";
 static int main_argc;
 static char **main_argv;
 
+static void locate_haproxy(char *buffer, size_t buffer_size)
+{
+	char* end;
+	readlink("/proc/self/exe", buffer, buffer_size);
+	end = strrchr(buffer, '/');
+	if (end == NULL)
+		strncpy(buffer, "/usr/sbin/haproxy", buffer_size);
+	end[1] = '\0';
+	strncat(buffer, "haproxy", buffer_size);
+}
+
 static void spawn_haproxy(char **pid_strv, int nb_pid)
 {
-	pid_t pid = fork();
+	char haproxy_bin[512];
+	pid_t pid;
+
+	pid = fork();
 	if (!pid) {
 		/* 3 for "haproxy -Ds -sf" */
 		char **argv = calloc(4 + main_argc + nb_pid + 1, sizeof(char *));
 		int i;
 		int argno = 0;
-		argv[argno++] = SBINDIR"/haproxy";
+		locate_haproxy(haproxy_bin, 512);
+		argv[argno++] = haproxy_bin;
 		for (i = 0; i < main_argc; ++i)
 			argv[argno++] = main_argv[i];
 		argv[argno++] = "-Ds";