X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/8bb0f8000b86df9270f2410de3fb6f41fa63e88b..2d033e9c995d385fcd69cb604bf8814de4d1ccec:/uip/rcvtty.c diff --git a/uip/rcvtty.c b/uip/rcvtty.c index a5c2d67e..c38dd061 100644 --- a/uip/rcvtty.c +++ b/uip/rcvtty.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #ifdef HAVE_GETUTXENT @@ -31,35 +30,31 @@ %<(mymbox{from})%<{to}To:%14(friendly{to})%>%>%<(zero)%17(friendly{from})%> \ %{subject}%<{body}<<%{body}>>%>" -static struct swit switches[] = { -#define BIFFSW 0 - { "biff", 0 }, -#define FORMSW 1 - { "form formatfile", 0 }, -#define FMTSW 2 - { "format string", 5 }, -#define WIDTHSW 3 - { "width columns", 0 }, -#define NLSW 4 - { "newline", 0 }, -#define NNLSW 5 - { "nonewline", 0 }, -#define BELSW 6 - { "bell", 0 }, -#define NBELSW 7 - { "nobell", 0 }, -#define VERSIONSW 8 - { "version", 0 }, -#define HELPSW 9 - { "help", 0 }, - { NULL, 0 } -}; +#define RCVTTY_SWITCHES \ + X("biff", 0, BIFFSW) \ + X("form formatfile", 0, FORMSW) \ + X("format string", 5, FMTSW) \ + X("width columns", 0, WIDTHSW) \ + X("newline", 0, NLSW) \ + X("nonewline", 0, NNLSW) \ + X("bell", 0, BELSW) \ + X("nobell", 0, NBELSW) \ + X("version", 0, VERSIONSW) \ + X("help", 0, HELPSW) \ + +#define X(sw, minchars, id) id, +DEFINE_SWITCH_ENUM(RCVTTY); +#undef X + +#define X(sw, minchars, id) { sw, minchars, id }, +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 int width = -1; static char *form = NULL; static char *format = NULL; @@ -68,15 +63,15 @@ static char *format = NULL; */ char *getusername(void); -extern m_getfld_state_t gstate; - /* * 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 @@ -86,29 +81,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); @@ -120,12 +110,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; @@ -171,10 +161,12 @@ main (int argc, char **argv) } } endutxent(); +#else + NMH_UNUSED (tty); + NMH_UNUSED (utp); #endif /* HAVE_GETUTXENT */ exit (RCV_MOK); - return 0; /* dead code to satisfy the compiler */ } @@ -191,18 +183,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 = vfork()) == NOTOK) { + 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); @@ -241,9 +238,11 @@ message_fd (char **vec) _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 */ + if (execvp (vec[0], vec) == NOTOK) { + _exit (-1); + } + + return NOTOK; } @@ -253,27 +252,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); - m_getfld_state_destroy (&gstate); - if (newline) - write (fd, "\n\r", 2); - write (fd, scanl, strlen (scanl)); - if (bell) - write (fd, "\007", 1); + scan (stdin, 0, 0, nfs, width, 0, 0, NULL, 0L, 0, &scanl); + scan_finished (); + 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) { @@ -311,4 +323,4 @@ alert (char *tty, int md) close (td); } - +#endif /* HAVE_GETUTXENT */