X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fsetup.c;h=c52966d22547089cd9226fa080a391b537734625;hb=f0280eaeb6f5a74d9c7508fdda1a15d373fcefc9;hp=c5ffed6337ea2c68fb84fdacaaefbe58bff60890;hpb=aed8dc89c34d42cd8d20e1b1c2aa110785fa5595;p=adns.git

diff --git a/src/setup.c b/src/setup.c
index c5ffed6..c52966d 100644
--- a/src/setup.c
+++ b/src/setup.c
@@ -260,90 +260,93 @@ static void ccf_sortlist(adns_state ads, const char *fn,
 
 static void ccf_options(adns_state ads, const char *fn,
 			int lno, const char *buf) {
-  const char *word, *rhs;
+  const char *opt, *word, *endword, *endopt;
   char *ep;
   unsigned long v;
-  int i,l;
+  int l;
 
   if (!buf) return;
 
-#define OPTION__IS(s,op) (l op (sizeof(s)-1) && !memcmp(word,s,(sizeof(s)-1)))
-#define OPTION_IS(s)     (OPTION__IS(s,==))
-#define OPTION_STARTS(s) (OPTION__IS(s,>=) ? ((rhs=word+sizeof(s)-1)) : 0)
+#define WORD__IS(s,op) ((endword-word) op (sizeof(s)-1) && \
+			  !memcmp(word,s,(sizeof(s)-1)))
+#define WORD_IS(s)     (WORD__IS(s,==))
+#define WORD_STARTS(s) (WORD__IS(s,>=) ? ((word+=sizeof(s)-1)) : 0)
 
   while (nextword(&buf,&word,&l)) {
-    if (OPTION_IS("debug")) {
+    opt=word;
+    endopt=endword=word+l;
+    if (WORD_IS("debug")) {
       ads->iflags |= adns_if_debug;
       continue;
     }
-    if (OPTION_STARTS("ndots:")) {
-      v= strtoul(rhs,&ep,10);
-      if (ep==rhs || ep != word+l || v > INT_MAX) {
+    if (WORD_STARTS("ndots:")) {
+      v= strtoul(word,&ep,10);
+      if (ep==word || ep != endword || v > INT_MAX) {
 	configparseerr(ads,fn,lno,"option `%.*s' malformed"
-		       " or has bad value",l,word);
+		       " or has bad value",l,opt);
 	continue;
       }
       ads->searchndots= v;
       continue;
     }
-    if (OPTION_STARTS("adns_checkc:")) {
-      if (!strcmp(rhs,"none")) {
+    if (WORD_STARTS("adns_checkc:")) {
+      if (WORD_IS("none")) {
 	ads->iflags &= ~adns_if_checkc_freq;
 	ads->iflags |= adns_if_checkc_entex;
-      } else if (!strcmp(rhs,"entex")) {
+      } else if (WORD_IS("entex")) {
 	ads->iflags &= ~adns_if_checkc_freq;
 	ads->iflags |= adns_if_checkc_entex;
-      } else if (!strcmp(rhs,"freq")) {
+      } else if (WORD_IS("freq")) {
 	ads->iflags |= adns_if_checkc_freq;
       } else {
 	configparseerr(ads,fn,lno, "option adns_checkc has bad value `%s' "
-		       "(must be none, entex or freq", rhs);
+		       "(must be none, entex or freq", word);
       }
       continue;
     }
-    if (OPTION_STARTS("adns_af:")) {
-      word= rhs;
+    if (WORD_STARTS("adns_af:")) {
       ads->iflags &= ~adns_if_afmask;
-      if (strcmp(word,"any")) for (;;) {
-	i= strcspn(word,",");
-	if (i>=4 && !memcmp(word,"ipv4",4))
+      if (!WORD_IS("any")) for (;;) {
+	const char *comma= memchr(word,',',endopt-word);
+	endword=comma?comma:endopt;
+	if (WORD_IS("ipv4"))
 	  ads->iflags |= adns_if_permit_ipv4;
-	else if (i>=4 && !memcmp(word,"ipv6",4))
+	else if (WORD_IS("ipv6"))
 	  ads->iflags |= adns_if_permit_ipv6;
 	else {
 	  configparseerr(ads,fn,lno, "option adns_af has bad value `%.*s' "
 			 "(must be `any' or list {`ipv4',`ipv6'},...)",
-			 i, word);
+			 (int)(endword-word), word);
 	  break;
 	}
-	if (!word[i]) break;
-	word= word + i + 1;
+	if (!comma) break;
+	word= comma+1;
       }
       continue;
     }
-    if (OPTION_IS("adns_ignoreunkcfg")) {
+    if (WORD_IS("adns_ignoreunkcfg")) {
       ads->config_report_unknown=0;
       continue;
     }
     if (/* adns's query strategy is not configurable */
-	OPTION_STARTS("timeout:") ||
-	OPTION_STARTS("attempts:") ||
-	OPTION_IS("rotate") ||
+	WORD_STARTS("timeout:") ||
+	WORD_STARTS("attempts:") ||
+	WORD_IS("rotate") ||
 	/* adns provides the application with knob for this */
-	OPTION_IS("no-check-names") ||
+	WORD_IS("no-check-names") ||
 	/* adns normally does IPv6 if the application wants it; control
 	 * this with the adns_af: option if you like */
-	OPTION_IS("inet6") ||
+	WORD_IS("inet6") ||
 	/* adns does not do edns0 and this is not a problem */
-	OPTION_IS("edns0"))
+	WORD_IS("edns0"))
       continue;
     if (ads->config_report_unknown)
-      adns__diag(ads,-1,0,"%s:%d: unknown option `%.*s'", fn,lno, l,word);
+      adns__diag(ads,-1,0,"%s:%d: unknown option `%.*s'", fn,lno, l,opt);
   }
 
-#undef OPTION__IS
-#undef OPTION_IS
-#undef OPTION_STARTS
+#undef WORD__IS
+#undef WORD_IS
+#undef WORD_STARTS
 }
 
 static void ccf_clearnss(adns_state ads, const char *fn,