X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/2e768e3cc0ce768373d3320eca4cdd08b8cf646a..ec173fd2c:/uip/rcvtty.c?ds=inline diff --git a/uip/rcvtty.c b/uip/rcvtty.c index 5443748c..73440fb0 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 @@ -12,14 +10,24 @@ * Ruud de Rooij Sun, 28 May 2000 17:28:55 +0200 */ -#include -#include +#include "h/mh.h" +#include "sbr/fmt_new.h" +#include "scansbr.h" +#include "sbr/getarguments.h" +#include "sbr/smatch.h" +#include "sbr/closefds.h" +#include "sbr/ambigsw.h" +#include "sbr/print_version.h" +#include "sbr/print_help.h" +#include "sbr/error.h" +#include "h/signals.h" #include -#include -#include -#include -#include -#include +#include "h/fmt_scan.h" +#include "h/tws.h" +#include "h/mts.h" +#include "h/done.h" +#include "h/utils.h" +#include "sbr/m_mktemp.h" #include #ifdef HAVE_GETUTXENT @@ -52,57 +60,49 @@ DEFINE_SWITCH_ARRAY(RCVTTY, switches); #undef X static jmp_buf myctx; -static int bell = 1; -static int newline = 1; -static int biff = 0; -static int width = 0; +static bool bell = true; +static bool newline = true; +static bool biff; +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 main (int argc, char **argv) { int md, vecp = 0; - char *cp, *user, buf[BUFSIZ], tty[BUFSIZ]; + char *cp, *user, buf[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], true, false)) { 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); @@ -111,36 +111,36 @@ main (int argc, char **argv) done (0); case BIFFSW: - biff = 1; + biff = true; continue; - case FORMSW: + case FORMSW: if (!(form = *argp++) || *form == '-') - adios (NULL, "missing argument to %s", argp[-2]); + die("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]); + die("missing argument to %s", argp[-2]); form = NULL; continue; case WIDTHSW: if (!(cp = *argp++) || *cp == '-') - adios(NULL, "missing argument to %s", argp[-2]); + die("missing argument to %s", argp[-2]); width = atoi(cp); continue; case NLSW: - newline = 1; + newline = true; continue; case NNLSW: - newline = 0; + newline = false; continue; case BELSW: - bell = 1; + bell = true; continue; case NBELSW: - bell = 0; + bell = false; continue; } @@ -150,7 +150,7 @@ main (int argc, char **argv) vec[vecp] = 0; if ((md = vecp ? message_fd (vec) : header_fd ()) == NOTOK) - exit (RCV_MBX); + exit(1); user = getusername(); @@ -160,15 +160,15 @@ main (int argc, char **argv) if (utp->ut_type == USER_PROCESS && utp->ut_user[0] != 0 && utp->ut_line[0] != 0 && strncmp (user, utp->ut_user, sizeof(utp->ut_user)) == 0) { - strncpy (tty, utp->ut_line, sizeof(utp->ut_line)); - alert (tty, md); + alert(utp->ut_line, md); } } endutxent(); +#else + NMH_UNUSED (utp); #endif /* HAVE_GETUTXENT */ - exit (RCV_MOK); - return 0; /* dead code to satisfy the compiler */ + exit(0); } @@ -185,18 +185,23 @@ static int message_fd (char **vec) { pid_t child_id; - int bytes, fd, seconds; - char tmpfil[BUFSIZ]; + int bytes, seconds; + 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 +221,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 { /* @@ -232,12 +237,14 @@ message_fd (char **vec) /* child process */ rewind (stdin); if (dup2 (fd, 1) == NOTOK || dup2 (fd, 2) == NOTOK) - _exit (-1); + _exit(1); closefds (3); - setpgid ((pid_t) 0, getpid ()); /* put in own process group */ - execvp (vec[0], vec); - _exit (-1); - return 1; /* dead code to satisfy compiler */ + setpgid(0, getpid()); /* put in own process group */ + if (execvp (vec[0], vec) == NOTOK) { + _exit(1); + } + + return NOTOK; } @@ -247,27 +254,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) { @@ -285,19 +305,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) @@ -305,4 +324,4 @@ alert (char *tty, int md) close (td); } - +#endif /* HAVE_GETUTXENT */