X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/322f6f0518f2fca892733dea85d87c33fcb65e83..e056446589e2fee53f823e0da1fb34076018c3dd:/uip/slocal.c

diff --git a/uip/slocal.c b/uip/slocal.c
index f500f6ea..f24228af 100644
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -959,7 +959,7 @@ logged_in (void)
 
     while ((utp = getutent()) != NULL) {
         if (
-#ifdef HAVE_UTMP_UT_TYPE
+#ifdef HAVE_STRUCT_UTMP_UT_TYPE
 		utp->ut_type == USER_PROCESS
                 &&
 #endif
@@ -1274,12 +1274,12 @@ copy_message (int qd, char *tmpfil, int fold)
     int i, first = 1, fd1, fd2;
     char buffer[BUFSIZ];
     FILE *qfp, *ffp;
+    char *tfile = NULL;
 
-    strcpy (tmpfil, m_tmpfil (invo_name));
-
-    /* open temporary file to put message in */
-    if ((fd1 = open (tmpfil, O_RDWR | O_CREAT | O_TRUNC, 0600)) == -1)
-	return -1;
+    tfile = m_mktemp2(NULL, invo_name, &fd1, NULL);
+    if (tfile == NULL) return -1;
+    fchmod(fd1, 0600);
+    strncpy (tmpfil, tfile, BUFSIZ);
 
     if (!fold) {
 	while ((i = read (qd, buffer, sizeof(buffer))) > 0)