Apple-2-SW/emailler
1
0
Fork 0
mirror of https://github.com/bobbimanners/emailler.git synced 2024-11-15 17:09:16 +00:00
Code Issues Projects Releases Wiki Activity

EMAIL: Improved parsing of MIME headers

Browse Source
This commit is contained in:
Bobbi Webber-Manners 2020-09-17 20:46:53 -04:00
parent de5520203f
commit e07f5ef545
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
apps/email.c
View File

@ -1244,11 +1244,15 @@ retry:
case 'M':
case 'm':
mime = 1;
mime_enc = ENC_7BIT;
mime_binary = 0;
pos = 0;
fseek(fp, pos, SEEK_SET);
get_line(fp, 1, linebuf, LINEBUFSZ, &pos); // Reset buffer
do {
get_line(fp, 0, linebuf, LINEBUFSZ, &pos);
if (!strncasecmp(linebuf, ct, 14))
mime = 4;
if (!strncasecmp(linebuf, cte, 27)) {
mime = 4;
if (!strncmp(linebuf + 27, "7bit", 4))
@ -1260,10 +1264,9 @@ retry:
else if (!strncmp(linebuf + 27, b64, 6))
mime_enc = ENC_B64;
else {
printf(unsupp_enc, linebuf + 27);
mime = 1;
mime = 0;
break;
}
break;
}
} while (linebuf[0] != '\r');
pos = hh.skipbytes;
@ -1717,14 +1720,11 @@ char prompt_okay(char *msg) {
* mode - 'R' if reply, 'F' if forward, 'N' if news follow-up
*/
void get_email_body(struct emailhdrs *h, FILE *f, char mode) {
uint32_t pos = 0;
uint8_t mime = 0;
const int8_t *b = b64dec - 43;
uint16_t chars;
uint8_t mime_enc, mime_binary;
char c, *readp, *writep;
mime = 0;
pos = 0;
uint32_t pos = 0;
const int8_t *b = b64dec - 43;
uint8_t mime = 0, mime_enc = ENC_7BIT, mime_binary = 0;
fseek(fp, pos, SEEK_SET);
get_line(fp, 1, linebuf, LINEBUFSZ, &pos); // Reset buffer
do {
@ -1732,6 +1732,8 @@ void get_email_body(struct emailhdrs *h, FILE *f, char mode) {
get_line(fp, 0, linebuf, LINEBUFSZ, &pos);
if (!strncasecmp(linebuf, mime_ver, 17))
mime = 1;
if (!strncasecmp(linebuf, ct, 14))
mime = 4;
if (!strncasecmp(linebuf, cte, 27)) {
mime = 4;
if (!strncmp(linebuf + 27, "7bit", 4))
@ -1746,7 +1748,6 @@ void get_email_body(struct emailhdrs *h, FILE *f, char mode) {
error(ERR_NONFATAL, unsupp_enc, linebuf + 27);
return;
}
break;
}
} while (linebuf[0] != '\r');
pos = h->skipbytes;

4
apps/nntp65.up.c
View File

@ -584,7 +584,7 @@ void main(int argc, char *argv[]) {
printf("%s", linebuf);
}
printf("\n%cS)end message | H)old message in NEWS.OUTBOX | D)elete message from NEWS.OUTBOX %c",
printf("\n%cS)end message | H)old message in NEWS.OUTBOX | D)elete message from NEWS.OUTBOX%c",
INVERSE, NORMAL);
while (1) {
c = cgetc();
@ -599,7 +599,7 @@ void main(int argc, char *argv[]) {
goto skiptonext;
case 'D':
case 'd':
printf("Sure? (y/n)");
printf("\nSure? (y/n)");
while (1) {
c = cgetc();
switch (c) {

4
apps/smtp65.c
View File

@ -596,7 +596,7 @@ void main(int argc, char *argv[]) {
printf("%s", linebuf);
}
printf("\n%cS)end message | H)old message in OUTBOX | D)elete message from OUTBOX %c",
printf("\n%cS)end message | H)old message in OUTBOX | D)elete message from OUTBOX %c",
INVERSE, NORMAL);
while (1) {
c = cgetc();
@ -611,7 +611,7 @@ void main(int argc, char *argv[]) {
goto skiptonext;
case 'D':
case 'd':
printf("Sure? (y/n)");
printf("\nSure? (y/n)");
while (1) {
c = cgetc();
switch (c) {