X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-compat-libdns_sd%2Fwarn.c;h=d3389c1b5c35f2695b50c162467becb22612ede4;hb=9f4f7318fb877f57c0d828ed1a732ca8a5e61310;hp=486447df2554435337de6b163c419066f7181587;hpb=58ca874e460691615b131ad8692165a12f14bd09;p=catta

diff --git a/avahi-compat-libdns_sd/warn.c b/avahi-compat-libdns_sd/warn.c
index 486447d..d3389c1 100644
--- a/avahi-compat-libdns_sd/warn.c
+++ b/avahi-compat-libdns_sd/warn.c
@@ -47,6 +47,9 @@ static pthread_mutex_t linkage_mutex = PTHREAD_MUTEX_INITIALIZER;
 static int linkage_warning = 0;
 
 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;
 
@@ -57,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;
@@ -77,6 +77,12 @@ 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
+    return "(unknown)";
+#endif
 }
 
 void avahi_warn(const char *fmt, ...) {
@@ -107,17 +113,14 @@ void avahi_warn_linkage(void) {
     pthread_mutex_unlock(&linkage_mutex);
 
     if (!w && !getenv("AVAHI_COMPAT_NOWARN")) {
-        avahi_warn("The programme '%s' uses the "COMPAT_LAYER" compatiblity layer of Avahi.", avahi_exe_name());
+        avahi_warn("The program '%s' uses the "COMPAT_LAYER" compatibility layer of Avahi.", avahi_exe_name());
         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>", avahi_exe_name());
     }
 }
 
 void avahi_warn_unsupported(const char *function) {
-    avahi_warn("The programme '%s' called '%s()' which is not supported (or only supported partially) in the "COMPAT_LAYER" compatiblity layer of Avahi.", avahi_exe_name(), function);
+    avahi_warn("The program '%s' called '%s()' which is not supported (or only supported partially) in the "COMPAT_LAYER" compatibility layer of Avahi.", avahi_exe_name(), 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);
 }
-
-
-