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);
cp++;
}
}
+ *cp++= adns_r_none;
types= types_a;
argv++;
} else {
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");
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 : "$",
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);