+ * adnshost prints somewhat better messages about some wrong usages.

@@ -3,6 +3,7 @@
   Bugfixes:
+  * adnshost prints somewhat better messages about some wrong usages.

diff --git a/changelog b/changelog
index 835d1ccd4011a920b7f45df0fa914aa01be29050..a3c0da5e7e8cdea3bbdb0b2e9bc5b12ccb0e8f30 100644 (file)
--- a/changelog
+++ b/changelog
@@ -3,6 +3,7 @@ adns (0.6) unstable; urgency=medium
   Bugfixes:
   * Do not fail assertion if _qf_owner, _qf_search, domain ends in `.'.
   * Dynamic library building works properly.
+  * adnshost prints somewhat better messages about some wrong usages.
 
  --
 

diff --git a/client/adh-opts.c b/client/adh-opts.c
index 5b38dea77cef737480f6633e173752077baf9533..5d9ddb938746b1bd35ec81912366796ba83aa7e0 100644 (file)
--- a/client/adh-opts.c
+++ b/client/adh-opts.c
@@ -285,12 +285,14 @@ static const struct optioninfo *find(const char **optp,
                                     const char *prefix,
                                     comparer_type *comparer) {
   const struct optioninfo *oip;
+  const char *opt;
 
+  opt= *optp;
   oip= find1(optp,perquery_options,comparer);
   if (oip) return oip;
   oip= find1(optp,global_options,comparer);
-  if (!oip) usageerr("unknown option %s%s",prefix,*optp);
-  if (ads) usageerr("global option %s%s specified after query domain(s)",prefix,*optp);
+  if (!oip) usageerr("unknown option %s%s",prefix,opt);
+  if (ads) usageerr("global option %s%s specified after query domain(s)",prefix,opt);
   return oip;
 }