Releasing 1.1.

[adns.git] / client / adnslogres.c

diff --git a/client/adnslogres.c b/client/adnslogres.c
index fc6b2cd7ee20b63d47fd40607f170432b7b47cf4..2f13fb02fbca246ff6143f2c003c13f6a2d7aa9d 100644 (file)
--- a/client/adnslogres.c
+++ b/client/adnslogres.c
@@ -4,12 +4,12 @@
  */
 /*
  *  This file is
- *   Copyright (C) 1999 Tony Finch <dot@dotat.at>
+ *   Copyright (C) 1999-2000 Tony Finch <dot@dotat.at>
  *   Copyright (C) 1999-2000 Ian Jackson <ian@davenant.greenend.org.uk>
  *
  *  It is part of adns, which is
  *    Copyright (C) 1997-2000 Ian Jackson <ian@davenant.greenend.org.uk>
- *    Copyright (C) 1999 Tony Finch <dot@dotat.at>
+ *    Copyright (C) 1999-2000 Tony Finch <dot@dotat.at>
  *  
  *  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
@@ -46,6 +46,11 @@ static const char * const cvsid =
 
 #include "config.h"
 #include "adns.h"
+#include "client.h"
+
+#ifdef ADNS_REGRESS_TEST
+# include "hredirect.h"
+#endif
 
 /* maximum number of concurrent DNS queries */
 #define MAXMAXPENDING 64000
@@ -58,7 +63,7 @@ static const char * const cvsid =
 #define OPT_DEBUG 1
 #define OPT_POLL 2
 
-static const char *progname;
+static const char *const progname= "adnslogres";
 static const char *config_text;
 
 #define guard_null(str) ((str) ? (str) : "")
@@ -180,7 +185,7 @@ static void proclog(FILE *inf, FILE *outf, int maxpending, int opts) {
       if (opts & OPT_DEBUG)
        msg("%d in queue; checking %.*s", len,
            head->rest-head->addr, guard_null(head->addr));
-      if (eof || len > maxpending) {
+      if (eof || len >= maxpending) {
        if (opts & OPT_POLL)
          err= adns_wait_poll(adns, &head->query, &answer, NULL);
        else
@@ -189,10 +194,15 @@ static void proclog(FILE *inf, FILE *outf, int maxpending, int opts) {
        err= adns_check(adns, &head->query, &answer, NULL);
       }
       if (err == EAGAIN) break;
+      if (err) {
+       fprintf(stderr, "%s: adns_wait/check: %s", progname, strerror(err));
+       exit(1);
+      }
       printline(outf, head->start, head->addr, head->rest,
                answer->status == adns_s_ok ? *answer->rrs.str : NULL);
       line= head; head= head->next;
-      free(line); free(answer);
+      free(line);
+      free(answer);
       len--;
     }
     if (!eof) {
@@ -209,9 +219,18 @@ static void proclog(FILE *inf, FILE *outf, int maxpending, int opts) {
   adns_finish(adns);
 }
 
+static void printhelp(FILE *file) {
+  fputs("usage: adnslogres [<options>] [<logfile>]\n"
+       "       adnslogres --version|--help\n"
+       "options: -c <concurrency>  set max number of outstanding queries\n"
+       "         -p                use poll(2) instead of select(2)\n"
+       "         -d                turn on debugging\n"
+       "         -C <config>       use instead of contents of resolv.conf\n",
+       stdout);
+}
+
 static void usage(void) {
-  fprintf(stderr, "usage: %s [-d] [-p] [-c concurrency] [-C config] [logfile]\n",
-         progname);
+  printhelp(stderr);
   exit(1);
 }
 
@@ -220,11 +239,17 @@ int main(int argc, char *argv[]) {
   extern char *optarg;
   FILE *inf;
 
-  progname= strrchr(*argv, '/');
-  if (progname)
-    progname++;
-  else
-    progname= *argv;
+  if (argv[1] && !strncmp(argv[1],"--",2)) {
+    if (!strcmp(argv[1],"--help")) {
+      printhelp(stdout);
+    } else if (!strcmp(argv[1],"--version")) {
+      fputs(VERSION_MESSAGE("adnslogres"),stdout);
+    } else {
+      usage();
+    }
+    if (ferror(stdout) || fclose(stdout)) { perror("stdout"); exit(1); }
+    exit(0);
+  }
 
   maxpending= DEFMAXPENDING;
   opts= 0;