bugfixes

[adns] / client / adh-opts.c

diff --git a/client/adh-opts.c b/client/adh-opts.c
index 6af9e021b84502a944972689f3242563951cdc7f..e7704a1341ac8faf8c17d02227b4164acdee3477 100644 (file)
--- a/client/adh-opts.c
+++ b/client/adh-opts.c
@@ -297,14 +297,28 @@ static const struct optioninfo *find(const char **optp,
 const struct optioninfo *opt_findl(const char *opt) { return find(&opt,"--",oc_long); }
 const struct optioninfo *opt_finds(const char **optp) { return find(optp,"-",oc_short); }
 
 const struct optioninfo *opt_findl(const char *opt) { return find(&opt,"--",oc_long); }
 const struct optioninfo *opt_finds(const char **optp) { return find(optp,"-",oc_short); }
 

-void opt_do(const struct optioninfo *oip, const char *arg) {
+static void noninvert(const struct optioninfo *oip) NONRETURNING;
+static void noninvert(const struct optioninfo *oip) {
+  usageerr("option %s%s%s%s%s may not be inverted",
+          oip->sopt ? "-" : "", oip->sopt ? oip->sopt : "",
+          oip->lopt && oip->sopt ? " / " : "",
+          oip->lopt ? "--" : "", oip->lopt ? oip->lopt : "");
+}
+
+void opt_do(const struct optioninfo *oip, const char *arg, int invert) {

   switch (oip->type) {
   switch (oip->type) {

-  case ot_flag: case ot_value:
+  case ot_flag:
+    assert(!arg);
+    *oip->storep= invert ? !oip->value : oip->value;
+    return;
+  case ot_value:

     assert(!arg);
     assert(!arg);

+    if (invert) noninvert(oip);

     *oip->storep= oip->value;
     return;
   case ot_func: case ot_funcarg:
     *oip->storep= oip->value;
     return;
   case ot_func: case ot_funcarg:

-    oip->func(oip,0);
+    if (invert) noninvert(oip);
+    oip->func(oip,arg);

     return;
   default:
     abort();
     return;
   default:
     abort();