* implement avahi_exe_name for BSD/Darwin

* no more sebest in the TOO :)

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@961 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

diff --git a/avahi-compat-libdns_sd/warn.c b/avahi-compat-libdns_sd/warn.c
index 8d766c3f9e880727fb9105808eae0ca4585db8ba..13586ef31fa60d317ce4b5395e47627d96ff0889 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 *** ";

diff --git a/configure.ac b/configure.ac
index 88ab3a506a62eb222f522d9d7b273e1853e3daac..6b83eed705add4fc6e78a51a96e7e7dc2a38f5c8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -206,7 +206,7 @@ AC_FUNC_MEMCMP
 AC_FUNC_SELECT_ARGTYPES
 AC_FUNC_MALLOC
 AC_FUNC_REALLOC
-AC_CHECK_FUNCS([gethostname memchr memmove memset mkdir select socket strchr strcspn strdup strerror strrchr strspn strstr uname setresuid setreuid setresgid setregid strcasecmp gettimeofday putenv strncasecmp strlcpy gethostbyname seteuid setegid setproctitle])
+AC_CHECK_FUNCS([gethostname memchr memmove memset mkdir select socket strchr strcspn strdup strerror strrchr strspn strstr uname setresuid setreuid setresgid setregid strcasecmp gettimeofday putenv strncasecmp strlcpy gethostbyname seteuid setegid setproctitle getprogname])
 
 AC_FUNC_CHOWN
 AC_FUNC_STAT

diff --git a/docs/TODO b/docs/TODO
index 9b770069fb16250066301fc8d14476d076160f49..46cb036e9728ca5cca16f8c3c5bc0ba75aaf3c9e 100644 (file)
--- a/docs/TODO
+++ b/docs/TODO
@@ -4,7 +4,6 @@ for 0.6:
 * Expose AvahiSRecordBrowser over D-BUS and implement in avahi-client [lathiat]
 * fix python scripts
 * update man pages
-* portability: implement avahi_exe_name() in avahi-compat-libdns_sd/warn.c on non-linux architectures [sebest]
 
 later:
 * add simplification routine for adding services