X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=client%2Fadh-opts.c;h=2f1f1836379ae7f2ba77324dad271edf248a9e28;hb=HEAD;hp=1521b5cadb35c090a4c46d5630f4c622de8b71a1;hpb=138722f000939e5a176b27d498c76681bdf04860;p=adns.git diff --git a/client/adh-opts.c b/client/adh-opts.c index 1521b5c..deea7d4 100644 --- a/client/adh-opts.c +++ b/client/adh-opts.c @@ -4,15 +4,12 @@ * option handling tables etc. */ /* - * This file is part of adns, which is - * 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 file is part of adns, which is Copyright Ian Jackson + * and contributors (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 - * the Free Software Foundation; either version 2, or (at your option) + * the Free Software Foundation; either version 3, or (at your option) * any later version. * * This program is distributed in the hope that it will be useful, @@ -21,8 +18,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 "adnshost.h" @@ -32,6 +28,7 @@ int ov_verbose= 0; adns_rrtype ov_type= adns_r_none; int ov_search=0, ov_qc_query=0, ov_qc_anshost=0, ov_qc_cname=1; int ov_tcp=0, ov_cname=0, ov_afflags=0, ov_v6map=0, ov_format=fmt_default; +int ov_checkc=0; char *ov_id= 0; struct perqueryflags_remember ov_pqfr = { 1,1,1, tm_none }; @@ -45,11 +42,11 @@ static const struct optioninfo global_options[]= { "a", "asynch", &ov_asynch, 1 }, { ot_desconly, "answer/error output format and destination (see below):" }, - { ot_value, "Answers to stdout, errors as messages to stderr (default)", + { ot_value, "Answers to stdout, errors as messages to stderr (default)", "Fs", "fmt-simple", &ov_format, fmt_simple }, - { ot_value, "Answers and errors both to stdout in parseable format", + { ot_value, "Answers and errors both to stdout in parseable format", "Fi", "fmt-inline", &ov_format, fmt_inline }, - { ot_value, "Fully-parseable output format (default for --asynch)", + { ot_value, "Fully-parseable output format (default for --asynch)", "Fa", "fmt-asynch", &ov_format, fmt_asynch }, { ot_desconly, "global verbosity level:" }, @@ -59,6 +56,13 @@ static const struct optioninfo global_options[]= { "Vn", "no-quiet", &ov_verbose, 0 }, { ot_value, "Debugging mode", "Vd", "debug", &ov_verbose, adns_if_debug }, + + { ot_value, "Do not do for-developer consistency checks", + 0, "no-checkc", &ov_checkc, 0 }, + { ot_value, "Do for-developer consistency checks", + 0, "checkc", &ov_checkc, adns_if_checkc_freq }, + { ot_value, "Do for-developer consistency checks very often", + 0, "checkc-freq", &ov_checkc, adns_if_checkc_freq }, { ot_desconly, "other global options:" }, { ot_funcarg, "Configuration to use instead of /etc/resolv.conf", @@ -127,7 +131,7 @@ static const struct optioninfo perquery_options[]= { { ot_desconly, "asynchronous/pipe mode options:" }, { ot_funcarg, "Set , default is decimal sequence starting 0", 0, "asynch-id", 0,0, &of_asynch_id, "id" }, - { ot_funcarg, "Cancel the query with id (no error if not found)", + { ot_funcarg, "Cancel the query with id (no error if not found)", 0, "cancel-id", 0,0, &of_cancel_id, "id" }, { ot_end }