X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmsh.c;h=f492a3703e3e440d2fba0bc0283ac07ba3ddba67;hp=6d6fbca2fed46b98d27cf4c33dca7aa3d81e865c;hb=2f689a1cb907a5de04e6d39ffd217a69af3216c7;hpb=38615191e71744b066425e0c44412b62dbe49cc2

diff --git a/uip/msh.c b/uip/msh.c
index 6d6fbca..f492a37 100644
--- a/uip/msh.c
+++ b/uip/msh.c
@@ -733,10 +733,10 @@ setup (char *file)
 
 #ifdef BPOP
     if (pmsh) {
-	strncpy (tmpfil, m_tmpfil (invo_name), sizeof(tmpfil));
-	if ((fp = fopen (tmpfil, "w+")) == NULL)
-	    padios (tmpfil, "unable to create");
-	unlink (tmpfil);
+        char *tfile = m_mktemp2(NULL, invo_name, NULL, &fp);
+        if (tfile == NULL) padios("msh", "unable to create temporary file");
+        unlink(tfile);
+	strncpy(tmpfil, tfile, sizeof(tmpfil));
     }
     else
 #endif /* BPOP */
@@ -996,10 +996,10 @@ msh_ready (int msgnum, int full)
 	if (Msgs[msgnum].m_top == 0)
 	    padios (NULL, "msh_ready (%d, %d) botch", msgnum, full);
 	if (!full) {
-	    strncpy (tmpfil, m_tmpfil (invo_name), sizeof(tmpfil));
-	    if ((yp = fopen (tmpfil, "w+")) == NULL)
-		padios (tmpfil, "unable to create");
-	    unlink (tmpfil);
+            char *tfile = m_mktemp2(NULL, invo_name, NULL, &yp);
+            if (tfile == NULL) padios("msh", "unable to create temporary file");
+            unlink(tfile);
+            strncpy(tmpfil, tfile, sizeof(tmpfil));
 
 	    if (pop_top (Msgs[msgnum].m_top, 4, pop_action) == NOTOK)
 		padios (NULL, "%s", response);
@@ -1163,7 +1163,7 @@ scanstring (char *arg)
 void
 readids (int id)
 {
-    register int cur, seqnum, i, msgnum;
+    register int cur, seqnum, i=0, msgnum;
 
     if (mp->curmsg == 0)
 	seq_setcur (mp, mp->lowmsg);
@@ -1475,7 +1475,7 @@ getargs (char *prompt, struct swit *sw, struct Cmd *cmdp)
 	    continue;
 	if (buffer[0] == '?') {
 	    printf ("commands:\n");
-	    print_sw (ALL, sw, "");
+	    print_sw (ALL, sw, "", stdout);
 	    printf ("type CTRL-D or use ``quit'' to leave %s\n",
 		    invo_name);
 	    continue;
@@ -2142,7 +2142,7 @@ pCMD (char *str, struct swit *sw, struct Cmd *cmdp)
 
 	    case OK: 
 		printf ("commands:\n");
-		print_sw (ALL, sw, "");
+		print_sw (ALL, sw, "", stdout);
 		printf ("type ``quit'' to leave %s\n", invo_name);
 		fflush (stdout);
 		fflush (stderr);