X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/fc69a9cd8f854da20fc2f4cf99fcf726958485f5..63621a81d16ab743de6b57d47578a9a2c670ad22:/uip/rcvtty.c diff --git a/uip/rcvtty.c b/uip/rcvtty.c index e91c74c2..101aa5ab 100644 --- a/uip/rcvtty.c +++ b/uip/rcvtty.c @@ -1,6 +1,4 @@ - -/* - * rcvtty.c -- a rcvmail program (a lot like rcvalert) handling IPC ttys +/* rcvtty.c -- a rcvmail program (a lot like rcvalert) handling IPC ttys * * This code is Copyright (c) 2002, by the authors of nmh. See the * COPYRIGHT file in the root directory of the nmh distribution for @@ -19,6 +17,8 @@ #include #include #include +#include +#include "sbr/m_mktemp.h" #include #ifdef HAVE_GETUTXENT @@ -54,22 +54,19 @@ static jmp_buf myctx; static int bell = 1; static int newline = 1; static int biff = 0; -static int width = 0; +static int width = -1; static char *form = NULL; static char *format = NULL; -/* - * external prototypes - */ -char *getusername(void); - /* * static prototypes */ static void alrmser (int); static int message_fd (char **); static int header_fd (void); +#if HAVE_GETUTXENT static void alert (char *, int); +#endif /* HAVE_GETUTXENT */ int @@ -79,29 +76,24 @@ main (int argc, char **argv) char *cp, *user, buf[BUFSIZ], tty[BUFSIZ]; char **argp, **arguments, *vec[MAXARGS]; struct utmpx *utp; -#ifdef LOCALE - setlocale(LC_ALL, ""); -#endif - invo_name = r1bindex (argv[0], '/'); - /* read user profile/context */ - context_read(); + if (nmh_init(argv[0], 2)) { return 1; } - mts_init (invo_name); + mts_init (); arguments = getarguments (invo_name, argc, argv, 1); argp = arguments; while ((cp = *argp++)) { if (*cp == '-') { switch (smatch (++cp, switches)) { - case AMBIGSW: + case AMBIGSW: ambigsw (cp, switches); done (1); - case UNKWNSW: + case UNKWNSW: vec[vecp++] = --cp; continue; - case HELPSW: + case HELPSW: snprintf (buf, sizeof(buf), "%s [command ...]", invo_name); print_help (buf, switches, 1); done (0); @@ -113,12 +105,12 @@ main (int argc, char **argv) biff = 1; continue; - case FORMSW: + case FORMSW: if (!(form = *argp++) || *form == '-') adios (NULL, "missing argument to %s", argp[-2]); format = NULL; continue; - case FMTSW: + case FMTSW: if (!(format = *argp++) || *format == '-') adios (NULL, "missing argument to %s", argp[-2]); form = NULL; @@ -164,6 +156,9 @@ main (int argc, char **argv) } } endutxent(); +#else + NMH_UNUSED (tty); + NMH_UNUSED (utp); #endif /* HAVE_GETUTXENT */ exit (RCV_MOK); @@ -184,19 +179,22 @@ message_fd (char **vec) { pid_t child_id; int bytes, seconds; - /* volatile to prevent "might be clobbered" warning from gcc: */ - volatile int fd; - char tmpfil[BUFSIZ]; + int fd; + char *tfile; struct stat st; - fd = mkstemp (strncpy (tmpfil, "/tmp/rcvttyXXXXX", sizeof(tmpfil))); - unlink (tmpfil); + if ((tfile = m_mktemp2(NULL, invo_name, &fd, NULL)) == NULL) { + inform("unable to create temporary file in %s", get_temp_dir()); + return NOTOK; + } + (void) m_unlink(tfile); /* Use fd, no longer need the file name. */ if ((child_id = fork()) == NOTOK) { /* fork error */ close (fd); return header_fd (); - } else if (child_id) { + } + if (child_id) { /* parent process */ if (!setjmp (myctx)) { SIGNAL (SIGALRM, alrmser); @@ -216,7 +214,7 @@ message_fd (char **vec) pidwait(child_id, OK); alarm (0); - if (fstat (fd, &st) != NOTOK && st.st_size > (off_t) 0) + if (fstat (fd, &st) != NOTOK && st.st_size > 0) return fd; } else { /* @@ -234,9 +232,12 @@ message_fd (char **vec) if (dup2 (fd, 1) == NOTOK || dup2 (fd, 2) == NOTOK) _exit (-1); closefds (3); - setpgid ((pid_t) 0, getpid ()); /* put in own process group */ - execvp (vec[0], vec); - _exit (-1); + setpgid(0, getpid()); /* put in own process group */ + if (execvp (vec[0], vec) == NOTOK) { + _exit (-1); + } + + return NOTOK; } @@ -246,27 +247,40 @@ header_fd (void) int fd; char *nfs; char *tfile = NULL; + charstring_t scanl = NULL; - tfile = m_mktemp2(NULL, invo_name, &fd, NULL); - if (tfile == NULL) return NOTOK; - unlink (tfile); + if ((tfile = m_mktemp2(NULL, invo_name, &fd, NULL)) == NULL) { + inform("unable to create temporary file in %s", get_temp_dir()); + return NOTOK; + } + (void) m_unlink(tfile); /* Use fd, no longer need the file name. */ rewind (stdin); /* get new format string */ nfs = new_fs (form, format, SCANFMT); - scan (stdin, 0, 0, nfs, width, 0, 0, NULL, 0L, 0); + scan (stdin, 0, 0, nfs, width, 0, 0, NULL, 0L, 0, &scanl); scan_finished (); - if (newline) - write (fd, "\n\r", 2); - write (fd, scanl, strlen (scanl)); - if (bell) - write (fd, "\007", 1); + if (newline) { + if (write (fd, "\n\r", 2) < 0) { + advise (tfile, "write LF/CR"); + } + } + if (write (fd, charstring_buffer (scanl), charstring_bytes (scanl)) < 0) { + advise (tfile, "write"); + } + charstring_free (scanl); + if (bell) { + if (write (fd, "\007", 1) < 0) { + advise (tfile, "write BEL"); + } + } return fd; } +#if HAVE_GETUTXENT static void alert (char *tty, int md) { @@ -284,19 +298,18 @@ alert (char *tty, int md) if (stat (ttyspec, &st) == NOTOK || (st.st_mode & mask) == 0) return; - if (!setjmp (myctx)) { - SIGNAL (SIGALRM, alrmser); - alarm (2); - td = open (ttyspec, O_WRONLY); - alarm (0); - if (td == NOTOK) - return; - } else { + if (setjmp (myctx)) { alarm (0); return; } + SIGNAL (SIGALRM, alrmser); + alarm (2); + td = open (ttyspec, O_WRONLY); + alarm (0); + if (td == NOTOK) + return; - lseek (md, (off_t) 0, SEEK_SET); + lseek(md, 0, SEEK_SET); while ((i = read (md, buffer, sizeof(buffer))) > 0) if (write (td, buffer, i) != i) @@ -304,4 +317,4 @@ alert (char *tty, int md) close (td); } - +#endif /* HAVE_GETUTXENT */