* 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-2000 Tony Finch <dot@dotat.at>
+ * Copyright (C) 1997-2000,2003,2006 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 program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include "config.h"
#include "adns.h"
+#include "client.h"
#ifdef ADNS_REGRESS_TEST
# include "hredirect.h"
}
}
sprintf(buf, "%.*s.%.*s.%.*s.%.*s.in-addr.arpa.",
- ptrs[4]-ptrs[3]-1, ptrs[3],
- ptrs[3]-ptrs[2]-1, ptrs[2],
- ptrs[2]-ptrs[1]-1, ptrs[1],
- ptrs[1]-ptrs[0]-1, ptrs[0]);
+ (int)(ptrs[4]-ptrs[3]-1), ptrs[3],
+ (int)(ptrs[3]-ptrs[2]-1), ptrs[2],
+ (int)(ptrs[2]-ptrs[1]-1), ptrs[1],
+ (int)(ptrs[1]-ptrs[0]-1), ptrs[0]);
*addr= ptrs[0];
*rest= ptrs[4]-1;
return buf;
static void printline(FILE *outf, char *start, char *addr, char *rest, char *domain) {
if (domain)
- fprintf(outf, "%.*s%s%s", addr - start, start, domain, rest);
+ fprintf(outf, "%.*s%s%s", (int)(addr - start), start, domain, rest);
else
fputs(start, outf);
if (ferror(outf)) aargh("write output");
strcpy(line->start, buf);
str= ipaddr2domain(line->start, &line->addr, &line->rest);
if (opts & OPT_DEBUG)
- msg("submitting %.*s -> %s", line->rest-line->addr, guard_null(line->addr), str);
+ msg("submitting %.*s -> %s", (int)(line->rest-line->addr), guard_null(line->addr), str);
if (adns_submit(adns, str, adns_r_ptr,
adns_qf_quoteok_cname|adns_qf_cname_loose,
NULL, &line->query))
while (head) {
if (opts & OPT_DEBUG)
msg("%d in queue; checking %.*s", len,
- head->rest-head->addr, guard_null(head->addr));
+ (int)(head->rest-head->addr), guard_null(head->addr));
if (eof || len >= maxpending) {
if (opts & OPT_POLL)
err= adns_wait_poll(adns, &head->query, &answer, NULL);
}
static void printhelp(FILE *file) {
- fprintf(file, "usage: %s [-d] [-p] [-c concurrency] [-C config] [logfile]\n",
- progname);
+ 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) {
extern char *optarg;
FILE *inf;
- if (argv[1] && !strcmp(argv[1],"--help")) {
- printhelp(stdout);
+ 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);
}