X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/a57e5d9907d845d6f83d2cfdea55cd52efad793f..3b2ca65d6c8ffd443caa93bf89b0f9b61d9a4919:/uip/slocal.c

diff --git a/uip/slocal.c b/uip/slocal.c
index a26432c5..71c67b1e 100644
--- 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;
     }