Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-07 17:06:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

refactor(mimeparser): remove dc_mprintf

Browse Source
This commit is contained in:
dignifiedquire
2019-09-15 21:33:50 +02:00
parent d091857cef
commit 9534a9ad30
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/dc_mimeparser.rs
View File

@@ -1,5 +1,5 @@
use std::collections::{HashMap, HashSet}; use std::collections::{HashMap, HashSet};
use std::ffi::{CStr, CString}; use std::ffi::CStr;
use std::ptr; use std::ptr;
use charset::Charset; use charset::Charset;
@@ -241,18 +241,14 @@ pub unsafe fn dc_mimeparser_parse<'a>(context: &'a Context, body: &[u8]) -> dc_m
.trim(); .trim();
if !subj.is_empty() { if !subj.is_empty() {
let subj_c = CString::yolo(subj);
for part in mimeparser.parts.iter_mut() { for part in mimeparser.parts.iter_mut() {
if part.type_0 == Viewtype::Text { if part.type_0 == Viewtype::Text {
let msg_c = part.msg.as_ref().unwrap().strdup(); let new_txt = format!(
let new_txt: *mut libc::c_char = dc_mprintf( "{} – {}",
b"%s \xe2\x80\x93 %s\x00" as *const u8 as *const libc::c_char, subj,
subj_c.as_ptr(), part.msg.as_ref().expect("missing msg part")
msg_c,
); );
free(msg_c.cast()); part.msg = Some(new_txt);
part.msg = Some(to_string_lossy(new_txt));
free(new_txt.cast());
break; break;
} }
} }
@@ -1213,10 +1209,11 @@ unsafe fn dc_mimeparser_add_single_part_if_known(
if !(*mime).mm_content_type.is_null() if !(*mime).mm_content_type.is_null()
&& !(*(*mime).mm_content_type).ct_subtype.is_null() && !(*(*mime).mm_content_type).ct_subtype.is_null()
{ {
desired_filename = dc_mprintf( desired_filename = format!(
b"file.%s\x00" as *const u8 as *const libc::c_char, "file.{}",
(*(*mime).mm_content_type).ct_subtype, as_str((*(*mime).mm_content_type).ct_subtype)
); )
.strdup();
} else { } else {
ok_to_continue = false; ok_to_continue = false;
} }