From: Arsen Arsenović <arsen@aarsen.me>
Date: Sun, 24 Jan 2021 15:44:13 +0000 (+0100)
Subject: jack: use program_invocation_short_name
X-Git-Tag: v1.2.7.1~1
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=335a418a2063d66164de02031b50258cceb4ea7c;p=alsa-plugins.git

jack: use program_invocation_short_name

Fixes: https://github.com/alsa-project/alsa-plugins/pull/18
Signed-off-by: Arsen Arsenović <arsen@aarsen.me>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---

diff --git a/jack/pcm_jack.c b/jack/pcm_jack.c
index 9aa051a..f266a35 100644
--- a/jack/pcm_jack.c
+++ b/jack/pcm_jack.c
@@ -20,7 +20,9 @@
  *
  */
 
+#define _GNU_SOURCE
 #include <stdbool.h>
+#include <errno.h>
 #include <byteswap.h>
 #include <sys/shm.h>
 #include <sys/types.h>
@@ -600,12 +602,16 @@ static int snd_pcm_jack_open(snd_pcm_t **pcmp, const char *name,
 		return -EINVAL;
 	}
 
-	if (client_name == NULL)
+	if (client_name == NULL) {
+		const char *pname = program_invocation_short_name;
+		if (!pname[0]) {
+			pname = "alsa-jack";
+		}
 		err = snprintf(jack_client_name, sizeof(jack_client_name),
-			       "alsa-jack.%s%s.%d.%d", name,
+			       "%s.%s.%d.%d", pname,
 			       stream == SND_PCM_STREAM_PLAYBACK ? "P" : "C",
 			       getpid(), num++);
-	else
+	} else
 		err = snprintf(jack_client_name, sizeof(jack_client_name),
 			       "%s", client_name);