xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

upas/marshal: make attachment failure fatal

Browse source
This commit is contained in:
Alex Musolino 2020-06-22 16:34:31 +09:30
parent 55d8082842
commit 200c18bc15
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sys/src/cmd/upas/marshal/marshal.c
View file

@ -136,6 +136,7 @@ char *user;
char *login;
Alias *aliases;
int rfc822syntaxerror;
int attachfailed;
char lastchar;
char *replymsg;
@ -308,6 +309,10 @@ main(int argc, char **argv)
holding = holdon();
headersrv = readheaders(&in, &flags, &hdrstring,
eightflag? &to: nil, eightflag? &cc: nil, eightflag? &bcc: nil, l, 1);
if(attachfailed){
Bdrain(&in);
fatal("attachment(s) failed, message not sent");
}
if(rfc822syntaxerror){
Bdrain(&in);
fatal("rfc822 syntax error, message not sent");
@ -501,7 +506,10 @@ readheaders(Biobuf *in, int *fp, String **sp, Addr **top, Addr **ccp, Addr **bcc
if(att == nil)
break;
*att = mkattach(hdrval(s_to_c(sline)), nil, hdrtype == Hinclude);
if(*att != nil)
if(*att == nil){
attachfailed = 1;
return Error;
}
att = &(*att)->next;
break;
}