X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Frcvtty.c;h=07053d2cf0728b3fdc9b82ed8c9bec3077ac65fd;hb=c70ca7816838825c93fbc54ac9e4a6e2a7bef6d8;hp=cf54134f924d328918c54410850903d06b792602;hpb=dee387b53ab0d42922f857b60d6f980c9e79d16f;p=mmh

diff --git a/uip/rcvtty.c b/uip/rcvtty.c
index cf54134..07053d2 100644
--- a/uip/rcvtty.c
+++ b/uip/rcvtty.c
@@ -2,7 +2,9 @@
 /*
  * rcvtty.c -- a rcvmail program (a lot like rcvalert) handling IPC ttys
  *
- * $Id$
+ * This code is Copyright (c) 2002, by the authors of nmh.  See the
+ * COPYRIGHT file in the root directory of the nmh distribution for
+ * complete copyright information.
  */
 
 /* Changed to use getutent() and friends.  Assumes that when getutent() exists,
@@ -172,10 +174,14 @@ main (int argc, char **argv)
 #ifdef HAVE_GETUTENT
     setutent();
     while ((utp = getutent()) != NULL) {
-        if (utp->ut_type == USER_PROCESS 
-               && utp->ut_user[0] != 0
+        if (
+#ifdef HAVE_STRUCT_UTMP_UT_TYPE
+	       utp->ut_type == USER_PROCESS 
+	       &&
+#endif
+               utp->ut_name[0] != 0
                && utp->ut_line[0] != 0
-               && strncmp (user, utp->ut_user, sizeof(utp->ut_user)) == 0) {
+               && strncmp (user, utp->ut_name, sizeof(utp->ut_name)) == 0) {
             strncpy (tty, utp->ut_line, sizeof(utp->ut_line));
 	    alert (tty, md);
         }
@@ -217,13 +223,7 @@ message_fd (char **vec)
     char tmpfil[BUFSIZ];
     struct stat st;
 
-#ifdef HAVE_MKSTEMP
     fd = mkstemp (strncpy (tmpfil, "/tmp/rcvttyXXXXX", sizeof(tmpfil)));
-#else
-    unlink (mktemp (strncpy (tmpfil, "/tmp/rcvttyXXXXX", sizeof(tmpfil))));
-    if ((fd = open (tmpfil, O_RDWR | O_CREAT | O_TRUNC, 0600)) == NOTOK)
-	return header_fd ();
-#endif
     unlink (tmpfil);
 
     if ((child_id = vfork()) == NOTOK) {
@@ -257,7 +257,7 @@ message_fd (char **vec)
 	     * Ruthlessly kill the child and anything
 	     * else in its process group.
 	     */
-	    KILLPG(child_id, SIGKILL);
+	    killpg(child_id, SIGKILL);
 	}
 	close (fd);
 	return header_fd ();
@@ -279,12 +279,12 @@ static int
 header_fd (void)
 {
     int fd;
-    char *nfs, tmpfil[BUFSIZ];
+    char *nfs;
+    char *tfile = NULL;
 
-    strncpy (tmpfil, m_tmpfil (invo_name), sizeof(tmpfil));
-    if ((fd = open (tmpfil, O_RDWR | O_CREAT | O_TRUNC, 0600)) == NOTOK)
-	return NOTOK;
-    unlink (tmpfil);
+    tfile = m_mktemp2(NULL, invo_name, &fd, NULL);
+    if (tfile == NULL) return NOTOK;
+    unlink (tfile);
 
     rewind (stdin);