projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Feed fileproc and mhlproc from rcvdist, send, whatnow, and whom to post.
[mmh]
/
uip
/
rcvtty.c
diff --git
a/uip/rcvtty.c
b/uip/rcvtty.c
index
9b272d2
..
07053d2
100644
(file)
--- a/
uip/rcvtty.c
+++ b/
uip/rcvtty.c
@@
-2,8
+2,6
@@
/*
* rcvtty.c -- a rcvmail program (a lot like rcvalert) handling IPC ttys
*
/*
* 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.
* 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.
@@
-177,7
+175,7
@@
main (int argc, char **argv)
setutent();
while ((utp = getutent()) != NULL) {
if (
setutent();
while ((utp = getutent()) != NULL) {
if (
-#ifdef HAVE_UTMP_UT_TYPE
+#ifdef HAVE_STRUCT_UTMP_UT_TYPE
utp->ut_type == USER_PROCESS
&&
#endif
utp->ut_type == USER_PROCESS
&&
#endif
@@
-225,13
+223,7
@@
message_fd (char **vec)
char tmpfil[BUFSIZ];
struct stat st;
char tmpfil[BUFSIZ];
struct stat st;
-#ifdef HAVE_MKSTEMP
fd = mkstemp (strncpy (tmpfil, "/tmp/rcvttyXXXXX", sizeof(tmpfil)));
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) {
unlink (tmpfil);
if ((child_id = vfork()) == NOTOK) {
@@
-265,7
+257,7
@@
message_fd (char **vec)
* Ruthlessly kill the child and anything
* else in its process group.
*/
* Ruthlessly kill the child and anything
* else in its process group.
*/
- KILLPG(child_id, SIGKILL);
+ killpg(child_id, SIGKILL);
}
close (fd);
return header_fd ();
}
close (fd);
return header_fd ();
@@
-287,12
+279,12
@@
static int
header_fd (void)
{
int fd;
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);
rewind (stdin);