projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed support for Encrypted: headers, which were removed in RFC 2822.
[mmh]
/
uip
/
scansbr.c
diff --git
a/uip/scansbr.c
b/uip/scansbr.c
index
6eca931
..
4b71243
100644
(file)
--- a/
uip/scansbr.c
+++ b/
uip/scansbr.c
@@
-37,9
+37,6
@@
#define SBUFSIZ 512
static struct format *fmt;
#define SBUFSIZ 512
static struct format *fmt;
-#ifdef JLR
-static struct format *fmt_top;
-#endif /* JLR */
static struct comp *datecomp; /* pntr to "date" comp */
static struct comp *bodycomp; /* pntr to "body" pseudo-comp (if referenced) */
static struct comp *datecomp; /* pntr to "date" comp */
static struct comp *bodycomp; /* pntr to "body" pseudo-comp (if referenced) */
@@
-74,7
+71,7
@@
int
scan(FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
int unseen, char *folder, long size, int noisy)
{
scan(FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
int unseen, char *folder, long size, int noisy)
{
- int i, compnum, encrypted, state;
+ int i, compnum, state;
unsigned char *cp, *tmpbuf;
char **nxtbuf;
char *saved_c_text = NULL;
unsigned char *cp, *tmpbuf;
char **nxtbuf;
char *saved_c_text = NULL;
@@
-107,22
+104,11
@@
scan(FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
/* Compile format string */
ncomps = fmt_compile(nfs, &fmt) + 1;
/* Compile format string */
ncomps = fmt_compile(nfs, &fmt) + 1;
-#ifdef JLR
- fmt_top = fmt;
-#endif /* JLR */
FINDCOMP(bodycomp, "body");
FINDCOMP(datecomp, "date");
FINDCOMP(cptr, "folder");
if (cptr && folder)
cptr->c_text = folder;
FINDCOMP(bodycomp, "body");
FINDCOMP(datecomp, "date");
FINDCOMP(cptr, "folder");
if (cptr && folder)
cptr->c_text = folder;
- FINDCOMP(cptr, "encrypted");
- if (!cptr)
- if ((cptr = (struct comp *)calloc(1, sizeof(*cptr)))) {
- cptr->c_name = "encrypted";
- cptr->c_next = wantcomp[i = CHASH(cptr->c_name)];
- wantcomp[i] = cptr;
- ncomps++;
- }
FINDCOMP(cptr, "dtimenow");
if (cptr)
cptr->c_text = getcpy(dtimenow(0));
FINDCOMP(cptr, "dtimenow");
if (cptr)
cptr->c_text = getcpy(dtimenow(0));
@@
-348,21
+334,12
@@
finished:
fmt_scan(fmt, scanl, slwidth, dat);
fmt_scan(fmt, scanl, slwidth, dat);
-#if 0
- fmt = fmt_scan(fmt, scanl, slwidth, dat);
- if (!fmt)
- fmt = fmt_top; /* reset for old format files */
-#endif
-
if (bodycomp)
bodycomp->c_text = saved_c_text;
if (noisy)
fputs(scanl, stdout);
if (bodycomp)
bodycomp->c_text = saved_c_text;
if (noisy)
fputs(scanl, stdout);
- FINDCOMP(cptr, "encrypted");
- encrypted = cptr && cptr->c_text;
-
/* return dynamically allocated buffers to pool */
while ((cptr = *savecomp++)) {
*--nxtbuf = cptr->c_text;
/* return dynamically allocated buffers to pool */
while ((cptr = *savecomp++)) {
*--nxtbuf = cptr->c_text;
@@
-373,7
+350,7
@@
finished:
if (outnum && (ferror(scnout) || fclose(scnout) == EOF))
DIEWRERR();
if (outnum && (ferror(scnout) || fclose(scnout) == EOF))
DIEWRERR();
- return (state != FILEEOF ? SCNERR : encrypted ? SCNENC : SCNMSG);
+ return (state != FILEEOF ? SCNERR : SCNMSG);
}
static int
}
static int