X-Git-Url: https://git.distorted.org.uk/~mdw/adns/blobdiff_plain/22181a31434b2439e41200ec65a95cb8605d41f5..dcc8e4427a046c05f9d3582c919ff276645a449a:/client/adnstest.c

diff --git a/client/adnstest.c b/client/adnstest.c
index 9828ee0..6c2fc61 100644
--- a/client/adnstest.c
+++ b/client/adnstest.c
@@ -99,7 +99,7 @@ int main(int argc, char *const *argv) {
   if (argv[0] && argv[1] && argv[1][0] == ':') {
     for (cp= argv[1]+1, tc=1; (ch= *cp); cp++)
       if (ch==',') tc++;
-    types_a= malloc(sizeof(*types_a)*tc);
+    types_a= malloc(sizeof(*types_a)*(tc+1));
     if (!types_a) { perror("malloc types"); exit(3); }
     for (cp= argv[1]+1, ti=0; ti<tc; ti++) {
       types_a[ti]= strtoul(cp,&cp,10);
@@ -111,6 +111,7 @@ int main(int argc, char *const *argv) {
 	cp++;
       }
     }
+    *cp++= adns_r_none;
     types= types_a;
     argv++;
   } else {
@@ -135,7 +136,7 @@ int main(int argc, char *const *argv) {
   for (qi=0; qi<qc; qi++) {
     fdom_split(fdomlist[qi],&domain,&qflags);
     for (ti=0; ti<tc; ti++) {
-      fprintf(stdout,"%s type %d flags %d",domain,types[ti],qflags);
+      fprintf(stdout,"%s flags %d type %d",domain,qflags,types[ti]);
       r= adns_submit(ads,domain,types[ti],qflags,0,&qus[qi*tc+ti]);
       if (r == adns_s_unknownrrtype) {
 	fprintf(stdout," not implemented\n");
@@ -164,10 +165,10 @@ int main(int argc, char *const *argv) {
       if (gettimeofday(&now,0)) { perror("gettimeofday"); exit(3); }
       
       ri= adns_rr_info(ans->type, &rrtn,&fmtn,&len, 0,0);
-      fprintf(stdout, "%s type ",domain);
+      fprintf(stdout, "%s flags %d type ",domain,qflags);
       dumptype(ri,rrtn,fmtn);
-      fprintf(stdout, " flags %d: %s; nrrs=%d; cname=%s; owner=%s; ttl=%ld\n",
-	      qflags, adns_strerror(ans->status),
+      fprintf(stdout, ": %s; nrrs=%d; cname=%s; owner=%s; ttl=%ld\n",
+	      adns_strerror(ans->status),
 	      ans->nrrs,
 	      ans->cname ? ans->cname : "$",
 	      ans->owner ? ans->owner : "$",
@@ -175,7 +176,7 @@ int main(int argc, char *const *argv) {
       if (ans->nrrs) {
 	assert(!ri);
 	for (i=0; i<ans->nrrs; i++) {
-	  r= adns_rr_info(ans->type, 0,0,0, ans->rrs.bytes+i*len,&show);
+	  r= adns_rr_info(ans->type, 0,0,0, ans->rrs.bytes + i*len, &show);
 	  if (r) failure("info",r);
 	  fprintf(stdout," %s\n",show);
 	  free(show);