New adnshost utility - currently only a usage message :-).

4 files changed, 123 insertions, 2 deletions

diff --git a/client/.cvsignore b/client/.cvsignore
index 7875d38..b942cd8 100644
--- a/client/.cvsignore
+++ b/client/.cvsignore
@@ -3,3 +3,5 @@ adnstest
 adnstest_s
 adnslogres
 adnslogres_s
+adnshost
+adnshost_s
diff --git a/client/Makefile.in b/client/Makefile.in
index fd161ff..c03b493 100644
--- a/client/Makefile.in
+++ b/client/Makefile.in
@@ -19,7 +19,7 @@
 srcdir=		@srcdir@
 VPATH=		@srcdir@
 
-PROGRAMS=	adnstest adnslogres
+PROGRAMS=	adnstest adnslogres adnshost
 TARG_INSTALL=	$(PROGRAMS)
 TARG_LOCAL=	$(addsuffix _s, $(PROGRAMS))
 TARGETS=	$(TARG_LOCAL) $(TARG_INSTALL)
diff --git a/client/adnshost.c b/client/adnshost.c
new file mode 100644
index 0000000..764cef5
--- /dev/null
+++ b/client/adnshost.c
@@ -0,0 +1,119 @@
+/*
+ * adnshost.c
+ * - useful general-purpose resolver client program
+ */
+/*
+ *  This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson
+ *  
+ *  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
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *  
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  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. 
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+
+#include "config.h"
+
+static void sysfail(const char *what, int errnoval) NONRETURNING;
+static void sysfail(const char *what, int errnoval) {
+  fprintf(stderr,"adnshost failed: %s: %s\n",what,strerror(errnoval));
+  exit(10);
+}
+
+
+static void printusage(void) {
+  if (fputs
+("usage: adnshost [global-opts] [query-opts] query-type query-domain\n"
+ "                             [[query-opts] [query-type] query-domain ...]\n"
+ "       adnshost [global-opts] [query-opts] -f|--pipe\n"
+ "\n"
+ "global binary options:\n"
+ "  +e  --no-env         No not look at environment variables at all.\n"
+ "  -f  --pipe           Read queries on stdin instead of using args.\n"
+ "  -A  --asynch         Allow answers to be reordered.\n"
+ "  -0  --null           stdin items are delimited by nulls.\n"
+ "global verbosity level:\n"
+ "  -vq  --quiet         Do not print anything to stderr.\n"
+ "  -vn  --no-quiet      Report unexpected kinds of problem only.\n"
+ "  -vd  --debug         Debugging mode.\n"
+ "other global options:\n"
+ "  --help, --version    Print usage or version information.\n"
+ "\n"
+ "per-query binary options:\n"
+ "  -R   --search        Use the search list.\n"
+ "  -Qq  --qc-query      Let query domains contain quote-requiring chars.\n"
+ "  -Qa  --qc-anshost    Let hostnames in answers contain ...\n"
+ "  +Qc  --no-qc-cname   Prevent CNAME target domains from  containing ...\n"
+ "  -u   --tcp           Force use of a virtual circuit.\n"
+ "  +fo  --no-owner      Do not display owner name in output.\n"
+ "  +ft  --no-type       Do not display RR type in output.\n"
+ "  +fc  --no-show-cname Do not display CNAME target in output.\n"
+ "per-query TTL mode (NB TTL is minimum across whole query reply):\n"
+ "  -Tt  --ttl-ttl       Show the TTL as a TTL.\n"
+ "  -Ta  --ttl-abs       Show the TTL as a time_t when the data might expire.\n"
+ "  -Tn  --no-ttl        Do not show the TTL (default).\n"
+ "per-query cname handling mode:\n"
+ "  -cf  --cname-reject  Call it an error if a CNAME is found.\n"
+ "  -cl  --cname-loose   Allow references to CNAMEs in other RRs.\n"
+ "  -cs  --cname-ok      CNAME ok for query domain, but not in RRs (default).\n"
+ "other per-query options:\n"
+ "  -I<id>           ) Set the <id> to print in the output with --async.\n"
+ "  --asynch-id <id> ) Default is a sequence number in decimal starting at 0.\n"
+ "\n"
+ "For binary options, --FOO and --no-FOO are opposites,\n"
+ "as are -X and +X; in each case the default is the one not listed.\n"
+ "Per query options stay set a particular way until they are reset,\n"
+ "whether they appear on the command line or on stdin.\n"
+ "\n"
+ "Output format is master file format without class or TTL by default:\n"
+ " [<owner>] [<ttl>] [<type>] <data>\n"
+ "or if the <owner> domain refers to a CNAME and --show-cname is on\n"
+ " [<owner>] [<ttl>] CNAME <cname>\n"
+ " [<cname>] [<ttl>] <type> <data>\n"
+ "When a query fails you get a line like:\n"
+ " ; failed <statustype> [<owner>] [<ttl>] [<type>] <status> \"<status string>\"\n"
+ "If you use --asynch, you don't get that.  Instead, each answer (success or\n"
+ "failure) is preceded by a line:\n"
+ " <id> <statustype> <status> <nrrs> [<cname>] \"<status string>\"\n"
+ "where <nrrs> is the number of RRs that follow and <cname> will be `$' or\n"
+ "the canonical name.\n"
+ "\n"
+ "With -f, the input should be a list of arguments one per line (ie separated\n"
+ "by newlines), or separated by null characters if -0 or --null was used\n"
+ "\n"
+ "Exit status:\n"
+ " 0    all went well\n"
+ " 1-6  at least one query failed with statustype:\n"
+ "   1    localfail   )\n"
+ "   2    remotefail  ) temporary errors\n"
+ "   3    tempfail  __)_________________\n"
+ "   4    misconfig   )\n"
+ "   5    misquery    ) permanent errors\n"
+ "   6    permfail    )\n"
+ " 10   system trouble\n"
+ " 11   usage problems\n"
+ "\n"
+ "Query types (see adns.h):\n"
+ "  NS  SOA  PTR  MX  RP  A          - enhanced versions\n"
+ "  CNAME  HINFO  TXT                - types with only one version\n"
+ "  A-  NS-  SOA-  PTR-  MX-  RP-    - _raw versions\n",
+ stdout) == EOF) sysfail("write usage message",errno);
+}
+
+int main(int argc, const char *const *argv) {
+  printusage();
+  if (fclose(stdout)) sysfail("finish writing output",errno);
+  exit(0);
+}
diff --git a/client/adnstest.c b/client/adnstest.c
index 7a69170..b994e7b 100644
--- a/client/adnstest.c
+++ b/client/adnstest.c
@@ -1,5 +1,5 @@
 /*
- * dtest.c
+ * adnstest.c
  * - simple test program, not part of the library
  */
 /*