Add a new (but incomplete) test for mhbuild's new functionality.

[nmh] / uip / install-mh.c

diff --git a/uip/install-mh.c b/uip/install-mh.c
index 34aed9505cdc4ff01ab6245ea0bfa5ec474bc834..12377352a8c71ea6c4ca5fc824602d938fc4d0f2 100644 (file)
--- a/uip/install-mh.c
+++ b/uip/install-mh.c
@@ -1,27 +1,28 @@
 /*
  * install-mh.c -- initialize the nmh environment of a new user
  *
 /*
  * install-mh.c -- initialize the nmh environment of a new user
  *

- * $Id$
- *

  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
  */
 
 #include <h/mh.h>                              /* mh internals */
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
  */
 
 #include <h/mh.h>                              /* mh internals */

+#include <h/utils.h>

 #include <pwd.h>                               /* structure for getpwuid() results */
 
 #include <pwd.h>                               /* structure for getpwuid() results */
 

-static struct swit switches[] = {
-#define AUTOSW     0
-    { "auto", 0 },
-#define VERSIONSW  1
-    { "version", 0 },
-#define HELPSW     2
-    { "help", 0 },
-#define CHECKSW     3
-    { "check", 1 },
-    { NULL, 0 }
-};
+#define INSTALLMH_SWITCHES \
+    X("auto", 0, AUTOSW) \
+    X("version", 0, VERSIONSW) \
+    X("help", 0, HELPSW) \
+    X("check", 1, CHECKSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(INSTALLMH);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(INSTALLMH, switches);
+#undef X

 
 /*
  * static prototypes
 
 /*
  * static prototypes


@@ -41,10 +42,8 @@ main (int argc, char **argv)
     FILE *in, *out;
     int                check;
 
     FILE *in, *out;
     int                check;
 

-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex (argv[0], '/');
+    if (nmh_init(argv[0], 0 /* use context_foil() */ )) { return 1; }
+

     arguments = getarguments (invo_name, argc, argv, 0);
     argp = arguments;
 
     arguments = getarguments (invo_name, argc, argv, 0);
     argp = arguments;
 


@@ -62,10 +61,10 @@ main (int argc, char **argv)
                case HELPSW:
                    snprintf (buf, sizeof(buf), "%s [switches]", invo_name);
                    print_help (buf, switches, 0);
                case HELPSW:
                    snprintf (buf, sizeof(buf), "%s [switches]", invo_name);
                    print_help (buf, switches, 0);

-                   done (1);
+                   done (0);

                case VERSIONSW:
                    print_version(invo_name);
                case VERSIONSW:
                    print_version(invo_name);

-                   done (1);
+                   done (0);

 
                case AUTOSW:
                    autof++;
 
                case AUTOSW:
                    autof++;


@@ -180,8 +179,7 @@ query:
     /*
      * Add some initial elements to the profile/context list
      */
     /*
      * Add some initial elements to the profile/context list
      */

-    if (!(m_defs = (struct node *) malloc (sizeof *np)))
-       adios (NULL, "unable to allocate profile storage");
+    m_defs = (struct node *) mh_xmalloc (sizeof *np);

     np = m_defs;
     np->n_name = getcpy ("Path");
     np->n_field = getcpy (pathname);
     np = m_defs;
     np->n_name = getcpy ("Path");
     np->n_field = getcpy (pathname);


@@ -213,7 +211,8 @@ query:
            fprintf (out, "%s: %s\n", np->n_name, np->n_field);
     }
     fclose (out);
            fprintf (out, "%s: %s\n", np->n_name, np->n_field);
     }
     fclose (out);

-    return done (0);
+    done (0);
+    return 1;

 }
 
 
 }