projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated man page to recent changes.
[mmh]
/
uip
/
rcvtty.c
diff --git
a/uip/rcvtty.c
b/uip/rcvtty.c
index
86066ed
..
8166dc9
100644
(file)
--- a/
uip/rcvtty.c
+++ b/
uip/rcvtty.c
@@
-32,7
+32,7
@@
#endif
#define SCANFMT \
#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}"
%<(mymbox{from})%<{to}To:%14(friendly{to})%>%>%<(zero)%17(friendly{from})%> \
%{subject}"
@@
-41,21
+41,19
@@
static struct swit switches[] = {
{ "biff", 0 },
#define FORMSW 1
{ "form formatfile", 0 },
{ "biff", 0 },
#define FORMSW 1
{ "form formatfile", 0 },
-#define FMTSW 2
- { "format string", 5 },
-#define WIDTHSW 3
+#define WIDTHSW 2
{ "width columns", 0 },
{ "width columns", 0 },
-#define NLSW 4
+#define NLSW 3
{ "newline", 0 },
{ "newline", 0 },
-#define NNLSW 5
+#define NNLSW 4
{ "nonewline", 0 },
{ "nonewline", 0 },
-#define BELSW 6
+#define BELSW 5
{ "bell", 0 },
{ "bell", 0 },
-#define NBELSW 7
+#define NBELSW 6
{ "nobell", 0 },
{ "nobell", 0 },
-#define VERSIONSW 8
+#define VERSIONSW 7
{ "version", 0 },
{ "version", 0 },
-#define HELPSW 9
+#define HELPSW 8
{ "help", 0 },
{ NULL, 0 }
};
{ "help", 0 },
{ NULL, 0 }
};
@@
-66,7
+64,6
@@
static int newline = 1;
static int biff = 0;
static int width = 0;
static char *form = NULL;
static int biff = 0;
static int width = 0;
static char *form = NULL;
-static char *format = NULL;
/*
** static prototypes
/*
** static prototypes
@@
-128,13
+125,6
@@
main(int argc, char **argv)
if (!(form = *argp++) || *form == '-')
adios(NULL, "missing argument to %s",
argp[-2]);
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:
continue;
case WIDTHSW:
@@
-292,7
+282,7
@@
header_fd(void)
rewind(stdin);
/* get new format string */
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);
scan(stdin, 0, 0, nfs, width, 0, 0, NULL, 0L, 0);
if (newline)
write(fd, "\n\r", 2);