Migrated show_content_aux2() to argsplit().

[nmh] / uip / conflict.c

diff --git a/uip/conflict.c b/uip/conflict.c
index d8c45669720075eb9f96e825b6d783725db84cf9..4c140022345c04285d1ac032186e2c537077c576 100644 (file)
--- a/uip/conflict.c
+++ b/uip/conflict.c
@@ -68,14 +68,7 @@ main (int argc, char **argv)
     char *cp, **argp, **arguments;
     char buf[BUFSIZ], *akv[50];
 
-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex (argv[0], '/');
-
-    /* foil search of user profile/context */
-    if (context_foil (NULL) == -1)
-       done (1);
+    if (nmh_init(argv[0], 0 /* use context_foil() */)) { return 1; }
 
     mts_init (invo_name);
     arguments = getarguments (invo_name, argc, argv, 0);
@@ -366,7 +359,7 @@ setup (void)
                        close (fd);
                    }
                execlp (mailproc, r1bindex (mailproc, '/'),
-                       mail, "-subject", invo_name, NULL);
+                       mail, "-subject", invo_name, (void *) NULL);
                adios (mailproc, "unable to exec ");
 
            default: