#include <h/mh.h>
#include <h/signals.h>
-#include <h/m_setjmp.h>
+#include <setjmp.h>
#include <h/rcvmail.h>
#include <h/scansbr.h>
#include <h/tws.h>
#include <h/mts.h>
-#include <signal.h>
#include <fcntl.h>
+#ifdef HAVE_GETUTXENT
#include <utmpx.h>
+#endif /* HAVE_GETUTXENT */
#define SCANFMT \
"%2(hour{dtimenow}):%02(min{dtimenow}): %<(size)%5(size) %>%<{encrypted}E%>\
%<(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;
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
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 (1);
+ done (0);
case VERSIONSW:
print_version(invo_name);
- done (1);
+ done (0);
case BIFFSW:
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;
user = getusername();
+#if HAVE_GETUTXENT
setutxent();
while ((utp = getutxent()) != NULL) {
if (utp->ut_type == USER_PROCESS && utp->ut_user[0] != 0
}
}
endutxent();
+#else
+ NMH_UNUSED (tty);
+ NMH_UNUSED (utp);
+#endif /* HAVE_GETUTXENT */
exit (RCV_MOK);
- return 0; /* dead code to satisfy the compiler */
}
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 = m_vfork()) == NOTOK) {
+ if ((child_id = fork()) == NOTOK) {
/* fork error */
close (fd);
return header_fd ();
- } else if (child_id) {
+ }
+ if (child_id) {
/* parent process */
- if (!m_setjmp (myctx)) {
+ if (!setjmp (myctx)) {
SIGNAL (SIGALRM, alrmser);
bytes = fstat(fileno (stdin), &st) != NOTOK ? (int) st.st_size : 100;
_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;
}
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);
- 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)
{
if (stat (ttyspec, &st) == NOTOK || (st.st_mode & mask) == 0)
return;
- if (!m_setjmp (myctx)) {
+ if (!setjmp (myctx)) {
SIGNAL (SIGALRM, alrmser);
alarm (2);
td = open (ttyspec, O_WRONLY);
close (td);
}
-
+#endif /* HAVE_GETUTXENT */
projects / nmh / blobdiff