Fix typo in changelog entry for 1.6.1

[adns.git] / client / adnstest.c

diff --git a/client/adnstest.c b/client/adnstest.c
index 8667a41aa7102fc07bc592525cb2f7cc1b2acaaf..0984399ed7be627af0b4fdda7e79c845b8aa80c8 100644 (file)
--- a/client/adnstest.c
+++ b/client/adnstest.c
@@ -3,11 +3,8 @@
  * - simple test program, not part of the library
  */
 /*
- *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014  Ian Jackson
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -37,6 +34,9 @@
 
 #ifdef ADNS_REGRESS_TEST
 # include "hredirect.h"
+# include "harness.h"
+# undef exit
+# define exit Texit
 #endif
 
 struct myctx {
@@ -101,6 +101,7 @@ static void usageerr(const char *why) {
          "initflags:   p  use poll(2) instead of select(2)\n"
          "             s  use adns_wait with specified query, instead of 0\n"
          "queryflags:  a  print status abbrevs instead of strings\n"
+         "typenum:      may be 0x<hex>|<dec>, or 0x<hex> or <dec>\n"
          "exit status:  0 ok (though some queries may have failed)\n"
          "              1 used by test harness to indicate test failed\n"
          "              2 unable to submit or init or some such\n"
@@ -206,12 +207,19 @@ int main(int argc, char *const *argv) {
       if (ch==',') tc++;
     types_a= malloc(sizeof(*types_a)*(tc+1));
     if (!types_a) { perror("malloc types"); quitnow(3); }
-    for (cp= argv[1]+1, ti=0; ti<tc; ti++) {
-      types_a[ti]= strtoul(cp,&cp,10);
-      if ((ch= *cp)) {
-       if (ch != ',') usageerr("unexpected char (not comma) in or between types");
+    for (cp= argv[1]+1, ti=0; ti<tc; ) {
+      types_a[ti]= 0;
+      for (;;) {
+       types_a[ti] |= strtoul(cp,&cp,0);
+       ch= *cp;
+       if (!ch) break;
        cp++;
+       if (ch=='|') continue;
+       if (ch==',') break;
+       usageerr("unexpected char (not comma) in or between types");
       }
+      ti++;
+      if (!ch) break;
     }
     types_a[ti]= adns_r_none;
     types= types_a;