X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/521674623c320c70a9f0a731326329898e02360c..079b426e4e813191dedbf8ba4aa454adf2f0a46d:/uip/send.c

diff --git a/uip/send.c b/uip/send.c
index 31718392..5885c98e 100644
--- a/uip/send.c
+++ b/uip/send.c
@@ -62,8 +62,8 @@
     X("saslmaxssf", SASLminc(-10), SASLMXSSFSW) \
     X("saslmech mechanism", SASLminc(-5), SASLMECHSW) \
     X("user username", SASLminc(-4), USERSW) \
-    X("attach", 6, ATTACHSW) \
-    X("noattach", 0, NOATTACHSW) \
+    X("attach", -6, ATTACHSW) \
+    X("noattach", -8, NOATTACHSW) \
     X("attachformat", 7, ATTACHFORMATSW) \
     X("port server-port-name/number", 4, PORTSW) \
     X("tls", TLSminc(-3), TLSSW) \
@@ -118,13 +118,7 @@ main (int argc, char **argv)
     struct msgs *mp;
     struct stat st;
 
-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex (argv[0], '/');
-
-    /* read user profile/context */
-    context_read();
+    if (nmh_init(argv[0], 1)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
@@ -384,8 +378,12 @@ go_to_it:
 	    && (distsw = atoi (cp))
 	    && altmsg) {
 	vec[vecp++] = "-dist";
-	distfile = getcpy (m_mktemp2 (altmsg, invo_name, NULL, NULL));
-	unlink(distfile);
+	if ((cp = m_mktemp2(altmsg, invo_name, NULL, NULL)) == NULL) {
+	    adios(NULL, "unable to create temporary file in %s",
+		  get_temp_dir());
+	}
+	distfile = getcpy (cp);
+	(void) m_unlink(distfile);
 	if (link (altmsg, distfile) == NOTOK) {
 	    /* Cygwin with FAT32 filesystem produces EPERM. */
 	    if (errno != EXDEV  &&  errno != EPERM
@@ -395,7 +393,11 @@ go_to_it:
 		)
 		adios (distfile, "unable to link %s to", altmsg);
 	    free (distfile);
-	    distfile = getcpy (m_mktemp2(NULL, invo_name, NULL, NULL));
+	    if ((cp = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {
+		adios(NULL, "unable to create temporary file in %s",
+		      get_temp_dir());
+	    }
+	    distfile = getcpy (cp);
 	    {
 		int in, out;
 		struct stat st;