Drop dependencies on argmatch and xgethostname.

4 files changed, 188 insertions, 190 deletions

diff --git a/NEWS b/NEWS
index 5a806d5..4bd6735 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,8 @@ See the end of file for copying conditions.
 Please send Wydawca bug reports to <bug-wydawca@gnu.org.ua>.
 
 
+Version 2.1.90 (Git)
+
 Version 2.1 "KMB", 2010-01-06
 
 * Incompatible changes
diff --git a/gnulib.modules b/gnulib.modules
index 61618ad..3d3f7f9 100644
--- a/gnulib.modules
+++ b/gnulib.modules
@@ -4,4 +4,3 @@ getline
 mkdtemp
 save-cwd
 backupfile
-xgethostname
diff --git a/src/config.c b/src/config.c
index 7353f29..df9816e 100644
--- a/src/config.c
+++ b/src/config.c
@@ -16,10 +16,40 @@
 
 #include "wydawca.h"
 #include "sql.h"
-#include "argmatch.h"
 #include <mail.h>
 
 
+struct keyword
+{
+  char *name;
+  int tok;
+};
+
+static int
+keyword_to_tok (const char *str, struct keyword *kw, int *pres)
+{
+  for (; kw->name; kw++)
+    if (strcmp (kw->name, str) == 0)
+      {
+        *pres = kw->tok;
+        return 0;
+      }
+  return 1;
+}
+
+static int
+tok_to_keyword (int tok, struct keyword *kw, const char **pres)
+{
+  for (; kw->name; kw++)
+    if (kw->tok == tok)
+      {
+        *pres = kw->name;
+        return 0;
+      }
+  return 1;
+}
+
+
 static struct archive_descr default_archive_descr = {
   archive_none,
   NULL,
@@ -35,7 +65,7 @@ static struct notification *default_notification = NULL;
    Strip trailing delimiter if present, unless it is the only character
    left. E.g.:
 
-         /home/user/../smith   -->   /home/smith
+         /home/user/../smith   -->   /home/smith
          /home/user/../..      -->   /
          ../file               -->   NULL
 */
@@ -123,102 +153,82 @@ safe_file_name_alloc (const char *file_name)
   return ns;
 }
 
-int
-string_to (const char *what, const char *str,
-           const char **args, int *vals,
-           int *pret,
-           grecs_locus_t *locus)
-{
-  ptrdiff_t x = ARGMATCH (str, args, vals);
-
-  if (x == (ptrdiff_t)-1)
-    {
-      grecs_error (locus, 0, _("unknown %s: %s"), what, str);
-      return 1;
-    }
-  else if (x == (ptrdiff_t)-2)
-    {
-      grecs_error (locus, 0, _("ambiguous %s: %s"), what, str);
-      return 1;
-    }
-  *pret = vals[x];
-  return 0;
-}
 
-static const char *event_args[] = {
-  "success",
-  "bad-ownership",
-  "bad-directive-signature",
-  "bad-detached-signature",
-  "check-failure",
-  NULL
-};
-
-static int event_types[] = {
-  ev_success,
-  ev_bad_ownership,
-  ev_bad_directive_signature,
-  ev_bad_detached_signature,
-  ev_check_fail
+static struct keyword event_tab[] = {
+  { "success", ev_success },
+  { "bad-ownership", ev_bad_ownership },
+  { "bad-directive-signature", ev_bad_directive_signature },
+  { "bad-detached-signature", ev_bad_detached_signature },
+  { "check-failure", ev_check_fail },
+  { NULL }
 };
 
-ARGMATCH_VERIFY (event_args, event_types);
-
 const char *
 notification_event_str (enum notification_event evt)
 {
-  return ARGMATCH_TO_ARGUMENT ((char*)&evt, event_args, event_types);
+  const char *ret;
+  if (tok_to_keyword (evt, event_tab, &ret))
+    {
+      grecs_error (NULL, 0,
+                   _("INTERNAL ERROR: unknown notification event number: %d"),
+                   evt);
+      return NULL;
+    }
+  return ret;
 }
 
 int
 string_to_notification_event (grecs_locus_t *locus, const char *val,
                               enum notification_event *pret)
 {
-  int rc, res;
-  rc = string_to ("notification event", val,
-                  event_args, event_types,
-                  &res,
-                  locus);
+  int res;
+  if (keyword_to_tok (val, event_tab, &res))
+    {
+      grecs_error (locus, 0, _("unknown notification event: %s"), val);
+      return 1;
+    }
   *pret = res;
-  return rc;
+  return 0;
 }
 
-static const char *target_args[] = {
-  "read",
-  "message",
-  "admin",
-  "owner",
-  "user",
-  NULL
-};
-
-static int target_types[] = {
-  notify_read,         /* Read recipients from the message headers */
-  notify_read,
-  notify_admin,        /* System administrator */
-  notify_owner,        /* Project admin */
-  notify_user          /* User (uploader) */
+static struct keyword target_tab[] = {
+  { "read", notify_read },    /* Read recipients from the message headers */
+  { "message", notify_read },
+  { "admin", notify_admin},   /* System administrator */
+  { "owner", notify_owner },  /* Project admin */
+  { "user", notify_user },    /* User (uploader) */
+  { NULL }
 };
 
-ARGMATCH_VERIFY (target_args, target_types);
 
 const char *
 notification_target_str (enum notification_target tgt)
 {
-  return ARGMATCH_TO_ARGUMENT ((char*)&tgt, target_args, target_types);
+  const char *ret;
+  if (tok_to_keyword (tgt, target_tab, &ret))
+    {
+      grecs_error (NULL, 0,
+                   _("INTERNAL ERROR: unknown notification target number: %d"),
+                   tgt);
+      return NULL;
+    }
+  return ret;
 }
 
 int
 string_to_notification_target (grecs_locus_t *locus, const char *val,
                                enum notification_target *pret)
 {
-  int rc, res;
-  rc = string_to ("notification target", val,
-                  target_args, target_types,
-                  &res,
-                  locus);
+  int res;
+  if (keyword_to_tok (val, target_tab, &res))
+    {
+      grecs_error (locus, 0,
+                   _("unknown notification target: %s"),
+                   val);
+      return 1;
+    }
   *pret = res;
-  return rc;
+  return 0;
 }
 
 
@@ -328,7 +338,7 @@ cb_email_address (enum grecs_callback_command cmd,
       grecs_error (locus, 0, _("too many arguments"));
       return 1;
     }
-      
+
   *(mu_address_t*) varptr = addr;
   return rc;
 }
@@ -400,47 +410,29 @@ cb_set_umask (enum grecs_callback_command cmd,
 }