X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-compat-libdns_sd%2Fwarn.c;h=13586ef31fa60d317ce4b5395e47627d96ff0889;hb=fc3830c24fd0341d762a2c4f05198f27fc3ccac0;hp=0f7f6dc647eeb6c32db710385c10f7e66a96f7b6;hpb=df8f2ac54e0786d1426da9ca9338590796938a6f;p=catta

diff --git a/avahi-compat-libdns_sd/warn.c b/avahi-compat-libdns_sd/warn.c
index 0f7f6dc..13586ef 100644
--- a/avahi-compat-libdns_sd/warn.c
+++ b/avahi-compat-libdns_sd/warn.c
@@ -46,9 +46,10 @@
 static pthread_mutex_t linkage_mutex = PTHREAD_MUTEX_INITIALIZER;
 static int linkage_warning = 0;
 
-#ifdef __linux__
-
 const char *avahi_exe_name(void) {
+#ifdef HAVE_GETPROGNAME
+    return getprogname();
+#elif defined(__linux__)
     static char exe_name[1024] = "";
     static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
 
@@ -59,11 +60,8 @@ const char *avahi_exe_name(void) {
 
     if (exe_name[0] == 0) {
         int k;
-        char fn[64];
-        
-        snprintf(fn, sizeof(fn), "/proc/%lu/exe", (unsigned long) getpid());
         
-        if ((k = readlink(fn, exe_name, sizeof(exe_name)-1)) < 0)
+        if ((k = readlink("/proc/self/exe", exe_name, sizeof(exe_name)-1)) < 0)
             snprintf(exe_name, sizeof(exe_name), "(unknown)");
         else {
             char *slash;
@@ -79,19 +77,13 @@ const char *avahi_exe_name(void) {
     pthread_mutex_unlock(&mutex);
 
     return exe_name;
-}
-
 #else
-
 #ifdef __GNUC__
 #warning "avahi_exe_name() needs to be implemented for your operating system"
 #endif
-
-const char *avahi_exe_name(void) {
     return "(unknown)";
-}
-
 #endif
+}
 
 void avahi_warn(const char *fmt, ...) {
     char msg[512]  = "*** WARNING *** ";
@@ -132,6 +124,3 @@ void avahi_warn_unsupported(const char *function) {
     avahi_warn("Please fix your application to use the native API of Avahi!");
     avahi_warn("For more information see <http://0pointer.de/avahi-compat?s="CGI_SUBSYSTEM"&e=%s&f=%s>", avahi_exe_name(), function);
 }
-
-
-