work around yet another bsd limitation: prefer IP_MULTICAST_IF over IP_SENDSRCADDR...

[catta] / avahi-compat-libdns_sd / warn.c

diff --git a/avahi-compat-libdns_sd/warn.c b/avahi-compat-libdns_sd/warn.c
index 8d766c3f9e880727fb9105808eae0ca4585db8ba..d3389c1b5c35f2695b50c162467becb22612ede4 100644 (file)
--- 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;
 
@@ -76,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 *** ";
@@ -118,14 +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);
 }