* allow the user to specify a static browse domain list in the configuration file

* remove "drop-root" configuration variable
* move the configuration variable "add-service-cookie" from [server] to [publish]
* reorder AVAHI_DOMAIN_BROWSER_xx defs


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

1 files changed, 10 insertions, 2 deletions

diff --git a/avahi-daemon/ini-file-parser.c b/avahi-daemon/ini-file-parser.c
index 03a3f8b..135876e 100644
--- a/avahi-daemon/ini-file-parser.c
+++ b/avahi-daemon/ini-file-parser.c
@@ -22,6 +22,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
+#include <ctype.h>
 
 #include <avahi-common/malloc.h>
 #include <avahi-core/log.h>
@@ -155,9 +156,16 @@ char** avahi_split_csv(const char *t) {
     i = r = avahi_new(char*, n_comma+2);
 
     for (;;) {
-        size_t l = strcspn(t, ",");
+        size_t n, l = strcspn(t, ",");
+        const char *c;
 
-        *(i++) = avahi_strndup(t, l);
+        /* Ignore leading blanks */
+        for (c = t, n = l; isblank(*c); c++, n--);
+
+        /* Ignore trailing blanks */
+        for (; n > 0 && isblank(c[n-1]); n--);
+
+        *(i++) = avahi_strndup(c, n);
 
         t += l;