Removed `-format string' switches but made -form accept `=formatstring'.

[mmh] / uip / rcvtty.c

diff --git a/uip/rcvtty.c b/uip/rcvtty.c
index 1dc38c4..8166dc9 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>
 
@@ -33,7 +32,7 @@
 #endif
 
 #define SCANFMT \
-"%2(hour{dtimenow}):%02(min{dtimenow}): %<(size)%5(size) %>%<{encrypted}E%>\
+"=%2(hour{dtimenow}):%02(min{dtimenow}): %<(size)%5(size) %>%<{encrypted}E%>\
 %<(mymbox{from})%<{to}To:%14(friendly{to})%>%>%<(zero)%17(friendly{from})%>  \
 %{subject}"
 
@@ -42,21 +41,19 @@ static struct swit switches[] = {
        { "biff", 0 },
 #define FORMSW  1
        { "form formatfile", 0 },
-#define FMTSW  2
-       { "format string", 5 },
-#define WIDTHSW 3
+#define WIDTHSW 2
        { "width columns", 0 },
-#define NLSW  4
+#define NLSW  3
        { "newline", 0 },
-#define NNLSW   5
+#define NNLSW   4
        { "nonewline", 0 },
-#define BELSW  6
+#define BELSW  5
        { "bell", 0 },
-#define NBELSW  7
+#define NBELSW  6
        { "nobell", 0 },
-#define VERSIONSW 8
+#define VERSIONSW 7
        { "version", 0 },
-#define HELPSW  9
+#define HELPSW  8
        { "help", 0 },
        { NULL, 0 }
 };
@@ -67,12 +64,6 @@ static int newline = 1;
 static int biff = 0;
 static int width = 0;
 static char *form = NULL;
-static char *format = NULL;
-
-/*
-** external prototypes
-*/
-char *getusername(void);
 
 /*
 ** static prototypes
@@ -134,13 +125,6 @@ main(int argc, char **argv)
                                if (!(form = *argp++) || *form == '-')
                                        adios(NULL, "missing argument to %s",
                                                        argp[-2]);
-                               format = NULL;
-                               continue;
-                       case FMTSW:
-                               if (!(format = *argp++) || *format == '-')
-                                       adios(NULL, "missing argument to %s",
-                                                       argp[-2]);
-                               form = NULL;
                                continue;
 
                        case WIDTHSW:
@@ -298,7 +282,7 @@ header_fd(void)
        rewind(stdin);
 
        /* get new format string */
-       nfs = new_fs(form, format, SCANFMT);
+       nfs = new_fs(form, SCANFMT);
        scan(stdin, 0, 0, nfs, width, 0, 0, NULL, 0L, 0);
        if (newline)
                write(fd, "\n\r", 2);