0ct0pu5/meli-terminal-mail-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

imap: make hostname optional in ENVELOPE address parser

Browse source
This commit is contained in:
Manos Pitsidianakis 2020-06-22 17:27:48 +03:00
parent 79b2e20557
commit 01e1f4111c
No known key found for this signature in database
GPG key ID: 73627C2F690DF710
1 changed files with 34 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
melib/src/backends/imap/protocol_parser.rs
View file

@ -1343,6 +1343,7 @@ pub fn envelope_addresses<'a>(input: &'a [u8]) -> IResult<&'a [u8], Option<Vec<A
let (input, _) = tag(")")(input)?; let (input, _) = tag(")")(input)?;
Ok((input, Some(envelopes))) Ok((input, Some(envelopes)))
}, },
map(tag("\"\""), |_| None),
))(input) ))(input)
/* /*
alt_complete!(map!(tag!("NIL"), |_| None) | alt_complete!(map!(tag!("NIL"), |_| None) |
@ -1366,24 +1367,43 @@ pub fn envelope_address(input: &[u8]) -> IResult<&[u8], Address> {
let (input, _) = alt((quoted, map(tag("NIL"), |_| Vec::new())))(input)?; let (input, _) = alt((quoted, map(tag("NIL"), |_| Vec::new())))(input)?;
let (input, _) = is_a("\r\n\t ")(input)?; let (input, _) = is_a("\r\n\t ")(input)?;
let (input, mailbox_name) = alt((quoted, map(tag("NIL"), |_| Vec::new())))(input)?; let (input, mailbox_name) = alt((quoted, map(tag("NIL"), |_| Vec::new())))(input)?;
let (input, _) = is_a("\r\n\t ")(input)?; let (input, host_name) = opt(preceded(
let (input, host_name) = alt((quoted, map(tag("NIL"), |_| Vec::new())))(input)?; is_a("\r\n\t "),
alt((quoted, map(tag("NIL"), |_| Vec::new()))),
))(input)?;
Ok(( Ok((
input, input,
Address::Mailbox(MailboxAddress { Address::Mailbox(MailboxAddress {
raw: format!( raw: if let Some(host_name) = host_name.as_ref() {
"{}{}<{}@{}>", format!(
to_str!(&name), "{}{}<{}@{}>",
if name.is_empty() { "" } else { " " }, to_str!(&name),
to_str!(&mailbox_name), if name.is_empty() { "" } else { " " },
to_str!(&host_name) to_str!(&mailbox_name),
) to_str!(&host_name)
.into_bytes(), )
.into_bytes()
} else {
format!(
"{}{}{}",
to_str!(&name),
if name.is_empty() { "" } else { " " },
to_str!(&mailbox_name),
)
.into_bytes()
},
display_name: str_builder!(0, name.len()), display_name: str_builder!(0, name.len()),
address_spec: str_builder!( address_spec: if let Some(host_name) = host_name.as_ref() {
if name.is_empty() { 1 } else { name.len() + 2 }, str_builder!(
mailbox_name.len() + host_name.len() + 1 if name.is_empty() { 1 } else { name.len() + 2 },
), mailbox_name.len() + host_name.len() + 1
)
} else {
str_builder!(
if name.is_empty() { 0 } else { name.len() + 1 },
mailbox_name.len()
)
},
}), }),
)) ))
/* /*