diff options
| author | Lennart Poettering <lennart@poettering.net> | 2005-10-19 00:10:02 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2005-10-19 00:10:02 +0000 |
| commit | 16d9e30dd7fa052bd7e6dd37927d7f27bec90ef1 (patch) | |
| tree | d52fcd4dfde907c278a29c76e59f899c92c1a4b4 /avahi-compat-howl | |
| parent | d266407d3e6d8f2a8e14e8bd2f89fa8a4333613c (diff) | |
* Compile tests only when --enable-tests was specified on the configure command line
* Build compat layers only when --enable-compat-{howl,libdns_sd} was passed to configure
* drop avahi_strlcpy() to reduce our code/API size
* replace getifname() with if_indextoname in avahi-dnsconfd
* declare environ if needed in avahi-dnsconfd
* drop some useless definitions like AVAHI_PUBLISH_NULL = 0
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@819 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
Diffstat (limited to 'avahi-compat-howl')
| -rw-r--r-- | avahi-compat-howl/Makefile.am | 4 | ||||
| -rw-r--r-- | avahi-compat-howl/samples/Makefile.am | 4 | ||||
| -rw-r--r-- | avahi-compat-howl/text.c | 18 |
3 files changed, 25 insertions, 1 deletions
diff --git a/avahi-compat-howl/Makefile.am b/avahi-compat-howl/Makefile.am index 5c12782..e183b7e 100644 --- a/avahi-compat-howl/Makefile.am +++ b/avahi-compat-howl/Makefile.am @@ -25,6 +25,7 @@ AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")' SUBDIRS = . samples if HAVE_DBUS +if ENABLE_COMPAT_HOWL avahi_compat_howldir=$(includedir)/avahi-compat-howl avahi_compat_howl_rendezvousdir=$(avahi_compat_howldir)/rendezvous @@ -70,7 +71,9 @@ HOWLHEADERS = \ lib_LTLIBRARIES = libavahi-compat-howl.la +if ENABLE_TESTS noinst_PROGRAMS = address-test text-test browse-domain-test +endif libavahi_compat_howl_la_SOURCES = \ $(HOWLHEADERS) \ @@ -105,3 +108,4 @@ browse_domain_test_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I $(srcdir)/include browse_domain_test_LDADD = $(AM_LDADD) libavahi-compat-howl.la endif +endif diff --git a/avahi-compat-howl/samples/Makefile.am b/avahi-compat-howl/samples/Makefile.am index 14bbfb7..21d15a8 100644 --- a/avahi-compat-howl/samples/Makefile.am +++ b/avahi-compat-howl/samples/Makefile.am @@ -23,8 +23,11 @@ AM_CFLAGS=-I$(top_srcdir) -I$(top_srcdir)/avahi-compat-howl/include AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")' if HAVE_DBUS +if ENABLE_COMPAT_HOWL +if ENABLE_TESTS noinst_PROGRAMS = browse resolve publish query +endif browse_SOURCES = \ browse.c @@ -47,3 +50,4 @@ query_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I $(srcdir)/include query_LDADD = $(AM_LDADD) ../libavahi-compat-howl.la endif +endif diff --git a/avahi-compat-howl/text.c b/avahi-compat-howl/text.c index 1cd34fe..fb05acf 100644 --- a/avahi-compat-howl/text.c +++ b/avahi-compat-howl/text.c @@ -39,6 +39,22 @@ struct _sw_text_record { int buffer_valid; }; +#ifndef HAVE_STRLCPY + +static size_t strlcpy(char *dest, const char *src, size_t n) { + assert(dest); + assert(src); + + if (n > 0) { + strncpy(dest, src, n-1); + dest[n-1] = 0; + } + + return strlen(src); +} + +#endif + sw_result sw_text_record_init(sw_text_record *self) { assert(self); @@ -223,7 +239,7 @@ sw_result sw_text_record_iterator_next( if (avahi_string_list_get_pair(self->index, &mkey, &mvalue, &msize) < 0) return SW_E_UNKNOWN; - avahi_strlcpy(key, mkey, SW_TEXT_RECORD_MAX_LEN); + strlcpy(key, mkey, SW_TEXT_RECORD_MAX_LEN); memset(val, 0, SW_TEXT_RECORD_MAX_LEN); memcpy(val, mvalue, msize); *val_len = msize; |