Moved #include of errno.h to h/nmh.h.

[nmh] / uip / mhparam.c

diff --git a/uip/mhparam.c b/uip/mhparam.c
index 1fb50a724d41d9e57592fa68db7dccc0c7e67e35..a1ca28f75d3d597ffa8a458fe9dfa9fbc015c34b 100644 (file)
--- a/uip/mhparam.c
+++ b/uip/mhparam.c
@@ -12,11 +12,6 @@
 
 #include <h/mh.h>
 
 
 #include <h/mh.h>
 

-extern char *mhlibdir;
-extern char *mhetcdir;
-
-char *sbackup = BACKUP_PREFIX;
-

 #define MHPARAM_SWITCHES \
     X("components", 0, COMPSW) \
     X("nocomponents", 0, NCOMPSW) \
 #define MHPARAM_SWITCHES \
     X("components", 0, COMPSW) \
     X("nocomponents", 0, NCOMPSW) \


@@ -33,6 +28,25 @@ DEFINE_SWITCH_ENUM(MHPARAM);
 DEFINE_SWITCH_ARRAY(MHPARAM, switches);
 #undef X
 
 DEFINE_SWITCH_ARRAY(MHPARAM, switches);
 #undef X
 

+extern char *mhlibdir;
+extern char *mhetcdir;
+
+char *sbackup = BACKUP_PREFIX;
+
+char *lockmethod =
+#if defined FCNTL_LOCKING
+    "fcntl"
+#elif defined FLOCK_LOCKING
+    "flock"
+#elif defined LOCKF_LOCKING
+    "lockf"
+#elif defined DOT_LOCKING
+    "dot"
+#else
+    "none"
+#endif
+    ;
+

 struct proc {
     char *p_name;
     char **p_field;
 struct proc {
     char *p_name;
     char **p_field;


@@ -46,7 +60,6 @@ static struct proc procs [] = {
      { "foldprot",      &foldprot },
      { "formatproc",   &formatproc },
      { "incproc",       &incproc },
      { "foldprot",      &foldprot },
      { "formatproc",   &formatproc },
      { "incproc",       &incproc },

-     { "installproc",   &installproc  },

      { "lproc",         &lproc },
      { "mailproc",      &mailproc },
      { "mhlproc",       &mhlproc },
      { "lproc",         &lproc },
      { "mailproc",      &mailproc },
      { "mhlproc",       &mhlproc },


@@ -66,6 +79,7 @@ static struct proc procs [] = {
      { "etcdir",        &mhetcdir },
      { "libdir",        &mhlibdir },
      { "sbackup",       &sbackup },
      { "etcdir",        &mhetcdir },
      { "libdir",        &mhlibdir },
      { "sbackup",       &sbackup },

+     { "lockmethod",    &lockmethod },

      { NULL,            NULL },
 };
 
      { NULL,            NULL },
 };
 


@@ -187,7 +201,7 @@ p_find(char *str)
     struct proc *ps;
 
     for (ps = procs; ps->p_name; ps++)
     struct proc *ps;
 
     for (ps = procs; ps->p_name; ps++)

-       if (!mh_strcasecmp (ps->p_name, str))
+       if (!strcasecmp (ps->p_name, str ? str : ""))

            return (*ps->p_field);
 
     return NULL;
            return (*ps->p_field);
 
     return NULL;