+ * Include stdlib.h in adnshost.h.

[adns.git] / client / adnslogres.c

diff --git a/client/adnslogres.c b/client/adnslogres.c
index b567bf99e6a83d010085c18d7a3e069b1f6ab19c..a91af8702a82616b59674a0b5521846d00813290 100644 (file)
--- a/client/adnslogres.c
+++ b/client/adnslogres.c
@@ -78,13 +78,15 @@ retry:
       *addr= *rest= NULL;
       return buf;
     }
-  for (i= 1; i < 5; i ++) {
-    ptrs[i]= strchr(ptrs[i-1], (i == 4) ? ' ' : '.');
-    if (!ptrs[i] || ptrs[i]-ptrs[i-1] > 3) {
-      ptrs[0]++;
+  for (i= 1; i < 5; i++) {
+    ptrs[i]= ptrs[i-1];
+    while (isdigit(*ptrs[i]++));
+    if ((i == 4 && !isspace(ptrs[i][-1])) ||
+       (i != 4 && ptrs[i][-1] != '.') ||
+       (ptrs[i]-ptrs[i-1] > 4)) {
+      ptrs[0]= ptrs[i]-1;
       goto retry;
-    } else
-      ptrs[i]++;
+    }
   }
   sprintf(buf, "%.*s.%.*s.%.*s.%.*s.in-addr.arpa.",
          ptrs[4]-ptrs[3]-1, ptrs[3],
@@ -96,12 +98,12 @@ retry:
   return buf;
 }
 
-static void printline(char *start, char *addr, char *rest, char *domain) {
+static void printline(FILE *outf, char *start, char *addr, char *rest, char *domain) {
   if (domain)
-    printf("%.*s%s%s", addr - start, start, domain, rest);
+    fprintf(outf, "%.*s%s%s", addr - start, start, domain, rest);
   else
-    fputs(start, stdout);
-  if (ferror(stdout)) aargh("write output");
+    fputs(start, outf);
+  if (ferror(outf)) aargh("write output");
 }
 
 typedef struct logline {
@@ -110,33 +112,33 @@ typedef struct logline {
   adns_query query;
 } logline;
 
-static logline *readline(adns_state adns, int opts) {
+static logline *readline(FILE *inf, adns_state adns, int opts) {
   static char buf[MAXLINE];
   char *str;
   logline *line;
 
-  if (fgets(buf, MAXLINE, stdin)) {
+  if (fgets(buf, MAXLINE, inf)) {
     str= malloc(sizeof(*line) + strlen(buf) + 1);
     if (!str) aargh("malloc");
     line= (logline*)str;
     line->next= NULL;
     line->start= str+sizeof(logline);
     strcpy(line->start, buf);
-    str = ipaddr2domain(line->start, &line->addr, &line->rest);
+    str= ipaddr2domain(line->start, &line->addr, &line->rest);
     if (opts & OPT_DEBUG)
-       fprintf(stderr, "%s: adns_submit %s\n", progname, str);
+      msg("submitting %.*s -> %s", line->rest-line->addr, line->addr, str);
     if (adns_submit(adns, str, adns_r_ptr,
                    adns_qf_quoteok_cname|adns_qf_cname_loose,
                    NULL, &line->query))
       aargh("adns_submit");
     return line;
   }
-  if (!feof(stdin))
+  if (!feof(inf))
     aargh("fgets");
   return NULL;
 }
        
-static void proclog(int opts) {
+static void proclog(FILE *inf, FILE *outf, int opts) {
   int eof, err, len;
   adns_state adns;
   adns_answer *answer;
@@ -144,9 +146,12 @@ static void proclog(int opts) {
 
   errno= adns_init(&adns, (opts & OPT_DEBUG) ? adns_if_debug : 0, 0);
   if (errno) aargh("adns_init");
-  head= tail= readline(adns, opts);
+  head= tail= readline(inf, adns, opts);
   len= 1; eof= 0;
   while (head) {
+    if (opts & OPT_DEBUG)
+      msg("%d in queue; checking %.*s", len,
+         head->rest-head->addr, head->addr);
     if (eof || len > MAXPENDING)
       if (opts & OPT_POLL)
        err= adns_wait_poll(adns, &head->query, &answer, NULL);
@@ -155,22 +160,22 @@ static void proclog(int opts) {
     else
       err= adns_check(adns, &head->query, &answer, NULL);
     if (err != EAGAIN) {
-       printline(head->start, head->addr, head->rest,
-                 answer->status == adns_s_ok ? *answer->rrs.str : NULL);
-       line= head; head= head->next;
-       free(line); free(answer);
-       len--;
+      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);
+      len--;
     }
     if (!eof) {
-      line= readline(adns, opts);
+      line= readline(inf, adns, opts);
       if (!line)
        eof= 1;
       else {
        if (!head)
-         head = line;
+         head= line;
        else
-         tail->next = line;
-       tail = line;
+         tail->next= line;
+       tail= line;
        len++;
       }
     }
@@ -178,30 +183,54 @@ static void proclog(int opts) {
   adns_finish(adns);
 }
 
+static void usage(void) {
+  fprintf(stderr, "usage: %s [-d] [-p] [logfile]\n", progname);
+  exit(1);
+}
+
 int main(int argc, char *argv[]) {
   int c, opts;
+  FILE *inf;
 
-  progname= *argv;
+  progname= strrchr(*argv, '/');
+  if (progname)
+    progname++;
+  else
+    progname= *argv;
   opts= 0;
 
-  while ((c= getopt(argc, argv, "dp")) != -1) {
+  while ((c= getopt(argc, argv, "dp")) != -1)
     switch (c) {
     case 'd':
-      opts |= OPT_DEBUG;
+      opts|= OPT_DEBUG;
       break;
     case 'p':
-      opts |= OPT_POLL;
+      opts|= OPT_POLL;
       break;
     default:
-      fprintf(stderr, "usage: %s [-d] < logfile\n", progname);
-      exit(1);
+      usage();
     }
-    argc-= optind;
-    argv+= optind;
-  }
 
-  proclog(opts);
+  argc-= optind;
+  argv+= optind;
+
+  inf= NULL;
+  if (argc == 0)
+    inf= stdin;
+  else if (argc == 1)
+    inf= fopen(*argv, "r");
+  else
+    usage();
+
+  if (!inf)
+    aargh("couldn't open input");
+
+  proclog(inf, stdout, opts);
+
+  if (fclose(inf))
+    aargh("fclose input");
+  if (fclose(stdout))
+    aargh("fclose output");
 
-  if (fclose(stdout)) aargh("finish writing output");
   return 0;
 }