X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fm_getfld.c;h=a2dba260966f2e7f7c14a76be509b61d922739be;hp=8fd836430b4d6ef07ae9914236e95acf285e2aaa;hb=684ec30d81e1223a282764452f4902ed4ad1c754;hpb=a0f6183a0f52f9c0f48ce42b4f10592ceec2b014 diff --git a/sbr/m_getfld.c b/sbr/m_getfld.c index 8fd8364..a2dba26 100644 --- 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 -** 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 - && strncmp(text, "From ", 5) == 0) { + && strncmp(text, "From ", 5) == 0) { msg_style = MS_MBOX; delimstr = "\nFrom "; #ifndef RPATHS @@ -661,11 +660,7 @@ m_unknown(FILE *iob) #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)); @@ -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; - - if (msg_style == MS_MMDF) { - /* flush extra msg hdrs */ - while ((c = getc(iob)) >= 0 && eom(c, iob)) - ; - if (c >= 0) - ungetc(c, iob); - } }