changelog: Document changes in 1.6.0 and finalise version number

[adns.git] / client / adnstest.c

diff --git a/client/adnstest.c b/client/adnstest.c
index 0c6b04eda7e4a5fab4565000ba586675b0035a17..2198ebcdd23ad169be0f5487643619f6548065ad 100644 (file)
--- a/client/adnstest.c
+++ b/client/adnstest.c
@@ -4,7 +4,8 @@
  */
 /*
  *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006  Ian Jackson
+ *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
+ *    Copyright (C) 2014  Mark Wooding
  *    Copyright (C) 1999-2000,2003,2006  Tony Finch
  *    Copyright (C) 1991 Massachusetts Institute of Technology
  *  (See the file INSTALL for full details.)
@@ -20,8 +21,7 @@
  *  GNU General Public License for more details.
  *  
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software Foundation,
- *  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
+ *  along with this program; if not, write to the Free Software Foundation.
  */
 
 #include <stdio.h>
@@ -38,6 +38,9 @@
 
 #ifdef ADNS_REGRESS_TEST
 # include "hredirect.h"
+# include "harness.h"
+# undef exit
+# define exit Texit
 #endif
 
 struct myctx {
@@ -102,6 +105,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"
@@ -207,12 +211,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;