projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rest of the MMDF-style mail drop support removal.
[mmh]
/
sbr
/
m_getfld.c
diff --git
a/sbr/m_getfld.c
b/sbr/m_getfld.c
index
8fd8364
..
a2dba26
100644
(file)
--- a/
sbr/m_getfld.c
+++ b/
sbr/m_getfld.c
@@
-639,15
+639,14
@@
m_unknown(FILE *iob)
**
** If the first line of the maildrop is a Unix "From " line, we
** say the style is MBOX and eat the rest of the line. Otherwise
**
** If the first line of the maildrop is a Unix "From " line, we
** say the style is MBOX and eat the rest of the line. Otherwise
-** we say the style is MMDF and look for the delimiter string
-** specified when nmh was built (or from the mts.conf file).
+** abort.
*/
msg_style = MS_UNKNOWN;
pos = ftell(iob);
if (fread(text, sizeof(*text), 5, iob) == 5
*/
msg_style = MS_UNKNOWN;
pos = ftell(iob);
if (fread(text, sizeof(*text), 5, iob) == 5
- && strncmp(text, "From ", 5) == 0) {
+ && strncmp(text, "From ", 5) == 0) {
msg_style = MS_MBOX;
delimstr = "\nFrom ";
#ifndef RPATHS
msg_style = MS_MBOX;
delimstr = "\nFrom ";
#ifndef RPATHS
@@
-661,11
+660,7
@@
m_unknown(FILE *iob)
#endif /* RPATHS */
} else {
/* not a Unix style maildrop */
#endif /* RPATHS */
} else {
/* not a Unix style maildrop */
- fseek(iob, pos, SEEK_SET);
- if (mmdlm2 == NULL || *mmdlm2 == 0)
- mmdlm2 = "\001\001\001\001\n";
- delimstr = mmdlm2;
- msg_style = MS_MMDF;
+ adios(NULL, "No Unix style (mbox) maildrop.");
}
c = strlen(delimstr);
fdelim = (unsigned char *) mh_xmalloc((size_t) (c + 3));
}
c = strlen(delimstr);
fdelim = (unsigned char *) mh_xmalloc((size_t) (c + 3));
@@
-689,14
+684,6
@@
m_unknown(FILE *iob)
for (cp = (char *) fdelim + 1; cp < (char *) delimend; cp++ )
pat_map[(unsigned char)*cp] = (unsigned char *) cp;
for (cp = (char *) fdelim + 1; cp < (char *) delimend; cp++ )
pat_map[(unsigned char)*cp] = (unsigned char *) cp;
-
- if (msg_style == MS_MMDF) {
- /* flush extra msg hdrs */
- while ((c = getc(iob)) >= 0 && eom(c, iob))
- ;
- if (c >= 0)
- ungetc(c, iob);
- }
}
}