X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fparse.c;h=5c4bdaf7a9196fe9ffbc67eb52c8dbd4c21cc427;hb=0f091044f8998faba2becd0f8c3ad9d5bc5976fb;hp=842556a79ae55ff93a540597ecd4b7a70d4c3dc2;hpb=73dba56e1981d7fe721acf17d0cd91a4fed04850;p=adns.git diff --git a/src/parse.c b/src/parse.c index 842556a..5c4bdaf 100644 --- a/src/parse.c +++ b/src/parse.c @@ -117,18 +117,28 @@ adns_status adns__parse_domain(adns_state ads, int serv, adns_query qu, const byte *dgram, int dglen, int *cbyte_io, int max) { findlabel_state fls; - int lablen, labstart, i, ch; - adns_status st; - adns__findlabel_start(&fls,ads, serv,qu, dgram,dglen,max, *cbyte_io,cbyte_io); vb->used= 0; + return adns__parse_domain_more(&fls,ads,qu, vb,flags,dgram); +} + +adns_status adns__parse_domain_more(findlabel_state *fls, adns_state ads, + adns_query qu, vbuf *vb, parsedomain_flags flags, + const byte *dgram) { + int lablen, labstart, i, ch, first; + adns_status st; + + first= 1; for (;;) { - st= adns__findlabel_next(&fls,&lablen,&labstart); + st= adns__findlabel_next(fls,&lablen,&labstart); if (st) return st; if (lablen<0) { vb->used=0; return adns_s_ok; } if (!lablen) break; - if (vb->used) + if (first) { + first= 0; + } else { if (!adns__vbuf_append(vb,".",1)) return adns_s_nomemory; + } if (flags & pdf_quoteok) { if (!vbuf__append_quoted1035(vb,dgram+labstart,lablen)) return adns_s_nomemory;