Replace getcpy() with mh_xstrdup() where the string isn't NULL.

[nmh] / uip / slocal.c

diff --git a/uip/slocal.c b/uip/slocal.c
index a26432c5da36e53f27b6bfc8fec02c770d411f8d..71c67b1ea4aec6dcffb4064e98265abd168c4069 100644 (file)
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -190,7 +190,7 @@ main (int argc, char **argv)
 
     if (nmh_init(argv[0], 0 /* use context_foil() */)) { return 1; }
 
-    mts_init (invo_name);
+    mts_init ();
     arguments = getarguments (invo_name, argc, argv, 0);
     argp = arguments;
 
@@ -273,8 +273,9 @@ main (int argc, char **argv)
 
     if (addr == NULL)
        addr = getusername ();
-    if (user == NULL)
-       user = (cp = strchr(addr, '.')) ? ++cp : addr;
+    if (user == NULL) {
+       user = getusername ();
+    }
     if ((pw = getpwnam (user)) == NULL)
        adios (NULL, "no such local user as %s", user);
 
@@ -1162,7 +1163,7 @@ get_sender (char *envelope, char **sender)
     char buffer[BUFSIZ];
 
     if (envelope == NULL) {
-       *sender = getcpy ("");
+       *sender = mh_xstrdup("");
        return;
     }