Augmented new_fs() with an additional argument for a default form.

[mmh] / uip / rcvtty.c

diff --git a/uip/rcvtty.c b/uip/rcvtty.c
index a71a516..99ae680 100644 (file)
--- a/uip/rcvtty.c
+++ b/uip/rcvtty.c
@@ -16,7 +16,6 @@
 #include <h/rcvmail.h>
 #include <h/scansbr.h>
 #include <h/tws.h>
-#include <h/mts.h>
 #include <signal.h>
 #include <fcntl.h>
 
@@ -35,7 +34,7 @@
 #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}>>%>"
+%{subject}"
 
 static struct swit switches[] = {
 #define BIFFSW  0
@@ -70,11 +69,6 @@ static char *form = NULL;
 static char *format = NULL;
 
 /*
-** external prototypes
-*/
-char *getusername(void);
-
-/*
 ** static prototypes
 */
 static RETSIGTYPE alrmser(int);
@@ -104,7 +98,6 @@ main(int argc, char **argv)
        /* read user profile/context */
        context_read();
 
-       mts_init(invo_name);
        arguments = getarguments(invo_name, argc, argv, 1);
        argp = arguments;
 
@@ -235,7 +228,7 @@ message_fd(char **vec)
 #endif
        unlink(tmpfil);
 
-       if ((child_id = vfork()) == NOTOK) {
+       if ((child_id = fork()) == NOTOK) {
                /* fork error */
                close(fd);
                return header_fd();
@@ -299,7 +292,7 @@ header_fd(void)
        rewind(stdin);
 
        /* get new format string */
-       nfs = new_fs(form, format, SCANFMT);
+       nfs = new_fs(form, format, NULL, SCANFMT);
        scan(stdin, 0, 0, nfs, width, 0, 0, NULL, 0L, 0);
        if (newline)
                write(fd, "\n\r", 2);