Add mail_security and send_security fields to LoginParam

There is no longer unsafe version of this function, so suffix is
useless now.

.circleci/config.yml

@@ -1,5 +1,4 @@
 version: 2.1
-
 executors:
   default:
     docker:
@@ -13,7 +12,7 @@ restore-workspace: &restore-workspace
 restore-cache: &restore-cache
   restore_cache:
     keys:
-      - cargo-v0-{{ checksum "rust-toolchain" }}-{{ checksum "Cargo.toml" }}-{{ checksum "Cargo.lock" }}-{{ arch }}
+      - cargo-v2-{{ checksum "rust-toolchain" }}-{{ checksum "Cargo.toml" }}-{{ checksum "Cargo.lock" }}-{{ arch }}
       - repo-source-{{ .Branch }}-{{ .Revision }}
 
 commands:
@@ -24,20 +23,9 @@ commands:
     steps:
       - *restore-workspace
       - *restore-cache
-      - setup_remote_docker:
-          docker_layer_caching: true
-      # TODO: move into image
-      - run:
-          name: Install Docker client
-          command: |
-            set -x
-            VER="18.09.2"
-            curl -L -o /tmp/docker-$VER.tgz https://download.docker.com/linux/static/stable/x86_64/docker-$VER.tgz
-            tar -xz -C /tmp -f /tmp/docker-$VER.tgz
-            mv /tmp/docker/* /usr/bin
       - run:
           name: Test (<< parameters.target >>)
-          command: TARGET=<< parameters.target >> ci/run.sh
+          command: TARGET=<< parameters.target >> ci_scripts/run-rust-test.sh
           no_output_timeout: 15m
 
 jobs:
@@ -53,21 +41,23 @@ jobs:
           command: cargo generate-lockfile
       - restore_cache:
           keys:
-            - cargo-v0-{{ checksum "rust-toolchain" }}-{{ checksum "Cargo.toml" }}-{{ checksum "Cargo.lock" }}-{{ arch }}
+            - cargo-v2-{{ checksum "rust-toolchain" }}-{{ checksum "Cargo.toml" }}-{{ checksum "Cargo.lock" }}-{{ arch }}
       - run: rustup install $(cat rust-toolchain)
       - run: rustup default $(cat rust-toolchain)
       - run: rustup component add --toolchain $(cat rust-toolchain) rustfmt
+      - run: rustup component add --toolchain $(cat rust-toolchain) clippy-preview
       - run: cargo update
       - run: cargo fetch
       - run: rustc +stable --version
       - run: rustc +$(cat rust-toolchain) --version
-      - run: rm -rf .git
+      # make sure this git repo doesn't grow too big
+      - run: git gc
       - persist_to_workspace:
           root: /mnt
           paths:
             - crate
       - save_cache:
-          key: cargo-v0-{{ checksum "rust-toolchain" }}-{{ checksum "Cargo.toml" }}-{{ checksum "Cargo.lock" }}-{{ arch }}
+          key: cargo-v2-{{ checksum "rust-toolchain" }}-{{ checksum "Cargo.toml" }}-{{ checksum "Cargo.lock" }}-{{ arch }}
           paths:
             - "~/.cargo"
             - "~/.rustup"
@@ -102,7 +92,7 @@ jobs:
       - run: cargo fetch
       - run:
           name: Test
-          command: TARGET=x86_64-apple-darwin ci/run.sh
+          command: TARGET=x86_64-apple-darwin ci_scripts/run-rust-test.sh
 
   test_x86_64-unknown-linux-gnu:
     executor: default
@@ -124,18 +114,18 @@ jobs:
 
 
   build_test_docs_wheel:
-    machine: True
-    steps:
-      - checkout
-      # - run: docker pull deltachat/doxygen
-      - run: docker pull deltachat/coredeps
-      - run:
-          name: build docs, run tests and build wheels
-          command: ci_scripts/ci_run.sh
-          environment:
+    docker:
+      - image: deltachat/coredeps
+        environment:
             TESTS: 1
             DOCS: 1
-
+    working_directory: /mnt/crate
+    steps:
+      - *restore-workspace
+      - *restore-cache
+      - run:
+          name: build docs, run tests and build wheels
+          command: ci_scripts/run-python.sh
       - run:
            name: copying docs and wheels to workspace
            command: |
@@ -143,7 +133,6 @@ jobs:
              # cp -av docs workspace/c-docs
              cp -av python/.docker-tox/wheelhouse workspace/
              cp -av python/doc/_build/ workspace/py-docs
-
       - persist_to_workspace:
           root: workspace
           paths:
@@ -152,28 +141,43 @@ jobs:
             - wheelhouse
 
   upload_docs_wheels:
-    machine: True
+    machine: true
     steps:
       - checkout
       - attach_workspace:
           at: workspace
+      - run: pyenv global 3.5.2
       - run: ls -laR workspace
       - run: ci_scripts/ci_upload.sh workspace/py-docs workspace/wheelhouse
 
+  clippy:
+    executor: default
+    steps:
+      - *restore-workspace
+      - *restore-cache
+      - run:
+          name: Run cargo clippy
+          command: cargo clippy --all
+
 
 workflows:
   version: 2.1
 
   test:
     jobs:
-      - build_test_docs_wheel
+      - cargo_fetch
+      - build_test_docs_wheel:
+          requires:
+            - cargo_fetch
       - upload_docs_wheels:
           requires:
             - build_test_docs_wheel
-      - cargo_fetch
       - rustfmt:
           requires:
             - cargo_fetch
+      - clippy:
+          requires:
+            - cargo_fetch
 
       # Linux Desktop 64bit
       - test_x86_64-unknown-linux-gnu:

.gitattributes

@@ -2,6 +2,10 @@
 # ensures this even if the user has not set core.autocrlf.
 *  text=auto
 
+# This directory contains email messages verbatim, and changing CRLF to
+# LF will corrupt them.
+test-data/* text=false
+
 # binary files should be detected by git, however, to be sure, you can add them here explicitly
 *.png  binary
 *.jpg  binary

.gitignore

@@ -16,5 +16,10 @@ python/.tox
 *.egg-info
 __pycache__
 python/src/deltachat/capi*.so
+python/.venv/
 
 python/liveconfig*
+
+# ignore doxgen generated files
+deltachat-ffi/html
+deltachat-ffi/xml

Cargo.toml

@@ -1,15 +1,14 @@
 [package]
 name = "deltachat"
-version = "1.0.0-alpha.3"
+version = "1.0.0-alpha.5"
 authors = ["dignifiedquire <dignifiedquire@gmail.com>"]
 edition = "2018"
 license = "MPL"
 
-[build-dependencies]
-cc = "1.0.35"
-pkg-config = "0.3"
-
 [dependencies]
+deltachat_derive = { path = "./deltachat_derive" }
+mmime = { version = "0.1.2", path = "./mmime" }
+
 libc = "0.2.51"
 pgp = { version = "0.2", default-features = false }
 hex = "0.3.2"
@@ -21,8 +20,7 @@ num-derive = "0.2.5"
 num-traits = "0.2.6"
 native-tls = "0.2.3"
 lettre = "0.9.0"
-imap = "1.0.1"
-mmime = "0.1.0"
+imap = { git = "https://github.com/jonhoo/rust-imap", rev = "281d2eb8ab50dc656ceff2ae749ca5045f334e15" }
 base64 = "0.10"
 charset = "0.1"
 percent-encoding = "2.0"
@@ -33,27 +31,35 @@ failure = "0.1.5"
 failure_derive = "0.1.5"
 # TODO: make optional
 rustyline = "4.1.0"
-lazy_static = "1.3.0"
+lazy_static = "1.4.0"
 regex = "1.1.6"
 rusqlite = { version = "0.20", features = ["bundled"] }
-addr = "0.2.0"
 r2d2_sqlite = "0.12.0"
 r2d2 = "0.8.5"
-strum = "0.15.0"
-strum_macros = "0.15.0"
+strum = "0.16.0"
+strum_macros = "0.16.0"
 thread-local-object = "0.1.0"
 backtrace = "0.3.33"
 byteorder = "1.3.1"
 itertools = "0.8.0"
+image-meta = "0.1.0"
+quick-xml = "0.15.0"
+escaper = "0.1.0"
+bitflags = "1.1.0"
+jetscii = "0.4.4"
+debug_stub_derive = "0.3.0"
 
 [dev-dependencies]
 tempfile = "3.0"
 pretty_assertions = "0.6.1"
 pretty_env_logger = "0.3.0"
+proptest = "0.9.4"
 
 [workspace]
 members = [
-  "deltachat-ffi"
+  "deltachat-ffi",
+  "deltachat_derive",
+  "mmime",
 ]
 
 [[example]]

README.md

@@ -89,6 +89,14 @@ $ cargo test --all
 $ cargo build -p deltachat_ffi --release
 ```
 
+### Expensive tests
+
+Some tests are expensive and marked with `#[ignore]`, to run these
+use the `--ignored` argument to the test binary (not to cargo itself):
+```sh
+$ cargo test -- --ignored
+```
+
 ## Features
 
 - `vendored`: When using Openssl for TLS, this bundles a vendored version.

Xargo.toml

@@ -0,0 +1,6 @@
+[dependencies.std]
+features = ["panic-unwind"]
+
+# if using `cargo test`
+[dependencies.test]
+stage = 1

appveyor.yml

@@ -13,7 +13,7 @@ install:
 build: false
 
 test_script:
-  - cargo test --release
+  - cargo test --release --all
 
 cache:
   - target

build.rs

@@ -1,38 +0,0 @@
-extern crate cc;
-
-fn link_static(lib: &str) {
-    println!("cargo:rustc-link-lib=static={}", lib);
-}
-
-fn link_framework(fw: &str) {
-    println!("cargo:rustc-link-lib=framework={}", fw);
-}
-
-fn add_search_path(p: &str) {
-    println!("cargo:rustc-link-search={}", p);
-}
-
-fn build_tools() {
-    let mut config = cc::Build::new();
-    config.file("misc.c").compile("libtools.a");
-
-    println!("rerun-if-changed=build.rs");
-    println!("rerun-if-changed=misc.h");
-    println!("rerun-if-changed=misc.c");
-}
-
-fn main() {
-    build_tools();
-
-    add_search_path("/usr/local/lib");
-
-    let target = std::env::var("TARGET").unwrap();
-    if target.contains("-apple") || target.contains("-darwin") {
-        link_framework("CoreFoundation");
-        link_framework("CoreServices");
-        link_framework("Security");
-    }
-
-    // local tools
-    link_static("tools");
-}

ci_scripts/ci_run.sh

@@ -1,22 +0,0 @@
-# perform CI jobs on PRs and after merges to master.
-# triggered from .circleci/config.yml
-
-set -e -x
-
-export BRANCH=${CIRCLE_BRANCH:-test7}
-    
-# run doxygen on c-source (needed by later doc-generation steps).
-# XXX modifies the host filesystem docs/xml and docs/html directories
-# XXX which you can then only remove with sudo as they belong to root
-
-# XXX we don't do doxygen doc generation with Rust anymore, needs to be
-# substituted with rust-docs 
-#if [ -n "$DOCS" ] ; then 
-#    docker run --rm -it -v $PWD:/mnt -w /mnt/docs deltachat/doxygen doxygen
-#fi
-
-# run everything else inside docker (TESTS, DOCS, WHEELS) 
-docker run -e BRANCH -e TESTS -e DOCS \
-           --rm -it -v $(pwd):/mnt -w /mnt \
-           deltachat/coredeps ci_scripts/run_all.sh
-

ci_scripts/ci_upload.sh

@@ -15,6 +15,7 @@ export BRANCH=${CIRCLE_BRANCH:?specify branch for uploading purposes}
 
 
 # python docs to py.delta.chat
+ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null delta@py.delta.chat mkdir -p build/${BRANCH}
 rsync -avz \
   -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" \
   "$PYDOCDIR/html/" \
@@ -33,15 +34,17 @@ echo -----------------------
 # Bundle external shared libraries into the wheels
 pushd $WHEELHOUSEDIR
 
-pip install devpi-client
+pip3 install devpi-client
 devpi use https://m.devpi.net
 devpi login dc --password $DEVPI_LOGIN
 
-devpi use dc/$BRANCH || {
-    devpi index -c $BRANCH 
-    devpi use dc/$BRANCH
+N_BRANCH=${BRANCH//[\/]}
+
+devpi use dc/$N_BRANCH || {
+    devpi index -c $N_BRANCH 
+    devpi use dc/$N_BRANCH
 }
-devpi index $BRANCH bases=/root/pypi
+devpi index $N_BRANCH bases=/root/pypi
 devpi upload deltachat*.whl
 
 popd

ci_scripts/docker-coredeps/deps/build_rust.sh

@@ -3,9 +3,9 @@
 set -e -x 
 
 # Install Rust 
-curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2019-04-19 -y
+curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2019-07-10 -y
 export PATH=/root/.cargo/bin:$PATH
 rustc --version
 
 # remove some 300-400 MB that we don't need for automated builds
-rm -rf /root/.rustup/toolchains/nightly-2019-04-19-x86_64-unknown-linux-gnu/share/
+rm -rf /root/.rustup/toolchains/nightly-2019-07-10-x86_64-unknown-linux-gnu/share/

ci_scripts/run-python.sh

@@ -36,15 +36,25 @@ if [ -n "$TESTS" ]; then
     rm -rf src/deltachat/__pycache__
     export PYTHONDONTWRITEBYTECODE=1
 
-    # run tox
-    tox --workdir "$TOXWORKDIR" -e lint,py27,py35,py36,py37,auditwheels
+    # run tox. The circle-ci project env-var-setting DCC_PY_LIVECONFIG 
+    # allows running of "liveconfig" tests but for speed reasons
+    # we run them only for the highest python version we support
+    
+    # we split out qr-tests run to minimize likelyness of flaky tests
+    # (some qr tests are pretty heavy in terms of send/received
+    # messages and rust's imap code likely has concurrency problems) 
+    tox --workdir "$TOXWORKDIR" -e py37 -- -k "not qr"
+    tox --workdir "$TOXWORKDIR" -e py37 -- -k "qr"
+    unset DCC_PY_LIVECONFIG
+    tox --workdir "$TOXWORKDIR" -p4 -e lint,py35,py36,doc
+    tox --workdir "$TOXWORKDIR" -e auditwheels
     popd
 fi
 
 
-if [ -n "$DOCS" ]; then
-    echo -----------------------
-    echo generating python docs
-    echo -----------------------
-    (cd python && tox --workdir "$TOXWORKDIR" -e doc)
-fi
+# if [ -n "$DOCS" ]; then
+#     echo -----------------------
+#     echo generating python docs
+#     echo -----------------------
+#     (cd python && tox --workdir "$TOXWORKDIR" -e doc)
+# fi

ci_scripts/run-rust-test.sh

@@ -31,7 +31,7 @@ fi
 if [[ $NORUN == "1" ]]; then
     export CARGO_SUBCMD="build"
 else
-    export CARGO_SUBCMD="test"
+    export CARGO_SUBCMD="test --all"
     export OPT="${OPT} "
     export OPT_RELEASE="${OPT_RELEASE} "
     export OPT_RELEASE_IGNORED="${OPT_RELEASE} -- --ignored"
@@ -41,6 +41,3 @@ fi
 $CARGO_CMD $CARGO_SUBCMD $OPT
 $CARGO_CMD $CARGO_SUBCMD $OPT_RELEASE
 $CARGO_CMD $CARGO_SUBCMD $OPT_RELEASE_IGNORED
-
-# Build the ffi lib
-$CARGO_CMD $CARGO_SUBCMD $OPT_FFI_RELEASE

deltachat-ffi/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.0.0-alpha.3"
+version = "1.0.0-alpha.5"
 description = "Deltachat FFI"
 authors = ["dignifiedquire <dignifiedquire@gmail.com>"]
 edition = "2018"
@@ -16,6 +16,7 @@ crate-type = ["cdylib", "staticlib"]
 
 [dependencies]
 deltachat = { path = "../", default-features = false }
+deltachat-provider-database = "0.2.1"
 libc = "0.2"
 human-panic = "1.0.1"
 num-traits = "0.2.6"
@@ -25,4 +26,3 @@ default = ["vendored", "nightly", "ringbuf"]
 vendored = ["deltachat/vendored"]
 nightly = ["deltachat/nightly"]
 ringbuf = ["deltachat/ringbuf"]
-

deltachat-ffi/Doxyfile.css

@@ -0,0 +1,7 @@
+
+/* the code snippet frame, defaults to white which tends to get badly readable in combination with explaining text around */
+div.fragment {
+	background-color: #e0e0e0;
+	border: 0;
+	padding: 1em;
+}

deltachat-ffi/README.md

@@ -1 +1,10 @@
 # Delta Chat C Interface
+
+## Documentation
+
+To generate the C Interface documentation,
+call doxygen in the `deltachat-ffi` directory
+and browse the `html` subdirectory.
+
+If thinks work,
+the documentation is also available online at <https://c.delta.chat>

deltachat-ffi/src/providers.rs

@@ -0,0 +1,92 @@
+extern crate deltachat_provider_database;
+
+use std::ptr;
+
+use deltachat::dc_tools::{as_str, StrExt};
+use deltachat_provider_database::StatusState;
+
+#[no_mangle]
+pub type dc_provider_t = deltachat_provider_database::Provider;
+
+#[no_mangle]
+pub unsafe extern "C" fn dc_provider_new_from_domain(
+    domain: *const libc::c_char,
+) -> *const dc_provider_t {
+    match deltachat_provider_database::get_provider_info(as_str(domain)) {
+        Some(provider) => provider,
+        None => ptr::null(),
+    }
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn dc_provider_new_from_email(
+    email: *const libc::c_char,
+) -> *const dc_provider_t {
+    let domain = deltachat_provider_database::get_domain_from_email(as_str(email));
+    match deltachat_provider_database::get_provider_info(domain) {
+        Some(provider) => provider,
+        None => ptr::null(),
+    }
+}
+
+macro_rules! null_guard {
+    ($context:tt) => {
+        if $context.is_null() {
+            return ptr::null_mut() as *mut libc::c_char;
+        }
+    };
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn dc_provider_get_overview_page(
+    provider: *const dc_provider_t,
+) -> *mut libc::c_char {
+    null_guard!(provider);
+    format!(
+        "{}/{}",
+        deltachat_provider_database::PROVIDER_OVERVIEW_URL,
+        (*provider).overview_page
+    )
+    .strdup()
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn dc_provider_get_name(provider: *const dc_provider_t) -> *mut libc::c_char {
+    null_guard!(provider);
+    (*provider).name.strdup()
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn dc_provider_get_markdown(
+    provider: *const dc_provider_t,
+) -> *mut libc::c_char {
+    null_guard!(provider);
+    (*provider).markdown.strdup()
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn dc_provider_get_status_date(
+    provider: *const dc_provider_t,
+) -> *mut libc::c_char {
+    null_guard!(provider);
+    (*provider).status.date.strdup()
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn dc_provider_get_status(provider: *const dc_provider_t) -> u32 {
+    if provider.is_null() {
+        return 0;
+    }
+    match (*provider).status.state {
+        StatusState::OK => 1,
+        StatusState::PREPARATION => 2,
+        StatusState::BROKEN => 3,
+    }
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn dc_provider_unref(_provider: *const dc_provider_t) {
+    ()
+}
+
+// TODO expose general provider overview url?

deltachat_derive/Cargo.toml

@@ -0,0 +1,12 @@
+[package]
+name = "deltachat_derive"
+version = "0.1.0"
+authors = ["Dmitry Bogatov <KAction@debian.org>"]
+edition = "2018"
+
+[lib]
+proc-macro = true
+
+[dependencies]
+syn = "0.14.4"
+quote = "0.6.3"

deltachat_derive/src/lib.rs

@@ -0,0 +1,44 @@
+#![recursion_limit = "128"]
+extern crate proc_macro;
+
+use crate::proc_macro::TokenStream;
+use quote::quote;
+use syn;
+
+// For now, assume (not check) that these macroses are applied to enum without
+// data.  If this assumption is violated, compiler error will point to
+// generated code, which is not very user-friendly.
+
+#[proc_macro_derive(ToSql)]
+pub fn to_sql_derive(input: TokenStream) -> TokenStream {
+    let ast: syn::DeriveInput = syn::parse(input).unwrap();
+    let name = &ast.ident;
+
+    let gen = quote! {
+        impl rusqlite::types::ToSql for #name {
+            fn to_sql(&self) -> rusqlite::Result<rusqlite::types::ToSqlOutput> {
+                let num = *self as i64;
+                let value = rusqlite::types::Value::Integer(num);
+                let output = rusqlite::types::ToSqlOutput::Owned(value);
+                std::result::Result::Ok(output)
+            }
+        }
+    };
+    gen.into()
+}
+
+#[proc_macro_derive(FromSql)]
+pub fn from_sql_derive(input: TokenStream) -> TokenStream {
+    let ast: syn::DeriveInput = syn::parse(input).unwrap();
+    let name = &ast.ident;
+
+    let gen = quote! {
+        impl rusqlite::types::FromSql for #name {
+            fn column_result(col: rusqlite::types::ValueRef) -> rusqlite::types::FromSqlResult<Self> {
+                let inner = rusqlite::types::FromSql::column_result(col)?;
+                Ok(num_traits::FromPrimitive::from_i64(inner).unwrap_or_default())
+            }
+        }
+    };
+    gen.into()
+}

examples/repl/main.rs

@@ -3,7 +3,6 @@
 //!
 //! Usage:  cargo run --example repl --release -- <databasefile>
 //! All further options can be set using the set-command (type ? for help).
-#![feature(ptr_cast)]
 
 #[macro_use]
 extern crate deltachat;
@@ -15,19 +14,19 @@ extern crate lazy_static;
 extern crate rusqlite;
 
 use std::borrow::Cow::{self, Borrowed, Owned};
+use std::io::{self, Write};
+use std::path::Path;
+use std::process::Command;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::{Arc, Mutex, RwLock};
 
 use deltachat::config;
-use deltachat::constants::*;
+use deltachat::configure::*;
 use deltachat::context::*;
-use deltachat::dc_configure::*;
-use deltachat::dc_job::*;
-use deltachat::dc_securejoin::*;
-use deltachat::dc_tools::*;
+use deltachat::job::*;
 use deltachat::oauth2::*;
-use deltachat::types::*;
-use deltachat::x::*;
+use deltachat::securejoin::*;
+use deltachat::Event;
 use rustyline::completion::{Completer, FilenameCompleter, Pair};
 use rustyline::config::OutputStreamType;
 use rustyline::error::ReadlineError;
@@ -42,96 +41,75 @@ use self::cmdline::*;
 
 // Event Handler
 
-unsafe extern "C" fn receive_event(
-    _context: &Context,
-    event: Event,
-    data1: uintptr_t,
-    data2: uintptr_t,
-) -> uintptr_t {
+fn receive_event(_context: &Context, event: Event) -> libc::uintptr_t {
     match event {
-        Event::GET_STRING => {}
-        Event::INFO => {
+        Event::GetString { .. } => {}
+        Event::Info(msg) => {
             /* do not show the event as this would fill the screen */
-            println!("{}", to_string(data2 as *const _),);
+            println!("{}", msg);
         }
-        Event::SMTP_CONNECTED => {
-            println!("[DC_EVENT_SMTP_CONNECTED] {}", to_string(data2 as *const _));
+        Event::SmtpConnected(msg) => {
+            println!("[DC_EVENT_SMTP_CONNECTED] {}", msg);
         }
-        Event::IMAP_CONNECTED => {
-            println!("[DC_EVENT_IMAP_CONNECTED] {}", to_string(data2 as *const _),);
+        Event::ImapConnected(msg) => {
+            println!("[DC_EVENT_IMAP_CONNECTED] {}", msg);
         }
-        Event::SMTP_MESSAGE_SENT => {
-            println!(
-                "[DC_EVENT_SMTP_MESSAGE_SENT] {}",
-                to_string(data2 as *const _),
-            );
+        Event::SmtpMessageSent(msg) => {
+            println!("[DC_EVENT_SMTP_MESSAGE_SENT] {}", msg);
         }
-        Event::WARNING => {
-            println!("[Warning] {}", to_string(data2 as *const _),);
+        Event::Warning(msg) => {
+            println!("[Warning] {}", msg);
         }
-        Event::ERROR => {
-            println!(
-                "\x1b[31m[DC_EVENT_ERROR] {}\x1b[0m",
-                to_string(data2 as *const _),
-            );
+        Event::Error(msg) => {
+            println!("\x1b[31m[DC_EVENT_ERROR] {}\x1b[0m", msg);
         }
-        Event::ERROR_NETWORK => {
-            println!(
-                "\x1b[31m[DC_EVENT_ERROR_NETWORK] first={}, msg={}\x1b[0m",
-                data1 as usize,
-                to_string(data2 as *const _),
-            );
+        Event::ErrorNetwork(msg) => {
+            println!("\x1b[31m[DC_EVENT_ERROR_NETWORK] msg={}\x1b[0m", msg);
         }
-        Event::ERROR_SELF_NOT_IN_GROUP => {
-            println!(
-                "\x1b[31m[DC_EVENT_ERROR_SELF_NOT_IN_GROUP] {}\x1b[0m",
-                to_string(data2 as *const _),
-            );
+        Event::ErrorSelfNotInGroup(msg) => {
+            println!("\x1b[31m[DC_EVENT_ERROR_SELF_NOT_IN_GROUP] {}\x1b[0m", msg);
         }
-        Event::MSGS_CHANGED => {
+        Event::MsgsChanged { chat_id, msg_id } => {
             print!(
-                "\x1b[33m{{Received DC_EVENT_MSGS_CHANGED({}, {})}}\n\x1b[0m",
-                data1 as usize, data2 as usize,
+                "\x1b[33m{{Received DC_EVENT_MSGS_CHANGED(chat_id={}, msg_id={})}}\n\x1b[0m",
+                chat_id, msg_id,
             );
         }
-        Event::CONTACTS_CHANGED => {
+        Event::ContactsChanged(_) => {
             print!("\x1b[33m{{Received DC_EVENT_CONTACTS_CHANGED()}}\n\x1b[0m");
         }
-        Event::LOCATION_CHANGED => {
+        Event::LocationChanged(contact) => {
             print!(
-                "\x1b[33m{{Received DC_EVENT_LOCATION_CHANGED(contact={})}}\n\x1b[0m",
-                data1 as usize,
+                "\x1b[33m{{Received DC_EVENT_LOCATION_CHANGED(contact={:?})}}\n\x1b[0m",
+                contact,
             );
         }
-        Event::CONFIGURE_PROGRESS => {
+        Event::ConfigureProgress(progress) => {
             print!(
                 "\x1b[33m{{Received DC_EVENT_CONFIGURE_PROGRESS({} ‰)}}\n\x1b[0m",
-                data1 as usize,
+                progress,
             );
         }
-        Event::IMEX_PROGRESS => {
+        Event::ImexProgress(progress) => {
             print!(
                 "\x1b[33m{{Received DC_EVENT_IMEX_PROGRESS({} ‰)}}\n\x1b[0m",
-                data1 as usize,
+                progress,
             );
         }
-        Event::IMEX_FILE_WRITTEN => {
+        Event::ImexFileWritten(file) => {
             print!(
                 "\x1b[33m{{Received DC_EVENT_IMEX_FILE_WRITTEN({})}}\n\x1b[0m",
-                to_string(data1 as *const _)
+                file.display()
             );
         }
-        Event::CHAT_MODIFIED => {
+        Event::ChatModified(chat) => {
             print!(
                 "\x1b[33m{{Received DC_EVENT_CHAT_MODIFIED({})}}\n\x1b[0m",
-                data1 as usize,
+                chat
             );
         }
         _ => {
-            print!(
-                "\x1b[33m{{Received {:?}({}, {})}}\n\x1b[0m",
-                event, data1 as usize, data2 as usize,
-            );
+            print!("\x1b[33m{{Received {:?}}}\n\x1b[0m", event);
         }
     }
 
@@ -173,13 +151,11 @@ fn start_threads(c: Arc<RwLock<Context>>) {
     let ctx = c.clone();
     let handle_imap = std::thread::spawn(move || loop {
         while_running!({
-            unsafe {
-                dc_perform_imap_jobs(&ctx.read().unwrap());
-                dc_perform_imap_fetch(&ctx.read().unwrap());
-            }
+            perform_imap_jobs(&ctx.read().unwrap());
+            perform_imap_fetch(&ctx.read().unwrap());
             while_running!({
                 let context = ctx.read().unwrap();
-                dc_perform_imap_idle(&context);
+                perform_imap_idle(&context);
             });
         });
     });
@@ -187,9 +163,9 @@ fn start_threads(c: Arc<RwLock<Context>>) {
     let ctx = c.clone();
     let handle_mvbox = std::thread::spawn(move || loop {
         while_running!({
-            unsafe { dc_perform_mvbox_fetch(&ctx.read().unwrap()) };
+            perform_mvbox_fetch(&ctx.read().unwrap());
             while_running!({
-                unsafe { dc_perform_mvbox_idle(&ctx.read().unwrap()) };
+                perform_mvbox_idle(&ctx.read().unwrap());
             });
         });
     });
@@ -197,9 +173,9 @@ fn start_threads(c: Arc<RwLock<Context>>) {
     let ctx = c.clone();
     let handle_sentbox = std::thread::spawn(move || loop {
         while_running!({
-            unsafe { dc_perform_sentbox_fetch(&ctx.read().unwrap()) };
+            perform_sentbox_fetch(&ctx.read().unwrap());
             while_running!({
-                unsafe { dc_perform_sentbox_idle(&ctx.read().unwrap()) };
+                perform_sentbox_idle(&ctx.read().unwrap());
             });
         });
     });
@@ -207,9 +183,9 @@ fn start_threads(c: Arc<RwLock<Context>>) {
     let ctx = c;
     let handle_smtp = std::thread::spawn(move || loop {
         while_running!({
-            unsafe { dc_perform_smtp_jobs(&ctx.read().unwrap()) };
+            perform_smtp_jobs(&ctx.read().unwrap());
             while_running!({
-                unsafe { dc_perform_smtp_idle(&ctx.read().unwrap()) };
+                perform_smtp_idle(&ctx.read().unwrap());
             });
         });
     });
@@ -227,12 +203,10 @@ fn stop_threads(context: &Context) {
         println!("Stopping threads");
         IS_RUNNING.store(false, Ordering::Relaxed);
 
-        unsafe {
-            dc_interrupt_imap_idle(context);
-            dc_interrupt_mvbox_idle(context);
-            dc_interrupt_sentbox_idle(context);
-            dc_interrupt_smtp_idle(context);
-        }
+        interrupt_imap_idle(context);
+        interrupt_mvbox_idle(context);
+        interrupt_sentbox_idle(context);
+        interrupt_smtp_idle(context);
 
         handle.handle_imap.take().unwrap().join().unwrap();
         handle.handle_mvbox.take().unwrap().join().unwrap();
@@ -335,8 +309,8 @@ const CONTACT_COMMANDS: [&'static str; 6] = [
     "delcontact",
     "cleanupcontacts",
 ];
-const MISC_COMMANDS: [&'static str; 8] = [
-    "getqr", "getbadqr", "checkqr", "event", "fileinfo", "clear", "exit", "help",
+const MISC_COMMANDS: [&'static str; 9] = [
+    "getqr", "getbadqr", "checkqr", "event", "fileinfo", "clear", "exit", "quit", "help",
 ];
 
 impl Hinter for DcHelper {
@@ -389,21 +363,15 @@ impl Highlighter for DcHelper {
 impl Helper for DcHelper {}
 
 fn main_0(args: Vec<String>) -> Result<(), failure::Error> {
-    let mut context = dc_context_new(
-        Some(receive_event),
-        0 as *mut libc::c_void,
-        Some("CLI".into()),
-    );
-
-    unsafe { dc_cmdline_skip_auth() };
-
-    if args.len() == 2 {
-        if unsafe { !dc_open(&mut context, &args[1], None) } {
-            println!("Error: Cannot open {}.", args[0],);
-        }
-    } else if args.len() != 1 {
+    if args.len() < 2 {
         println!("Error: Bad arguments, expected [db-name].");
+        return Err(format_err!("No db-name specified"));
     }
+    let context = Context::new(
+        Box::new(receive_event),
+        "CLI".into(),
+        Path::new(&args[1]).to_path_buf(),
+    )?;
 
     println!("Delta Chat Core is awaiting your commands.");
 
@@ -456,12 +424,6 @@ fn main_0(args: Vec<String>) -> Result<(), failure::Error> {
     println!("history saved");
     {
         stop_threads(&ctx.read().unwrap());
-
-        unsafe {
-            let mut ctx = ctx.write().unwrap();
-            dc_close(&mut ctx);
-            dc_context_unref(&mut ctx);
-        }
     }
 
     Ok(())
@@ -477,11 +439,6 @@ unsafe fn handle_cmd(line: &str, ctx: Arc<RwLock<Context>>) -> Result<ExitResult
     let mut args = line.splitn(2, ' ');
     let arg0 = args.next().unwrap_or_default();
     let arg1 = args.next().unwrap_or_default();
-    let arg1_c = if arg1.is_empty() {
-        std::ptr::null()
-    } else {
-        arg1.strdup()
-    };
 
     match arg0 {
         "connect" => {
@@ -494,19 +451,19 @@ unsafe fn handle_cmd(line: &str, ctx: Arc<RwLock<Context>>) -> Result<ExitResult
             if HANDLE.clone().lock().unwrap().is_some() {
                 println!("smtp-jobs are already running in a thread.",);
             } else {
-                dc_perform_smtp_jobs(&ctx.read().unwrap());
+                perform_smtp_jobs(&ctx.read().unwrap());
             }
         }
         "imap-jobs" => {
             if HANDLE.clone().lock().unwrap().is_some() {
                 println!("imap-jobs are already running in a thread.");
             } else {
-                dc_perform_imap_jobs(&ctx.read().unwrap());
+                perform_imap_jobs(&ctx.read().unwrap());
             }
         }
         "configure" => {
             start_threads(ctx.clone());
-            dc_configure(&ctx.read().unwrap());
+            configure(&ctx.read().unwrap());
         }
         "oauth2" => {
             if let Some(addr) = ctx.read().unwrap().get_config(config::Config::Addr) {
@@ -530,38 +487,33 @@ unsafe fn handle_cmd(line: &str, ctx: Arc<RwLock<Context>>) -> Result<ExitResult
         }
         "getqr" | "getbadqr" => {
             start_threads(ctx.clone());
-            let qrstr =
-                dc_get_securejoin_qr(&ctx.read().unwrap(), arg1.parse().unwrap_or_default());
-            if !qrstr.is_null() && 0 != *qrstr.offset(0isize) as libc::c_int {
-                if arg0 == "getbadqr" && strlen(qrstr) > 40 {
-                    let mut i: libc::c_int = 12i32;
-                    while i < 22i32 {
-                        *qrstr.offset(i as isize) = '0' as i32 as libc::c_char;
-                        i += 1
+            if let Some(mut qr) =
+                dc_get_securejoin_qr(&ctx.read().unwrap(), arg1.parse().unwrap_or_default())
+            {
+                if !qr.is_empty() {
+                    if arg0 == "getbadqr" && qr.len() > 40 {
+                        qr.replace_range(12..22, "0000000000")
                     }
+                    println!("{}", qr);
+                    let output = Command::new("qrencode")
+                        .args(&["-t", "ansiutf8", qr.as_str(), "-o", "-"])
+                        .output()
+                        .expect("failed to execute process");
+                    io::stdout().write_all(&output.stdout).unwrap();
+                    io::stderr().write_all(&output.stderr).unwrap();
                 }
-                println!("{}", to_string(qrstr as *const _));
-                let syscmd = dc_mprintf(
-                    b"qrencode -t ansiutf8 \"%s\" -o -\x00" as *const u8 as *const libc::c_char,
-                    qrstr,
-                );
-                system(syscmd);
-                free(syscmd as *mut libc::c_void);
             }
-            free(qrstr as *mut libc::c_void);
         }
         "joinqr" => {
             start_threads(ctx.clone());
             if !arg0.is_empty() {
-                dc_join_securejoin(&ctx.read().unwrap(), arg1_c);
+                dc_join_securejoin(&ctx.read().unwrap(), arg1);
             }
         }
-        "exit" => return Ok(ExitResult::Exit),
+        "exit" | "quit" => return Ok(ExitResult::Exit),
         _ => dc_cmdline(&ctx.read().unwrap(), line)?,
     }
 
-    free(arg1_c as *mut _);
-
     Ok(ExitResult::Continue)
 }
 

examples/simple.rs

@@ -1,64 +1,62 @@
 extern crate deltachat;
 
-use std::ffi::CStr;
 use std::sync::{Arc, RwLock};
 use std::{thread, time};
 use tempfile::tempdir;
 
+use deltachat::chat;
 use deltachat::chatlist::*;
 use deltachat::config;
-use deltachat::constants::Event;
+use deltachat::configure::*;
 use deltachat::contact::*;
 use deltachat::context::*;
-use deltachat::dc_chat::*;
-use deltachat::dc_configure::*;
-use deltachat::dc_job::{
-    dc_perform_imap_fetch, dc_perform_imap_idle, dc_perform_imap_jobs, dc_perform_smtp_idle,
-    dc_perform_smtp_jobs,
+use deltachat::job::{
+    perform_imap_fetch, perform_imap_idle, perform_imap_jobs, perform_smtp_idle, perform_smtp_jobs,
 };
-use deltachat::dc_lot::*;
+use deltachat::Event;
 
-extern "C" fn cb(_ctx: &Context, event: Event, data1: usize, data2: usize) -> usize {
-    println!("[{:?}]", event);
+fn cb(_ctx: &Context, event: Event) -> usize {
+    print!("[{:?}]", event);
 
     match event {
-        Event::CONFIGURE_PROGRESS => {
-            println!("  progress: {}", data1);
+        Event::ConfigureProgress(progress) => {
+            print!("  progress: {}\n", progress);
             0
         }
-        Event::INFO | Event::WARNING | Event::ERROR | Event::ERROR_NETWORK => {
-            println!(
-                "  {}",
-                unsafe { CStr::from_ptr(data2 as *const _) }
-                    .to_str()
-                    .unwrap()
-            );
+        Event::Info(msg) | Event::Warning(msg) | Event::Error(msg) | Event::ErrorNetwork(msg) => {
+            print!("  {}\n", msg);
+            0
+        }
+        _ => {
+            print!("\n");
             0
         }
-        _ => 0,
     }
 }
 
 fn main() {
     unsafe {
-        let ctx = dc_context_new(Some(cb), std::ptr::null_mut(), None);
+        let dir = tempdir().unwrap();
+        let dbfile = dir.path().join("db.sqlite");
+        println!("creating database {:?}", dbfile);
+        let ctx =
+            Context::new(Box::new(cb), "FakeOs".into(), dbfile).expect("Failed to create context");
         let running = Arc::new(RwLock::new(true));
-        let info = dc_get_info(&ctx);
-        let info_s = CStr::from_ptr(info);
+        let info = ctx.get_info();
         let duration = time::Duration::from_millis(4000);
-        println!("info: {}", info_s.to_str().unwrap());
+        println!("info: {:#?}", info);
 
         let ctx = Arc::new(ctx);
         let ctx1 = ctx.clone();
         let r1 = running.clone();
         let t1 = thread::spawn(move || {
             while *r1.read().unwrap() {
-                dc_perform_imap_jobs(&ctx1);
+                perform_imap_jobs(&ctx1);
                 if *r1.read().unwrap() {
-                    dc_perform_imap_fetch(&ctx1);
+                    perform_imap_fetch(&ctx1);
 
                     if *r1.read().unwrap() {
-                        dc_perform_imap_idle(&ctx1);
+                        perform_imap_idle(&ctx1);
                     }
                 }
             }
@@ -68,20 +66,13 @@ fn main() {
         let r1 = running.clone();
         let t2 = thread::spawn(move || {
             while *r1.read().unwrap() {
-                dc_perform_smtp_jobs(&ctx1);
+                perform_smtp_jobs(&ctx1);
                 if *r1.read().unwrap() {
-                    dc_perform_smtp_idle(&ctx1);
+                    perform_smtp_idle(&ctx1);
                 }
             }
         });
 
-        let dir = tempdir().unwrap();
-        let dbfile = dir.path().join("db.sqlite");
-
-        println!("opening database {:?}", dbfile);
-
-        assert!(dc_open(&ctx, dbfile.to_str().unwrap(), None));
-
         println!("configuring");
         let args = std::env::args().collect::<Vec<String>>();
         assert_eq!(args.len(), 2, "missing password");
@@ -89,36 +80,24 @@ fn main() {
         ctx.set_config(config::Config::Addr, Some("d@testrun.org"))
             .unwrap();
         ctx.set_config(config::Config::MailPw, Some(&pw)).unwrap();
-        dc_configure(&ctx);
+        configure(&ctx);
 
         thread::sleep(duration);
 
         println!("sending a message");
         let contact_id =
             Contact::create(&ctx, "dignifiedquire", "dignifiedquire@gmail.com").unwrap();
-        let chat_id = dc_create_chat_by_contact_id(&ctx, contact_id);
-        dc_send_text_msg(&ctx, chat_id, "Hi, here is my first message!".into());
+        let chat_id = chat::create_by_contact_id(&ctx, contact_id).unwrap();
+        chat::send_text_msg(&ctx, chat_id, "Hi, here is my first message!".into()).unwrap();
 
         println!("fetching chats..");
         let chats = Chatlist::try_load(&ctx, 0, None, None).unwrap();
 
         for i in 0..chats.len() {
-            let summary = chats.get_summary(0, std::ptr::null_mut());
-            let text1 = dc_lot_get_text1(summary);
-            let text2 = dc_lot_get_text2(summary);
-
-            let text1_s = if !text1.is_null() {
-                Some(CStr::from_ptr(text1))
-            } else {
-                None
-            };
-            let text2_s = if !text2.is_null() {
-                Some(CStr::from_ptr(text2))
-            } else {
-                None
-            };
-            println!("chat: {} - {:?} - {:?}", i, text1_s, text2_s,);
-            dc_lot_unref(summary);
+            let summary = chats.get_summary(&ctx, 0, None);
+            let text1 = summary.get_text1();
+            let text2 = summary.get_text2();
+            println!("chat: {} - {:?} - {:?}", i, text1, text2,);
         }
 
         thread::sleep(duration);
@@ -136,14 +115,13 @@ fn main() {
         println!("stopping threads");
 
         *running.clone().write().unwrap() = false;
-        deltachat::dc_job::dc_interrupt_imap_idle(&ctx);
-        deltachat::dc_job::dc_interrupt_smtp_idle(&ctx);
+        deltachat::job::interrupt_imap_idle(&ctx);
+        deltachat::job::interrupt_smtp_idle(&ctx);
 
         println!("joining");
         t1.join().unwrap();
         t2.join().unwrap();
 
         println!("closing");
-        dc_close(&ctx);
     }
 }

misc.c

@@ -1,52 +0,0 @@
-#include <stdlib.h>
-#include <stdarg.h>
-#include <ctype.h>
-#include <string.h>
-#include <stdio.h>
-#include "misc.h"
-
-
-static char* internal_dc_strdup(const char* s) /* strdup(NULL) is undefined, save_strdup(NULL) returns an empty string in this case */
-{
-	char* ret = NULL;
-	if (s) {
-		if ((ret=strdup(s))==NULL) {
-			exit(16); /* cannot allocate (little) memory, unrecoverable error */
-		}
-	}
-	else {
-		if ((ret=(char*)calloc(1, 1))==NULL) {
-			exit(17); /* cannot allocate little memory, unrecoverable error */
-		}
-	}
-	return ret;
-}
-
-char* dc_mprintf(const char* format, ...)
-{
-	char  testbuf[1];
-	char* buf = NULL;
-	int   char_cnt_without_zero = 0;
-
-	va_list argp;
-	va_list argp_copy;
-	va_start(argp, format);
-	va_copy(argp_copy, argp);
-
-	char_cnt_without_zero = vsnprintf(testbuf, 0, format, argp);
-	va_end(argp);
-	if (char_cnt_without_zero < 0) {
-		va_end(argp_copy);
-		return internal_dc_strdup("ErrFmt");
-	}
-
-	buf = malloc(char_cnt_without_zero+2 /* +1 would be enough, however, protect against off-by-one-errors */);
-	if (buf==NULL) {
-		va_end(argp_copy);
-		return internal_dc_strdup("ErrMem");
-	}
-
-	vsnprintf(buf, char_cnt_without_zero+1, format, argp_copy);
-	va_end(argp_copy);
-	return buf;
-}

misc.h

@@ -1 +0,0 @@
-char* dc_mprintf                 (const char* format, ...); /* The result must be free()'d. */

mmime/.circleci/config.yml

@@ -0,0 +1,42 @@
+# copied from http://koushiro.me/2019/04/30/Building-and-Testing-Rust-projects-on-CircleCI/
+
+version: 2.1
+jobs:
+  build:
+    docker:
+      - image: ubuntu:18.04
+
+    working_directory: ~/deltachat-core-rust
+
+    steps:
+      - checkout
+
+      - run:
+          name: Setup build environment
+          command: |
+            apt update
+            apt install -y curl build-essential autoconf libtool git python pkg-config
+            # this will pick default toolchain from `rust-toolchain` file
+            curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --no-modify-path --default-toolchain none -y;
+            source $HOME/.cargo/env
+          no_output_timeout: 1800s
+
+      - run:
+          name: Format
+          command: |
+            export PATH=~/.cargo/bin:$PATH
+            rustup component add rustfmt
+            cargo fmt -- --check
+
+      - run:
+          name: Test
+          command: |
+            export PATH=~/.cargo/bin:$PATH
+            export RUST_BACKTRACE=1
+            cargo test
+
+workflows:
+  version: 2.1
+  build:
+    jobs:
+      - build

mmime/Cargo.toml

@@ -0,0 +1,23 @@
+[package]
+name = "mmime"
+version = "0.1.2"
+authors = ["dignifiedquire <dignifiedquire@users.noreply.github.com>"]
+edition = "2018"
+license = "MIT OR Apache-2.0"
+homepage = "https://github.com/deltachat/deltachat-core-rust"
+repository = "https://github.com/deltachat/deltachat-core-rust"
+readme = "README.md"
+description = "Mime parsing for email"
+
+
+keywords = ["mail", "mim", "email", "imap", "smtp"]
+categories = ["std", "email"]
+
+[dependencies]
+libc = "0.2.54"
+charset = "0.1.2"
+memmap = "0.7.0"
+lazy_static = "1.3.0"
+rand = "0.6.5"
+chrono = "0.4.6"
+hex = "0.3.2"

mmime/LICENSE-APACHE

@@ -0,0 +1,201 @@
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

mmime/LICENSE-MIT

@@ -0,0 +1,23 @@
+Permission is hereby granted, free of charge, to any
+person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the
+Software without restriction, including without
+limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.

mmime/LICENSE.md

@@ -0,0 +1,4 @@
+This library is primarly distributed under the terms of both the MIT license and
+the Apache License (Version 2.0).
+
+See LICENSE-MIT and LICENSE-APACHE for details.

mmime/README.md

@@ -0,0 +1,16 @@
+# mmime
+
+[![CircleCI build status][circle-shield]][circle] [![Appveyor build status][appveyor-shield]][appveyor] [![License][license-shield]][license]
+
+> mmmmmmime parsing
+
+Base code was compiled using c2rust from libetpan.
+
+
+
+[circle-shield]: https://img.shields.io/circleci/project/github/dignifiedquire/mmime/master.svg?style=flat-square
+[circle]: https://circleci.com/gh/dignifiedquire/mmime/
+[appveyor-shield]: https://ci.appveyor.com/api/projects/status/l26co5rba32knrlu/branch/master?style=flat-square
+[appveyor]: https://ci.appveyor.com/project/dignifiedquire/mmime/branch/master
+[license-shield]: https://img.shields.io/badge/License-MIT%2FApache2.0-green.svg?style=flat-square
+[license]: https://github.com/rpgp/rpgp/blob/master/LICENSE.md

mmime/src/charconv.rs

@@ -0,0 +1,32 @@
+use crate::other::*;
+use libc;
+use std::ffi::{CStr, CString};
+
+pub const MAIL_CHARCONV_ERROR_CONV: libc::c_uint = 3;
+pub const MAIL_CHARCONV_ERROR_MEMORY: libc::c_uint = 2;
+pub const MAIL_CHARCONV_ERROR_UNKNOWN_CHARSET: libc::c_uint = 1;
+pub const MAIL_CHARCONV_NO_ERROR: libc::c_uint = 0;
+
+pub unsafe fn charconv(
+    tocode: *const libc::c_char,
+    fromcode: *const libc::c_char,
+    s: *const libc::c_char,
+    length: size_t,
+    result: *mut *mut libc::c_char,
+) -> libc::c_int {
+    assert!(!fromcode.is_null(), "invalid fromcode");
+    assert!(!s.is_null(), "invalid input string");
+    if let Some(encoding) =
+        charset::Charset::for_label(CStr::from_ptr(fromcode).to_str().unwrap().as_bytes())
+    {
+        let data = std::slice::from_raw_parts(s as *const u8, strlen(s));
+
+        let (res, _, _) = encoding.decode(data);
+        let res_c = CString::new(res.as_bytes()).unwrap();
+        *result = strdup(res_c.as_ptr()) as *mut _;
+
+        MAIL_CHARCONV_NO_ERROR as libc::c_int
+    } else {
+        MAIL_CHARCONV_ERROR_UNKNOWN_CHARSET as libc::c_int
+    }
+}

mmime/src/chash.rs

@@ -0,0 +1,427 @@
+use libc;
+
+use crate::other::*;
+
+#[derive(Copy, Clone)]
+#[repr(C)]
+pub struct chashdatum {
+    pub data: *mut libc::c_void,
+    pub len: libc::c_uint,
+}
+
+#[derive(Copy, Clone)]
+#[repr(C)]
+pub struct chash {
+    pub size: libc::c_uint,
+    pub count: libc::c_uint,
+    pub copyvalue: libc::c_int,
+    pub copykey: libc::c_int,
+    pub cells: *mut *mut chashcell,
+}
+
+#[derive(Copy, Clone)]
+#[repr(C)]
+pub struct chashcell {
+    pub func: libc::c_uint,
+    pub key: chashdatum,
+    pub value: chashdatum,
+    pub next: *mut chashcell,
+}
+
+pub type chashiter = chashcell;
+/* Allocates a new (empty) hash using this initial size and the given flags,
+  specifying which data should be copied in the hash.
+   CHASH_COPYNONE  : Keys/Values are not copied.
+   CHASH_COPYKEY   : Keys are dupped and freed as needed in the hash.
+   CHASH_COPYVALUE : Values are dupped and freed as needed in the hash.
+   CHASH_COPYALL   : Both keys and values are dupped in the hash.
+*/
+pub unsafe fn chash_new(mut size: libc::c_uint, mut flags: libc::c_int) -> *mut chash {
+    let mut h: *mut chash = 0 as *mut chash;
+    h = malloc(::std::mem::size_of::<chash>() as libc::size_t) as *mut chash;
+    if h.is_null() {
+        return 0 as *mut chash;
+    }
+    if size < 13i32 as libc::c_uint {
+        size = 13i32 as libc::c_uint
+    }
+    (*h).count = 0i32 as libc::c_uint;
+    (*h).cells = calloc(
+        size as libc::size_t,
+        ::std::mem::size_of::<*mut chashcell>() as libc::size_t,
+    ) as *mut *mut chashcell;
+    if (*h).cells.is_null() {
+        free(h as *mut libc::c_void);
+        return 0 as *mut chash;
+    }
+    (*h).size = size;
+    (*h).copykey = flags & 1i32;
+    (*h).copyvalue = flags & 2i32;
+    return h;
+}
+
+/* Frees a hash */
+pub unsafe fn chash_free(mut hash: *mut chash) {
+    let mut indx: libc::c_uint = 0;
+    let mut iter: *mut chashiter = 0 as *mut chashiter;
+    let mut next: *mut chashiter = 0 as *mut chashiter;
+    indx = 0i32 as libc::c_uint;
+    while indx < (*hash).size {
+        iter = *(*hash).cells.offset(indx as isize);
+        while !iter.is_null() {
+            next = (*iter).next;
+            if 0 != (*hash).copykey {
+                free((*iter).key.data);
+            }
+            if 0 != (*hash).copyvalue {
+                free((*iter).value.data);
+            }
+            free(iter as *mut libc::c_void);
+            iter = next
+        }
+        indx = indx.wrapping_add(1)
+    }
+    free((*hash).cells as *mut libc::c_void);
+    free(hash as *mut libc::c_void);
+}
+
+/* Removes all elements from a hash */
+pub unsafe fn chash_clear(mut hash: *mut chash) {
+    let mut indx: libc::c_uint = 0;
+    let mut iter: *mut chashiter = 0 as *mut chashiter;
+    let mut next: *mut chashiter = 0 as *mut chashiter;
+    indx = 0i32 as libc::c_uint;
+    while indx < (*hash).size {
+        iter = *(*hash).cells.offset(indx as isize);
+        while !iter.is_null() {
+            next = (*iter).next;
+            if 0 != (*hash).copykey {
+                free((*iter).key.data);
+            }
+            if 0 != (*hash).copyvalue {
+                free((*iter).value.data);
+            }
+            free(iter as *mut libc::c_void);
+            iter = next
+        }
+        indx = indx.wrapping_add(1)
+    }
+    memset(
+        (*hash).cells as *mut libc::c_void,
+        0i32,
+        ((*hash).size as libc::size_t)
+            .wrapping_mul(::std::mem::size_of::<*mut chashcell>() as libc::size_t),
+    );
+    (*hash).count = 0i32 as libc::c_uint;
+}
+/* Adds an entry in the hash table.
+Length can be 0 if key/value are strings.
+If an entry already exists for this key, it is replaced, and its value
+is returned. Otherwise, the data pointer will be NULL and the length
+field be set to TRUE or FALSe to indicate success or failure. */
+pub unsafe fn chash_set(
+    mut hash: *mut chash,
+    mut key: *mut chashdatum,
+    mut value: *mut chashdatum,
+    mut oldvalue: *mut chashdatum,
+) -> libc::c_int {
+    let mut current_block: u64;
+    let mut func: libc::c_uint = 0;
+    let mut indx: libc::c_uint = 0;
+    let mut iter: *mut chashiter = 0 as *mut chashiter;
+    let mut cell: *mut chashiter = 0 as *mut chashiter;
+    let mut r: libc::c_int = 0;
+    if (*hash).count > (*hash).size.wrapping_mul(3i32 as libc::c_uint) {
+        r = chash_resize(
+            hash,
+            (*hash)
+                .count
+                .wrapping_div(3i32 as libc::c_uint)
+                .wrapping_mul(2i32 as libc::c_uint)
+                .wrapping_add(1i32 as libc::c_uint),
+        );
+        if r < 0i32 {
+            current_block = 17701753836843438419;
+        } else {
+            current_block = 7095457783677275021;
+        }
+    } else {
+        current_block = 7095457783677275021;
+    }
+    match current_block {
+        7095457783677275021 => {
+            func = chash_func((*key).data as *const libc::c_char, (*key).len);
+            indx = func.wrapping_rem((*hash).size);
+            iter = *(*hash).cells.offset(indx as isize);
+            loop {
+                if iter.is_null() {
+                    current_block = 17788412896529399552;
+                    break;
+                }
+                if (*iter).key.len == (*key).len
+                    && (*iter).func == func
+                    && 0 == memcmp((*iter).key.data, (*key).data, (*key).len as libc::size_t)
+                {
+                    /* found, replacing entry */
+                    if 0 != (*hash).copyvalue {
+                        let mut data: *mut libc::c_char = 0 as *mut libc::c_char;
+                        data = chash_dup((*value).data, (*value).len);
+                        if data.is_null() {
+                            current_block = 17701753836843438419;
+                            break;
+                        }
+                        free((*iter).value.data);
+                        (*iter).value.data = data as *mut libc::c_void;
+                        (*iter).value.len = (*value).len
+                    } else {
+                        if !oldvalue.is_null() {
+                            (*oldvalue).data = (*iter).value.data;
+                            (*oldvalue).len = (*iter).value.len
+                        }
+                        (*iter).value.data = (*value).data;
+                        (*iter).value.len = (*value).len
+                    }
+                    if 0 == (*hash).copykey {
+                        (*iter).key.data = (*key).data
+                    }
+                    if !oldvalue.is_null() {
+                        (*oldvalue).data = (*value).data;
+                        (*oldvalue).len = (*value).len
+                    }
+                    return 0i32;
+                } else {
+                    iter = (*iter).next
+                }
+            }
+            match current_block {
+                17701753836843438419 => {}
+                _ => {
+                    if !oldvalue.is_null() {
+                        (*oldvalue).data = 0 as *mut libc::c_void;
+                        (*oldvalue).len = 0i32 as libc::c_uint
+                    }
+                    cell = malloc(::std::mem::size_of::<chashcell>() as libc::size_t)
+                        as *mut chashcell;
+                    if !cell.is_null() {
+                        if 0 != (*hash).copykey {
+                            (*cell).key.data =
+                                chash_dup((*key).data, (*key).len) as *mut libc::c_void;
+                            if (*cell).key.data.is_null() {
+                                current_block = 4267898785354516004;
+                            } else {
+                                current_block = 7226443171521532240;
+                            }
+                        } else {
+                            (*cell).key.data = (*key).data;
+                            current_block = 7226443171521532240;
+                        }
+                        match current_block {
+                            7226443171521532240 => {
+                                (*cell).key.len = (*key).len;
+                                if 0 != (*hash).copyvalue {
+                                    (*cell).value.data =
+                                        chash_dup((*value).data, (*value).len) as *mut libc::c_void;
+                                    if (*cell).value.data.is_null() {
+                                        if 0 != (*hash).copykey {
+                                            free((*cell).key.data);
+                                        }
+                                        current_block = 4267898785354516004;
+                                    } else {
+                                        current_block = 6717214610478484138;
+                                    }
+                                } else {
+                                    (*cell).value.data = (*value).data;
+                                    current_block = 6717214610478484138;
+                                }
+                                match current_block {
+                                    4267898785354516004 => {}
+                                    _ => {
+                                        (*cell).value.len = (*value).len;
+                                        (*cell).func = func;
+                                        (*cell).next = *(*hash).cells.offset(indx as isize);
+                                        let ref mut fresh0 = *(*hash).cells.offset(indx as isize);
+                                        *fresh0 = cell;
+                                        (*hash).count = (*hash).count.wrapping_add(1);
+                                        return 0i32;
+                                    }
+                                }
+                            }
+                            _ => {}
+                        }
+                        free(cell as *mut libc::c_void);
+                    }
+                }
+            }
+        }
+        _ => {}
+    }
+    return -1i32;
+}
+#[inline]
+unsafe fn chash_dup(mut data: *const libc::c_void, mut len: libc::c_uint) -> *mut libc::c_char {
+    let mut r: *mut libc::c_void = 0 as *mut libc::c_void;
+    r = malloc(len as libc::size_t) as *mut libc::c_char as *mut libc::c_void;
+    if r.is_null() {
+        return 0 as *mut libc::c_char;
+    }
+    memcpy(r, data, len as libc::size_t);
+    return r as *mut libc::c_char;
+}
+
+#[inline]
+unsafe fn chash_func(mut key: *const libc::c_char, mut len: libc::c_uint) -> libc::c_uint {
+    let mut c: libc::c_uint = 5381i32 as libc::c_uint;
+    let mut k: *const libc::c_char = key;
+    loop {
+        let fresh1 = len;
+        len = len.wrapping_sub(1);
+        if !(0 != fresh1) {
+            break;
+        }
+        let fresh2 = k;
+        k = k.offset(1);
+        c = (c << 5i32)
+            .wrapping_add(c)
+            .wrapping_add(*fresh2 as libc::c_uint)
+    }
+    return c;
+}
+
+/* Resizes the hash table to the passed size. */
+pub unsafe fn chash_resize(mut hash: *mut chash, mut size: libc::c_uint) -> libc::c_int {
+    let mut cells: *mut *mut chashcell = 0 as *mut *mut chashcell;
+    let mut indx: libc::c_uint = 0;
+    let mut nindx: libc::c_uint = 0;
+    let mut iter: *mut chashiter = 0 as *mut chashiter;
+    let mut next: *mut chashiter = 0 as *mut chashiter;
+    if (*hash).size == size {
+        return 0i32;
+    }
+    cells = calloc(
+        size as libc::size_t,
+        ::std::mem::size_of::<*mut chashcell>() as libc::size_t,
+    ) as *mut *mut chashcell;
+    if cells.is_null() {
+        return -1i32;
+    }
+    indx = 0i32 as libc::c_uint;
+    while indx < (*hash).size {
+        iter = *(*hash).cells.offset(indx as isize);
+        while !iter.is_null() {
+            next = (*iter).next;
+            nindx = (*iter).func.wrapping_rem(size);
+            (*iter).next = *cells.offset(nindx as isize);
+            let ref mut fresh3 = *cells.offset(nindx as isize);
+            *fresh3 = iter;
+            iter = next
+        }
+        indx = indx.wrapping_add(1)
+    }
+    free((*hash).cells as *mut libc::c_void);
+    (*hash).size = size;
+    (*hash).cells = cells;
+    return 0i32;
+}
+
+/* Retrieves the data associated to the key if it is found in the hash table.
+The data pointer and the length will be NULL if not found*/
+pub unsafe fn chash_get(
+    mut hash: *mut chash,
+    mut key: *mut chashdatum,
+    mut result: *mut chashdatum,
+) -> libc::c_int {
+    let mut func: libc::c_uint = 0;
+    let mut iter: *mut chashiter = 0 as *mut chashiter;
+    func = chash_func((*key).data as *const libc::c_char, (*key).len);
+    iter = *(*hash)
+        .cells
+        .offset(func.wrapping_rem((*hash).size) as isize);
+    while !iter.is_null() {
+        if (*iter).key.len == (*key).len
+            && (*iter).func == func
+            && 0 == memcmp((*iter).key.data, (*key).data, (*key).len as libc::size_t)
+        {
+            *result = (*iter).value;
+            return 0i32;
+        }
+        iter = (*iter).next
+    }
+    return -1i32;
+}
+/* Removes the entry associated to this key if it is found in the hash table,
+and returns its contents if not dupped (otherwise, pointer will be NULL
+and len TRUE). If entry is not found both pointer and len will be NULL. */
+pub unsafe fn chash_delete(
+    mut hash: *mut chash,
+    mut key: *mut chashdatum,
+    mut oldvalue: *mut chashdatum,
+) -> libc::c_int {
+    /*  chashdatum result = { NULL, TRUE }; */
+    let mut func: libc::c_uint = 0;
+    let mut indx: libc::c_uint = 0;
+    let mut iter: *mut chashiter = 0 as *mut chashiter;
+    let mut old: *mut chashiter = 0 as *mut chashiter;
+    func = chash_func((*key).data as *const libc::c_char, (*key).len);
+    indx = func.wrapping_rem((*hash).size);
+    old = 0 as *mut chashiter;
+    iter = *(*hash).cells.offset(indx as isize);
+    while !iter.is_null() {
+        if (*iter).key.len == (*key).len
+            && (*iter).func == func
+            && 0 == memcmp((*iter).key.data, (*key).data, (*key).len as libc::size_t)
+        {
+            if !old.is_null() {
+                (*old).next = (*iter).next
+            } else {
+                let ref mut fresh4 = *(*hash).cells.offset(indx as isize);
+                *fresh4 = (*iter).next
+            }
+            if 0 != (*hash).copykey {
+                free((*iter).key.data);
+            }
+            if 0 != (*hash).copyvalue {
+                free((*iter).value.data);
+            } else if !oldvalue.is_null() {
+                (*oldvalue).data = (*iter).value.data;
+                (*oldvalue).len = (*iter).value.len
+            }
+            free(iter as *mut libc::c_void);
+            (*hash).count = (*hash).count.wrapping_sub(1);
+            return 0i32;
+        }
+        old = iter;
+        iter = (*iter).next
+    }
+    return -1i32;
+}
+/* Returns an iterator to the first non-empty entry of the hash table */
+pub unsafe fn chash_begin(mut hash: *mut chash) -> *mut chashiter {
+    let mut iter: *mut chashiter = 0 as *mut chashiter;
+    let mut indx: libc::c_uint = 0i32 as libc::c_uint;
+    iter = *(*hash).cells.offset(0isize);
+    while iter.is_null() {
+        indx = indx.wrapping_add(1);
+        if indx >= (*hash).size {
+            return 0 as *mut chashiter;
+        }
+        iter = *(*hash).cells.offset(indx as isize)
+    }
+    return iter;
+}
+/* Returns the next non-empty entry of the hash table */
+pub unsafe fn chash_next(mut hash: *mut chash, mut iter: *mut chashiter) -> *mut chashiter {
+    let mut indx: libc::c_uint = 0;
+    if iter.is_null() {
+        return 0 as *mut chashiter;
+    }
+    indx = (*iter).func.wrapping_rem((*hash).size);
+    iter = (*iter).next;
+    while iter.is_null() {
+        indx = indx.wrapping_add(1);
+        if indx >= (*hash).size {
+            return 0 as *mut chashiter;
+        }
+        iter = *(*hash).cells.offset(indx as isize)
+    }
+    return iter;
+}

mmime/src/clist.rs

@@ -0,0 +1,202 @@
+use libc;
+
+use crate::other::*;
+
+#[derive(Copy, Clone)]
+#[repr(C)]
+pub struct clistcell {
+    pub data: *mut libc::c_void,
+    pub previous: *mut clistcell,
+    pub next: *mut clistcell,
+}
+
+#[derive(Clone)]
+#[repr(C)]
+pub struct clist {
+    pub first: *mut clistcell,
+    pub last: *mut clistcell,
+    pub count: libc::c_int,
+}
+
+impl Default for clist {
+    fn default() -> Self {
+        Self {
+            first: std::ptr::null_mut(),
+            last: std::ptr::null_mut(),
+            count: 0,
+        }
+    }
+}
+
+impl Drop for clist {
+    fn drop(&mut self) {
+        unsafe {
+            let mut l1 = self.first;
+            while !l1.is_null() {
+                let l2 = (*l1).next;
+                free(l1 as *mut libc::c_void);
+                l1 = l2
+            }
+        }
+    }
+}
+
+pub type clistiter = clistcell;
+pub struct CListIterator {
+    cur: *mut clistiter,
+}
+impl Iterator for CListIterator {
+    type Item = *mut libc::c_void;
+    fn next(&mut self) -> Option<Self::Item> {
+        unsafe {
+            if self.cur.is_null() {
+                None
+            } else {
+                let data = (*self.cur).data;
+                self.cur = (*self.cur).next;
+                Some(data)
+            }
+        }
+    }
+}
+
+impl IntoIterator for &clist {
+    type Item = *mut libc::c_void;
+    type IntoIter = CListIterator;
+    fn into_iter(self) -> Self::IntoIter {
+        return CListIterator { cur: self.first };
+    }
+}
+
+pub type clist_func =
+    Option<unsafe extern "C" fn(_: *mut libc::c_void, _: *mut libc::c_void) -> ()>;
+
+/* Allocate a new pointer list */
+pub fn clist_new() -> *mut clist {
+    Box::into_raw(Box::new(Default::default()))
+}
+/* Destroys a list. Data pointed by data pointers is NOT freed. */
+pub unsafe fn clist_free(mut lst: *mut clist) {
+    Box::from_raw(lst);
+}
+/* Inserts this data pointer after the element pointed by the iterator */
+pub unsafe fn clist_insert_after(
+    mut lst: *mut clist,
+    mut iter: *mut clistiter,
+    mut data: *mut libc::c_void,
+) -> libc::c_int {
+    let mut c: *mut clistcell = 0 as *mut clistcell;
+    c = malloc(::std::mem::size_of::<clistcell>() as libc::size_t) as *mut clistcell;
+    if c.is_null() {
+        return -1i32;
+    }
+    (*c).data = data;
+    (*lst).count += 1;
+    if (*lst).first == (*lst).last && (*lst).last.is_null() {
+        (*c).next = 0 as *mut clistcell;
+        (*c).previous = (*c).next;
+        (*lst).last = c;
+        (*lst).first = (*lst).last;
+        return 0i32;
+    }
+    if iter.is_null() {
+        (*c).previous = (*lst).last;
+        (*(*c).previous).next = c;
+        (*c).next = 0 as *mut clistcell;
+        (*lst).last = c;
+        return 0i32;
+    }
+    (*c).previous = iter;
+    (*c).next = (*iter).next;
+    if !(*c).next.is_null() {
+        (*(*c).next).previous = c
+    } else {
+        (*lst).last = c
+    }
+    (*(*c).previous).next = c;
+    return 0i32;
+}
+/* Deletes the element pointed by the iterator.
+Returns an iterator to the next element. */
+pub unsafe fn clist_delete(mut lst: *mut clist, mut iter: *mut clistiter) -> *mut clistiter {
+    let mut ret: *mut clistiter = 0 as *mut clistiter;
+    if iter.is_null() {
+        return 0 as *mut clistiter;
+    }
+    if !(*iter).previous.is_null() {
+        (*(*iter).previous).next = (*iter).next
+    } else {
+        (*lst).first = (*iter).next
+    }
+    if !(*iter).next.is_null() {
+        (*(*iter).next).previous = (*iter).previous;
+        ret = (*iter).next
+    } else {
+        (*lst).last = (*iter).previous;
+        ret = 0 as *mut clistiter
+    }
+    free(iter as *mut libc::c_void);
+    (*lst).count -= 1;
+    return ret;
+}
+pub unsafe fn clist_foreach(
+    mut lst: *mut clist,
+    mut func: clist_func,
+    mut data: *mut libc::c_void,
+) {
+    let mut cur: *mut clistiter = 0 as *mut clistiter;
+    cur = (*lst).first;
+    while !cur.is_null() {
+        func.expect("non-null function pointer")((*cur).data, data);
+        cur = (*cur).next
+    }
+}
+
+pub unsafe fn clist_nth_data(mut lst: *mut clist, mut indx: libc::c_int) -> *mut libc::c_void {
+    let mut cur: *mut clistiter = 0 as *mut clistiter;
+    cur = internal_clist_nth(lst, indx);
+    if cur.is_null() {
+        return 0 as *mut libc::c_void;
+    }
+    return (*cur).data;
+}
+#[inline]
+unsafe fn internal_clist_nth(mut lst: *mut clist, mut indx: libc::c_int) -> *mut clistiter {
+    let mut cur: *mut clistiter = 0 as *mut clistiter;
+    cur = (*lst).first;
+    while indx > 0i32 && !cur.is_null() {
+        cur = (*cur).next;
+        indx -= 1
+    }
+    if cur.is_null() {
+        return 0 as *mut clistiter;
+    }
+    return cur;
+}
+
+pub unsafe fn clist_nth(mut lst: *mut clist, mut indx: libc::c_int) -> *mut clistiter {
+    return internal_clist_nth(lst, indx);
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::ptr;
+    #[test]
+    fn test_clist_iterator() {
+        unsafe {
+            let mut c = clist_new();
+            assert!(!c.is_null());
+            clist_insert_after(c, ptr::null_mut(), clist_nth as _);
+            assert_eq!((*c).count, 1);
+
+            /* Only one iteration */
+            for data in &*c {
+                assert_eq!(data, clist_nth as _);
+            }
+            assert_eq!((*c).count, 1);
+
+            clist_free(c);
+        }
+    }
+}

mmime/src/constants.rs

@@ -0,0 +1,71 @@
+pub const MAIL_ERROR_SSL: libc::c_uint = 58;
+pub const MAIL_ERROR_FOLDER: libc::c_uint = 57;
+pub const MAIL_ERROR_UNABLE: libc::c_uint = 56;
+pub const MAIL_ERROR_SYSTEM: libc::c_uint = 55;
+pub const MAIL_ERROR_COMMAND: libc::c_uint = 54;
+pub const MAIL_ERROR_SEND: libc::c_uint = 53;
+pub const MAIL_ERROR_CHAR_ENCODING_FAILED: libc::c_uint = 52;
+pub const MAIL_ERROR_SUBJECT_NOT_FOUND: libc::c_uint = 51;
+/* 50 */
+pub const MAIL_ERROR_PROGRAM_ERROR: libc::c_uint = 50;
+pub const MAIL_ERROR_NO_PERMISSION: libc::c_uint = 49;
+pub const MAIL_ERROR_COMMAND_NOT_SUPPORTED: libc::c_uint = 48;
+pub const MAIL_ERROR_NO_APOP: libc::c_uint = 47;
+pub const MAIL_ERROR_READONLY: libc::c_uint = 46;
+pub const MAIL_ERROR_FATAL: libc::c_uint = 45;
+pub const MAIL_ERROR_CLOSE: libc::c_uint = 44;
+pub const MAIL_ERROR_CAPABILITY: libc::c_uint = 43;
+pub const MAIL_ERROR_PROTOCOL: libc::c_uint = 42;
+/* misc errors */
+pub const MAIL_ERROR_MISC: libc::c_uint = 41;
+/* 40 */
+pub const MAIL_ERROR_EXPUNGE: libc::c_uint = 40;
+pub const MAIL_ERROR_NO_TLS: libc::c_uint = 39;
+pub const MAIL_ERROR_CACHE_MISS: libc::c_uint = 38;
+pub const MAIL_ERROR_STARTTLS: libc::c_uint = 37;
+pub const MAIL_ERROR_MOVE: libc::c_uint = 36;
+pub const MAIL_ERROR_FOLDER_NOT_FOUND: libc::c_uint = 35;
+pub const MAIL_ERROR_REMOVE: libc::c_uint = 34;
+pub const MAIL_ERROR_PART_NOT_FOUND: libc::c_uint = 33;
+pub const MAIL_ERROR_INVAL: libc::c_uint = 32;
+pub const MAIL_ERROR_PARSE: libc::c_uint = 31;
+/* 30 */
+pub const MAIL_ERROR_MSG_NOT_FOUND: libc::c_uint = 30;
+pub const MAIL_ERROR_DISKSPACE: libc::c_uint = 29;
+pub const MAIL_ERROR_SEARCH: libc::c_uint = 28;
+pub const MAIL_ERROR_STORE: libc::c_uint = 27;
+pub const MAIL_ERROR_FETCH: libc::c_uint = 26;
+pub const MAIL_ERROR_COPY: libc::c_uint = 25;
+pub const MAIL_ERROR_APPEND: libc::c_uint = 24;
+pub const MAIL_ERROR_LSUB: libc::c_uint = 23;
+pub const MAIL_ERROR_LIST: libc::c_uint = 22;
+pub const MAIL_ERROR_UNSUBSCRIBE: libc::c_uint = 21;
+/* 20 */
+pub const MAIL_ERROR_SUBSCRIBE: libc::c_uint = 20;
+pub const MAIL_ERROR_STATUS: libc::c_uint = 19;
+pub const MAIL_ERROR_MEMORY: libc::c_uint = 18;
+pub const MAIL_ERROR_SELECT: libc::c_uint = 17;
+pub const MAIL_ERROR_EXAMINE: libc::c_uint = 16;
+pub const MAIL_ERROR_CHECK: libc::c_uint = 15;
+pub const MAIL_ERROR_RENAME: libc::c_uint = 14;
+pub const MAIL_ERROR_NOOP: libc::c_uint = 13;
+pub const MAIL_ERROR_LOGOUT: libc::c_uint = 12;
+pub const MAIL_ERROR_DELETE: libc::c_uint = 11;
+/* 10 */
+pub const MAIL_ERROR_CREATE: libc::c_uint = 10;
+pub const MAIL_ERROR_LOGIN: libc::c_uint = 9;
+pub const MAIL_ERROR_STREAM: libc::c_uint = 8;
+pub const MAIL_ERROR_FILE: libc::c_uint = 7;
+pub const MAIL_ERROR_BAD_STATE: libc::c_uint = 6;
+pub const MAIL_ERROR_CONNECT: libc::c_uint = 5;
+pub const MAIL_ERROR_UNKNOWN: libc::c_uint = 4;
+pub const MAIL_ERROR_NOT_IMPLEMENTED: libc::c_uint = 3;
+pub const MAIL_NO_ERROR_NON_AUTHENTICATED: libc::c_uint = 2;
+pub const MAIL_NO_ERROR_AUTHENTICATED: libc::c_uint = 1;
+pub const MAIL_NO_ERROR: libc::c_uint = 0;
+
+pub const MAILIMF_ERROR_FILE: libc::c_uint = 4;
+pub const MAILIMF_ERROR_INVAL: libc::c_uint = 3;
+pub const MAILIMF_ERROR_MEMORY: libc::c_uint = 2;
+pub const MAILIMF_ERROR_PARSE: libc::c_uint = 1;
+pub const MAILIMF_NO_ERROR: libc::c_uint = 0;

mmime/src/display.rs

@@ -0,0 +1,386 @@
+use crate::clist::*;
+
+use crate::mailimf::types::*;
+use crate::mailmime::types::*;
+
+use std::ffi::CStr;
+
+pub unsafe fn display_mime(mut mime: *mut Mailmime) {
+    let mut cur: *mut clistiter = 0 as *mut clistiter;
+    println!("{}", (*mime).mm_type);
+
+    match (*mime).mm_type as u32 {
+        MAILMIME_SINGLE => {
+            println!("single part");
+        }
+        MAILMIME_MULTIPLE => {
+            println!("multipart");
+        }
+        MAILMIME_MESSAGE => println!("message"),
+        _ => {}
+    }
+    if !(*mime).mm_mime_fields.is_null() {
+        if !(*(*(*mime).mm_mime_fields).fld_list).first.is_null() {
+            print!("MIME headers begin");
+            display_mime_fields((*mime).mm_mime_fields);
+            println!("MIME headers end");
+        }
+    }
+    display_mime_content((*mime).mm_content_type);
+    match (*mime).mm_type as u32 {
+        MAILMIME_SINGLE => {
+            display_mime_data((*mime).mm_data.mm_single);
+        }
+        MAILMIME_MULTIPLE => {
+            cur = (*(*mime).mm_data.mm_multipart.mm_mp_list).first;
+            while !cur.is_null() {
+                display_mime(
+                    (if !cur.is_null() {
+                        (*cur).data
+                    } else {
+                        0 as *mut libc::c_void
+                    }) as *mut Mailmime,
+                );
+                cur = if !cur.is_null() {
+                    (*cur).next
+                } else {
+                    0 as *mut clistcell
+                }
+            }
+        }
+        MAILMIME_MESSAGE => {
+            if !(*mime).mm_data.mm_message.mm_fields.is_null() {
+                if !(*(*(*mime).mm_data.mm_message.mm_fields).fld_list)
+                    .first
+                    .is_null()
+                {
+                    println!("headers begin");
+                    display_fields((*mime).mm_data.mm_message.mm_fields);
+                    println!("headers end");
+                }
+                if !(*mime).mm_data.mm_message.mm_msg_mime.is_null() {
+                    display_mime((*mime).mm_data.mm_message.mm_msg_mime);
+                }
+            }
+        }
+        _ => {}
+    };
+}
+
+unsafe fn display_mime_content(mut content_type: *mut mailmime_content) {
+    print!("type: ");
+    display_mime_type((*content_type).ct_type);
+    println!(
+        "/{}",
+        CStr::from_ptr((*content_type).ct_subtype).to_str().unwrap()
+    );
+}
+unsafe fn display_mime_type(mut type_0: *mut mailmime_type) {
+    match (*type_0).tp_type {
+        1 => {
+            display_mime_discrete_type((*type_0).tp_data.tp_discrete_type);
+        }
+        2 => {
+            display_mime_composite_type((*type_0).tp_data.tp_composite_type);
+        }
+        _ => {}
+    };
+}
+unsafe fn display_mime_composite_type(mut ct: *mut mailmime_composite_type) {
+    match (*ct).ct_type {
+        1 => {
+            print!("message");
+        }
+        2 => {
+            print!("multipart");
+        }
+        3 => {
+            print!("{}", CStr::from_ptr((*ct).ct_token).to_str().unwrap());
+        }
+        _ => {}
+    };
+}
+unsafe fn display_mime_discrete_type(mut discrete_type: *mut mailmime_discrete_type) {
+    match (*discrete_type).dt_type {
+        1 => {
+            print!("text");
+        }
+        2 => {
+            print!("image");
+        }
+        3 => {
+            print!("audio");
+        }
+        4 => {
+            print!("video");
+        }
+        5 => {
+            print!("application");
+        }
+        6 => {
+            print!("{}", (*discrete_type).dt_extension as u8 as char);
+        }
+        _ => {}
+    };
+}
+unsafe fn display_mime_data(mut data: *mut mailmime_data) {
+    match (*data).dt_type {
+        0 => {
+            println!(
+                "data : {} bytes",
+                (*data).dt_data.dt_text.dt_length as libc::c_uint,
+            );
+        }
+        1 => {
+            println!(
+                "data (file) : {}",
+                CStr::from_ptr((*data).dt_data.dt_filename)
+                    .to_str()
+                    .unwrap()
+            );
+        }
+        _ => {}
+    };
+}
+unsafe fn display_mime_dsp_parm(mut param: *mut mailmime_disposition_parm) {
+    match (*param).pa_type {
+        0 => {
+            println!(
+                "filename: {}",
+                CStr::from_ptr((*param).pa_data.pa_filename)
+                    .to_str()
+                    .unwrap()
+            );
+        }
+        _ => {}
+    };
+}
+unsafe fn display_mime_disposition(mut disposition: *mut mailmime_disposition) {
+    let mut cur: *mut clistiter = 0 as *mut clistiter;
+    cur = (*(*disposition).dsp_parms).first;
+    while !cur.is_null() {
+        let mut param: *mut mailmime_disposition_parm = 0 as *mut mailmime_disposition_parm;
+        param = (if !cur.is_null() {
+            (*cur).data
+        } else {
+            0 as *mut libc::c_void
+        }) as *mut mailmime_disposition_parm;
+        display_mime_dsp_parm(param);
+        cur = if !cur.is_null() {
+            (*cur).next
+        } else {
+            0 as *mut clistcell
+        }
+    }
+}
+unsafe fn display_mime_field(mut field: *mut mailmime_field) {
+    match (*field).fld_type {
+        1 => {
+            print!("content-type: ");
+            display_mime_content((*field).fld_data.fld_content);
+            println!("");
+        }
+        6 => {
+            display_mime_disposition((*field).fld_data.fld_disposition);
+        }
+        _ => {}
+    };
+}
+unsafe fn display_mime_fields(mut fields: *mut mailmime_fields) {
+    let mut cur: *mut clistiter = 0 as *mut clistiter;
+    cur = (*(*fields).fld_list).first;
+    while !cur.is_null() {
+        let mut field: *mut mailmime_field = 0 as *mut mailmime_field;
+        field = (if !cur.is_null() {
+            (*cur).data
+        } else {
+            0 as *mut libc::c_void
+        }) as *mut mailmime_field;
+        display_mime_field(field);
+        cur = if !cur.is_null() {
+            (*cur).next
+        } else {
+            0 as *mut clistcell
+        }
+    }
+}
+unsafe fn display_date_time(mut d: *mut mailimf_date_time) {
+    print!(
+        "{:02}/{:02}/{:02} {:02}:{:02}:{:02} +{:04}",
+        (*d).dt_day,
+        (*d).dt_month,
+        (*d).dt_year,
+        (*d).dt_hour,
+        (*d).dt_min,
+        (*d).dt_sec,
+        (*d).dt_zone,
+    );
+}
+unsafe fn display_orig_date(mut orig_date: *mut mailimf_orig_date) {
+    display_date_time((*orig_date).dt_date_time);
+}
+unsafe fn display_mailbox(mut mb: *mut mailimf_mailbox) {
+    if !(*mb).mb_display_name.is_null() {
+        print!(
+            "{}",
+            CStr::from_ptr((*mb).mb_display_name).to_str().unwrap()
+        );
+    }
+    print!("<{}>", CStr::from_ptr((*mb).mb_addr_spec).to_str().unwrap());
+}
+unsafe fn display_mailbox_list(mut mb_list: *mut mailimf_mailbox_list) {
+    let mut cur: *mut clistiter = 0 as *mut clistiter;
+    cur = (*(*mb_list).mb_list).first;
+    while !cur.is_null() {
+        let mut mb: *mut mailimf_mailbox = 0 as *mut mailimf_mailbox;
+        mb = (if !cur.is_null() {
+            (*cur).data
+        } else {
+            0 as *mut libc::c_void
+        }) as *mut mailimf_mailbox;
+        display_mailbox(mb);
+        if !if !cur.is_null() {
+            (*cur).next
+        } else {
+            0 as *mut clistcell
+        }
+        .is_null()
+        {
+            print!(", ");
+        }
+        cur = if !cur.is_null() {
+            (*cur).next
+        } else {
+            0 as *mut clistcell
+        }
+    }
+}
+unsafe fn display_group(mut group: *mut mailimf_group) {
+    let mut cur: *mut clistiter = 0 as *mut clistiter;
+    print!(
+        "{}: ",
+        CStr::from_ptr((*group).grp_display_name).to_str().unwrap()
+    );
+    cur = (*(*(*group).grp_mb_list).mb_list).first;
+    while !cur.is_null() {
+        let mut mb: *mut mailimf_mailbox = 0 as *mut mailimf_mailbox;
+        mb = (if !cur.is_null() {
+            (*cur).data
+        } else {
+            0 as *mut libc::c_void
+        }) as *mut mailimf_mailbox;
+        display_mailbox(mb);
+        cur = if !cur.is_null() {
+            (*cur).next
+        } else {
+            0 as *mut clistcell
+        }
+    }
+    print!("; ");
+}
+unsafe fn display_address(mut a: *mut mailimf_address) {
+    match (*a).ad_type {
+        2 => {
+            display_group((*a).ad_data.ad_group);
+        }
+        1 => {
+            display_mailbox((*a).ad_data.ad_mailbox);
+        }
+        _ => {}
+    };
+}
+unsafe fn display_address_list(mut addr_list: *mut mailimf_address_list) {
+    let mut cur: *mut clistiter = 0 as *mut clistiter;
+    cur = (*(*addr_list).ad_list).first;
+    while !cur.is_null() {
+        let mut addr: *mut mailimf_address = 0 as *mut mailimf_address;
+        addr = (if !cur.is_null() {
+            (*cur).data
+        } else {
+            0 as *mut libc::c_void
+        }) as *mut mailimf_address;
+        display_address(addr);
+        if !if !cur.is_null() {
+            (*cur).next
+        } else {
+            0 as *mut clistcell
+        }
+        .is_null()
+        {
+            print!(", ");
+        }
+        cur = if !cur.is_null() {
+            (*cur).next
+        } else {
+            0 as *mut clistcell
+        }
+    }
+}
+unsafe fn display_from(mut from: *mut mailimf_from) {
+    display_mailbox_list((*from).frm_mb_list);
+}
+unsafe fn display_to(mut to: *mut mailimf_to) {
+    display_address_list((*to).to_addr_list);
+}
+unsafe fn display_cc(mut cc: *mut mailimf_cc) {
+    display_address_list((*cc).cc_addr_list);
+}
+unsafe fn display_subject(mut subject: *mut mailimf_subject) {
+    print!("{}", CStr::from_ptr((*subject).sbj_value).to_str().unwrap());
+}
+unsafe fn display_field(mut field: *mut mailimf_field) {
+    match (*field).fld_type {
+        9 => {
+            print!("Date: ");
+            display_orig_date((*field).fld_data.fld_orig_date);
+            println!("");
+        }
+        10 => {
+            print!("From: ");
+            display_from((*field).fld_data.fld_from);
+            println!("");
+        }
+        13 => {
+            print!("To: ");
+            display_to((*field).fld_data.fld_to);
+            println!("");
+        }
+        14 => {
+            print!("Cc: ");
+            display_cc((*field).fld_data.fld_cc);
+            println!("");
+        }
+        19 => {
+            print!("Subject: ");
+            display_subject((*field).fld_data.fld_subject);
+            println!("");
+        }
+        16 => {
+            println!(
+                "Message-ID: {}",
+                CStr::from_ptr((*(*field).fld_data.fld_message_id).mid_value)
+                    .to_str()
+                    .unwrap(),
+            );
+        }
+        _ => {}
+    };
+}
+unsafe fn display_fields(mut fields: *mut mailimf_fields) {
+    let mut cur: *mut clistiter = 0 as *mut clistiter;
+    cur = (*(*fields).fld_list).first;
+    while !cur.is_null() {
+        let mut f: *mut mailimf_field = 0 as *mut mailimf_field;
+        f = (if !cur.is_null() {
+            (*cur).data
+        } else {
+            0 as *mut libc::c_void
+        }) as *mut mailimf_field;
+        display_field(f);
+        cur = if !cur.is_null() {
+            (*cur).next
+        } else {
+            0 as *mut clistcell
+        }
+    }
+}

mmime/src/lib.rs

@@ -0,0 +1,78 @@
+#![deny(clippy::correctness)]
+// TODO: make all of these errors, such that clippy actually passes.
+#![warn(clippy::all, clippy::perf, clippy::not_unsafe_ptr_arg_deref)]
+// This is nice, but for now just annoying.
+#![allow(clippy::unreadable_literal)]
+#![feature(ptr_wrapping_offset_from)]
+#![allow(unused_attributes)]
+#![allow(unused_variables)]
+#![allow(mutable_transmutes)]
+#![allow(non_camel_case_types)]
+#![allow(non_snake_case)]
+#![allow(non_upper_case_globals)]
+#![allow(unused_assignments)]
+#![allow(unused_mut)]
+#![allow(unused_must_use)]
+#![feature(extern_types)]
+#![feature(const_raw_ptr_to_usize_cast)]
+
+pub mod charconv;
+pub mod chash;
+pub mod clist;
+pub mod display;
+pub mod mailimf;
+pub mod mailmime;
+pub mod mmapstring;
+pub mod other;
+
+pub use self::charconv::*;
+pub use self::chash::*;
+pub use self::clist::*;
+pub use self::display::*;
+pub use self::mailimf::*;
+pub use self::mailmime::*;
+pub use self::mmapstring::*;
+pub use self::other::*;
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn mailmime_parse_test() {
+        unsafe {
+            let data = "MIME-Version: 1.0\
+                        Content-Type: multipart/mixed; boundary=frontier\
+                        \
+                        This is a message with multiple parts in MIME format.\
+                        --frontier\
+                        Content-Type: text/plain\
+                        \
+                        This is the body of the message.\
+                        --frontier\
+                        Content-Type: application/octet-stream\
+                        Content-Transfer-Encoding: base64\
+                        \
+                        PGh0bWw+CiAgPGhlYWQ+CiAgPC9oZWFkPgogIDxib2R5PgogICAgPHA+VGhpcyBpcyB0aGUg\
+                        Ym9keSBvZiB0aGUgbWVzc2FnZS48L3A+CiAgPC9ib2R5Pgo8L2h0bWw+Cg==\
+                        --frontier--";
+            let c_data = std::ffi::CString::new(data).unwrap();
+
+            let mut current_index = 0;
+            let mut mime = std::ptr::null_mut();
+            let res = crate::mailmime::content::mailmime_parse(
+                c_data.as_ptr(),
+                data.len() as usize,
+                &mut current_index,
+                &mut mime,
+            );
+
+            assert_eq!(res, MAIL_NO_ERROR as libc::c_int);
+            assert!(!mime.is_null());
+
+            display_mime(mime);
+
+            mailmime::types::mailmime_free(mime);
+        }
+    }
+}

mmime/src/mailimf/types_helper.rs

@@ -0,0 +1,89 @@
+use crate::clist::*;
+use crate::mailimf::types::*;
+use crate::other::*;
+
+/*
+  this function creates a new mailimf_fields structure with no fields
+*/
+pub unsafe fn mailimf_fields_new_empty() -> *mut mailimf_fields {
+    let mut list: *mut clist = 0 as *mut clist;
+    let mut fields_list: *mut mailimf_fields = 0 as *mut mailimf_fields;
+    list = clist_new();
+    if list.is_null() {
+        return 0 as *mut mailimf_fields;
+    }
+    fields_list = mailimf_fields_new(list);
+    if fields_list.is_null() {
+        return 0 as *mut mailimf_fields;
+    }
+    return fields_list;
+}
+/*
+ this function adds a field to the mailimf_fields structure
+
+ @return MAILIMF_NO_ERROR will be returned on success,
+ other code will be returned otherwise
+*/
+pub unsafe fn mailimf_fields_add(
+    mut fields: *mut mailimf_fields,
+    mut field: *mut mailimf_field,
+) -> libc::c_int {
+    let mut r: libc::c_int = 0;
+    r = clist_insert_after(
+        (*fields).fld_list,
+        (*(*fields).fld_list).last,
+        field as *mut libc::c_void,
+    );
+    if r < 0i32 {
+        return MAILIMF_ERROR_MEMORY as libc::c_int;
+    }
+    return MAILIMF_NO_ERROR as libc::c_int;
+}
+
+/*
+  mailimf_field_new_custom creates a new field of type optional
+
+  @param name should be allocated with malloc()
+  @param value should be allocated with malloc()
+*/
+pub unsafe fn mailimf_field_new_custom(
+    mut name: *mut libc::c_char,
+    mut value: *mut libc::c_char,
+) -> *mut mailimf_field {
+    let mut opt_field: *mut mailimf_optional_field = 0 as *mut mailimf_optional_field;
+    let mut field: *mut mailimf_field = 0 as *mut mailimf_field;
+    opt_field = mailimf_optional_field_new(name, value);
+    if !opt_field.is_null() {
+        field = mailimf_field_new(
+            MAILIMF_FIELD_OPTIONAL_FIELD as libc::c_int,
+            0 as *mut mailimf_return,
+            0 as *mut mailimf_orig_date,
+            0 as *mut mailimf_from,
+            0 as *mut mailimf_sender,
+            0 as *mut mailimf_to,
+            0 as *mut mailimf_cc,
+            0 as *mut mailimf_bcc,
+            0 as *mut mailimf_message_id,
+            0 as *mut mailimf_orig_date,
+            0 as *mut mailimf_from,
+            0 as *mut mailimf_sender,
+            0 as *mut mailimf_reply_to,
+            0 as *mut mailimf_to,
+            0 as *mut mailimf_cc,
+            0 as *mut mailimf_bcc,
+            0 as *mut mailimf_message_id,
+            0 as *mut mailimf_in_reply_to,
+            0 as *mut mailimf_references,
+            0 as *mut mailimf_subject,
+            0 as *mut mailimf_comments,
+            0 as *mut mailimf_keywords,
+            opt_field,
+        );
+        if field.is_null() {
+            mailimf_optional_field_free(opt_field);
+        } else {
+            return field;
+        }
+    }
+    return 0 as *mut mailimf_field;
+}

mmime/src/mailmime/decode.rs

@@ -0,0 +1,860 @@
+use libc;
+use libc::toupper;
+
+use crate::charconv::*;
+use crate::mailimf::*;
+use crate::mailmime::content::*;
+use crate::mailmime::types::*;
+use crate::mmapstring::*;
+use crate::other::*;
+
+pub const TYPE_WORD: libc::c_uint = 1;
+pub const TYPE_ENCODED_WORD: libc::c_uint = 2;
+pub const MAILMIME_ENCODING_Q: libc::c_uint = 1;
+pub const MAILMIME_ENCODING_B: libc::c_uint = 0;
+pub const TYPE_ERROR: libc::c_uint = 0;
+
+pub unsafe fn mailmime_encoded_phrase_parse(
+    mut default_fromcode: *const libc::c_char,
+    mut message: *const libc::c_char,
+    mut length: size_t,
+    mut indx: *mut size_t,
+    mut tocode: *const libc::c_char,
+    mut result: *mut *mut libc::c_char,
+) -> libc::c_int {
+    let mut current_block: u64;
+    let mut gphrase: *mut MMAPString = 0 as *mut MMAPString;
+    let mut word: *mut mailmime_encoded_word = 0 as *mut mailmime_encoded_word;
+    let mut first: libc::c_int = 0;
+    let mut cur_token: size_t = 0;
+    let mut r: libc::c_int = 0;
+    let mut res: libc::c_int = 0;
+    let mut str: *mut libc::c_char = 0 as *mut libc::c_char;
+    let mut wordutf8: *mut libc::c_char = 0 as *mut libc::c_char;
+    let mut type_0: libc::c_int = 0;
+    let mut missing_closing_quote: libc::c_int = 0;
+    cur_token = *indx;
+    gphrase = mmap_string_new(b"\x00" as *const u8 as *const libc::c_char);
+    if gphrase.is_null() {
+        res = MAILIMF_ERROR_MEMORY as libc::c_int
+    } else {
+        first = 1i32;
+        type_0 = TYPE_ERROR as libc::c_int;
+        loop {
+            let mut has_fwd: libc::c_int = 0;
+            word = 0 as *mut mailmime_encoded_word;
+            r = mailmime_encoded_word_parse(
+                message,
+                length,
+                &mut cur_token,
+                &mut word,
+                &mut has_fwd,
+                &mut missing_closing_quote,
+            );
+            if r == MAILIMF_NO_ERROR as libc::c_int {
+                if 0 == first && 0 != has_fwd {
+                    if type_0 != TYPE_ENCODED_WORD as libc::c_int {
+                        if mmap_string_append_c(gphrase, ' ' as i32 as libc::c_char).is_null() {
+                            mailmime_encoded_word_free(word);
+                            res = MAILIMF_ERROR_MEMORY as libc::c_int;
+                            current_block = 13246848547199022064;
+                            break;
+                        }
+                    }
+                }
+                type_0 = TYPE_ENCODED_WORD as libc::c_int;
+                wordutf8 = 0 as *mut libc::c_char;
+                r = charconv(
+                    tocode,
+                    (*word).wd_charset,
+                    (*word).wd_text,
+                    strlen((*word).wd_text),
+                    &mut wordutf8,
+                );
+                match r {
+                    2 => {
+                        mailmime_encoded_word_free(word);
+                        res = MAILIMF_ERROR_MEMORY as libc::c_int;
+                        current_block = 13246848547199022064;
+                        break;
+                    }
+                    1 => {
+                        r = charconv(
+                            tocode,
+                            b"iso-8859-1\x00" as *const u8 as *const libc::c_char,
+                            (*word).wd_text,
+                            strlen((*word).wd_text),
+                            &mut wordutf8,
+                        )
+                    }
+                    3 => {
+                        mailmime_encoded_word_free(word);
+                        res = MAILIMF_ERROR_PARSE as libc::c_int;
+                        current_block = 13246848547199022064;
+                        break;
+                    }
+                    _ => {}
+                }
+                match r {
+                    2 => {
+                        mailmime_encoded_word_free(word);
+                        res = MAILIMF_ERROR_MEMORY as libc::c_int;
+                        current_block = 13246848547199022064;
+                        break;
+                    }
+                    3 => {
+                        mailmime_encoded_word_free(word);
+                        res = MAILIMF_ERROR_PARSE as libc::c_int;
+                        current_block = 13246848547199022064;
+                        break;
+                    }
+                    _ => {
+                        if !wordutf8.is_null() {
+                            if mmap_string_append(gphrase, wordutf8).is_null() {
+                                mailmime_encoded_word_free(word);
+                                free(wordutf8 as *mut libc::c_void);
+                                res = MAILIMF_ERROR_MEMORY as libc::c_int;
+                                current_block = 13246848547199022064;
+                                break;
+                            } else {
+                                free(wordutf8 as *mut libc::c_void);
+                            }
+                        }
+                        mailmime_encoded_word_free(word);
+                        first = 0i32
+                    }
+                }
+            } else if !(r == MAILIMF_ERROR_PARSE as libc::c_int) {
+                /* do nothing */
+                res = r;
+                current_block = 13246848547199022064;
+                break;
+            }
+            if !(r == MAILIMF_ERROR_PARSE as libc::c_int) {
+                continue;
+            }
+            let mut raw_word: *mut libc::c_char = 0 as *mut libc::c_char;
+            raw_word = 0 as *mut libc::c_char;
+            r = mailmime_non_encoded_word_parse(
+                message,
+                length,
+                &mut cur_token,
+                &mut raw_word,
+                &mut has_fwd,
+            );
+            if r == MAILIMF_NO_ERROR as libc::c_int {
+                if 0 == first && 0 != has_fwd {
+                    if mmap_string_append_c(gphrase, ' ' as i32 as libc::c_char).is_null() {
+                        free(raw_word as *mut libc::c_void);
+                        res = MAILIMF_ERROR_MEMORY as libc::c_int;
+                        current_block = 13246848547199022064;
+                        break;
+                    }
+                }
+                type_0 = TYPE_WORD as libc::c_int;
+                wordutf8 = 0 as *mut libc::c_char;
+                r = charconv(
+                    tocode,
+                    default_fromcode,
+                    raw_word,
+                    strlen(raw_word),
+                    &mut wordutf8,
+                );
+                match r {
+                    2 => {
+                        free(raw_word as *mut libc::c_void);
+                        res = MAILIMF_ERROR_MEMORY as libc::c_int;
+                        current_block = 13246848547199022064;
+                        break;
+                    }
+                    1 | 3 => {
+                        free(raw_word as *mut libc::c_void);
+                        res = MAILIMF_ERROR_PARSE as libc::c_int;
+                        current_block = 13246848547199022064;
+                        break;
+                    }
+                    _ => {
+                        if mmap_string_append(gphrase, wordutf8).is_null() {
+                            free(wordutf8 as *mut libc::c_void);
+                            free(raw_word as *mut libc::c_void);
+                            res = MAILIMF_ERROR_MEMORY as libc::c_int;
+                            current_block = 13246848547199022064;
+                            break;
+                        } else {
+                            free(wordutf8 as *mut libc::c_void);
+                            free(raw_word as *mut libc::c_void);
+                            first = 0i32
+                        }
+                    }
+                }
+            } else if r == MAILIMF_ERROR_PARSE as libc::c_int {
+                r = mailimf_fws_parse(message, length, &mut cur_token);
+                if r != MAILIMF_NO_ERROR as libc::c_int {
+                    current_block = 5005389895767293342;
+                    break;
+                }
+                if mmap_string_append_c(gphrase, ' ' as i32 as libc::c_char).is_null() {
+                    res = MAILIMF_ERROR_MEMORY as libc::c_int;
+                    current_block = 13246848547199022064;
+                    break;
+                } else {
+                    first = 0i32;
+                    current_block = 5005389895767293342;
+                    break;
+                }
+            } else {
+                res = r;
+                current_block = 13246848547199022064;
+                break;
+            }
+        }
+        match current_block {
+            5005389895767293342 => {
+                if 0 != first {
+                    if cur_token != length {
+                        res = MAILIMF_ERROR_PARSE as libc::c_int;
+                        current_block = 13246848547199022064;
+                    } else {
+                        current_block = 7072655752890836508;
+                    }
+                } else {
+                    current_block = 7072655752890836508;
+                }
+                match current_block {
+                    13246848547199022064 => {}
+                    _ => {
+                        str = strdup((*gphrase).str_0);
+                        if str.is_null() {
+                            res = MAILIMF_ERROR_MEMORY as libc::c_int
+                        } else {
+                            mmap_string_free(gphrase);
+                            *result = str;
+                            *indx = cur_token;
+                            return MAILIMF_NO_ERROR as libc::c_int;
+                        }
+                    }
+                }
+            }
+            _ => {}
+        }
+        mmap_string_free(gphrase);
+    }
+    return res;
+}
+unsafe fn mailmime_non_encoded_word_parse(
+    mut message: *const libc::c_char,
+    mut length: size_t,
+    mut indx: *mut size_t,
+    mut result: *mut *mut libc::c_char,
+    mut p_has_fwd: *mut libc::c_int,
+) -> libc::c_int {
+    let mut end: libc::c_int = 0;
+    let mut cur_token: size_t = 0;
+    let mut res: libc::c_int = 0;
+    let mut text: *mut libc::c_char = 0 as *mut libc::c_char;
+    let mut r: libc::c_int = 0;
+    let mut begin: size_t = 0;
+    let mut state: libc::c_int = 0;
+    let mut has_fwd: libc::c_int = 0;
+    cur_token = *indx;
+    has_fwd = 0i32;
+    r = mailimf_fws_parse(message, length, &mut cur_token);
+    if r == MAILIMF_NO_ERROR as libc::c_int {
+        has_fwd = 1i32
+    }
+    if r != MAILIMF_NO_ERROR as libc::c_int && r != MAILIMF_ERROR_PARSE as libc::c_int {
+        res = r
+    } else {
+        begin = cur_token;
+        state = 0i32;
+        end = 0i32;
+        while !(cur_token >= length) {
+            let mut current_block_17: u64;
+            match *message.offset(cur_token as isize) as libc::c_int {
+                32 | 9 | 13 | 10 => {
+                    state = 0i32;
+                    end = 1i32;
+                    current_block_17 = 16924917904204750491;
+                }
+                61 => {
+                    state = 1i32;
+                    current_block_17 = 16924917904204750491;
+                }
+                63 => {
+                    if state == 1i32 {
+                        cur_token = cur_token.wrapping_sub(1);
+                        end = 1i32
+                    }
+                    current_block_17 = 10192508258555769664;
+                }
+                _ => {
+                    current_block_17 = 10192508258555769664;
+                }
+            }
+            match current_block_17 {
+                10192508258555769664 => state = 0i32,
+                _ => {}
+            }
+            if 0 != end {
+                break;
+            }
+            cur_token = cur_token.wrapping_add(1)
+        }
+        if cur_token.wrapping_sub(begin) == 0i32 as libc::size_t {
+            res = MAILIMF_ERROR_PARSE as libc::c_int
+        } else {
+            text = malloc(
+                cur_token
+                    .wrapping_sub(begin)
+                    .wrapping_add(1i32 as libc::size_t),
+            ) as *mut libc::c_char;
+            if text.is_null() {
+                res = MAILIMF_ERROR_MEMORY as libc::c_int
+            } else {
+                memcpy(
+                    text as *mut libc::c_void,
+                    message.offset(begin as isize) as *const libc::c_void,
+                    cur_token.wrapping_sub(begin),
+                );
+                *text.offset(cur_token.wrapping_sub(begin) as isize) =
+                    '\u{0}' as i32 as libc::c_char;
+                *indx = cur_token;
+                *result = text;
+                *p_has_fwd = has_fwd;
+                return MAILIMF_NO_ERROR as libc::c_int;
+            }
+        }
+    }
+    return res;
+}
+
+pub unsafe fn mailmime_encoded_word_parse(
+    mut message: *const libc::c_char,
+    mut length: size_t,
+    mut indx: *mut size_t,
+    mut result: *mut *mut mailmime_encoded_word,
+    mut p_has_fwd: *mut libc::c_int,
+    mut p_missing_closing_quote: *mut libc::c_int,
+) -> libc::c_int {
+    let mut current_block: u64;
+    /*
+    Parse the following, when a unicode character encoding is split.
+    =?UTF-8?B?4Lij4Liw4LmA4Lia4Li04LiU4LiE4Lin4Liy4Lih4Lih4Lix4LiZ4Liq4LmM?=
+    =?UTF-8?B?4LmA4LiV4LmH4Lih4Lie4Li04LiB4Lix4LiUIFRSQU5TRk9STUVSUyA0IOC4?=
+    =?UTF-8?B?oeC4seC4meC4quC5jOC4hOC4o+C4muC4l+C4uOC4geC4o+C4sOC4muC4miDg?=
+    =?UTF-8?B?uJfguLXguYjguYDguJTguLXguKLguKfguYPguJnguYDguKHguLfguK3guIfg?=
+    =?UTF-8?B?uYTguJfguKI=?=
+    Expected result:
+    ระเบิดความมันส์เต็มพิกัด TRANSFORMERS 4 มันส์ครบทุกระบบ ที่เดียวในเมืองไทย
+    libetpan result:
+    ระเบิดความมันส์เต็มพิกัด TRANSFORMERS 4 ?ันส์ครบทุกระบบ ??ี่เดียวในเมือง??ทย
+
+    See https://github.com/dinhviethoa/libetpan/pull/211
+    */
+    let mut cur_token: size_t = 0;
+    let mut charset: *mut libc::c_char = 0 as *mut libc::c_char;
+    let mut encoding: libc::c_int = 0;
+    let mut body: *mut libc::c_char = 0 as *mut libc::c_char;
+    let mut old_body_len: size_t = 0;
+    let mut text: *mut libc::c_char = 0 as *mut libc::c_char;
+    let mut end_encoding: size_t = 0;
+    let mut lookfwd_cur_token: size_t = 0;
+    let mut lookfwd_charset: *mut libc::c_char = 0 as *mut libc::c_char;
+    let mut lookfwd_encoding: libc::c_int = 0;
+    let mut copy_len: size_t = 0;
+    let mut decoded_token: size_t = 0;
+    let mut decoded: *mut libc::c_char = 0 as *mut libc::c_char;
+    let mut decoded_len: size_t = 0;
+    let mut ew: *mut mailmime_encoded_word = 0 as *mut mailmime_encoded_word;
+    let mut r: libc::c_int = 0;
+    let mut res: libc::c_int = 0;
+    let mut opening_quote: libc::c_int = 0;
+    let mut end: libc::c_int = 0;
+    let mut has_fwd: libc::c_int = 0;
+    let mut missing_closing_quote: libc::c_int = 0;
+    cur_token = *indx;
+    text = 0 as *mut libc::c_char;
+    lookfwd_charset = 0 as *mut libc::c_char;
+    missing_closing_quote = 0i32;
+    has_fwd = 0i32;
+    r = mailimf_fws_parse(message, length, &mut cur_token);
+    if r == MAILIMF_NO_ERROR as libc::c_int {
+        has_fwd = 1i32
+    }
+    if r != MAILIMF_NO_ERROR as libc::c_int && r != MAILIMF_ERROR_PARSE as libc::c_int {
+        res = r
+    } else {
+        opening_quote = 0i32;
+        r = mailimf_char_parse(message, length, &mut cur_token, '\"' as i32 as libc::c_char);
+        if r == MAILIMF_NO_ERROR as libc::c_int {
+            opening_quote = 1i32;
+            current_block = 17788412896529399552;
+        } else if r == MAILIMF_ERROR_PARSE as libc::c_int {
+            current_block = 17788412896529399552;
+        } else {
+            /* do nothing */
+            res = r;
+            current_block = 7995813543095296079;
+        }
+        match current_block {
+            7995813543095296079 => {}
+            _ => {
+                r = mailimf_token_case_insensitive_len_parse(
+                    message,
+                    length,
+                    &mut cur_token,
+                    b"=?\x00" as *const u8 as *const libc::c_char as *mut libc::c_char,
+                    strlen(b"=?\x00" as *const u8 as *const libc::c_char),
+                );
+                if r != MAILIMF_NO_ERROR as libc::c_int {
+                    res = r
+                } else {
+                    r = mailmime_charset_parse(message, length, &mut cur_token, &mut charset);
+                    if r != MAILIMF_NO_ERROR as libc::c_int {
+                        res = r
+                    } else {
+                        r = mailimf_char_parse(
+                            message,
+                            length,
+                            &mut cur_token,
+                            '?' as i32 as libc::c_char,
+                        );
+                        if r != MAILIMF_NO_ERROR as libc::c_int {
+                            res = r
+                        } else {
+                            r = mailmime_encoding_parse(
+                                message,
+                                length,
+                                &mut cur_token,
+                                &mut encoding,
+                            );
+                            if r != MAILIMF_NO_ERROR as libc::c_int {
+                                res = r
+                            } else {
+                                r = mailimf_char_parse(
+                                    message,
+                                    length,
+                                    &mut cur_token,
+                                    '?' as i32 as libc::c_char,
+                                );
+                                if r != MAILIMF_NO_ERROR as libc::c_int {
+                                    res = r
+                                } else {
+                                    lookfwd_cur_token = cur_token;
+                                    body = 0 as *mut libc::c_char;
+                                    old_body_len = 0i32 as size_t;
+                                    loop {
+                                        let mut has_base64_padding: libc::c_int = 0;
+                                        end = 0i32;
+                                        has_base64_padding = 0i32;
+                                        end_encoding = cur_token;
+                                        while !(end_encoding >= length) {
+                                            if end_encoding.wrapping_add(1i32 as libc::size_t)
+                                                < length
+                                            {
+                                                if *message.offset(end_encoding as isize)
+                                                    as libc::c_int
+                                                    == '?' as i32
+                                                    && *message.offset(
+                                                        end_encoding
+                                                            .wrapping_add(1i32 as libc::size_t)
+                                                            as isize,
+                                                    )
+                                                        as libc::c_int
+                                                        == '=' as i32
+                                                {
+                                                    end = 1i32
+                                                }
+                                            }
+                                            if 0 != end {
+                                                break;
+                                            }
+                                            end_encoding = end_encoding.wrapping_add(1)
+                                        }
+                                        copy_len = end_encoding.wrapping_sub(lookfwd_cur_token);
+                                        if copy_len > 0i32 as libc::size_t {
+                                            if encoding == MAILMIME_ENCODING_B as libc::c_int {
+                                                if end_encoding >= 1i32 as libc::size_t {
+                                                    if *message.offset(
+                                                        end_encoding
+                                                            .wrapping_sub(1i32 as libc::size_t)
+                                                            as isize,
+                                                    )
+                                                        as libc::c_int
+                                                        == '=' as i32
+                                                    {
+                                                        has_base64_padding = 1i32
+                                                    }
+                                                }
+                                            }
+                                            body = realloc(
+                                                body as *mut libc::c_void,
+                                                old_body_len
+                                                    .wrapping_add(copy_len)
+                                                    .wrapping_add(1i32 as libc::size_t),
+                                            )
+                                                as *mut libc::c_char;
+                                            if body.is_null() {
+                                                res = MAILIMF_ERROR_MEMORY as libc::c_int;
+                                                current_block = 13900684162107791171;
+                                                break;
+                                            } else {
+                                                memcpy(
+                                                    body.offset(old_body_len as isize)
+                                                        as *mut libc::c_void,
+                                                    &*message.offset(cur_token as isize)
+                                                        as *const libc::c_char
+                                                        as *const libc::c_void,
+                                                    copy_len,
+                                                );
+                                                *body
+                                                    .offset(old_body_len.wrapping_add(copy_len)
+                                                        as isize) = '\u{0}' as i32 as libc::c_char;
+                                                old_body_len = (old_body_len as libc::size_t)
+                                                    .wrapping_add(copy_len)
+                                                    as size_t
+                                                    as size_t
+                                            }
+                                        }
+                                        cur_token = end_encoding;
+                                        r = mailimf_token_case_insensitive_len_parse(
+                                            message,
+                                            length,
+                                            &mut cur_token,
+                                            b"?=\x00" as *const u8 as *const libc::c_char
+                                                as *mut libc::c_char,
+                                            strlen(b"?=\x00" as *const u8 as *const libc::c_char),
+                                        );
+                                        if r != MAILIMF_NO_ERROR as libc::c_int {
+                                            current_block = 2652804691515851435;
+                                            break;
+                                        }
+                                        if 0 != has_base64_padding {
+                                            current_block = 2652804691515851435;
+                                            break;
+                                        }
+                                        lookfwd_cur_token = cur_token;
+                                        r = mailimf_fws_parse(
+                                            message,
+                                            length,
+                                            &mut lookfwd_cur_token,
+                                        );
+                                        if r != MAILIMF_NO_ERROR as libc::c_int
+                                            && r != MAILIMF_ERROR_PARSE as libc::c_int
+                                        {
+                                            current_block = 2652804691515851435;
+                                            break;
+                                        }
+                                        r = mailimf_token_case_insensitive_len_parse(
+                                            message,
+                                            length,
+                                            &mut lookfwd_cur_token,
+                                            b"=?\x00" as *const u8 as *const libc::c_char
+                                                as *mut libc::c_char,
+                                            strlen(b"=?\x00" as *const u8 as *const libc::c_char),
+                                        );
+                                        if r != MAILIMF_NO_ERROR as libc::c_int {
+                                            current_block = 2652804691515851435;
+                                            break;
+                                        }
+                                        r = mailmime_charset_parse(
+                                            message,
+                                            length,
+                                            &mut lookfwd_cur_token,
+                                            &mut lookfwd_charset,
+                                        );
+                                        if r != MAILIMF_NO_ERROR as libc::c_int {
+                                            current_block = 2652804691515851435;
+                                            break;
+                                        }
+                                        r = mailimf_char_parse(
+                                            message,
+                                            length,
+                                            &mut lookfwd_cur_token,
+                                            '?' as i32 as libc::c_char,
+                                        );
+                                        if r != MAILIMF_NO_ERROR as libc::c_int {
+                                            current_block = 2652804691515851435;
+                                            break;
+                                        }
+                                        r = mailmime_encoding_parse(
+                                            message,
+                                            length,
+                                            &mut lookfwd_cur_token,
+                                            &mut lookfwd_encoding,
+                                        );
+                                        if r != MAILIMF_NO_ERROR as libc::c_int {
+                                            current_block = 2652804691515851435;
+                                            break;
+                                        }
+                                        r = mailimf_char_parse(
+                                            message,
+                                            length,
+                                            &mut lookfwd_cur_token,
+                                            '?' as i32 as libc::c_char,
+                                        );
+                                        if r != MAILIMF_NO_ERROR as libc::c_int {
+                                            current_block = 2652804691515851435;
+                                            break;
+                                        }
+                                        if strcasecmp(charset, lookfwd_charset) == 0i32
+                                            && encoding == lookfwd_encoding
+                                        {
+                                            cur_token = lookfwd_cur_token;
+                                            mailmime_charset_free(lookfwd_charset);
+                                            lookfwd_charset = 0 as *mut libc::c_char
+                                        } else {
+                                            /* the next charset is not matched with the current one,
+                                            therefore exit the loop to decode the body appended so far */
+                                            current_block = 2652804691515851435;
+                                            break;
+                                        }
+                                    }
+                                    match current_block {
+                                        2652804691515851435 => {
+                                            if !lookfwd_charset.is_null() {
+                                                mailmime_charset_free(lookfwd_charset);
+                                                lookfwd_charset = 0 as *mut libc::c_char
+                                            }
+                                            if body.is_null() {
+                                                body = strdup(
+                                                    b"\x00" as *const u8 as *const libc::c_char,
+                                                );
+                                                if body.is_null() {
+                                                    res = MAILIMF_ERROR_MEMORY as libc::c_int;
+                                                    current_block = 13900684162107791171;
+                                                } else {
+                                                    current_block = 16778110326724371720;
+                                                }
+                                            } else {
+                                                current_block = 16778110326724371720;
+                                            }
+                                            match current_block {
+                                                13900684162107791171 => {}
+                                                _ => {
+                                                    decoded_token = 0i32 as size_t;
+                                                    decoded_len = 0i32 as size_t;
+                                                    decoded = 0 as *mut libc::c_char;
+                                                    match encoding {
+                                                        0 => {
+                                                            r = mailmime_base64_body_parse(
+                                                                body,
+                                                                strlen(body),
+                                                                &mut decoded_token,
+                                                                &mut decoded,
+                                                                &mut decoded_len,
+                                                            );
+                                                            if r != MAILIMF_NO_ERROR as libc::c_int
+                                                            {
+                                                                res = r;
+                                                                current_block =
+                                                                    13900684162107791171;
+                                                            } else {
+                                                                current_block = 7337917895049117968;
+                                                            }
+                                                        }
+                                                        1 => {
+                                                            r =
+                                                                mailmime_quoted_printable_body_parse(body,
+                                                                                                     strlen(body),
+                                                                                                     &mut decoded_token,
+                                                                                                     &mut decoded,
+                                                                                                     &mut decoded_len,
+                                                                                                     1i32);
+                                                            if r != MAILIMF_NO_ERROR as libc::c_int
+                                                            {
+                                                                res = r;
+                                                                current_block =
+                                                                    13900684162107791171;
+                                                            } else {
+                                                                current_block = 7337917895049117968;
+                                                            }
+                                                        }
+                                                        _ => {
+                                                            current_block = 7337917895049117968;
+                                                        }
+                                                    }
+                                                    match current_block {
+                                                        13900684162107791171 => {}
+                                                        _ => {
+                                                            text =
+                                                                malloc(decoded_len.wrapping_add(
+                                                                    1i32 as libc::size_t,
+                                                                ))
+                                                                    as *mut libc::c_char;
+                                                            if text.is_null() {
+                                                                res = MAILIMF_ERROR_MEMORY
+                                                                    as libc::c_int
+                                                            } else {
+                                                                if decoded_len
+                                                                    > 0i32 as libc::size_t
+                                                                {
+                                                                    memcpy(
+                                                                        text as *mut libc::c_void,
+                                                                        decoded
+                                                                            as *const libc::c_void,
+                                                                        decoded_len,
+                                                                    );
+                                                                }
+                                                                *text
+                                                                    .offset(decoded_len as isize) =
+                                                                    '\u{0}' as i32 as libc::c_char;
+                                                                if 0 != opening_quote {
+                                                                    r = mailimf_char_parse(
+                                                                        message,
+                                                                        length,
+                                                                        &mut cur_token,
+                                                                        '\"' as i32 as libc::c_char,
+                                                                    );
+                                                                    if r == MAILIMF_ERROR_PARSE
+                                                                        as libc::c_int
+                                                                    {
+                                                                        missing_closing_quote = 1i32
+                                                                    }
+                                                                }
+                                                                if strcasecmp(
+                                                                    charset,
+                                                                    b"utf8\x00" as *const u8
+                                                                        as *const libc::c_char,
+                                                                ) == 0i32
+                                                                {
+                                                                    free(
+                                                                        charset
+                                                                            as *mut libc::c_void,
+                                                                    );
+                                                                    charset = strdup(
+                                                                        b"utf-8\x00" as *const u8
+                                                                            as *const libc::c_char,
+                                                                    )
+                                                                }
+                                                                ew = mailmime_encoded_word_new(
+                                                                    charset, text,
+                                                                );
+                                                                if ew.is_null() {
+                                                                    res = MAILIMF_ERROR_MEMORY
+                                                                        as libc::c_int
+                                                                } else {
+                                                                    *result = ew;
+                                                                    *indx = cur_token;
+                                                                    *p_has_fwd = has_fwd;
+                                                                    *p_missing_closing_quote =
+                                                                        missing_closing_quote;
+                                                                    mailmime_decoded_part_free(
+                                                                        decoded,
+                                                                    );
+                                                                    free(body as *mut libc::c_void);
+                                                                    return MAILIMF_NO_ERROR
+                                                                        as libc::c_int;
+                                                                }
+                                                            }
+                                                            mailmime_decoded_part_free(decoded);
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                        _ => {}
+                                    }
+                                    free(body as *mut libc::c_void);
+                                    mailmime_encoded_text_free(text);
+                                }
+                            }
+                        }
+                        mailmime_charset_free(charset);
+                    }
+                }
+            }
+        }
+    }
+    return res;
+}
+unsafe fn mailmime_encoding_parse(
+    mut message: *const libc::c_char,
+    mut length: size_t,
+    mut indx: *mut size_t,
+    mut result: *mut libc::c_int,
+) -> libc::c_int {
+    let mut cur_token: size_t = 0;
+    let mut encoding: libc::c_int = 0;
+    cur_token = *indx;
+    if cur_token >= length {
+        return MAILIMF_ERROR_PARSE as libc::c_int;
+    }
+    match toupper(*message.offset(cur_token as isize) as libc::c_uchar as libc::c_int)
+        as libc::c_char as libc::c_int
+    {
+        81 => encoding = MAILMIME_ENCODING_Q as libc::c_int,
+        66 => encoding = MAILMIME_ENCODING_B as libc::c_int,
+        _ => return MAILIMF_ERROR_INVAL as libc::c_int,
+    }
+    cur_token = cur_token.wrapping_add(1);
+    *result = encoding;
+    *indx = cur_token;
+    return MAILIMF_NO_ERROR as libc::c_int;
+}
+
+/*
+ * libEtPan! -- a mail stuff library
+ *
+ * Copyright (C) 2001, 2005 - DINH Viet Hoa
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the libEtPan! project nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+/*
+ * $Id: mailmime_decode.c,v 1.37 2010/11/16 20:52:28 hoa Exp $
+ */
+/*
+  RFC 2047 : MIME (Multipurpose Internet Mail Extensions) Part Three:
+             Message Header Extensions for Non-ASCII Text
+*/
+unsafe fn mailmime_charset_parse(
+    mut message: *const libc::c_char,
+    mut length: size_t,
+    mut indx: *mut size_t,
+    mut charset: *mut *mut libc::c_char,
+) -> libc::c_int {
+    return mailmime_etoken_parse(message, length, indx, charset);
+}
+unsafe fn mailmime_etoken_parse(
+    mut message: *const libc::c_char,
+    mut length: size_t,
+    mut indx: *mut size_t,
+    mut result: *mut *mut libc::c_char,
+) -> libc::c_int {
+    return mailimf_custom_string_parse(message, length, indx, result, Some(is_etoken_char));
+}
+
+unsafe fn is_etoken_char(mut ch: libc::c_char) -> libc::c_int {
+    let mut uch: libc::c_uchar = ch as libc::c_uchar;
+    if (uch as libc::c_int) < 31i32 {
+        return 0i32;
+    }
+    match uch as libc::c_int {
+        32 | 40 | 41 | 60 | 62 | 64 | 44 | 59 | 58 | 34 | 47 | 91 | 93 | 63 | 61 => return 0i32,
+        _ => {}
+    }
+    return 1i32;
+}

mmime/src/mailmime/disposition.rs

@@ -0,0 +1,583 @@
+use libc::{self, toupper};
+
+use crate::clist::*;
+use crate::mailimf::*;
+use crate::mailmime::types::*;
+use crate::mailmime::*;
+use crate::other::*;
+
+pub const MAILMIME_DISPOSITION_TYPE_EXTENSION: libc::c_uint = 3;
+pub const MAILMIME_DISPOSITION_TYPE_ATTACHMENT: libc::c_uint = 2;
+pub const MAILMIME_DISPOSITION_TYPE_INLINE: libc::c_uint = 1;
+pub const MAILMIME_DISPOSITION_TYPE_ERROR: libc::c_uint = 0;
+
+pub unsafe fn mailmime_disposition_parse(
+    mut message: *const libc::c_char,
+    mut length: size_t,
+    mut indx: *mut size_t,
+    mut result: *mut *mut mailmime_disposition,
+) -> libc::c_int {
+    let mut current_block: u64;
+    let mut final_token: size_t = 0;
+    let mut cur_token: size_t = 0;
+    let mut dsp_type: *mut mailmime_disposition_type = 0 as *mut mailmime_disposition_type;
+    let mut list: *mut clist = 0 as *mut clist;
+    let mut dsp: *mut mailmime_disposition = 0 as *mut mailmime_disposition;
+    let mut r: libc::c_int = 0;
+    let mut res: libc::c_int = 0;
+    cur_token = *indx;
+    r = mailmime_disposition_type_parse(message, length, &mut cur_token, &mut dsp_type);
+    if r != MAILIMF_NO_ERROR as libc::c_int {
+        res = r
+    } else {
+        list = clist_new();
+        if list.is_null() {
+            res = MAILIMF_ERROR_MEMORY as libc::c_int
+        } else {
+            loop {
+                let mut param: *mut mailmime_disposition_parm = 0 as *mut mailmime_disposition_parm;
+                final_token = cur_token;
+                r = mailimf_unstrict_char_parse(
+                    message,
+                    length,
+                    &mut cur_token,
+                    ';' as i32 as libc::c_char,
+                );
+                if r == MAILIMF_NO_ERROR as libc::c_int {
+                    param = 0 as *mut mailmime_disposition_parm;
+                    r = mailmime_disposition_parm_parse(
+                        message,
+                        length,
+                        &mut cur_token,
+                        &mut param,
+                    );
+                    if r == MAILIMF_NO_ERROR as libc::c_int {
+                        r = clist_insert_after(list, (*list).last, param as *mut libc::c_void);
+                        if !(r < 0i32) {
+                            continue;
+                        }
+                        res = MAILIMF_ERROR_MEMORY as libc::c_int;
+                        current_block = 18290070879695007868;
+                        break;
+                    } else if r == MAILIMF_ERROR_PARSE as libc::c_int {
+                        cur_token = final_token;
+                        current_block = 652864300344834934;
+                        break;
+                    } else {
+                        res = r;
+                        current_block = 18290070879695007868;
+                        break;
+                    }
+                } else {
+                    /* do nothing */
+                    if r == MAILIMF_ERROR_PARSE as libc::c_int {
+                        current_block = 652864300344834934;
+                        break;
+                    }
+                    res = r;
+                    current_block = 18290070879695007868;
+                    break;
+                }
+            }
+            match current_block {
+                652864300344834934 => {
+                    dsp = mailmime_disposition_new(dsp_type, list);
+                    if dsp.is_null() {
+                        res = MAILIMF_ERROR_MEMORY as libc::c_int
+                    } else {
+                        *result = dsp;
+                        *indx = cur_token;
+                        return MAILIMF_NO_ERROR as libc::c_int;
+                    }
+                }
+                _ => {}
+            }
+            clist_foreach(
+                list,
+                ::std::mem::transmute::<
+                    Option<unsafe fn(_: *mut mailmime_disposition_parm) -> ()>,
+                    clist_func,
+                >(Some(mailmime_disposition_parm_free)),
+                0 as *mut libc::c_void,
+            );
+            clist_free(list);
+        }
+        mailmime_disposition_type_free(dsp_type);
+    }
+    return res;
+}
+/*
+ * libEtPan! -- a mail stuff library
+ *
+ * Copyright (C) 2001, 2005 - DINH Viet Hoa
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the libEtPan! project nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+/*
+ * $Id: mailmime_disposition.c,v 1.17 2011/05/03 16:30:22 hoa Exp $
+ */
+unsafe fn mailmime_disposition_parm_parse(
+    mut message: *const libc::c_char,
+    mut length: size_t,
+    mut indx: *mut size_t,
+    mut result: *mut *mut mailmime_disposition_parm,
+) -> libc::c_int {
+    let mut current_block: u64;
+    let mut filename: *mut libc::c_char = 0 as *mut libc::c_char;
+    let mut creation_date: *mut libc::c_char = 0 as *mut libc::c_char;
+    let mut modification_date: *mut libc::c_char = 0 as *mut libc::c_char;
+    let mut read_date: *mut libc::c_char = 0 as *mut libc::c_char;
+    let mut size: size_t = 0;
+    let mut parameter: *mut mailmime_parameter = 0 as *mut mailmime_parameter;
+    let mut cur_token: size_t = 0;
+    let mut dsp_parm: *mut mailmime_disposition_parm = 0 as *mut mailmime_disposition_parm;
+    let mut type_0: libc::c_int = 0;
+    let mut guessed_type: libc::c_int = 0;
+    let mut r: libc::c_int = 0;
+    let mut res: libc::c_int = 0;
+    cur_token = *indx;
+    filename = 0 as *mut libc::c_char;
+    creation_date = 0 as *mut libc::c_char;
+    modification_date = 0 as *mut libc::c_char;
+    read_date = 0 as *mut libc::c_char;
+    size = 0i32 as size_t;
+    parameter = 0 as *mut mailmime_parameter;
+    r = mailimf_cfws_parse(message, length, &mut cur_token);
+    if r != MAILIMF_NO_ERROR as libc::c_int && r != MAILIMF_ERROR_PARSE as libc::c_int {
+        res = r
+    } else {
+        guessed_type = mailmime_disposition_guess_type(message, length, cur_token);
+        type_0 = MAILMIME_DISPOSITION_PARM_PARAMETER as libc::c_int;
+        match guessed_type {
+            0 => {
+                r = mailmime_filename_parm_parse(message, length, &mut cur_token, &mut filename);
+                if r == MAILIMF_NO_ERROR as libc::c_int {
+                    type_0 = guessed_type;
+                    current_block = 13826291924415791078;
+                } else if r == MAILIMF_ERROR_PARSE as libc::c_int {
+                    current_block = 13826291924415791078;
+                } else {
+                    /* do nothing */
+                    res = r;
+                    current_block = 9120900589700563584;
+                }
+            }
+            1 => {
+                r = mailmime_creation_date_parm_parse(
+                    message,
+                    length,
+                    &mut cur_token,
+                    &mut creation_date,
+                );
+                if r == MAILIMF_NO_ERROR as libc::c_int {
+                    type_0 = guessed_type;
+                    current_block = 13826291924415791078;
+                } else if r == MAILIMF_ERROR_PARSE as libc::c_int {
+                    current_block = 13826291924415791078;
+                } else {
+                    /* do nothing */
+                    res = r;
+                    current_block = 9120900589700563584;
+                }
+            }
+            2 => {
+                r = mailmime_modification_date_parm_parse(
+                    message,
+                    length,
+                    &mut cur_token,
+                    &mut modification_date,
+                );
+                if r == MAILIMF_NO_ERROR as libc::c_int {
+                    type_0 = guessed_type;
+                    current_block = 13826291924415791078;
+                } else if r == MAILIMF_ERROR_PARSE as libc::c_int {
+                    current_block = 13826291924415791078;
+                } else {
+                    /* do nothing */
+                    res = r;
+                    current_block = 9120900589700563584;
+                }
+            }
+            3 => {
+                r = mailmime_read_date_parm_parse(message, length, &mut cur_token, &mut read_date);
+                if r == MAILIMF_NO_ERROR as libc::c_int {
+                    type_0 = guessed_type;
+                    current_block = 13826291924415791078;
+                } else if r == MAILIMF_ERROR_PARSE as libc::c_int {
+                    current_block = 13826291924415791078;
+                } else {
+                    /* do nothing */
+                    res = r;
+                    current_block = 9120900589700563584;
+                }
+            }
+            4 => {
+                r = mailmime_size_parm_parse(message, length, &mut cur_token, &mut size);
+                if r == MAILIMF_NO_ERROR as libc::c_int {
+                    type_0 = guessed_type;
+                    current_block = 13826291924415791078;
+                } else if r == MAILIMF_ERROR_PARSE as libc::c_int {
+                    current_block = 13826291924415791078;
+                } else {
+                    /* do nothing */
+                    res = r;
+                    current_block = 9120900589700563584;
+                }
+            }
+            _ => {
+                current_block = 13826291924415791078;
+            }
+        }
+        match current_block {
+            9120900589700563584 => {}
+            _ => {
+                if type_0 == MAILMIME_DISPOSITION_PARM_PARAMETER as libc::c_int {
+                    r = mailmime_parameter_parse(message, length, &mut cur_token, &mut parameter);
+                    if r != MAILIMF_NO_ERROR as libc::c_int {
+                        type_0 = guessed_type;
+                        res = r;
+                        current_block = 9120900589700563584;
+                    } else {
+                        current_block = 6721012065216013753;
+                    }
+                } else {
+                    current_block = 6721012065216013753;
+                }
+                match current_block {
+                    9120900589700563584 => {}
+                    _ => {
+                        dsp_parm = mailmime_disposition_parm_new(
+                            type_0,
+                            filename,
+                            creation_date,
+                            modification_date,
+                            read_date,
+                            size,
+                            parameter,
+                        );
+                        if dsp_parm.is_null() {
+                            res = MAILIMF_ERROR_MEMORY as libc::c_int;
+                            if !filename.is_null() {
+                                mailmime_filename_parm_free(filename);
+                            }
+                            if !creation_date.is_null() {
+                                mailmime_creation_date_parm_free(creation_date);
+                            }
+                            if !modification_date.is_null() {
+                                mailmime_modification_date_parm_free(modification_date);
+                            }
+                            if !read_date.is_null() {
+                                mailmime_read_date_parm_free(read_date);
+                            }
+                            if !parameter.is_null() {
+                                mailmime_parameter_free(parameter);
+                            }
+                        } else {
+                            *result = dsp_parm;
+                            *indx = cur_token;
+                            return MAILIMF_NO_ERROR as libc::c_int;
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return res;
+}
+unsafe fn mailmime_size_parm_parse(
+    mut message: *const libc::c_char,
+    mut length: size_t,
+    mut indx: *mut size_t,
+    mut result: *mut size_t,
+) -> libc::c_int {
+    let mut value: uint32_t = 0;
+    let mut cur_token: size_t = 0;
+    let mut r: libc::c_int = 0;
+    cur_token = *indx;
+    r = mailimf_token_case_insensitive_len_parse(
+        message,
+        length,
+        &mut cur_token,
+        b"size\x00" as *const u8 as *const libc::c_char as *mut libc::c_char,
+        strlen(b"size\x00" as *const u8 as *const libc::c_char),
+    );
+    if r != MAILIMF_NO_ERROR as libc::c_int {
+        return r;
+    }
+    r = mailimf_unstrict_char_parse(message, length, &mut cur_token, '=' as i32 as libc::c_char);
+    if r != MAILIMF_NO_ERROR as libc::c_int {
+        return r;
+    }
+    r = mailimf_cfws_parse(message, length, &mut cur_token);
+    if r != MAILIMF_NO_ERROR as libc::c_int && r != MAILIMF_ERROR_PARSE as libc::c_int {
+        return r;
+    }
+    r = mailimf_number_parse(message, length, &mut cur_token, &mut value);
+    if r != MAILIMF_NO_ERROR as libc::c_int {
+        return r;
+    }
+    *indx = cur_token;
+    *result = value as size_t;
+    return MAILIMF_NO_ERROR as libc::c_int;
+}
+unsafe fn mailmime_read_date_parm_parse(
+    mut message: *const libc::c_char,
+    mut length: size_t,
+    mut indx: *mut size_t,
+    mut result: *mut *mut libc::c_char,
+) -> libc::c_int {
+    let mut value: *mut libc::c_char = 0 as *mut libc::c_char;
+    let mut cur_token: size_t = 0;
+    let mut r: libc::c_int = 0;
+    cur_token = *indx;
+    r = mailimf_token_case_insensitive_len_parse(
+        message,
+        length,
+        &mut cur_token,
+        b"read-date\x00" as *const u8 as *const libc::c_char as *mut libc::c_char,
+        strlen(b"read-date\x00" as *const u8 as *const libc::c_char),
+    );
+    if r != MAILIMF_NO_ERROR as libc::c_int {
+        return r;
+    }
+    r = mailimf_unstrict_char_parse(message, length, &mut cur_token, '=' as i32 as libc::c_char);
+    if r != MAILIMF_NO_ERROR as libc::c_int {
+        return r;
+    }
+    r = mailimf_cfws_parse(message, length, &mut cur_token);
+    if r != MAILIMF_NO_ERROR as libc::c_int && r != MAILIMF_ERROR_PARSE as libc::c_int {
+        return r;
+    }
+    r = mailmime_quoted_date_time_parse(message, length, &mut cur_token, &mut value);
+    if r != MAILIMF_NO_ERROR as libc::c_int {
+        return r;
+    }
+    *indx = cur_token;
+    *result = value;
+    return MAILIMF_NO_ERROR as libc::c_int;
+}
+unsafe fn mailmime_quoted_date_time_parse(
+    mut message: *const libc::c_char,
+    mut length: size_t,
+    mut indx: *mut size_t,
+    mut result: *mut *mut libc::c_char,
+) -> libc::c_int {
+    return mailimf_quoted_string_parse(message, length, indx, result);
+}
+unsafe fn mailmime_modification_date_parm_parse(
+    mut message: *const libc::c_char,
+    mut length: size_t,
+    mut indx: *mut size_t,
+    mut result: *mut *mut libc::c_char,
+) -> libc::c_int {
+    let mut value: *mut libc::c_char = 0 as *mut libc::c_char;
+    let mut cur_token: size_t = 0;
+    let mut r: libc::c_int = 0;
+    cur_token = *indx;
+    r = mailimf_token_case_insensitive_len_parse(
+        message,
+        length,
+        &mut cur_token,
+        b"modification-date\x00" as *const u8 as *const libc::c_char as *mut libc::c_char,
+        strlen(b"modification-date\x00" as *const u8 as *const libc::c_char),
+    );
+    if r != MAILIMF_NO_ERROR as libc::c_int {
+        return r;
+    }
+    r = mailimf_unstrict_char_parse(message, length, &mut cur_token, '=' as i32 as libc::c_char);
+    if r != MAILIMF_NO_ERROR as libc::c_int {
+        return r;
+    }
+    r = mailimf_cfws_parse(message, length, &mut cur_token);
+    if r != MAILIMF_NO_ERROR as libc::c_int && r != MAILIMF_ERROR_PARSE as libc::c_int {
+        return r;
+    }
+    r = mailmime_quoted_date_time_parse(message, length, &mut cur_token, &mut value);
+    if r != MAILIMF_NO_ERROR as libc::c_int {
+        return r;
+    }
+    *indx = cur_token;
+    *result = value;
+    return MAILIMF_NO_ERROR as libc::c_int;
+}
+unsafe fn mailmime_creation_date_parm_parse(
+    mut message: *const libc::c_char,
+    mut length: size_t,
+    mut indx: *mut size_t,
+    mut result: *mut *mut libc::c_char,
+) -> libc::c_int {
+    let mut value: *mut libc::c_char = 0 as *mut libc::c_char;
+    let mut r: libc::c_int = 0;
+    let mut cur_token: size_t = 0;
+    cur_token = *indx;
+    r = mailimf_token_case_insensitive_len_parse(
+        message,
+        length,
+        &mut cur_token,
+        b"creation-date\x00" as *const u8 as *const libc::c_char as *mut libc::c_char,
+        strlen(b"creation-date\x00" as *const u8 as *const libc::c_char),
+    );
+    if r != MAILIMF_NO_ERROR as libc::c_int {
+        return r;
+    }
+    r = mailimf_unstrict_char_parse(message, length, &mut cur_token, '=' as i32 as libc::c_char);
+    if r != MAILIMF_NO_ERROR as libc::c_int {
+        return r;
+    }
+    r = mailimf_cfws_parse(message, length, &mut cur_token);
+    if r != MAILIMF_NO_ERROR as libc::c_int && r != MAILIMF_ERROR_PARSE as libc::c_int {
+        return r;
+    }
+    r = mailmime_quoted_date_time_parse(message, length, &mut cur_token, &mut value);
+    if r != MAILIMF_NO_ERROR as libc::c_int {
+        return r;
+    }
+    *indx = cur_token;
+    *result = value;
+    return MAILIMF_NO_ERROR as libc::c_int;
+}
+unsafe fn mailmime_filename_parm_parse(
+    mut message: *const libc::c_char,
+    mut length: size_t,
+    mut indx: *mut size_t,
+    mut result: *mut *mut libc::c_char,
+) -> libc::c_int {
+    let mut value: *mut libc::c_char = 0 as *mut libc::c_char;
+    let mut r: libc::c_int = 0;
+    let mut cur_token: size_t = 0;
+    cur_token = *indx;
+    r = mailimf_token_case_insensitive_len_parse(
+        message,
+        length,
+        &mut cur_token,
+        b"filename\x00" as *const u8 as *const libc::c_char as *mut libc::c_char,
+        strlen(b"filename\x00" as *const u8 as *const libc::c_char),
+    );
+    if r != MAILIMF_NO_ERROR as libc::c_int {
+        return r;
+    }
+    r = mailimf_unstrict_char_parse(message, length, &mut cur_token, '=' as i32 as libc::c_char);
+    if r != MAILIMF_NO_ERROR as libc::c_int {
+        return r;
+    }
+    r = mailimf_cfws_parse(message, length, &mut cur_token);
+    if r != MAILIMF_NO_ERROR as libc::c_int && r != MAILIMF_ERROR_PARSE as libc::c_int {
+        return r;
+    }
+    r = mailmime_value_parse(message, length, &mut cur_token, &mut value);
+    if r != MAILIMF_NO_ERROR as libc::c_int {
+        return r;
+    }
+    *indx = cur_token;
+    *result = value;
+    return MAILIMF_NO_ERROR as libc::c_int;
+}
+
+pub unsafe fn mailmime_disposition_guess_type(
+    mut message: *const libc::c_char,
+    mut length: size_t,
+    mut indx: size_t,
+) -> libc::c_int {
+    if indx >= length {
+        return MAILMIME_DISPOSITION_PARM_PARAMETER as libc::c_int;
+    }
+    match toupper(*message.offset(indx as isize) as libc::c_uchar as libc::c_int) as libc::c_char
+        as libc::c_int
+    {
+        70 => return MAILMIME_DISPOSITION_PARM_FILENAME as libc::c_int,
+        67 => return MAILMIME_DISPOSITION_PARM_CREATION_DATE as libc::c_int,
+        77 => return MAILMIME_DISPOSITION_PARM_MODIFICATION_DATE as libc::c_int,
+        82 => return MAILMIME_DISPOSITION_PARM_READ_DATE as libc::c_int,
+        83 => return MAILMIME_DISPOSITION_PARM_SIZE as libc::c_int,
+        _ => return MAILMIME_DISPOSITION_PARM_PARAMETER as libc::c_int,
+    };
+}
+
+pub unsafe fn mailmime_disposition_type_parse(
+    mut message: *const libc::c_char,
+    mut length: size_t,
+    mut indx: *mut size_t,
+    mut result: *mut *mut mailmime_disposition_type,
+) -> libc::c_int {
+    let mut cur_token: size_t = 0;
+    let mut type_0: libc::c_int = 0;
+    let mut extension: *mut libc::c_char = 0 as *mut libc::c_char;
+    let mut dsp_type: *mut mailmime_disposition_type = 0 as *mut mailmime_disposition_type;
+    let mut r: libc::c_int = 0;
+    let mut res: libc::c_int = 0;
+    cur_token = *indx;
+    r = mailimf_cfws_parse(message, length, &mut cur_token);
+    if r != MAILIMF_NO_ERROR as libc::c_int && r != MAILIMF_ERROR_PARSE as libc::c_int {
+        res = r
+    } else {
+        type_0 = MAILMIME_DISPOSITION_TYPE_ERROR as libc::c_int;
+        extension = 0 as *mut libc::c_char;
+        r = mailimf_token_case_insensitive_len_parse(
+            message,
+            length,
+            &mut cur_token,
+            b"inline\x00" as *const u8 as *const libc::c_char as *mut libc::c_char,
+            strlen(b"inline\x00" as *const u8 as *const libc::c_char),
+        );
+        if r == MAILIMF_NO_ERROR as libc::c_int {
+            type_0 = MAILMIME_DISPOSITION_TYPE_INLINE as libc::c_int
+        }
+        if r == MAILIMF_ERROR_PARSE as libc::c_int {
+            r = mailimf_token_case_insensitive_len_parse(
+                message,
+                length,
+                &mut cur_token,
+                b"attachment\x00" as *const u8 as *const libc::c_char as *mut libc::c_char,
+                strlen(b"attachment\x00" as *const u8 as *const libc::c_char),
+            );
+            if r == MAILIMF_NO_ERROR as libc::c_int {
+                type_0 = MAILMIME_DISPOSITION_TYPE_ATTACHMENT as libc::c_int
+            }
+        }
+        if r == MAILIMF_ERROR_PARSE as libc::c_int {
+            r = mailmime_extension_token_parse(message, length, &mut cur_token, &mut extension);
+            if r == MAILIMF_NO_ERROR as libc::c_int {
+                type_0 = MAILMIME_DISPOSITION_TYPE_EXTENSION as libc::c_int
+            }
+        }
+        if r != MAILIMF_NO_ERROR as libc::c_int {
+            res = r
+        } else {
+            dsp_type = mailmime_disposition_type_new(type_0, extension);
+            if dsp_type.is_null() {
+                res = MAILIMF_ERROR_MEMORY as libc::c_int;
+                if !extension.is_null() {
+                    free(extension as *mut libc::c_void);
+                }
+            } else {
+                *result = dsp_type;
+                *indx = cur_token;
+                return MAILIMF_NO_ERROR as libc::c_int;
+            }
+        }
+    }
+    return res;
+}

mmime/src/mailmime/types.rs

@@ -0,0 +1,891 @@
+use crate::clist::*;
+use crate::mailimf::types::*;
+use crate::mmapstring::*;
+use crate::other::*;
+
+pub const MAILMIME_MECHANISM_TOKEN: libc::c_uint = 6;
+pub const MAILMIME_MECHANISM_BASE64: libc::c_uint = 5;
+pub const MAILMIME_MECHANISM_QUOTED_PRINTABLE: libc::c_uint = 4;
+pub const MAILMIME_MECHANISM_BINARY: libc::c_uint = 3;
+pub const MAILMIME_MECHANISM_8BIT: libc::c_uint = 2;
+pub const MAILMIME_MECHANISM_7BIT: libc::c_uint = 1;
+pub const MAILMIME_MECHANISM_ERROR: libc::c_uint = 0;
+
+#[derive(Copy, Clone)]
+#[repr(C)]
+pub struct mailmime_composite_type {
+    pub ct_type: libc::c_int,
+    pub ct_token: *mut libc::c_char,
+}
+#[derive(Copy, Clone)]
+#[repr(C)]
+pub struct mailmime_content {
+    pub ct_type: *mut mailmime_type,
+    pub ct_subtype: *mut libc::c_char,
+    pub ct_parameters: *mut clist,
+}
+#[derive(Copy, Clone)]
+#[repr(C)]
+pub struct mailmime_type {
+    pub tp_type: libc::c_int,
+    pub tp_data: unnamed,
+}
+#[derive(Copy, Clone)]
+#[repr(C)]
+pub union unnamed {
+    pub tp_discrete_type: *mut mailmime_discrete_type,
+    pub tp_composite_type: *mut mailmime_composite_type,
+}
+#[derive(Copy, Clone)]
+#[repr(C)]
+pub struct mailmime_discrete_type {
+    pub dt_type: libc::c_int,
+    pub dt_extension: *mut libc::c_char,
+}
+pub type unnamed_0 = libc::c_uint;
+pub const MAILMIME_FIELD_LOCATION: unnamed_0 = 8;
+pub const MAILMIME_FIELD_LANGUAGE: unnamed_0 = 7;
+pub const MAILMIME_FIELD_DISPOSITION: unnamed_0 = 6;
+pub const MAILMIME_FIELD_VERSION: unnamed_0 = 5;
+pub const MAILMIME_FIELD_DESCRIPTION: unnamed_0 = 4;
+pub const MAILMIME_FIELD_ID: unnamed_0 = 3;
+pub const MAILMIME_FIELD_TRANSFER_ENCODING: unnamed_0 = 2;
+pub const MAILMIME_FIELD_TYPE: unnamed_0 = 1;
+pub const MAILMIME_FIELD_NONE: unnamed_0 = 0;
+#[derive(Copy, Clone)]
+#[repr(C)]
+pub struct mailmime_field {
+    pub fld_type: libc::c_int,
+    pub fld_data: unnamed_1,
+}
+#[derive(Copy, Clone)]
+#[repr(C)]
+pub union unnamed_1 {
+    pub fld_content: *mut mailmime_content,
+    pub fld_encoding: *mut mailmime_mechanism,
+    pub fld_id: *mut libc::c_char,
+    pub fld_description: *mut libc::c_char,
+    pub fld_version: uint32_t,
+    pub fld_disposition: *mut mailmime_disposition,
+    pub fld_language: *mut mailmime_language,
+    pub fld_location: *mut libc::c_char,
+}
+#[derive(Copy, Clone)]
+#[repr(C)]
+pub struct mailmime_language {
+    pub lg_list: *mut clist,
+}
+#[derive(Copy, Clone)]
+#[repr(C)]
+pub struct mailmime_disposition {
+    pub dsp_type: *mut mailmime_disposition_type,
+    pub dsp_parms: *mut clist,
+}
+#[derive(Copy, Clone)]
+#[repr(C)]
+pub struct mailmime_disposition_type {
+    pub dsp_type: libc::c_int,
+    pub dsp_extension: *mut libc::c_char,
+}
+#[derive(Copy, Clone)]
+#[repr(C)]
+pub struct mailmime_mechanism {
+    pub enc_type: libc::c_int,
+    pub enc_token: *mut libc::c_char,
+}
+#[derive(Copy, Clone)]
+#[repr(C)]
+pub struct mailmime_fields {
+    pub fld_list: *mut clist,
+}
+#[derive(Copy, Clone)]
+#[repr(C)]
+pub struct mailmime_parameter {
+    pub pa_name: *mut libc::c_char,
+    pub pa_value: *mut libc::c_char,
+}
+
+#[derive(Copy, Clone)]
+#[repr(C)]
+pub struct mailmime_disposition_parm {
+    pub pa_type: libc::c_int,
+    pub pa_data: unnamed_3,
+}
+#[derive(Copy, Clone)]
+#[repr(C)]
+pub union unnamed_3 {
+    pub pa_filename: *mut libc::c_char,
+    pub pa_creation_date: *mut libc::c_char,
+    pub pa_modification_date: *mut libc::c_char,
+    pub pa_read_date: *mut libc::c_char,
+    pub pa_size: size_t,
+    pub pa_parameter: *mut mailmime_parameter,
+}
+pub const MAILMIME_DISPOSITION_PARM_PARAMETER: unnamed_11 = 5;
+pub const MAILMIME_DISPOSITION_PARM_READ_DATE: unnamed_11 = 3;
+pub const MAILMIME_DISPOSITION_PARM_MODIFICATION_DATE: unnamed_11 = 2;
+pub const MAILMIME_DISPOSITION_PARM_CREATION_DATE: unnamed_11 = 1;
+pub const MAILMIME_DISPOSITION_PARM_FILENAME: unnamed_11 = 0;
+#[derive(Copy, Clone)]
+#[repr(C)]
+pub struct mailmime_multipart_body {
+    pub bd_list: *mut clist,
+}
+pub type unnamed_4 = libc::c_uint;
+pub const MAILMIME_DATA_FILE: unnamed_4 = 1;
+pub const MAILMIME_DATA_TEXT: unnamed_4 = 0;
+#[derive(Copy, Clone)]
+#[repr(C)]
+pub struct mailmime_data {
+    pub dt_type: libc::c_int,
+    pub dt_encoding: libc::c_int,
+    pub dt_encoded: libc::c_int,
+    pub dt_data: unnamed_5,
+}
+#[derive(Copy, Clone)]
+#[repr(C)]
+pub union unnamed_5 {
+    pub dt_text: unnamed_6,
+    pub dt_filename: *mut libc::c_char,
+}
+#[derive(Copy, Clone)]
+#[repr(C)]
+pub struct unnamed_6 {
+    pub dt_data: *const libc::c_char,
+    pub dt_length: size_t,
+}
+pub type unnamed_7 = libc::c_uint;
+pub const MAILMIME_MESSAGE: unnamed_7 = 3;
+pub const MAILMIME_MULTIPLE: unnamed_7 = 2;
+pub const MAILMIME_SINGLE: unnamed_7 = 1;
+pub const MAILMIME_NONE: unnamed_7 = 0;
+
+#[derive(Copy, Clone)]
+#[repr(C)]
+pub struct Mailmime {
+    pub mm_parent_type: libc::c_int,
+    pub mm_parent: *mut Mailmime,
+    pub mm_multipart_pos: *mut clistiter,
+    pub mm_type: libc::c_int,
+    pub mm_mime_start: *const libc::c_char,
+    pub mm_length: size_t,
+    pub mm_mime_fields: *mut mailmime_fields,
+    pub mm_content_type: *mut mailmime_content,
+    pub mm_body: *mut mailmime_data,
+    pub mm_data: unnamed_8,
+}
+#[derive(Copy, Clone)]
+#[repr(C)]
+pub union unnamed_8 {
+    pub mm_single: *mut mailmime_data,
+    pub mm_multipart: unnamed_10,
+    pub mm_message: unnamed_9,
+}
+/* message */
+#[derive(Copy, Clone)]
+#[repr(C)]
+pub struct unnamed_9 {
+    pub mm_fields: *mut mailimf_fields,
+    pub mm_msg_mime: *mut Mailmime,
+}
+/* multi-part */
+#[derive(Copy, Clone)]
+#[repr(C)]
+pub struct unnamed_10 {
+    pub mm_preamble: *mut mailmime_data,
+    pub mm_epilogue: *mut mailmime_data,
+    pub mm_mp_list: *mut clist,
+}
+#[derive(Copy, Clone)]
+#[repr(C)]
+pub struct mailmime_encoded_word {
+    pub wd_charset: *mut libc::c_char,
+    pub wd_text: *mut libc::c_char,
+}
+pub type unnamed_11 = libc::c_uint;
+pub const MAILMIME_DISPOSITION_PARM_SIZE: unnamed_11 = 4;
+#[derive(Copy, Clone)]
+#[repr(C)]
+pub struct mailmime_section {
+    pub sec_list: *mut clist,
+}
+
+pub unsafe fn mailmime_attribute_free(mut attribute: *mut libc::c_char) {
+    mailmime_token_free(attribute);
+}
+
+pub unsafe fn mailmime_token_free(mut token: *mut libc::c_char) {
+    free(token as *mut libc::c_void);
+}
+pub unsafe fn mailmime_composite_type_new(
+    mut ct_type: libc::c_int,
+    mut ct_token: *mut libc::c_char,
+) -> *mut mailmime_composite_type {
+    let mut ct: *mut mailmime_composite_type = 0 as *mut mailmime_composite_type;
+    ct = malloc(::std::mem::size_of::<mailmime_composite_type>() as libc::size_t)
+        as *mut mailmime_composite_type;
+    if ct.is_null() {
+        return 0 as *mut mailmime_composite_type;
+    }
+    (*ct).ct_type = ct_type;
+    (*ct).ct_token = ct_token;
+    return ct;
+}
+
+pub unsafe fn mailmime_composite_type_free(mut ct: *mut mailmime_composite_type) {
+    if !(*ct).ct_token.is_null() {
+        mailmime_extension_token_free((*ct).ct_token);
+    }
+    free(ct as *mut libc::c_void);
+}
+
+pub unsafe fn mailmime_extension_token_free(mut extension: *mut libc::c_char) {
+    mailmime_token_free(extension);
+}
+
+pub unsafe fn mailmime_content_new(
+    mut ct_type: *mut mailmime_type,
+    mut ct_subtype: *mut libc::c_char,
+    mut ct_parameters: *mut clist,
+) -> *mut mailmime_content {
+    let mut content: *mut mailmime_content = 0 as *mut mailmime_content;
+    content =
+        malloc(::std::mem::size_of::<mailmime_content>() as libc::size_t) as *mut mailmime_content;
+    if content.is_null() {
+        return 0 as *mut mailmime_content;
+    }
+    (*content).ct_type = ct_type;
+    (*content).ct_subtype = ct_subtype;
+    (*content).ct_parameters = ct_parameters;
+    return content;
+}
+
+pub unsafe fn mailmime_content_free(mut content: *mut mailmime_content) {
+    mailmime_type_free((*content).ct_type);
+    mailmime_subtype_free((*content).ct_subtype);
+    if !(*content).ct_parameters.is_null() {
+        clist_foreach(
+            (*content).ct_parameters,
+            ::std::mem::transmute::<Option<unsafe fn(_: *mut mailmime_parameter) -> ()>, clist_func>(
+                Some(mailmime_parameter_free),
+            ),
+            0 as *mut libc::c_void,
+        );
+        clist_free((*content).ct_parameters);
+    }
+    free(content as *mut libc::c_void);
+}
+
+pub unsafe fn mailmime_parameter_free(mut parameter: *mut mailmime_parameter) {
+    mailmime_attribute_free((*parameter).pa_name);
+    mailmime_value_free((*parameter).pa_value);
+    free(parameter as *mut libc::c_void);
+}
+
+pub unsafe fn mailmime_value_free(mut value: *mut libc::c_char) {
+    free(value as *mut libc::c_void);
+}
+
+pub unsafe fn mailmime_subtype_free(mut subtype: *mut libc::c_char) {
+    mailmime_extension_token_free(subtype);
+}
+
+pub unsafe fn mailmime_type_free(mut type_0: *mut mailmime_type) {
+    match (*type_0).tp_type {
+        1 => {
+            mailmime_discrete_type_free((*type_0).tp_data.tp_discrete_type);
+        }
+        2 => {
+            mailmime_composite_type_free((*type_0).tp_data.tp_composite_type);
+        }
+        _ => {}
+    }
+    free(type_0 as *mut libc::c_void);
+}
+
+pub unsafe fn mailmime_discrete_type_free(mut discrete_type: *mut mailmime_discrete_type) {
+    if !(*discrete_type).dt_extension.is_null() {
+        mailmime_extension_token_free((*discrete_type).dt_extension);
+    }
+    free(discrete_type as *mut libc::c_void);
+}
+
+pub unsafe fn mailmime_description_free(mut description: *mut libc::c_char) {
+    free(description as *mut libc::c_void);
+}
+
+pub unsafe fn mailmime_location_free(mut location: *mut libc::c_char) {
+    free(location as *mut libc::c_void);
+}
+
+pub unsafe fn mailmime_discrete_type_new(
+    mut dt_type: libc::c_int,
+    mut dt_extension: *mut libc::c_char,
+) -> *mut mailmime_discrete_type {
+    let mut discrete_type: *mut mailmime_discrete_type = 0 as *mut mailmime_discrete_type;
+    discrete_type = malloc(::std::mem::size_of::<mailmime_discrete_type>() as libc::size_t)
+        as *mut mailmime_discrete_type;
+    if discrete_type.is_null() {
+        return 0 as *mut mailmime_discrete_type;
+    }
+    (*discrete_type).dt_type = dt_type;
+    (*discrete_type).dt_extension = dt_extension;
+    return discrete_type;
+}
+
+pub unsafe fn mailmime_encoding_free(mut encoding: *mut mailmime_mechanism) {
+    mailmime_mechanism_free(encoding);
+}
+
+pub unsafe fn mailmime_mechanism_free(mut mechanism: *mut mailmime_mechanism) {
+    if !(*mechanism).enc_token.is_null() {
+        mailmime_token_free((*mechanism).enc_token);
+    }
+    free(mechanism as *mut libc::c_void);
+}
+
+pub unsafe fn mailmime_id_free(mut id: *mut libc::c_char) {
+    mailimf_msg_id_free(id);
+}
+
+pub unsafe fn mailmime_mechanism_new(
+    mut enc_type: libc::c_int,
+    mut enc_token: *mut libc::c_char,
+) -> *mut mailmime_mechanism {
+    let mut mechanism: *mut mailmime_mechanism = 0 as *mut mailmime_mechanism;
+    mechanism = malloc(::std::mem::size_of::<mailmime_mechanism>() as libc::size_t)
+        as *mut mailmime_mechanism;
+    if mechanism.is_null() {
+        return 0 as *mut mailmime_mechanism;
+    }
+    (*mechanism).enc_type = enc_type;
+    (*mechanism).enc_token = enc_token;
+    return mechanism;
+}
+
+pub unsafe fn mailmime_parameter_new(
+    mut pa_name: *mut libc::c_char,
+    mut pa_value: *mut libc::c_char,
+) -> *mut mailmime_parameter {
+    let mut parameter: *mut mailmime_parameter = 0 as *mut mailmime_parameter;
+    parameter = malloc(::std::mem::size_of::<mailmime_parameter>() as libc::size_t)
+        as *mut mailmime_parameter;
+    if parameter.is_null() {
+        return 0 as *mut mailmime_parameter;
+    }
+    (*parameter).pa_name = pa_name;
+    (*parameter).pa_value = pa_value;
+    return parameter;
+}
+
+pub unsafe fn mailmime_type_new(
+    mut tp_type: libc::c_int,
+    mut tp_discrete_type: *mut mailmime_discrete_type,
+    mut tp_composite_type: *mut mailmime_composite_type,
+) -> *mut mailmime_type {
+    let mut mime_type: *mut mailmime_type = 0 as *mut mailmime_type;
+    mime_type =
+        malloc(::std::mem::size_of::<mailmime_type>() as libc::size_t) as *mut mailmime_type;
+    if mime_type.is_null() {
+        return 0 as *mut mailmime_type;
+    }
+    (*mime_type).tp_type = tp_type;
+    match tp_type {
+        1 => (*mime_type).tp_data.tp_discrete_type = tp_discrete_type,
+        2 => (*mime_type).tp_data.tp_composite_type = tp_composite_type,
+        _ => {}
+    }
+    return mime_type;
+}
+
+pub unsafe fn mailmime_language_new(mut lg_list: *mut clist) -> *mut mailmime_language {
+    let mut lang: *mut mailmime_language = 0 as *mut mailmime_language;
+    lang = malloc(::std::mem::size_of::<mailmime_language>() as libc::size_t)
+        as *mut mailmime_language;
+    if lang.is_null() {
+        return 0 as *mut mailmime_language;
+    }
+    (*lang).lg_list = lg_list;
+    return lang;
+}
+
+pub unsafe fn mailmime_language_free(mut lang: *mut mailmime_language) {
+    clist_foreach(
+        (*lang).lg_list,
+        ::std::mem::transmute::<Option<unsafe fn(_: *mut libc::c_char) -> ()>, clist_func>(Some(
+            mailimf_atom_free,
+        )),
+        0 as *mut libc::c_void,
+    );
+    clist_free((*lang).lg_list);
+    free(lang as *mut libc::c_void);
+}
+/*
+void mailmime_x_token_free(gchar * x_token);
+*/
+pub unsafe fn mailmime_field_new(
+    mut fld_type: libc::c_int,
+    mut fld_content: *mut mailmime_content,
+    mut fld_encoding: *mut mailmime_mechanism,
+    mut fld_id: *mut libc::c_char,
+    mut fld_description: *mut libc::c_char,
+    mut fld_version: uint32_t,
+    mut fld_disposition: *mut mailmime_disposition,
+    mut fld_language: *mut mailmime_language,
+    mut fld_location: *mut libc::c_char,
+) -> *mut mailmime_field {
+    let mut field: *mut mailmime_field = 0 as *mut mailmime_field;
+    field = malloc(::std::mem::size_of::<mailmime_field>() as libc::size_t) as *mut mailmime_field;
+    if field.is_null() {
+        return 0 as *mut mailmime_field;
+    }
+    (*field).fld_type = fld_type;
+    match fld_type {
+        1 => (*field).fld_data.fld_content = fld_content,
+        2 => (*field).fld_data.fld_encoding = fld_encoding,
+        3 => (*field).fld_data.fld_id = fld_id,
+        4 => (*field).fld_data.fld_description = fld_description,
+        5 => (*field).fld_data.fld_version = fld_version,
+        6 => (*field).fld_data.fld_disposition = fld_disposition,
+        7 => (*field).fld_data.fld_language = fld_language,
+        8 => (*field).fld_data.fld_location = fld_location,
+        _ => {}
+    }
+    return field;
+}
+
+pub unsafe fn mailmime_field_free(mut field: *mut mailmime_field) {
+    match (*field).fld_type {
+        1 => {
+            if !(*field).fld_data.fld_content.is_null() {
+                mailmime_content_free((*field).fld_data.fld_content);
+            }
+        }
+        2 => {
+            if !(*field).fld_data.fld_encoding.is_null() {
+                mailmime_encoding_free((*field).fld_data.fld_encoding);
+            }
+        }
+        3 => {
+            if !(*field).fld_data.fld_id.is_null() {
+                mailmime_id_free((*field).fld_data.fld_id);
+            }
+        }
+        4 => {
+            if !(*field).fld_data.fld_description.is_null() {
+                mailmime_description_free((*field).fld_data.fld_description);
+            }
+        }
+        6 => {
+            if !(*field).fld_data.fld_disposition.is_null() {
+                mailmime_disposition_free((*field).fld_data.fld_disposition);
+            }
+        }
+        7 => {
+            if !(*field).fld_data.fld_language.is_null() {
+                mailmime_language_free((*field).fld_data.fld_language);
+            }
+        }
+        8 => {
+            if !(*field).fld_data.fld_location.is_null() {
+                mailmime_location_free((*field).fld_data.fld_location);
+            }
+        }
+        _ => {}
+    }
+    free(field as *mut libc::c_void);
+}
+
+pub unsafe fn mailmime_disposition_free(mut dsp: *mut mailmime_disposition) {
+    mailmime_disposition_type_free((*dsp).dsp_type);
+    clist_foreach(
+        (*dsp).dsp_parms,
+        ::std::mem::transmute::<
+            Option<unsafe fn(_: *mut mailmime_disposition_parm) -> ()>,
+            clist_func,
+        >(Some(mailmime_disposition_parm_free)),
+        0 as *mut libc::c_void,
+    );
+    clist_free((*dsp).dsp_parms);
+    free(dsp as *mut libc::c_void);
+}
+
+pub unsafe fn mailmime_disposition_parm_free(mut dsp_parm: *mut mailmime_disposition_parm) {
+    match (*dsp_parm).pa_type {
+        0 => {
+            mailmime_filename_parm_free((*dsp_parm).pa_data.pa_filename);
+        }
+        1 => {
+            mailmime_creation_date_parm_free((*dsp_parm).pa_data.pa_creation_date);
+        }
+        2 => {
+            mailmime_modification_date_parm_free((*dsp_parm).pa_data.pa_modification_date);
+        }
+        3 => {
+            mailmime_read_date_parm_free((*dsp_parm).pa_data.pa_read_date);
+        }
+        5 => {
+            mailmime_parameter_free((*dsp_parm).pa_data.pa_parameter);
+        }
+        _ => {}
+    }
+    free(dsp_parm as *mut libc::c_void);
+}
+
+pub unsafe fn mailmime_read_date_parm_free(mut date: *mut libc::c_char) {
+    mailmime_quoted_date_time_free(date);
+}
+
+pub unsafe fn mailmime_quoted_date_time_free(mut date: *mut libc::c_char) {
+    mailimf_quoted_string_free(date);
+}
+
+pub unsafe fn mailmime_modification_date_parm_free(mut date: *mut libc::c_char) {
+    mailmime_quoted_date_time_free(date);
+}
+
+pub unsafe fn mailmime_creation_date_parm_free(mut date: *mut libc::c_char) {
+    mailmime_quoted_date_time_free(date);
+}
+
+pub unsafe fn mailmime_filename_parm_free(mut filename: *mut libc::c_char) {
+    mailmime_value_free(filename);
+}
+
+pub unsafe fn mailmime_disposition_type_free(mut dsp_type: *mut mailmime_disposition_type) {
+    if !(*dsp_type).dsp_extension.is_null() {
+        free((*dsp_type).dsp_extension as *mut libc::c_void);
+    }
+    free(dsp_type as *mut libc::c_void);
+}
+
+pub unsafe fn mailmime_fields_new(mut fld_list: *mut clist) -> *mut mailmime_fields {
+    let mut fields: *mut mailmime_fields = 0 as *mut mailmime_fields;
+    fields =
+        malloc(::std::mem::size_of::<mailmime_fields>() as libc::size_t) as *mut mailmime_fields;
+    if fields.is_null() {
+        return 0 as *mut mailmime_fields;
+    }
+    (*fields).fld_list = fld_list;
+    return fields;
+}
+
+pub unsafe fn mailmime_fields_free(mut fields: *mut mailmime_fields) {
+    clist_foreach(
+        (*fields).fld_list,
+        ::std::mem::transmute::<Option<unsafe fn(_: *mut mailmime_field) -> ()>, clist_func>(Some(
+            mailmime_field_free,
+        )),
+        0 as *mut libc::c_void,
+    );
+    clist_free((*fields).fld_list);
+    free(fields as *mut libc::c_void);
+}
+
+pub unsafe fn mailmime_multipart_body_new(mut bd_list: *mut clist) -> *mut mailmime_multipart_body {
+    let mut mp_body: *mut mailmime_multipart_body = 0 as *mut mailmime_multipart_body;
+    mp_body = malloc(::std::mem::size_of::<mailmime_multipart_body>() as libc::size_t)
+        as *mut mailmime_multipart_body;
+    if mp_body.is_null() {
+        return 0 as *mut mailmime_multipart_body;
+    }
+    (*mp_body).bd_list = bd_list;
+    return mp_body;
+}
+
+pub unsafe fn mailmime_multipart_body_free(mut mp_body: *mut mailmime_multipart_body) {
+    clist_foreach(
+        (*mp_body).bd_list,
+        ::std::mem::transmute::<Option<unsafe fn(_: *mut mailimf_body) -> ()>, clist_func>(Some(
+            mailimf_body_free,
+        )),
+        0 as *mut libc::c_void,
+    );
+    clist_free((*mp_body).bd_list);
+    free(mp_body as *mut libc::c_void);
+}
+
+pub unsafe fn mailmime_data_new(
+    mut dt_type: libc::c_int,
+    mut dt_encoding: libc::c_int,
+    mut dt_encoded: libc::c_int,
+    mut dt_data: *const libc::c_char,
+    mut dt_length: size_t,
+    mut dt_filename: *mut libc::c_char,
+) -> *mut mailmime_data {
+    let mut mime_data: *mut mailmime_data = 0 as *mut mailmime_data;
+    mime_data =
+        malloc(::std::mem::size_of::<mailmime_data>() as libc::size_t) as *mut mailmime_data;
+    if mime_data.is_null() {
+        return 0 as *mut mailmime_data;
+    }
+    (*mime_data).dt_type = dt_type;
+    (*mime_data).dt_encoding = dt_encoding;
+    (*mime_data).dt_encoded = dt_encoded;
+    match dt_type {
+        0 => {
+            (*mime_data).dt_data.dt_text.dt_data = dt_data;
+            (*mime_data).dt_data.dt_text.dt_length = dt_length
+        }
+        1 => (*mime_data).dt_data.dt_filename = dt_filename,
+        _ => {}
+    }
+    return mime_data;
+}
+
+pub unsafe fn mailmime_data_free(mut mime_data: *mut mailmime_data) {
+    match (*mime_data).dt_type {
+        1 => {
+            free((*mime_data).dt_data.dt_filename as *mut libc::c_void);
+        }
+        _ => {}
+    }
+    free(mime_data as *mut libc::c_void);
+}
+
+pub unsafe fn mailmime_new(
+    mut mm_type: libc::c_int,
+    mut mm_mime_start: *const libc::c_char,
+    mut mm_length: size_t,
+    mut mm_mime_fields: *mut mailmime_fields,
+    mut mm_content_type: *mut mailmime_content,
+    mut mm_body: *mut mailmime_data,
+    mut mm_preamble: *mut mailmime_data,
+    mut mm_epilogue: *mut mailmime_data,
+    mut mm_mp_list: *mut clist,
+    mut mm_fields: *mut mailimf_fields,
+    mut mm_msg_mime: *mut Mailmime,
+) -> *mut Mailmime {
+    let mut mime: *mut Mailmime = 0 as *mut Mailmime;
+    let mut cur: *mut clistiter = 0 as *mut clistiter;
+    mime = malloc(::std::mem::size_of::<Mailmime>() as libc::size_t) as *mut Mailmime;
+    if mime.is_null() {
+        return 0 as *mut Mailmime;
+    }
+    (*mime).mm_parent = 0 as *mut Mailmime;
+    (*mime).mm_parent_type = MAILMIME_NONE as libc::c_int;
+    (*mime).mm_multipart_pos = 0 as *mut clistiter;
+    (*mime).mm_type = mm_type;
+    (*mime).mm_mime_start = mm_mime_start;
+    (*mime).mm_length = mm_length;
+    (*mime).mm_mime_fields = mm_mime_fields;
+    (*mime).mm_content_type = mm_content_type;
+    (*mime).mm_body = mm_body;
+    match mm_type {
+        1 => (*mime).mm_data.mm_single = mm_body,
+        2 => {
+            (*mime).mm_data.mm_multipart.mm_preamble = mm_preamble;
+            (*mime).mm_data.mm_multipart.mm_epilogue = mm_epilogue;
+            (*mime).mm_data.mm_multipart.mm_mp_list = mm_mp_list;
+            cur = (*mm_mp_list).first;
+            while !cur.is_null() {
+                let mut submime: *mut Mailmime = 0 as *mut Mailmime;
+                submime = (if !cur.is_null() {
+                    (*cur).data
+                } else {
+                    0 as *mut libc::c_void
+                }) as *mut Mailmime;
+                (*submime).mm_parent = mime;
+                (*submime).mm_parent_type = MAILMIME_MULTIPLE as libc::c_int;
+                (*submime).mm_multipart_pos = cur;
+                cur = if !cur.is_null() {
+                    (*cur).next
+                } else {
+                    0 as *mut clistcell
+                }
+            }
+        }
+        3 => {
+            (*mime).mm_data.mm_message.mm_fields = mm_fields;
+            (*mime).mm_data.mm_message.mm_msg_mime = mm_msg_mime;
+            if !mm_msg_mime.is_null() {
+                (*mm_msg_mime).mm_parent = mime;
+                (*mm_msg_mime).mm_parent_type = MAILMIME_MESSAGE as libc::c_int
+            }
+        }
+        _ => {}
+    }
+    return mime;
+}
+
+pub unsafe fn mailmime_new_simple(
+    mut mm_type: libc::c_int,
+    mut mm_mime_fields: *mut mailmime_fields,
+    mut mm_content_type: *mut mailmime_content,
+    mut mm_fields: *mut mailimf_fields,
+    mut mm_msg_mime: *mut Mailmime,
+) -> *mut Mailmime {
+    mailmime_new(
+        mm_type,
+        std::ptr::null(),
+        0,
+        mm_mime_fields,
+        mm_content_type,
+        std::ptr::null_mut(),
+        std::ptr::null_mut(),
+        std::ptr::null_mut(),
+        std::ptr::null_mut(),
+        mm_fields,
+        mm_msg_mime,
+    )
+}
+
+pub unsafe fn mailmime_free(mut mime: *mut Mailmime) {
+    match (*mime).mm_type {
+        1 => {
+            if (*mime).mm_body.is_null() && !(*mime).mm_data.mm_single.is_null() {
+                mailmime_data_free((*mime).mm_data.mm_single);
+            }
+        }
+        2 => {
+            /* do nothing */
+            if !(*mime).mm_data.mm_multipart.mm_preamble.is_null() {
+                mailmime_data_free((*mime).mm_data.mm_multipart.mm_preamble);
+            }
+            if !(*mime).mm_data.mm_multipart.mm_epilogue.is_null() {
+                mailmime_data_free((*mime).mm_data.mm_multipart.mm_epilogue);
+            }
+            clist_foreach(
+                (*mime).mm_data.mm_multipart.mm_mp_list,
+                ::std::mem::transmute::<Option<unsafe fn(_: *mut Mailmime) -> ()>, clist_func>(
+                    Some(mailmime_free),
+                ),
+                0 as *mut libc::c_void,
+            );
+            clist_free((*mime).mm_data.mm_multipart.mm_mp_list);
+        }
+        3 => {
+            if !(*mime).mm_data.mm_message.mm_fields.is_null() {
+                mailimf_fields_free((*mime).mm_data.mm_message.mm_fields);
+            }
+            if !(*mime).mm_data.mm_message.mm_msg_mime.is_null() {
+                mailmime_free((*mime).mm_data.mm_message.mm_msg_mime);
+            }
+        }
+        _ => {}
+    }
+    if !(*mime).mm_body.is_null() {
+        mailmime_data_free((*mime).mm_body);
+    }
+    if !(*mime).mm_mime_fields.is_null() {
+        mailmime_fields_free((*mime).mm_mime_fields);
+    }
+    if !(*mime).mm_content_type.is_null() {
+        mailmime_content_free((*mime).mm_content_type);
+    }
+    free(mime as *mut libc::c_void);
+}
+
+pub unsafe fn mailmime_encoded_word_new(
+    mut wd_charset: *mut libc::c_char,
+    mut wd_text: *mut libc::c_char,
+) -> *mut mailmime_encoded_word {
+    let mut ew: *mut mailmime_encoded_word = 0 as *mut mailmime_encoded_word;
+    ew = malloc(::std::mem::size_of::<mailmime_encoded_word>() as libc::size_t)
+        as *mut mailmime_encoded_word;
+    if ew.is_null() {
+        return 0 as *mut mailmime_encoded_word;
+    }
+    (*ew).wd_charset = wd_charset;
+    (*ew).wd_text = wd_text;
+    return ew;
+}
+
+pub unsafe fn mailmime_encoded_word_free(mut ew: *mut mailmime_encoded_word) {
+    mailmime_charset_free((*ew).wd_charset);
+    mailmime_encoded_text_free((*ew).wd_text);
+    free(ew as *mut libc::c_void);
+}
+
+pub unsafe fn mailmime_encoded_text_free(mut text: *mut libc::c_char) {
+    free(text as *mut libc::c_void);
+}
+
+pub unsafe fn mailmime_charset_free(mut charset: *mut libc::c_char) {
+    free(charset as *mut libc::c_void);
+}
+
+pub unsafe fn mailmime_disposition_new(
+    mut dsp_type: *mut mailmime_disposition_type,
+    mut dsp_parms: *mut clist,
+) -> *mut mailmime_disposition {
+    let mut dsp: *mut mailmime_disposition = 0 as *mut mailmime_disposition;
+    dsp = malloc(::std::mem::size_of::<mailmime_disposition>() as libc::size_t)
+        as *mut mailmime_disposition;
+    if dsp.is_null() {
+        return 0 as *mut mailmime_disposition;
+    }
+    (*dsp).dsp_type = dsp_type;
+    (*dsp).dsp_parms = dsp_parms;
+    return dsp;
+}
+
+pub unsafe fn mailmime_disposition_type_new(
+    mut dsp_type: libc::c_int,
+    mut dsp_extension: *mut libc::c_char,
+) -> *mut mailmime_disposition_type {
+    let mut m_dsp_type: *mut mailmime_disposition_type = 0 as *mut mailmime_disposition_type;
+    m_dsp_type = malloc(::std::mem::size_of::<mailmime_disposition_type>() as libc::size_t)
+        as *mut mailmime_disposition_type;
+    if m_dsp_type.is_null() {
+        return 0 as *mut mailmime_disposition_type;
+    }
+    (*m_dsp_type).dsp_type = dsp_type;
+    (*m_dsp_type).dsp_extension = dsp_extension;
+    return m_dsp_type;
+}
+
+pub unsafe fn mailmime_disposition_parm_new(
+    mut pa_type: libc::c_int,
+    mut pa_filename: *mut libc::c_char,
+    mut pa_creation_date: *mut libc::c_char,
+    mut pa_modification_date: *mut libc::c_char,
+    mut pa_read_date: *mut libc::c_char,
+    mut pa_size: size_t,
+    mut pa_parameter: *mut mailmime_parameter,
+) -> *mut mailmime_disposition_parm {
+    let mut dsp_parm: *mut mailmime_disposition_parm = 0 as *mut mailmime_disposition_parm;
+    dsp_parm = malloc(::std::mem::size_of::<mailmime_disposition_parm>() as libc::size_t)
+        as *mut mailmime_disposition_parm;
+    if dsp_parm.is_null() {
+        return 0 as *mut mailmime_disposition_parm;
+    }
+    (*dsp_parm).pa_type = pa_type;
+    match pa_type {
+        0 => (*dsp_parm).pa_data.pa_filename = pa_filename,
+        1 => (*dsp_parm).pa_data.pa_creation_date = pa_creation_date,
+        2 => (*dsp_parm).pa_data.pa_modification_date = pa_modification_date,
+        3 => (*dsp_parm).pa_data.pa_read_date = pa_read_date,
+        4 => (*dsp_parm).pa_data.pa_size = pa_size,
+        5 => (*dsp_parm).pa_data.pa_parameter = pa_parameter,
+        _ => {}
+    }
+    return dsp_parm;
+}
+
+pub unsafe fn mailmime_section_new(mut sec_list: *mut clist) -> *mut mailmime_section {
+    let mut section: *mut mailmime_section = 0 as *mut mailmime_section;
+    section =
+        malloc(::std::mem::size_of::<mailmime_section>() as libc::size_t) as *mut mailmime_section;
+    if section.is_null() {
+        return 0 as *mut mailmime_section;
+    }
+    (*section).sec_list = sec_list;
+    return section;
+}
+
+pub unsafe fn mailmime_section_free(mut section: *mut mailmime_section) {
+    clist_foreach(
+        (*section).sec_list,
+        ::std::mem::transmute::<Option<unsafe extern "C" fn(_: *mut libc::c_void) -> ()>, clist_func>(
+            Some(free),
+        ),
+        0 as *mut libc::c_void,
+    );
+    clist_free((*section).sec_list);
+    free(section as *mut libc::c_void);
+}
+
+pub unsafe fn mailmime_decoded_part_free(mut part: *mut libc::c_char) {
+    mmap_string_unref(part);
+}

mmime/src/mailmime/write_mem.rs

@@ -0,0 +1,82 @@
+use crate::mailmime::types::*;
+use crate::mailmime::write_generic::*;
+use crate::mmapstring::*;
+use crate::other::*;
+
+unsafe fn do_write(
+    mut data: *mut libc::c_void,
+    mut str: *const libc::c_char,
+    mut length: size_t,
+) -> libc::c_int {
+    let mut f: *mut MMAPString = 0 as *mut MMAPString;
+    f = data as *mut MMAPString;
+    if mmap_string_append_len(f, str, length).is_null() {
+        return 0i32;
+    } else {
+        return length as libc::c_int;
+    };
+}
+
+pub unsafe fn mailmime_content_write_mem(
+    mut f: *mut MMAPString,
+    mut col: *mut libc::c_int,
+    mut content: *mut mailmime_content,
+) -> libc::c_int {
+    return mailmime_content_write_driver(Some(do_write), f as *mut libc::c_void, col, content);
+}
+
+pub unsafe fn mailmime_content_type_write_mem(
+    mut f: *mut MMAPString,
+    mut col: *mut libc::c_int,
+    mut content: *mut mailmime_content,
+) -> libc::c_int {
+    return mailmime_content_type_write_driver(
+        Some(do_write),
+        f as *mut libc::c_void,
+        col,
+        content,
+    );
+}
+
+pub unsafe fn mailmime_write_mem(
+    mut f: *mut MMAPString,
+    mut col: *mut libc::c_int,
+    mut build_info: *mut Mailmime,
+) -> libc::c_int {
+    return mailmime_write_driver(Some(do_write), f as *mut libc::c_void, col, build_info);
+}
+
+pub unsafe fn mailmime_quoted_printable_write_mem(
+    mut f: *mut MMAPString,
+    mut col: *mut libc::c_int,
+    mut istext: libc::c_int,
+    mut text: *const libc::c_char,
+    mut size: size_t,
+) -> libc::c_int {
+    return mailmime_quoted_printable_write_driver(
+        Some(do_write),
+        f as *mut libc::c_void,
+        col,
+        istext,
+        text,
+        size,
+    );
+}
+
+pub unsafe fn mailmime_base64_write_mem(
+    mut f: *mut MMAPString,
+    mut col: *mut libc::c_int,
+    mut text: *const libc::c_char,
+    mut size: size_t,
+) -> libc::c_int {
+    return mailmime_base64_write_driver(Some(do_write), f as *mut libc::c_void, col, text, size);
+}
+
+pub unsafe fn mailmime_data_write_mem(
+    mut f: *mut MMAPString,
+    mut col: *mut libc::c_int,
+    mut data: *mut mailmime_data,
+    mut istext: libc::c_int,
+) -> libc::c_int {
+    return mailmime_data_write_driver(Some(do_write), f as *mut libc::c_void, col, data, istext);
+}

mmime/src/mmapstring.rs

@@ -0,0 +1,397 @@
+use std::sync::Mutex;
+
+use lazy_static::lazy_static;
+use libc;
+
+use crate::chash::*;
+use crate::other::*;
+
+lazy_static! {
+    static ref mmapstring_lock: Mutex<()> = Mutex::new(());
+}
+
+#[derive(Copy, Clone)]
+#[repr(C)]
+pub struct MMAPString {
+    pub str_0: *mut libc::c_char,
+    pub len: size_t,
+    pub allocated_len: size_t,
+    pub fd: libc::c_int,
+    pub mmapped_size: size_t,
+}
+
+pub const TMPDIR: &'static str = "/tmp";
+
+pub unsafe fn mmap_string_new(mut init: *const libc::c_char) -> *mut MMAPString {
+    let mut string: *mut MMAPString = 0 as *mut MMAPString;
+    string = mmap_string_sized_new(if !init.is_null() {
+        strlen(init).wrapping_add(2i32 as libc::size_t)
+    } else {
+        2i32 as libc::size_t
+    });
+    if string.is_null() {
+        return 0 as *mut MMAPString;
+    }
+    if !init.is_null() {
+        mmap_string_append(string, init);
+    }
+    return string;
+}
+
+pub unsafe fn mmap_string_append(
+    mut string: *mut MMAPString,
+    mut val: *const libc::c_char,
+) -> *mut MMAPString {
+    return mmap_string_insert_len(string, (*string).len, val, strlen(val));
+}
+
+pub unsafe fn mmap_string_insert_len(
+    mut string: *mut MMAPString,
+    mut pos: size_t,
+    mut val: *const libc::c_char,
+    mut len: size_t,
+) -> *mut MMAPString {
+    if mmap_string_maybe_expand(string, len).is_null() {
+        return 0 as *mut MMAPString;
+    }
+    if pos < (*string).len {
+        memmove(
+            (*string).str_0.offset(pos as isize).offset(len as isize) as *mut libc::c_void,
+            (*string).str_0.offset(pos as isize) as *const libc::c_void,
+            (*string).len.wrapping_sub(pos),
+        );
+    }
+    memmove(
+        (*string).str_0.offset(pos as isize) as *mut libc::c_void,
+        val as *const libc::c_void,
+        len,
+    );
+    (*string).len = ((*string).len as libc::size_t).wrapping_add(len) as size_t as size_t;
+    *(*string).str_0.offset((*string).len as isize) = 0i32 as libc::c_char;
+    return string;
+}
+unsafe fn mmap_string_maybe_expand(
+    mut string: *mut MMAPString,
+    mut len: size_t,
+) -> *mut MMAPString {
+    if (*string).len.wrapping_add(len) >= (*string).allocated_len {
+        let mut old_size: size_t = 0;
+        let mut newstring: *mut MMAPString = 0 as *mut MMAPString;
+        old_size = (*string).allocated_len;
+        (*string).allocated_len = nearest_power(
+            1i32 as size_t,
+            (*string)
+                .len
+                .wrapping_add(len)
+                .wrapping_add(1i32 as libc::size_t),
+        );
+        newstring = mmap_string_realloc_memory(string);
+        if newstring.is_null() {
+            (*string).allocated_len = old_size
+        }
+        return newstring;
+    }
+    return string;
+}
+/* Strings.
+ */
+/* SEB */
+unsafe fn mmap_string_realloc_memory(mut string: *mut MMAPString) -> *mut MMAPString {
+    let mut tmp: *mut libc::c_char = 0 as *mut libc::c_char;
+    tmp = realloc(
+        (*string).str_0 as *mut libc::c_void,
+        (*string).allocated_len,
+    ) as *mut libc::c_char;
+    if tmp.is_null() {
+        string = 0 as *mut MMAPString
+    } else {
+        (*string).str_0 = tmp
+    }
+    return string;
+}
+/* MMAPString */
+#[inline]
+unsafe fn nearest_power(mut base: size_t, mut num: size_t) -> size_t {
+    if num > (-1i32 as size_t).wrapping_div(2i32 as libc::size_t) {
+        return -1i32 as size_t;
+    } else {
+        let mut n: size_t = base;
+        while n < num {
+            n <<= 1i32
+        }
+        return n;
+    };
+}
+
+pub unsafe fn mmap_string_sized_new(mut dfl_size: size_t) -> *mut MMAPString {
+    let mut string: *mut MMAPString = 0 as *mut MMAPString;
+    string = malloc(::std::mem::size_of::<MMAPString>() as libc::size_t) as *mut MMAPString;
+    if string.is_null() {
+        return 0 as *mut MMAPString;
+    }
+    (*string).allocated_len = 0i32 as size_t;
+    (*string).len = 0i32 as size_t;
+    (*string).str_0 = 0 as *mut libc::c_char;
+    (*string).fd = -1i32;
+    (*string).mmapped_size = 0i32 as size_t;
+    if mmap_string_maybe_expand(
+        string,
+        if dfl_size > 2i32 as libc::size_t {
+            dfl_size
+        } else {
+            2i32 as libc::size_t
+        },
+    )
+    .is_null()
+    {
+        free(string as *mut libc::c_void);
+        return 0 as *mut MMAPString;
+    }
+    *(*string).str_0.offset(0isize) = 0i32 as libc::c_char;
+    return string;
+}
+
+pub unsafe fn mmap_string_new_len(
+    mut init: *const libc::c_char,
+    mut len: size_t,
+) -> *mut MMAPString {
+    let mut string: *mut MMAPString = 0 as *mut MMAPString;
+    if len <= 0i32 as libc::size_t {
+        return mmap_string_new(b"\x00" as *const u8 as *const libc::c_char);
+    } else {
+        string = mmap_string_sized_new(len);
+        if string.is_null() {
+            return string;
+        }
+        if !init.is_null() {
+            mmap_string_append_len(string, init, len);
+        }
+        return string;
+    };
+}
+
+pub unsafe fn mmap_string_append_len(
+    mut string: *mut MMAPString,
+    mut val: *const libc::c_char,
+    mut len: size_t,
+) -> *mut MMAPString {
+    return mmap_string_insert_len(string, (*string).len, val, len);
+}
+
+pub unsafe fn mmap_string_free(mut string: *mut MMAPString) {
+    if string.is_null() {
+        return;
+    }
+    free((*string).str_0 as *mut libc::c_void);
+    free(string as *mut libc::c_void);
+}
+
+pub unsafe fn mmap_string_assign(
+    mut string: *mut MMAPString,
+    mut rval: *const libc::c_char,
+) -> *mut MMAPString {
+    mmap_string_truncate(string, 0i32 as size_t);
+    if mmap_string_append(string, rval).is_null() {
+        return 0 as *mut MMAPString;
+    }
+    return string;
+}
+
+pub unsafe fn mmap_string_truncate(
+    mut string: *mut MMAPString,
+    mut len: size_t,
+) -> *mut MMAPString {
+    (*string).len = if len < (*string).len {
+        len
+    } else {
+        (*string).len
+    };
+    *(*string).str_0.offset((*string).len as isize) = 0i32 as libc::c_char;
+    return string;
+}
+
+pub unsafe fn mmap_string_set_size(
+    mut string: *mut MMAPString,
+    mut len: size_t,
+) -> *mut MMAPString {
+    if len >= (*string).allocated_len {
+        if mmap_string_maybe_expand(string, len.wrapping_sub((*string).len)).is_null() {
+            return 0 as *mut MMAPString;
+        }
+    }
+    (*string).len = len;
+    *(*string).str_0.offset(len as isize) = 0i32 as libc::c_char;
+    return string;
+}
+
+pub unsafe fn mmap_string_append_c(
+    mut string: *mut MMAPString,
+    mut c: libc::c_char,
+) -> *mut MMAPString {
+    return mmap_string_insert_c(string, (*string).len, c);
+}
+
+pub unsafe fn mmap_string_insert_c(
+    mut string: *mut MMAPString,
+    mut pos: size_t,
+    mut c: libc::c_char,
+) -> *mut MMAPString {
+    if mmap_string_maybe_expand(string, 1i32 as size_t).is_null() {
+        return 0 as *mut MMAPString;
+    }
+    if pos < (*string).len {
+        memmove(
+            (*string).str_0.offset(pos as isize).offset(1isize) as *mut libc::c_void,
+            (*string).str_0.offset(pos as isize) as *const libc::c_void,
+            (*string).len.wrapping_sub(pos),
+        );
+    }
+    *(*string).str_0.offset(pos as isize) = c;
+    (*string).len =
+        ((*string).len as libc::size_t).wrapping_add(1i32 as libc::size_t) as size_t as size_t;
+    *(*string).str_0.offset((*string).len as isize) = 0i32 as libc::c_char;
+    return string;
+}
+
+pub unsafe fn mmap_string_prepend(
+    mut string: *mut MMAPString,
+    mut val: *const libc::c_char,
+) -> *mut MMAPString {
+    return mmap_string_insert_len(string, 0i32 as size_t, val, strlen(val));
+}
+
+pub unsafe fn mmap_string_prepend_c(
+    mut string: *mut MMAPString,
+    mut c: libc::c_char,
+) -> *mut MMAPString {
+    return mmap_string_insert_c(string, 0i32 as size_t, c);
+}
+
+pub unsafe fn mmap_string_prepend_len(
+    mut string: *mut MMAPString,
+    mut val: *const libc::c_char,
+    mut len: size_t,
+) -> *mut MMAPString {
+    return mmap_string_insert_len(string, 0i32 as size_t, val, len);
+}
+
+pub unsafe fn mmap_string_insert(
+    mut string: *mut MMAPString,
+    mut pos: size_t,
+    mut val: *const libc::c_char,
+) -> *mut MMAPString {
+    return mmap_string_insert_len(string, pos, val, strlen(val));
+}
+
+pub unsafe fn mmap_string_erase(
+    mut string: *mut MMAPString,
+    mut pos: size_t,
+    mut len: size_t,
+) -> *mut MMAPString {
+    if pos.wrapping_add(len) < (*string).len {
+        memmove(
+            (*string).str_0.offset(pos as isize) as *mut libc::c_void,
+            (*string).str_0.offset(pos as isize).offset(len as isize) as *const libc::c_void,
+            (*string).len.wrapping_sub(pos.wrapping_add(len)),
+        );
+    }
+    (*string).len = ((*string).len as libc::size_t).wrapping_sub(len) as size_t as size_t;
+    *(*string).str_0.offset((*string).len as isize) = 0i32 as libc::c_char;
+    return string;
+}
+
+pub unsafe fn mmap_string_set_ceil(mut ceil: size_t) {
+    mmap_string_ceil = ceil;
+}
+static mut mmap_string_ceil: size_t = (8i32 * 1024i32 * 1024i32) as size_t;
+
+pub unsafe fn mmap_string_ref(mut string: *mut MMAPString) -> libc::c_int {
+    let mut ht: *mut chash = 0 as *mut chash;
+    let mut r: libc::c_int = 0;
+    let mut key: chashdatum = chashdatum {
+        data: 0 as *mut libc::c_void,
+        len: 0,
+    };
+    let mut data: chashdatum = chashdatum {
+        data: 0 as *mut libc::c_void,
+        len: 0,
+    };
+    mmapstring_lock.lock().unwrap();
+    if mmapstring_hashtable.is_null() {
+        mmapstring_hashtable_init();
+    }
+    ht = mmapstring_hashtable;
+    if ht.is_null() {
+        return -1i32;
+    }
+    key.data = &mut (*string).str_0 as *mut *mut libc::c_char as *mut libc::c_void;
+    key.len = ::std::mem::size_of::<*mut libc::c_char>() as libc::size_t as libc::c_uint;
+    data.data = string as *mut libc::c_void;
+    data.len = 0i32 as libc::c_uint;
+    r = chash_set(
+        mmapstring_hashtable,
+        &mut key,
+        &mut data,
+        0 as *mut chashdatum,
+    );
+
+    if r < 0i32 {
+        return r;
+    }
+    return 0i32;
+}
+
+static mut mmapstring_hashtable: *mut chash = 0 as *const chash as *mut chash;
+unsafe fn mmapstring_hashtable_init() {
+    mmapstring_hashtable = chash_new(13i32 as libc::c_uint, 1i32);
+}
+
+pub unsafe fn mmap_string_unref(mut str: *mut libc::c_char) -> libc::c_int {
+    let mut string: *mut MMAPString = 0 as *mut MMAPString;
+    let mut ht: *mut chash = 0 as *mut chash;
+    let mut key: chashdatum = chashdatum {
+        data: 0 as *mut libc::c_void,
+        len: 0,
+    };
+    let mut data: chashdatum = chashdatum {
+        data: 0 as *mut libc::c_void,
+        len: 0,
+    };
+    let mut r: libc::c_int = 0;
+    if str.is_null() {
+        return -1i32;
+    }
+    mmapstring_lock.lock().unwrap();
+    ht = mmapstring_hashtable;
+    if ht.is_null() {
+        return -1i32;
+    }
+    key.data = &mut str as *mut *mut libc::c_char as *mut libc::c_void;
+    key.len = ::std::mem::size_of::<*mut libc::c_char>() as libc::size_t as libc::c_uint;
+    r = chash_get(ht, &mut key, &mut data);
+    if r < 0i32 {
+        string = 0 as *mut MMAPString
+    } else {
+        string = data.data as *mut MMAPString
+    }
+    if !string.is_null() {
+        chash_delete(ht, &mut key, 0 as *mut chashdatum);
+        if chash_count(ht) == 0i32 as libc::c_uint {
+            chash_free(ht);
+            mmapstring_hashtable = 0 as *mut chash
+        }
+    }
+    if !string.is_null() {
+        mmap_string_free(string);
+        return 0i32;
+    } else {
+        return -1i32;
+    };
+}
+#[inline]
+unsafe fn chash_count(mut hash: *mut chash) -> libc::c_uint {
+    return (*hash).count;
+}
+
+pub unsafe fn mmapstring_init_lock() {}
+pub unsafe fn mmapstring_uninit_lock() {}

proptest-regressions/dc_strencode.txt

@@ -0,0 +1,8 @@
+# Seeds for failure cases proptest has generated in the past. It is
+# automatically read and these particular cases re-run before any
+# novel cases are generated.
+#
+# It is recommended to check this file in to source control so that
+# everyone who runs the test benefits from these saved cases.
+cc 679506fe9ac59df773f8cfa800fdab5f0a32fe49d2ab370394000a1aa5bc2a72 # shrinks to buf = "%0A"
+cc e34960438edb2426904b44fb4215154e7e2880f2fd1c3183b98bfcc76fec4882 # shrinks to input = " 0"

proptest-regressions/dc_tools.txt

@@ -0,0 +1,9 @@
+# Seeds for failure cases proptest has generated in the past. It is
+# automatically read and these particular cases re-run before any
+# novel cases are generated.
+#
+# It is recommended to check this file in to source control so that
+# everyone who runs the test benefits from these saved cases.
+cc c310754465ee0261807b96fa9bcc4861ff9aa286e94667524b5960c69f9b6620 # shrinks to buf = "", approx_chars = 0, do_unwrap = false
+cc 5fd8d730b0a9cdf7308ce58818ca9aefc0255c9ba2a0878944fc48d43a67315b # shrinks to buf = "𑒀ὐ￠🜀\u{1e01b}A a🟠", approx_chars = 0, do_unwrap = false
+cc c6a0029a54137a4b9efc9ef2ea6d9a7dd1d60d1c937bb472b66a174618ba8013 # shrinks to buf = "𐠈0Aᝮa𫝀®!ꫛa¡0A𐢧00𐹠®A  丽ⷐએ  ", approx_chars = 0, do_unwrap = false

python/README.rst

@@ -15,7 +15,7 @@ without any "build-from-source" steps.
 1. `Install virtualenv <https://virtualenv.pypa.io/en/stable/installation/>`_,
    then create a fresh python environment and activate it in your shell::
 
-        virtualenv -p python3 venv
+        virtualenv venv  # or: python -m venv
         source venv/bin/activate
 
    Afterwards, invoking ``python`` or ``pip install`` will only
@@ -39,6 +39,12 @@ and push them to a python package index. To install the latest github ``master``
 
     pip install -i https://m.devpi.net/dc/master deltachat
 
+.. note::
+
+    If you can help to automate the building of wheels for Mac or Windows,
+    that'd be much appreciated! please then get
+    `in contact with us <https://delta.chat/en/contribute>`_.
+
 
 Installing bindings from source
 ===============================
@@ -48,34 +54,55 @@ to core deltachat library::
 
     git clone https://github.com/deltachat/deltachat-core-rust
     cd deltachat-core-rust
-    cargo build -p deltachat_ffi --release
-
-This will result in a ``libdeltachat.so`` and ``libdeltachat.a`` files
-in the ``target/release`` directory. These files are needed for
-creating the python bindings for deltachat::
-
     cd python
-    DCC_RS_DEV=`pwd`/.. pip install -e .
 
-Now test if the bindings find the correct library::
+If you don't have one active, create and activate a python "virtualenv":
 
-    python -c 'import deltachat ; print(deltachat.__version__)'
+    python virtualenv venv  # or python -m venv
+    source venv/bin/activate
 
-This should print your deltachat bindings version.
+Afterwards ``which python`` tells you that it comes out of the "venv"
+directory that contains all python install artifacts. Let's first
+install test tools::
+
+    pip install pytest pytest-timeout pytest-rerunfailures requests
+
+then cargo-build and install the deltachat bindings::
+
+    python install_python_bindings.py
+
+The bindings will be installed in release mode but with debug symbols.
+The release mode is necessary because some tests generate RSA keys
+which is prohibitively slow in debug mode.
+
+After successful binding installation you can finally run the tests::
+
+    pytest -v tests
 
 .. note::
 
-    If you can help to automate the building of wheels for Mac or Windows,
-    that'd be much appreciated! please then get
-    `in contact with us <https://delta.chat/en/contribute>`_.
+    Some tests are sometimes failing/hanging because of
+    https://github.com/deltachat/deltachat-core-rust/issues/331
+    and
+    https://github.com/deltachat/deltachat-core-rust/issues/326
 
-Using a system-installed deltachat-core-rust
---------------------------------------------
 
-When calling ``pip`` without specifying the ``DCC_RS_DEV`` environment
-variable cffi will try to use a ``deltachat.h`` from a system location
-like ``/usr/local/include`` and will try to dynamically link against a
-``libdeltachat.so`` in a similar location (e.g. ``/usr/local/lib``).
+running "live" tests (experimental)
+-----------------------------------
+
+If you want to run "liveconfig" functional tests you can set
+``DCC_PY_LIVECONFIG`` to:
+
+- a particular https-url that you can ask for from the delta
+  chat devs.
+
+- or the path of a file that contains two lines, each describing
+  via "addr=... mail_pwd=..." a test account login that will
+  be used for the live tests.
+
+With ``DCC_PY_LIVECONFIG`` set pytest invocations will use real
+e-mail accounts and run through all functional "liveconfig" tests.
+
 
 
 Code examples
@@ -84,68 +111,34 @@ Code examples
 You may look at `examples <https://py.delta.chat/examples.html>`_.
 
 
-Running tests
-=============
-
-Get a checkout of the `deltachat-core-rust github repository`_ and type::
-
-    pip install tox
-    ./run-integration-tests.sh
-
-If you want to run functional tests with real
-e-mail test accounts, generate a "liveconfig" file where each
-lines contains test account settings, for example::
-
-    # 'liveconfig' file specifying imap/smtp accounts
-    addr=some-email@example.org mail_pw=password
-    addr=other-email@example.org mail_pw=otherpassword
-
-The "keyword=value" style allows to specify any
-`deltachat account config setting <https://c.delta.chat/classdc__context__t.html#aff3b894f6cfca46cab5248fdffdf083d>`_ so you can also specify smtp or imap servers, ports, ssl modes etc.
-Typically DC's automatic configuration allows to not specify these settings.
-
-The ``run-integration-tests.sh`` script will automatically use
-``python/liveconfig`` if it exists, to manually run tests with this
-``liveconfig`` file use::
-
-    tox -- --liveconfig liveconfig
-
-
 .. _`deltachat-core-rust github repository`: https://github.com/deltachat/deltachat-core-rust
 .. _`deltachat-core`: https://github.com/deltachat/deltachat-core-rust
 
-Running test using a debug build
---------------------------------
-
-If you need to examine e.g. a coredump you may want to run the tests
-using a debug build::
-
-   DCC_RS_TARGET=debug ./run-integration-tests.sh -e py37 -- -x -v -k failing_test
-
 
 Building manylinux1 wheels
 ==========================
 
+.. note::
+
+   This section may not fully work.
+
 Building portable manylinux1 wheels which come with libdeltachat.so
 and all it's dependencies is easy using the provided docker tooling.
 
 using docker pull / premade images
 ------------------------------------
 
-We publish a build environment under the ``deltachat/wheel`` tag so
+We publish a build environment under the ``deltachat/coredeps`` tag so
 that you can pull it from the ``hub.docker.com`` site's "deltachat"
 organization::
 
-    $ docker pull deltachat/wheel
+    $ docker pull deltachat/coredeps
 
-The ``deltachat/wheel`` image can be used to build both libdeltachat.so
-and the Python wheels::
+This docker image can be used to run tests and build Python wheels for all interpreters::
 
-    $ docker run --rm -it -v $(pwd):/io/ deltachat/wheel /io/python/wheelbuilder/build-wheels.sh
+    $ bash ci_scripts/ci_run.sh
 
-This command runs a script within the image, after mounting ``$(pwd)`` as ``/io`` within
-the docker image.  The script is specified as a path within the docker image's filesystem.
-The resulting wheel files will be in ``python/wheelhouse``.
+This command runs tests and build-wheel scripts in a docker container.
 
 
 Optionally build your own docker image
@@ -154,10 +147,10 @@ Optionally build your own docker image
 If you want to build your own custom docker image you can do this::
 
    $ cd deltachat-core # cd to deltachat-core checkout directory
-   $ docker build -t deltachat/wheel python/wheelbuilder/
+   $ docker build -t deltachat/coredeps ci_scripts/docker_coredeps
 
-This will use the ``python/wheelbuilder/Dockerfile`` to build
-up docker image called ``deltachat/wheel``.  You can afterwards
+This will use the ``ci_scripts/docker_coredeps/Dockerfile`` to build
+up docker image called ``deltachat/coredeps``.  You can afterwards
 find it with::
 
    $ docker images

python/doc/api.rst

@@ -37,16 +37,3 @@ Message
 .. autoclass:: deltachat.message.Message
     :members:
 
-MessageType
-------------
-
-.. autoclass:: deltachat.message.MessageType
-    :members:
-
-MessageState
-------------
-
-.. autoclass:: deltachat.message.MessageState
-    :members:
-
-

python/doc/examples.rst

@@ -8,8 +8,7 @@ Playing around on the commandline
 ----------------------------------
 
 Once you have :doc:`installed deltachat bindings <install>`
-you can start playing from the python interpreter commandline::
-
+you can start playing from the python interpreter commandline.
 For example you can type ``python`` and then::
 
     # instantiate and configure deltachat account
@@ -23,7 +22,7 @@ For example you can type ``python`` and then::
     # create a contact and send a message
     contact = ac.create_contact("someother@email.address")
     chat = ac.create_chat_by_contact(contact)
-    chat.send_text_message("hi from the python interpreter command line")
+    chat.send_text("hi from the python interpreter command line")
 
 Checkout our :doc:`api` for the various high-level things you can do
 to send/receive messages, create contacts and chats.

python/install_python_bindings.py

@@ -6,31 +6,20 @@
 
 import os
 import subprocess
+import sys
 
 if __name__ == "__main__":
     os.environ["DCC_RS_TARGET"] = target = "release"
+    if "DCC_RS_DEV" not in os.environ:
+        dn = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+        os.environ["DCC_RS_DEV"] = dn
 
-    toml = os.path.join(os.getcwd(), "..", "Cargo.toml")
-    assert os.path.exists(toml)
-    with open(toml) as f:
-        s = orig = f.read()
-    s += "\n"
-    s += "[profile.release]\n"
-    s += "debug = true\n"
-    with open(toml, "w") as f:
-        f.write(s)
-    print("temporarily modifying Cargo.toml to provide release build with debug symbols ")
-    try:
-        subprocess.check_call([
-            "cargo", "build", "-p", "deltachat_ffi", "--" + target
-        ])
-    finally:
-        with open(toml, "w") as f:
-            f.write(orig)
-        print("\nreseted Cargo.toml to previous original state")
-
+    os.environ["RUSTFLAGS"] = "-g"
+    subprocess.check_call([
+        "cargo", "build", "-p", "deltachat_ffi", "--" + target
+    ])
     subprocess.check_call("rm -rf build/ src/deltachat/*.so" , shell=True)
 
     subprocess.check_call([
-        "pip", "install", "-e", "."
+        sys.executable, "-m", "pip", "install", "-e", "."
     ])

python/src/deltachat/__init__.py

@@ -34,13 +34,14 @@ def py_dc_callback(ctx, evt, data1, data2):
     if data1 and event_sig_types & 1:
         data1 = ffi.string(ffi.cast('char*', data1)).decode("utf8")
     if data2 and event_sig_types & 2:
+        data2 = ffi.string(ffi.cast('char*', data2)).decode("utf8")
         try:
-            data2 = ffi.string(ffi.cast('char*', data2)).decode("utf8")
+            if isinstance(data2, bytes):
+                data2 = data2.decode("utf8")
         except UnicodeDecodeError:
-            # XXX ignoring this error is not quite correct but for now
+            # XXX ignoring the decode error is not quite correct but for now
             # i don't want to hunt down encoding problems in the c lib
-            data2 = ffi.string(ffi.cast('char*', data2))
-
+            pass
     try:
         ret = callback(ctx, evt_name, data1, data2)
         if ret is None:

python/src/deltachat/_build.py

@@ -6,10 +6,15 @@ import platform
 import os
 import cffi
 import shutil
+from os.path import dirname as dn
+from os.path import abspath
 
 
 def ffibuilder():
     projdir = os.environ.get('DCC_RS_DEV')
+    if not projdir:
+        p = dn(dn(dn(dn(abspath(__file__)))))
+        projdir = os.environ["DCC_RS_DEV"] = p
     target = os.environ.get('DCC_RS_TARGET', 'release')
     if projdir:
         if platform.system() == 'Darwin':

python/src/deltachat/account.py

@@ -2,7 +2,6 @@
 
 from __future__ import print_function
 import threading
-import os
 import re
 import time
 from array import array
@@ -14,7 +13,7 @@ except ImportError:
 import deltachat
 from . import const
 from .capi import ffi, lib
-from .cutil import as_dc_charpointer, from_dc_charpointer, iter_array
+from .cutil import as_dc_charpointer, from_dc_charpointer, iter_array, DCLot
 from .chatting import Contact, Chat, Message
 
 
@@ -23,7 +22,7 @@ class Account(object):
     by the underlying deltachat c-library.  All public Account methods are
     meant to be memory-safe and return memory-safe objects.
     """
-    def __init__(self, db_path, logid=None, eventlogging=True):
+    def __init__(self, db_path, logid=None, eventlogging=True, debug=True):
         """ initialize account object.
 
         :param db_path: a path to the account database. The database
@@ -31,13 +30,14 @@ class Account(object):
         :param logid: an optional logging prefix that should be used with
                       the default internal logging.
         :param eventlogging: if False no eventlogging and no context callback will be configured
+        :param debug: turn on debug logging for events.
         """
         self._dc_context = ffi.gc(
             lib.dc_context_new(lib.py_dc_callback, ffi.NULL, ffi.NULL),
             _destroy_dc_context,
         )
         if eventlogging:
-            self._evlogger = EventLogger(self._dc_context, logid)
+            self._evlogger = EventLogger(self._dc_context, logid, debug)
             deltachat.set_context_callback(self._dc_context, self._process_event)
             self._threads = IOThreads(self._dc_context, self._evlogger._log_event)
         else:
@@ -48,7 +48,7 @@ class Account(object):
         if not lib.dc_open(self._dc_context, db_path, ffi.NULL):
             raise ValueError("Could not dc_open: {}".format(db_path))
         self._configkeys = self.get_config("sys.config_keys").split()
-        self._imex_completed = threading.Event()
+        self._imex_events = Queue()
 
     def __del__(self):
         self.shutdown()
@@ -175,7 +175,7 @@ class Account(object):
                       whose name or e-mail matches query.
         :param only_verified: if true only return verified contacts.
         :param with_self: if true the self-contact is also returned.
-        :returns: list of :class:`deltachat.message.Message` objects.
+        :returns: list of :class:`deltachat.chatting.Contact` objects.
         """
         flags = 0
         query = as_dc_charpointer(query)
@@ -231,7 +231,7 @@ class Account(object):
         :returns: a :class:`deltachat.chatting.Chat` object.
         """
         bytes_name = name.encode("utf8")
-        chat_id = lib.dc_create_group_chat(self._dc_context, verified, bytes_name)
+        chat_id = lib.dc_create_group_chat(self._dc_context, int(verified), bytes_name)
         return Chat(self, chat_id)
 
     def get_chats(self):
@@ -289,31 +289,64 @@ class Account(object):
         msg_ids = [msg.id for msg in messages]
         lib.dc_delete_msgs(self._dc_context, msg_ids, len(msg_ids))
 
-    def export_to_dir(self, backupdir):
-        """return after all delta chat state is exported to a new file in
-        the specified directory.
+    def export_self_keys(self, path):
+        """ export public and private keys to the specified directory. """
+        return self._export(path, imex_cmd=1)
+
+    def export_all(self, path):
+        """return new file containing a backup of all database state
+        (chats, contacts, keys, media, ...). The file is created in the
+        the `path` directory.
         """
-        snap_files = os.listdir(backupdir)
-        self._imex_completed.clear()
-        lib.dc_imex(self._dc_context, 11, as_dc_charpointer(backupdir), ffi.NULL)
+        export_files = self._export(path, 11)
+        if len(export_files) != 1:
+            raise RuntimeError("found more than one new file")
+        return export_files[0]
+
+    def _imex_events_clear(self):
+        try:
+            while True:
+                self._imex_events.get_nowait()
+        except Empty:
+            pass
+
+    def _export(self, path, imex_cmd):
+        self._imex_events_clear()
+        lib.dc_imex(self._dc_context, imex_cmd, as_dc_charpointer(path), ffi.NULL)
         if not self._threads.is_started():
             lib.dc_perform_imap_jobs(self._dc_context)
-        self._imex_completed.wait()
-        for x in os.listdir(backupdir):
-            if x not in snap_files:
-                return os.path.join(backupdir, x)
+        files_written = []
+        while True:
+            ev = self._imex_events.get()
+            if isinstance(ev, str):
+                files_written.append(ev)
+            elif isinstance(ev, bool):
+                if not ev:
+                    raise ValueError("export failed, exp-files: {}".format(files_written))
+                return files_written
 
-    def import_from_file(self, path):
-        """import delta chat state from the specified backup file.
+    def import_self_keys(self, path):
+        """ Import private keys found in the `path` directory.
+        The last imported key is made the default keys unless its name
+        contains the string legacy. Public keys are not imported.
+        """
+        self._import(path, imex_cmd=2)
+
+    def import_all(self, path):
+        """import delta chat state from the specified backup `path` (a file).
 
         The account must be in unconfigured state for import to attempted.
         """
         assert not self.is_configured(), "cannot import into configured account"
-        self._imex_completed.clear()
-        lib.dc_imex(self._dc_context, 12, as_dc_charpointer(path), ffi.NULL)
+        self._import(path, imex_cmd=12)
+
+    def _import(self, path, imex_cmd):
+        self._imex_events_clear()
+        lib.dc_imex(self._dc_context, imex_cmd, as_dc_charpointer(path), ffi.NULL)
         if not self._threads.is_started():
             lib.dc_perform_imap_jobs(self._dc_context)
-        self._imex_completed.wait()
+        if not self._imex_events.get():
+            raise ValueError("import from path '{}' failed".format(path))
 
     def initiate_key_transfer(self):
         """return setup code after a Autocrypt setup message
@@ -328,7 +361,66 @@ class Account(object):
             raise RuntimeError("could not send out autocrypt setup message")
         return from_dc_charpointer(res)
 
-    def start_threads(self):
+    def get_setup_contact_qr(self):
+        """ get/create Setup-Contact QR Code as ascii-string.
+
+        this string needs to be transferred to another DC account
+        in a second channel (typically used by mobiles with QRcode-show + scan UX)
+        where qr_setup_contact(qr) is called.
+        """
+        res = lib.dc_get_securejoin_qr(self._dc_context, 0)
+        return from_dc_charpointer(res)
+
+    def check_qr(self, qr):
+        """ check qr code and return :class:`ScannedQRCode` instance representing the result"""
+        res = ffi.gc(
+            lib.dc_check_qr(self._dc_context, as_dc_charpointer(qr)),
+            lib.dc_lot_unref
+        )
+        lot = DCLot(res)
+        if lot.state() == const.DC_QR_ERROR:
+            raise ValueError("invalid or unknown QR code: {}".format(lot.text1()))
+        return ScannedQRCode(lot)
+
+    def qr_setup_contact(self, qr):
+        """ setup contact and return a Chat after contact is established.
+
+        Note that this function may block for a long time as messages are exchanged
+        with the emitter of the QR code.  On success a :class:`deltachat.chatting.Chat` instance
+        is returned.
+        :param qr: valid "setup contact" QR code (all other QR codes will result in an exception)
+        """
+        assert self.check_qr(qr).is_ask_verifycontact()
+        chat_id = lib.dc_join_securejoin(self._dc_context, as_dc_charpointer(qr))
+        if chat_id == 0:
+            raise ValueError("could not setup secure contact")
+        return Chat(self, chat_id)
+
+    def qr_join_chat(self, qr):
+        """ join a chat group through a QR code.
+
+        Note that this function may block for a long time as messages are exchanged
+        with the emitter of the QR code.  On success a :class:`deltachat.chatting.Chat` instance
+        is returned which is the chat that we just joined.
+
+        :param qr: valid "join-group" QR code (all other QR codes will result in an exception)
+        """
+        assert self.check_qr(qr).is_ask_verifygroup()
+        chat_id = lib.dc_join_securejoin(self._dc_context, as_dc_charpointer(qr))
+        if chat_id == 0:
+            raise ValueError("could not join group")
+        return Chat(self, chat_id)
+
+    #
+    # meta API for start/stop and event based processing
+    #
+
+    def wait_next_incoming_message(self):
+        """ wait for and return next incoming message. """
+        ev = self._evlogger.get_matching("DC_EVENT_INCOMING_MSG")
+        return self.get_message_by_id(ev[2])
+
+    def start_threads(self, mvbox=False, sentbox=False):
         """ start IMAP/SMTP threads (and configure account if it hasn't happened).
 
         :raises: ValueError if 'addr' or 'mail_pw' are not configured.
@@ -336,7 +428,7 @@ class Account(object):
         """
         if not self.is_configured():
             self.configure()
-        self._threads.start()
+        self._threads.start(mvbox=mvbox, sentbox=sentbox)
 
     def stop_threads(self, wait=True):
         """ stop IMAP/SMTP threads. """
@@ -346,7 +438,8 @@ class Account(object):
     def shutdown(self, wait=True):
         """ stop threads and close and remove underlying dc_context and callbacks. """
         if hasattr(self, "_dc_context") and hasattr(self, "_threads"):
-            self.stop_threads(wait=False)  # to interrupt idle and tell python threads to stop
+            # print("SHUTDOWN", self)
+            self.stop_threads(wait=False)
             lib.dc_close(self._dc_context)
             self.stop_threads(wait=wait)  # to wait for threads
             deltachat.clear_context_callback(self._dc_context)
@@ -363,7 +456,12 @@ class Account(object):
 
     def on_dc_event_imex_progress(self, data1, data2):
         if data1 == 1000:
-            self._imex_completed.set()
+            self._imex_events.put(True)
+        elif data1 == 0:
+            self._imex_events.put(False)
+
+    def on_dc_event_imex_file_written(self, data1, data2):
+        self._imex_events.put(data1)
 
 
 class IOThreads:
@@ -376,10 +474,14 @@ class IOThreads:
     def is_started(self):
         return len(self._name2thread) > 0
 
-    def start(self, imap=True, smtp=True):
+    def start(self, imap=True, smtp=True, mvbox=False, sentbox=False):
         assert not self.is_started()
         if imap:
-            self._start_one_thread("imap", self.imap_thread_run)
+            self._start_one_thread("inbox", self.imap_thread_run)
+        if mvbox:
+            self._start_one_thread("mvbox", self.mvbox_thread_run)
+        if sentbox:
+            self._start_one_thread("sentbox", self.sentbox_thread_run)
         if smtp:
             self._start_one_thread("smtp", self.smtp_thread_run)
 
@@ -392,17 +494,35 @@ class IOThreads:
         self._thread_quitflag = True
         lib.dc_interrupt_imap_idle(self._dc_context)
         lib.dc_interrupt_smtp_idle(self._dc_context)
+        lib.dc_interrupt_mvbox_idle(self._dc_context)
+        lib.dc_interrupt_sentbox_idle(self._dc_context)
         if wait:
             for name, thread in self._name2thread.items():
                 thread.join()
 
     def imap_thread_run(self):
-        self._log_event("py-bindings-info", 0, "IMAP THREAD START")
+        self._log_event("py-bindings-info", 0, "INBOX THREAD START")
         while not self._thread_quitflag:
             lib.dc_perform_imap_jobs(self._dc_context)
             lib.dc_perform_imap_fetch(self._dc_context)
             lib.dc_perform_imap_idle(self._dc_context)
-        self._log_event("py-bindings-info", 0, "IMAP THREAD FINISHED")
+        self._log_event("py-bindings-info", 0, "INBOX THREAD FINISHED")
+
+    def mvbox_thread_run(self):
+        self._log_event("py-bindings-info", 0, "MVBOX THREAD START")
+        while not self._thread_quitflag:
+            lib.dc_perform_mvbox_jobs(self._dc_context)
+            lib.dc_perform_mvbox_fetch(self._dc_context)
+            lib.dc_perform_mvbox_idle(self._dc_context)
+        self._log_event("py-bindings-info", 0, "MVBOX THREAD FINISHED")
+
+    def sentbox_thread_run(self):
+        self._log_event("py-bindings-info", 0, "SENTBOX THREAD START")
+        while not self._thread_quitflag:
+            lib.dc_perform_sentbox_jobs(self._dc_context)
+            lib.dc_perform_sentbox_fetch(self._dc_context)
+            lib.dc_perform_sentbox_idle(self._dc_context)
+        self._log_event("py-bindings-info", 0, "SENTBOX THREAD FINISHED")
 
     def smtp_thread_run(self):
         self._log_event("py-bindings-info", 0, "SMTP THREAD START")
@@ -432,6 +552,10 @@ class EventLogger:
     def set_timeout(self, timeout):
         self._timeout = timeout
 
+    def consume_events(self, check_error=True):
+        while not self._event_queue.empty():
+            self.get()
+
     def get(self, timeout=None, check_error=True):
         timeout = timeout or self._timeout
         ev = self._event_queue.get(timeout=timeout)
@@ -491,3 +615,18 @@ def _destroy_dc_context(dc_context, dc_context_unref=lib.dc_context_unref):
         # we are deep into Python Interpreter shutdown,
         # so no need to clear the callback context mapping.
         pass
+
+
+class ScannedQRCode:
+    def __init__(self, dc_lot):
+        self._dc_lot = dc_lot
+
+    def is_ask_verifycontact(self):
+        return self._dc_lot.state() == const.DC_QR_ASK_VERIFYCONTACT
+
+    def is_ask_verifygroup(self):
+        return self._dc_lot.state() == const.DC_QR_ASK_VERIFYGROUP
+
+    @property
+    def contact_id(self):
+        return self._dc_lot.id()

python/src/deltachat/chatting.py

@@ -1,6 +1,7 @@
 """ chatting related objects: Contact, Chat, Message. """
 
 import mimetypes
+import os
 from . import props
 from .cutil import as_dc_charpointer, from_dc_charpointer, iter_array
 from .capi import lib, ffi
@@ -108,6 +109,13 @@ class Chat(object):
         """
         return not lib.dc_chat_is_unpromoted(self._dc_chat)
 
+    def is_verified(self):
+        """ return True if this chat is a verified group.
+
+        :returns: True if chat is verified, False otherwise.
+        """
+        return lib.dc_chat_is_verified(self._dc_chat)
+
     def get_name(self):
         """ return name of this chat.
 
@@ -131,6 +139,16 @@ class Chat(object):
         """
         return lib.dc_chat_get_type(self._dc_chat)
 
+    def get_join_qr(self):
+        """ get/create Join-Group QR Code as ascii-string.
+
+        this string needs to be transferred to another DC account
+        in a second channel (typically used by mobiles with QRcode-show + scan UX)
+        where account.join_with_qrcode(qr) needs to be called.
+        """
+        res = lib.dc_get_securejoin_qr(self._dc_context, self.id)
+        return from_dc_charpointer(res)
+
     # ------  chat messaging API ------------------------------
 
     def send_text(self, text):
@@ -294,7 +312,6 @@ class Chat(object):
     def get_contacts(self):
         """ get all contacts for this chat.
         :params: contact object.
-        :raises ValueError: if contact could not be added
         :returns: list of :class:`deltachat.chatting.Contact` objects for this chat
 
         """
@@ -305,3 +322,46 @@ class Chat(object):
         return list(iter_array(
             dc_array, lambda id: Contact(self._dc_context, id))
         )
+
+    def set_profile_image(self, img_path):
+        """Set group profile image.
+
+        If the group is already promoted (any message was sent to the group),
+        all group members are informed by a special status message that is sent
+        automatically by this function.
+        :params img_path: path to image object
+        :raises ValueError: if profile image could not be set
+        :returns: None
+        """
+        assert os.path.exists(img_path), img_path
+        p = as_dc_charpointer(img_path)
+        res = lib.dc_set_chat_profile_image(self._dc_context, self.id, p)
+        if res != 1:
+            raise ValueError("Setting Profile Image {!r} failed".format(p))
+
+    def remove_profile_image(self):
+        """remove group profile image.
+
+        If the group is already promoted (any message was sent to the group),
+        all group members are informed by a special status message that is sent
+        automatically by this function.
+        :raises ValueError: if profile image could not be reset
+        :returns: None
+        """
+        res = lib.dc_set_chat_profile_image(self._dc_context, self.id, ffi.NULL)
+        if res != 1:
+            raise ValueError("Removing Profile Image failed")
+
+    def get_profile_image(self):
+        """Get group profile image.
+
+        For groups, this is the image set by any group member using
+        set_chat_profile_image(). For normal chats, this is the image
+        set by each remote user on their own using dc_set_config(context,
+        "selfavatar", image).
+        :returns: path to profile image, None if no profile image exists.
+        """
+        dc_res = lib.dc_chat_get_profile_image(self._dc_chat)
+        if dc_res == ffi.NULL:
+            return None
+        return from_dc_charpointer(dc_res)

python/src/deltachat/const.py

@@ -8,11 +8,23 @@ from os.path import join as joinpath
 # this works well when you in a git-checkout
 # run "python deltachat/const.py" to regenerate events
 # begin const generated
+DC_PROVIDER_STATUS_OK = 1
+DC_PROVIDER_STATUS_PREPARATION = 2
+DC_PROVIDER_STATUS_BROKEN = 3
 DC_GCL_ARCHIVED_ONLY = 0x01
 DC_GCL_NO_SPECIALS = 0x02
 DC_GCL_ADD_ALLDONE_HINT = 0x04
 DC_GCL_VERIFIED_ONLY = 0x01
 DC_GCL_ADD_SELF = 0x02
+DC_QR_ASK_VERIFYCONTACT = 200
+DC_QR_ASK_VERIFYGROUP = 202
+DC_QR_FPR_OK = 210
+DC_QR_FPR_MISMATCH = 220
+DC_QR_FPR_WITHOUT_ADDR = 230
+DC_QR_ADDR = 320
+DC_QR_TEXT = 330
+DC_QR_URL = 332
+DC_QR_ERROR = 400
 DC_CHAT_ID_DEADDROP = 1
 DC_CHAT_ID_TRASH = 3
 DC_CHAT_ID_MSGS_IN_CREATION = 4
@@ -69,15 +81,14 @@ DC_EVENT_IMEX_FILE_WRITTEN = 2052
 DC_EVENT_SECUREJOIN_INVITER_PROGRESS = 2060
 DC_EVENT_SECUREJOIN_JOINER_PROGRESS = 2061
 DC_EVENT_GET_STRING = 2091
-DC_EVENT_HTTP_GET = 2100
-DC_EVENT_HTTP_POST = 2110
 DC_EVENT_FILE_COPIED = 2055
 DC_EVENT_IS_OFFLINE = 2081
 # end const generated
 
 
 def read_event_defines(f):
-    rex = re.compile(r'#define\s+((?:DC_EVENT_|DC_MSG|DC_STATE_|DC_CONTACT_ID_|DC_GCL|DC_CHAT)\S+)\s+([x\d]+).*')
+    rex = re.compile(r'#define\s+((?:DC_EVENT_|DC_QR|DC_MSG|DC_STATE_|'
+                     r'DC_CONTACT_ID_|DC_GCL|DC_CHAT|DC_PROVIDER)\S+)\s+([x\d]+).*')
     for line in f:
         m = rex.match(line)
         if m:
@@ -90,7 +101,7 @@ if __name__ == "__main__":
     if len(sys.argv) >= 2:
         deltah = sys.argv[1]
     else:
-        deltah = joinpath(dirname(dirname(dirname(here_dir))), "src", "deltachat.h")
+        deltah = joinpath(dirname(dirname(dirname(here_dir))), "deltachat-ffi", "deltachat.h")
     assert os.path.exists(deltah)
 
     lines = []

python/src/deltachat/cutil.py

@@ -1,5 +1,6 @@
 from .capi import lib
 from .capi import ffi
+from datetime import datetime
 
 
 def as_dc_charpointer(obj):
@@ -16,4 +17,30 @@ def iter_array(dc_array_t, constructor):
 
 
 def from_dc_charpointer(obj):
-    return ffi.string(obj).decode("utf8")
+    return ffi.string(ffi.gc(obj, lib.dc_str_unref)).decode("utf8")
+
+
+class DCLot:
+    def __init__(self, dc_lot):
+        self._dc_lot = dc_lot
+
+    def id(self):
+        return lib.dc_lot_get_id(self._dc_lot)
+
+    def state(self):
+        return lib.dc_lot_get_state(self._dc_lot)
+
+    def text1(self):
+        return from_dc_charpointer(lib.dc_lot_get_text1(self._dc_lot))
+
+    def text1_meaning(self):
+        return lib.dc_lot_get_text1_meaning(self._dc_lot)
+
+    def text2(self):
+        return from_dc_charpointer(lib.dc_lot_get_text2(self._dc_lot))
+
+    def timestamp(self):
+        ts = lib.dc_lot_get_timestamp(self._dc_lot)
+        if ts == 0:
+            return None
+        return datetime.utcfromtimestamp(ts)

python/src/deltachat/message.py

@@ -101,6 +101,14 @@ class Message(object):
         """ return True if this message is a setup message. """
         return lib.dc_msg_is_setupmessage(self._dc_msg)
 
+    def get_setupcodebegin(self):
+        """ return the first characters of a setup code in a setup message. """
+        return from_dc_charpointer(lib.dc_msg_get_setupcodebegin(self._dc_msg))
+
+    def is_encrypted(self):
+        """ return True if this message was encrypted. """
+        return bool(lib.dc_msg_get_showpadlock(self._dc_msg))
+
     def get_message_info(self):
         """ Return informational text for a single message.
 
@@ -110,7 +118,13 @@ class Message(object):
 
     def continue_key_transfer(self, setup_code):
         """ extract key and use it as primary key for this account. """
-        lib.dc_continue_key_transfer(self._dc_context, self.id, as_dc_charpointer(setup_code))
+        res = lib.dc_continue_key_transfer(
+                self._dc_context,
+                self.id,
+                as_dc_charpointer(setup_code)
+        )
+        if res == 0:
+            raise ValueError("could not decrypt")
 
     @props.with_doc
     def time_sent(self):
@@ -142,7 +156,7 @@ class Message(object):
         import email.parser
         mime_headers = lib.dc_get_mime_headers(self._dc_context, self.id)
         if mime_headers:
-            s = ffi.string(mime_headers)
+            s = ffi.string(ffi.gc(mime_headers, lib.dc_str_unref))
             if isinstance(s, bytes):
                 s = s.decode("ascii")
             return email.message_from_string(s)

python/src/deltachat/provider.py

@@ -0,0 +1,67 @@
+"""Provider info class."""
+
+from .capi import ffi, lib
+from .cutil import as_dc_charpointer, from_dc_charpointer
+
+
+class ProviderNotFoundError(Exception):
+    """The provider information was not found."""
+
+
+class Provider(object):
+    """Provider information.
+
+    :param domain: The domain to get the provider info for, this is
+    normally the part following the `@` of the domain.
+    """
+
+    def __init__(self, domain):
+        provider = ffi.gc(
+            lib.dc_provider_new_from_domain(as_dc_charpointer(domain)),
+            lib.dc_provider_unref,
+        )
+        if provider == ffi.NULL:
+            raise ProviderNotFoundError("Provider not found")
+        self._provider = provider
+
+    @classmethod
+    def from_email(cls, email):
+        """Create provider info from an email address.
+
+        :param email: Email address to get provider info for.
+        """
+        return cls(email.split('@')[-1])
+
+    @property
+    def overview_page(self):
+        """URL to the overview page of the provider on providers.delta.chat."""
+        return from_dc_charpointer(
+            lib.dc_provider_get_overview_page(self._provider))
+
+    @property
+    def name(self):
+        """The name of the provider."""
+        return from_dc_charpointer(lib.dc_provider_get_name(self._provider))
+
+    @property
+    def markdown(self):
+        """Content of the information page, formatted as markdown."""
+        return from_dc_charpointer(
+            lib.dc_provider_get_markdown(self._provider))
+
+    @property
+    def status_date(self):
+        """The date the provider info was last updated, as a string."""
+        return from_dc_charpointer(
+            lib.dc_provider_get_status_date(self._provider))
+
+    @property
+    def status(self):
+        """The status of the provider information.
+
+        This is one of the
+        :attr:`deltachat.const.DC_PROVIDER_STATUS_OK`,
+        :attr:`deltachat.const.DC_PROVIDER_STATUS_PREPARATION` or
+        :attr:`deltachat.const.DC_PROVIDER_STATUS_BROKEN` constants.
+        """
+        return lib.dc_provider_get_status(self._provider)

python/tests/conftest.py

@@ -1,9 +1,9 @@
 from __future__ import print_function
 import os
 import pytest
+import requests
 import time
 from deltachat import Account
-from deltachat import props
 from deltachat.capi import lib
 import tempfile
 
@@ -24,18 +24,9 @@ def pytest_configure(config):
             config.option.liveconfig = cfg
 
 
-@pytest.hookimpl(trylast=True)
-def pytest_runtest_call(item):
-    # perform early finalization because we otherwise get cloberred
-    # output from concurrent threads printing between execution
-    # of the test function and the teardown phase of that test function
-    if "acfactory" in item.funcargs:
-        print("*"*30, "finalizing", "*"*30)
-        acfactory = item.funcargs["acfactory"]
-        acfactory.finalize()
-
-
 def pytest_report_header(config, startdir):
+    summary = []
+
     t = tempfile.mktemp()
     try:
         ac = Account(t, eventlogging=False)
@@ -43,13 +34,18 @@ def pytest_report_header(config, startdir):
         ac.shutdown()
     finally:
         os.remove(t)
-    summary = ['Deltachat core={} sqlite={}'.format(
+    summary.extend(['Deltachat core={} sqlite={}'.format(
          info['deltachat_core_version'],
          info['sqlite_version'],
-     )]
-    cfg = config.getoption('--liveconfig')
+     )])
+
+    cfg = config.option.liveconfig
     if cfg:
-        summary.append('Liveconfig: {}'.format(os.path.abspath(cfg)))
+        if "#" in cfg:
+            url, token = cfg.split("#", 1)
+            summary.append('Liveconfig provider: {}#<token ommitted>'.format(url))
+        else:
+            summary.append('Liveconfig file: {}'.format(cfg))
     return summary
 
 
@@ -66,9 +62,56 @@ def data():
     return Data()
 
 
+class SessionLiveConfigFromFile:
+    def __init__(self, fn):
+        self.fn = fn
+        self.configlist = []
+        for line in open(fn):
+            if line.strip() and not line.strip().startswith('#'):
+                d = {}
+                for part in line.split():
+                    name, value = part.split("=")
+                    d[name] = value
+                self.configlist.append(d)
+
+    def get(self, index):
+        return self.configlist[index]
+
+    def exists(self):
+        return bool(self.configlist)
+
+
+class SessionLiveConfigFromURL:
+    def __init__(self, url, create_token):
+        self.configlist = []
+        for i in range(2):
+            res = requests.post(url, json={"token_create_user": int(create_token)})
+            if res.status_code != 200:
+                pytest.skip("creating newtmpuser failed {!r}".format(res))
+            d = res.json()
+            config = dict(addr=d["email"], mail_pw=d["password"])
+            self.configlist.append(config)
+
+    def get(self, index):
+        return self.configlist[index]
+
+    def exists(self):
+        return bool(self.configlist)
+
+
+@pytest.fixture(scope="session")
+def session_liveconfig(request):
+    liveconfig_opt = request.config.option.liveconfig
+    if liveconfig_opt:
+        if liveconfig_opt.startswith("http"):
+            url, create_token = liveconfig_opt.split("#", 1)
+            return SessionLiveConfigFromURL(url, create_token)
+        else:
+            return SessionLiveConfigFromFile(liveconfig_opt)
+
+
 @pytest.fixture
-def acfactory(pytestconfig, tmpdir, request):
-    fn = pytestconfig.getoption("--liveconfig")
+def acfactory(pytestconfig, tmpdir, request, session_liveconfig):
 
     class AccountMaker:
         def __init__(self):
@@ -82,25 +125,17 @@ def acfactory(pytestconfig, tmpdir, request):
                 fin = self._finalizers.pop()
                 fin()
 
-        @props.cached
-        def configlist(self):
-            configlist = []
-            for line in open(fn):
-                if line.strip() and not line.strip().startswith('#'):
-                    d = {}
-                    for part in line.split():
-                        name, value = part.split("=")
-                        d[name] = value
-                    configlist.append(d)
-            return configlist
+        def make_account(self, path, logid):
+            ac = Account(path, logid=logid)
+            self._finalizers.append(ac.shutdown)
+            return ac
 
         def get_unconfigured_account(self):
             self.offline_count += 1
             tmpdb = tmpdir.join("offlinedb%d" % self.offline_count)
-            ac = Account(tmpdb.strpath, logid="ac{}".format(self.offline_count))
+            ac = self.make_account(tmpdb.strpath, logid="ac{}".format(self.offline_count))
             ac._evlogger.init_time = self.init_time
             ac._evlogger.set_timeout(2)
-            self._finalizers.append(ac.shutdown)
             return ac
 
         def get_configured_offline_account(self):
@@ -115,32 +150,47 @@ def acfactory(pytestconfig, tmpdir, request):
             lib.dc_set_config(ac._dc_context, b"configured", b"1")
             return ac
 
-        def get_online_configuring_account(self):
-            if not fn:
-                pytest.skip("specify a --liveconfig file to run tests with real accounts")
+        def get_online_config(self):
+            if not session_liveconfig:
+                pytest.skip("specify DCC_PY_LIVECONFIG or --liveconfig")
+            configdict = session_liveconfig.get(self.live_count)
             self.live_count += 1
-            configdict = self.configlist.pop(0)
+            if "e2ee_enabled" not in configdict:
+                configdict["e2ee_enabled"] = "1"
             tmpdb = tmpdir.join("livedb%d" % self.live_count)
-            ac = Account(tmpdb.strpath, logid="ac{}".format(self.live_count))
+            ac = self.make_account(tmpdb.strpath, logid="ac{}".format(self.live_count))
             ac._evlogger.init_time = self.init_time
             ac._evlogger.set_timeout(30)
+            return ac, dict(configdict)
+
+        def get_online_configuring_account(self, mvbox=False, sentbox=False):
+            ac, configdict = self.get_online_config()
             ac.configure(**configdict)
-            ac.start_threads()
-            self._finalizers.append(ac.shutdown)
+            ac.start_threads(mvbox=mvbox, sentbox=sentbox)
             return ac
 
+        def get_two_online_accounts(self):
+            ac1 = self.get_online_configuring_account()
+            ac2 = self.get_online_configuring_account()
+            wait_successful_IMAP_SMTP_connection(ac1)
+            wait_configuration_progress(ac1, 1000)
+            wait_successful_IMAP_SMTP_connection(ac2)
+            wait_configuration_progress(ac2, 1000)
+            return ac1, ac2
+
         def clone_online_account(self, account):
             self.live_count += 1
             tmpdb = tmpdir.join("livedb%d" % self.live_count)
-            ac = Account(tmpdb.strpath, logid="ac{}".format(self.live_count))
+            ac = self.make_account(tmpdb.strpath, logid="ac{}".format(self.live_count))
             ac._evlogger.init_time = self.init_time
             ac._evlogger.set_timeout(30)
             ac.configure(addr=account.get_config("addr"), mail_pw=account.get_config("mail_pw"))
             ac.start_threads()
-            self._finalizers.append(ac.shutdown)
             return ac
 
-    return AccountMaker()
+    am = AccountMaker()
+    request.addfinalizer(am.finalize)
+    return am
 
 
 @pytest.fixture
@@ -160,12 +210,22 @@ def lp():
     return Printer()
 
 
-def wait_configuration_progress(account, target):
+def wait_configuration_progress(account, min_target, max_target=1001):
+    min_target = min(min_target, max_target)
     while 1:
         evt_name, data1, data2 = \
             account._evlogger.get_matching("DC_EVENT_CONFIGURE_PROGRESS")
-        if data1 >= target:
-            print("** CONFIG PROGRESS {}".format(target), account)
+        if data1 >= min_target and data1 <= max_target:
+            print("** CONFIG PROGRESS {}".format(min_target), account)
+            break
+
+
+def wait_securejoin_inviter_progress(account, target):
+    while 1:
+        evt_name, data1, data2 = \
+            account._evlogger.get_matching("DC_EVENT_SECUREJOIN_INVITER_PROGRESS")
+        if data2 >= target:
+            print("** SECUREJOINT-INVITER PROGRESS {}".format(target), account)
             break
 
 

python/tests/test_account.py

@@ -4,7 +4,7 @@ import os
 from deltachat import const, Account
 from deltachat.message import Message
 from datetime import datetime, timedelta
-from conftest import wait_configuration_progress, wait_successful_IMAP_SMTP_connection
+from conftest import wait_configuration_progress, wait_successful_IMAP_SMTP_connection, wait_securejoin_inviter_progress
 
 
 class TestOfflineAccountBasic:
@@ -93,8 +93,9 @@ class TestOfflineContact:
         ac1 = acfactory.get_configured_offline_account()
         contact1 = ac1.create_contact(email="some1@example.com", name="some1")
         chat = ac1.create_chat_by_contact(contact1)
-        chat.send_text("one messae")
+        msg = chat.send_text("one messae")
         assert not ac1.delete_contact(contact1)
+        assert not msg.filemime
 
 
 class TestOfflineChat:
@@ -106,7 +107,7 @@ class TestOfflineChat:
     def chat1(self, ac1):
         contact1 = ac1.create_contact("some1@hello.com", name="some1")
         chat = ac1.create_chat_by_contact(contact1)
-        assert chat.id >= const.DC_CHAT_ID_LAST_SPECIAL, chat.id
+        assert chat.id > const.DC_CHAT_ID_LAST_SPECIAL, chat.id
         return chat
 
     def test_display(self, chat1):
@@ -140,6 +141,22 @@ class TestOfflineChat:
         chat.set_name("title2")
         assert chat.get_name() == "title2"
 
+    @pytest.mark.parametrize("verified", [True, False])
+    def test_group_chat_qr(self, acfactory, ac1, verified):
+        ac2 = acfactory.get_configured_offline_account()
+        chat = ac1.create_group_chat(name="title1", verified=verified)
+        qr = chat.get_join_qr()
+        assert ac2.check_qr(qr).is_ask_verifygroup
+
+    def test_get_set_profile_image_simple(self, ac1, data):
+        chat = ac1.create_group_chat(name="title1")
+        p = data.get_path("d.png")
+        chat.set_profile_image(p)
+        p2 = chat.get_profile_image()
+        assert open(p, "rb").read() == open(p2, "rb").read()
+        chat.remove_profile_image()
+        assert chat.get_profile_image() is None
+
     def test_delete_and_send_fails(self, ac1, chat1):
         chat1.delete()
         ac1._evlogger.get_matching("DC_EVENT_MSGS_CHANGED")
@@ -277,10 +294,10 @@ class TestOfflineChat:
         assert contact == ac1.get_self_contact()
         assert not backupdir.listdir()
 
-        path = ac1.export_to_dir(backupdir.strpath)
+        path = ac1.export_all(backupdir.strpath)
         assert os.path.exists(path)
         ac2 = acfactory.get_unconfigured_account()
-        ac2.import_from_file(path)
+        ac2.import_all(path)
         contacts = ac2.get_contacts(query="some1")
         assert len(contacts) == 1
         contact2 = contacts[0]
@@ -306,18 +323,39 @@ class TestOfflineChat:
         chat1.set_draft(None)
         assert chat1.get_draft() is None
 
+    def test_qr_setup_contact(self, acfactory, lp):
+        ac1 = acfactory.get_configured_offline_account()
+        ac2 = acfactory.get_configured_offline_account()
+        qr = ac1.get_setup_contact_qr()
+        assert qr.startswith("OPENPGP4FPR:")
+        res = ac2.check_qr(qr)
+        assert res.is_ask_verifycontact()
+        assert not res.is_ask_verifygroup()
+        assert res.contact_id == 10
+
 
 class TestOnlineAccount:
-    def test_one_account_init(self, acfactory):
-        ac1 = acfactory.get_online_configuring_account()
-        wait_successful_IMAP_SMTP_connection(ac1)
-        wait_configuration_progress(ac1, 1000)
+    def get_chat(self, ac1, ac2):
+        c2 = ac1.create_contact(email=ac2.get_config("addr"))
+        chat = ac1.create_chat_by_contact(c2)
+        assert chat.id > const.DC_CHAT_ID_LAST_SPECIAL
+        return chat
+
+    def test_export_import_self_keys(self, acfactory, tmpdir):
+        ac1, ac2 = acfactory.get_two_online_accounts()
+        dir = tmpdir.mkdir("exportdir")
+        export_files = ac1.export_self_keys(dir.strpath)
+        assert len(export_files) == 2
+        for x in export_files:
+            assert x.startswith(dir.strpath)
+        ac1._evlogger.consume_events()
+        ac1.import_self_keys(dir.strpath)
 
     def test_one_account_send(self, acfactory):
         ac1 = acfactory.get_online_configuring_account()
         c2 = ac1.create_contact(email=ac1.get_config("addr"))
         chat = ac1.create_chat_by_contact(c2)
-        assert chat.id >= const.DC_CHAT_ID_LAST_SPECIAL
+        assert chat.id > const.DC_CHAT_ID_LAST_SPECIAL
         wait_successful_IMAP_SMTP_connection(ac1)
         wait_configuration_progress(ac1, 1000)
 
@@ -326,35 +364,19 @@ class TestOnlineAccount:
         ev = ac1._evlogger.get_matching("DC_EVENT_INCOMING_MSG|DC_EVENT_MSGS_CHANGED")
         assert ev[1] == msg_out.id
 
-    def test_two_accounts_send_receive(self, acfactory):
-        ac1 = acfactory.get_online_configuring_account()
+    def test_mvbox_sentbox_threads(self, acfactory):
+        ac1 = acfactory.get_online_configuring_account(mvbox=True, sentbox=True)
         ac2 = acfactory.get_online_configuring_account()
-        c2 = ac1.create_contact(email=ac2.get_config("addr"))
-        chat = ac1.create_chat_by_contact(c2)
-        assert chat.id >= const.DC_CHAT_ID_LAST_SPECIAL
-        wait_successful_IMAP_SMTP_connection(ac1)
-        wait_configuration_progress(ac1, 1000)
-        wait_successful_IMAP_SMTP_connection(ac2)
         wait_configuration_progress(ac2, 1000)
-
-        msg_out = chat.send_text("message1")
-
-        # wait for other account to receive
+        wait_configuration_progress(ac1, 1000)
+        chat = self.get_chat(ac1, ac2)
+        chat.send_text("message1")
         ev = ac2._evlogger.get_matching("DC_EVENT_INCOMING_MSG|DC_EVENT_MSGS_CHANGED")
-        assert ev[2] == msg_out.id
-        msg_in = ac2.get_message_by_id(msg_out.id)
-        assert msg_in.text == "message1"
+        assert ev[2] > const.DC_CHAT_ID_LAST_SPECIAL
 
     def test_forward_messages(self, acfactory):
-        ac1 = acfactory.get_online_configuring_account()
-        ac2 = acfactory.get_online_configuring_account()
-        c2 = ac1.create_contact(email=ac2.get_config("addr"))
-        chat = ac1.create_chat_by_contact(c2)
-        assert chat.id >= const.DC_CHAT_ID_LAST_SPECIAL
-        wait_successful_IMAP_SMTP_connection(ac1)
-        wait_configuration_progress(ac1, 1000)
-        wait_successful_IMAP_SMTP_connection(ac2)
-        wait_configuration_progress(ac2, 1000)
+        ac1, ac2 = acfactory.get_two_online_accounts()
+        chat = self.get_chat(ac1, ac2)
 
         msg_out = chat.send_text("message2")
 
@@ -377,16 +399,11 @@ class TestOnlineAccount:
         ac2.delete_messages(messages)
         assert not chat3.get_messages()
 
-    def test_send_and_receive_message(self, acfactory, lp):
-        lp.sec("starting accounts, waiting for configuration")
-        ac1 = acfactory.get_online_configuring_account()
-        ac2 = acfactory.get_online_configuring_account()
-        c2 = ac1.create_contact(email=ac2.get_config("addr"))
-        chat = ac1.create_chat_by_contact(c2)
-        assert chat.id >= const.DC_CHAT_ID_LAST_SPECIAL
+    def test_send_and_receive_message_markseen(self, acfactory, lp):
+        ac1, ac2 = acfactory.get_two_online_accounts()
 
-        wait_configuration_progress(ac1, 1000)
-        wait_configuration_progress(ac2, 1000)
+        lp.sec("ac1: create chat with ac2")
+        chat = self.get_chat(ac1, ac2)
 
         lp.sec("sending text message from ac1 to ac2")
         msg_out = chat.send_text("message1")
@@ -422,20 +439,46 @@ class TestOnlineAccount:
         ac2.mark_seen_messages([msg_in])
         lp.step("1")
         ev = ac1._evlogger.get_matching("DC_EVENT_MSG_READ")
-        assert ev[1] >= const.DC_CHAT_ID_LAST_SPECIAL
-        assert ev[2] >= const.DC_MSG_ID_LAST_SPECIAL
+        assert ev[1] > const.DC_CHAT_ID_LAST_SPECIAL
+        assert ev[2] > const.DC_MSG_ID_LAST_SPECIAL
         lp.step("2")
         assert msg_out.is_out_mdn_received()
 
+    def test_send_and_receive_will_encrypt_decrypt(self, acfactory, lp):
+        ac1, ac2 = acfactory.get_two_online_accounts()
+
+        lp.sec("ac1: create chat with ac2")
+        chat = self.get_chat(ac1, ac2)
+
+        lp.sec("sending text message from ac1 to ac2")
+        msg_out = chat.send_text("message1")
+        assert not msg_out.is_encrypted()
+
+        lp.sec("wait for ac2 to receive message")
+        ev = ac2._evlogger.get_matching("DC_EVENT_MSGS_CHANGED")
+        assert ev[2] == msg_out.id
+        msg_in = ac2.get_message_by_id(msg_out.id)
+        assert msg_in.text == "message1"
+
+        lp.sec("create new chat with contact and send back (encrypted) message")
+        chat2b = ac2.create_chat_by_message(msg_in)
+        chat2b.send_text("message-back")
+
+        lp.sec("wait for ac1 to receive message")
+        ev = ac1._evlogger.get_matching("DC_EVENT_INCOMING_MSG")
+        assert ev[1] == chat.id
+        assert ev[2] > msg_out.id
+        msg_back = ac1.get_message_by_id(ev[2])
+        assert msg_back.text == "message-back"
+        assert msg_back.is_encrypted()
+
     def test_saved_mime_on_received_message(self, acfactory, lp):
-        lp.sec("starting accounts, waiting for configuration")
-        ac1 = acfactory.get_online_configuring_account()
-        ac2 = acfactory.get_online_configuring_account()
+        ac1, ac2 = acfactory.get_two_online_accounts()
+
+        lp.sec("configure ac2 to save mime headers, create ac1/ac2 chat")
         ac2.set_config("save_mime_headers", "1")
-        c2 = ac1.create_contact(email=ac2.get_config("addr"))
-        chat = ac1.create_chat_by_contact(c2)
-        wait_configuration_progress(ac1, 1000)
-        wait_configuration_progress(ac2, 1000)
+        chat = self.get_chat(ac1, ac2)
+
         lp.sec("sending text message from ac1 to ac2")
         msg_out = chat.send_text("message1")
         ac1._evlogger.get_matching("DC_EVENT_MSG_DELIVERED")
@@ -449,14 +492,8 @@ class TestOnlineAccount:
         assert mime.get_all("Received")
 
     def test_send_and_receive_image(self, acfactory, lp, data):
-        lp.sec("starting accounts, waiting for configuration")
-        ac1 = acfactory.get_online_configuring_account()
-        ac2 = acfactory.get_online_configuring_account()
-        c2 = ac1.create_contact(email=ac2.get_config("addr"))
-        chat = ac1.create_chat_by_contact(c2)
-
-        wait_configuration_progress(ac1, 1000)
-        wait_configuration_progress(ac2, 1000)
+        ac1, ac2 = acfactory.get_two_online_accounts()
+        chat = self.get_chat(ac1, ac2)
 
         lp.sec("sending image message from ac1 to ac2")
         path = data.get_path("d.png")
@@ -475,19 +512,19 @@ class TestOnlineAccount:
         assert os.path.exists(msg_in.filename)
         assert os.stat(msg_in.filename).st_size == os.stat(path).st_size
 
-    def test_import_export_online(self, acfactory, tmpdir):
-        backupdir = tmpdir.mkdir("backup")
+    def test_import_export_online_all(self, acfactory, tmpdir):
         ac1 = acfactory.get_online_configuring_account()
         wait_configuration_progress(ac1, 1000)
 
         contact1 = ac1.create_contact("some1@hello.com", name="some1")
         chat = ac1.create_chat_by_contact(contact1)
         chat.send_text("msg1")
-        path = ac1.export_to_dir(backupdir.strpath)
+        backupdir = tmpdir.mkdir("backup")
+        path = ac1.export_all(backupdir.strpath)
         assert os.path.exists(path)
 
         ac2 = acfactory.get_unconfigured_account()
-        ac2.import_from_file(path)
+        ac2.import_all(path)
         contacts = ac2.get_contacts(query="some1")
         assert len(contacts) == 1
         contact2 = contacts[0]
@@ -497,7 +534,7 @@ class TestOnlineAccount:
         assert len(messages) == 1
         assert messages[0].text == "msg1"
 
-    def test_ac_setup_message(self, acfactory):
+    def test_ac_setup_message(self, acfactory, lp):
         # note that the receiving account needs to be configured and running
         # before ther setup message is send. DC does not read old messages
         # as of Jul2019
@@ -505,13 +542,152 @@ class TestOnlineAccount:
         ac2 = acfactory.clone_online_account(ac1)
         wait_configuration_progress(ac2, 1000)
         wait_configuration_progress(ac1, 1000)
+        lp.sec("trigger ac setup message and return setupcode")
         assert ac1.get_info()["fingerprint"] != ac2.get_info()["fingerprint"]
         setup_code = ac1.initiate_key_transfer()
         ac2._evlogger.set_timeout(30)
         ev = ac2._evlogger.get_matching("DC_EVENT_INCOMING_MSG|DC_EVENT_MSGS_CHANGED")
         msg = ac2.get_message_by_id(ev[2])
         assert msg.is_setup_message()
+        assert msg.get_setupcodebegin() == setup_code[:2]
+        lp.sec("try a bad setup code")
+        with pytest.raises(ValueError):
+            msg.continue_key_transfer(str(reversed(setup_code)))
+        lp.sec("try a good setup code")
         print("*************** Incoming ASM File at: ", msg.filename)
         print("*************** Setup Code: ", setup_code)
         msg.continue_key_transfer(setup_code)
         assert ac1.get_info()["fingerprint"] == ac2.get_info()["fingerprint"]
+
+    def test_qr_setup_contact(self, acfactory, lp):
+        ac1, ac2 = acfactory.get_two_online_accounts()
+        lp.sec("ac1: create QR code and let ac2 scan it, starting the securejoin")
+        qr = ac1.get_setup_contact_qr()
+        lp.sec("ac2: start QR-code based setup contact protocol")
+        ch = ac2.qr_setup_contact(qr)
+        assert ch.id >= 10
+        wait_securejoin_inviter_progress(ac1, 1000)
+
+    def test_qr_join_chat(self, acfactory, lp):
+        ac1, ac2 = acfactory.get_two_online_accounts()
+        lp.sec("ac1: create QR code and let ac2 scan it, starting the securejoin")
+        chat = ac1.create_group_chat("hello")
+        qr = chat.get_join_qr()
+        lp.sec("ac2: start QR-code based join-group protocol")
+        ch = ac2.qr_join_chat(qr)
+        assert ch.id >= 10
+        wait_securejoin_inviter_progress(ac1, 1000)
+
+    def test_qr_verified_group_and_chatting(self, acfactory, lp):
+        ac1, ac2 = acfactory.get_two_online_accounts()
+        lp.sec("ac1: create verified-group QR, ac2 scans and joins")
+        chat1 = ac1.create_group_chat("hello", verified=True)
+        assert chat1.is_verified()
+        qr = chat1.get_join_qr()
+        lp.sec("ac2: start QR-code based join-group protocol")
+        chat2 = ac2.qr_join_chat(qr)
+        assert chat2.id >= 10
+        wait_securejoin_inviter_progress(ac1, 1000)
+
+        lp.sec("ac2: read member added message")
+        msg = ac2.wait_next_incoming_message()
+        assert msg.is_encrypted()
+        assert "added" in msg.text.lower()
+
+        lp.sec("ac1: send message")
+        msg_out = chat1.send_text("hello")
+        assert msg_out.is_encrypted()
+
+        lp.sec("ac2: read message and check it's verified chat")
+        msg = ac2.wait_next_incoming_message()
+        assert msg.text == "hello"
+        assert msg.chat.is_verified()
+        assert msg.is_encrypted()
+
+        lp.sec("ac2: send message and let ac1 read it")
+        chat2.send_text("world")
+        msg = ac1.wait_next_incoming_message()
+        assert msg.text == "world"
+        assert msg.is_encrypted()
+
+    def test_set_get_profile_image(self, acfactory, data, lp):
+        ac1, ac2 = acfactory.get_two_online_accounts()
+
+        lp.sec("create unpromoted group chat")
+        chat = ac1.create_group_chat("hello")
+        p = data.get_path("d.png")
+
+        lp.sec("ac1: set profile image on unpromoted chat")
+        chat.set_profile_image(p)
+        ac1._evlogger.get_matching("DC_EVENT_CHAT_MODIFIED")
+        assert not chat.is_promoted()
+
+        lp.sec("ac1: send text to promote chat (XXX without contact added)")
+        # XXX first promote the chat before adding contact
+        # because DC does not send out profile images for unpromoted chats
+        # otherwise
+        chat.send_text("ac1: initial message to promote chat (workaround)")
+        assert chat.is_promoted()
+
+        lp.sec("ac2: add ac1 to a chat so the message does not land in DEADDROP")
+        c1 = ac2.create_contact(email=ac1.get_config("addr"))
+        ac2.create_chat_by_contact(c1)
+        ev = ac2._evlogger.get_matching("DC_EVENT_MSGS_CHANGED")
+
+        lp.sec("ac1: add ac2 to promoted group chat")
+        c2 = ac1.create_contact(email=ac2.get_config("addr"))
+        chat.add_contact(c2)
+
+        lp.sec("ac1: send a first message to ac2")
+        chat.send_text("hi")
+        assert chat.is_promoted()
+
+        lp.sec("ac2: wait for receiving message from ac1")
+        ev = ac2._evlogger.get_matching("DC_EVENT_INCOMING_MSG")
+        msg_in = ac2.get_message_by_id(ev[2])
+        assert not msg_in.chat.is_deaddrop()
+
+        lp.sec("ac2: create chat and read profile image")
+        chat2 = ac2.create_chat_by_message(msg_in)
+        p2 = chat2.get_profile_image()
+        assert p2 is not None
+        assert open(p2, "rb").read() == open(p, "rb").read()
+
+        ac2._evlogger.consume_events()
+        ac1._evlogger.consume_events()
+        lp.sec("ac2: delete profile image from chat")
+        chat2.remove_profile_image()
+        ev = ac1._evlogger.get_matching("DC_EVENT_INCOMING_MSG")
+        assert ev[1] == chat.id
+        chat1b = ac1.create_chat_by_message(ev[2])
+        assert chat1b.get_profile_image() is None
+        assert chat.get_profile_image() is None
+
+
+class TestOnlineConfigureFails:
+    def test_invalid_password(self, acfactory):
+        ac1, configdict = acfactory.get_online_config()
+        ac1.configure(addr=configdict["addr"], mail_pw="123")
+        ac1.start_threads()
+        wait_configuration_progress(ac1, 500)
+        ev1 = ac1._evlogger.get_matching("DC_EVENT_ERROR_NETWORK")
+        assert "authentication failed" in ev1[2].lower()
+        wait_configuration_progress(ac1, 0, 0)
+
+    def test_invalid_user(self, acfactory):
+        ac1, configdict = acfactory.get_online_config()
+        ac1.configure(addr="x" + configdict["addr"], mail_pw=configdict["mail_pw"])
+        ac1.start_threads()
+        wait_configuration_progress(ac1, 500)
+        ev1 = ac1._evlogger.get_matching("DC_EVENT_ERROR_NETWORK")
+        assert "authentication failed" in ev1[2].lower()
+        wait_configuration_progress(ac1, 0, 0)
+
+    def test_invalid_domain(self, acfactory):
+        ac1, configdict = acfactory.get_online_config()
+        ac1.configure(addr=configdict["addr"] + "x", mail_pw=configdict["mail_pw"])
+        ac1.start_threads()
+        wait_configuration_progress(ac1, 500)
+        ev1 = ac1._evlogger.get_matching("DC_EVENT_ERROR_NETWORK")
+        assert "could not connect" in ev1[2].lower()
+        wait_configuration_progress(ac1, 0, 0)

python/tests/test_increation.py

@@ -4,7 +4,7 @@ from deltachat import const
 from conftest import wait_configuration_progress, wait_msgs_changed
 
 
-class TestInCreation:
+class TestOnlineInCreation:
     def test_forward_increation(self, acfactory, data, lp):
         ac1 = acfactory.get_online_configuring_account()
         ac2 = acfactory.get_online_configuring_account()

python/tests/test_lowlevel.py

@@ -1,5 +1,5 @@
 from __future__ import print_function
-from deltachat import capi, const, set_context_callback, clear_context_callback
+from deltachat import capi, cutil, const, set_context_callback, clear_context_callback
 from deltachat.capi import ffi
 from deltachat.capi import lib
 from deltachat.account import EventLogger
@@ -17,11 +17,19 @@ def test_callback_None2int():
     clear_context_callback(ctx)
 
 
-def test_dc_close_events():
-    ctx = capi.lib.dc_context_new(capi.lib.py_dc_callback, ffi.NULL, ffi.NULL)
+def test_dc_close_events(tmpdir):
+    ctx = ffi.gc(
+        capi.lib.dc_context_new(capi.lib.py_dc_callback, ffi.NULL, ffi.NULL),
+        lib.dc_context_unref,
+    )
     evlog = EventLogger(ctx)
     evlog.set_timeout(5)
-    set_context_callback(ctx, lambda ctx, evt_name, data1, data2: evlog(evt_name, data1, data2))
+    set_context_callback(
+        ctx,
+        lambda ctx, evt_name, data1, data2: evlog(evt_name, data1, data2)
+    )
+    p = tmpdir.join("hello.db")
+    lib.dc_open(ctx, p.strpath.encode("ascii"), ffi.NULL)
     capi.lib.dc_close(ctx)
 
     def find(info_string):
@@ -51,6 +59,16 @@ def test_wrong_db(tmpdir):
     assert not lib.dc_open(dc_context, p.strpath.encode("ascii"), ffi.NULL)
 
 
+def test_empty_blobdir(tmpdir):
+    # Apparently some client code expects this to be the same as passing NULL.
+    ctx = ffi.gc(
+        lib.dc_context_new(lib.py_dc_callback, ffi.NULL, ffi.NULL),
+        lib.dc_context_unref,
+    )
+    db_fname = tmpdir.join("hello.db")
+    assert lib.dc_open(ctx, db_fname.strpath.encode("ascii"), b"")
+
+
 def test_event_defines():
     assert const.DC_EVENT_INFO == 100
     assert const.DC_CONTACT_ID_SELF
@@ -75,3 +93,58 @@ def test_markseen_invalid_message_ids(acfactory):
     msg_ids = [9]
     lib.dc_markseen_msgs(ac1._dc_context, msg_ids, len(msg_ids))
     ac1._evlogger.ensure_event_not_queued("DC_EVENT_WARNING|DC_EVENT_ERROR")
+
+
+def test_provider_info():
+    provider = lib.dc_provider_new_from_email(cutil.as_dc_charpointer("ex@example.com"))
+    assert cutil.from_dc_charpointer(
+        lib.dc_provider_get_overview_page(provider)
+    ) == "https://providers.delta.chat/example.com"
+    assert cutil.from_dc_charpointer(lib.dc_provider_get_name(provider)) == "Example"
+    assert cutil.from_dc_charpointer(lib.dc_provider_get_markdown(provider)) == "\n..."
+    assert cutil.from_dc_charpointer(lib.dc_provider_get_status_date(provider)) == "2018-09"
+    assert lib.dc_provider_get_status(provider) == const.DC_PROVIDER_STATUS_PREPARATION
+
+
+def test_provider_info_none():
+    assert lib.dc_provider_new_from_email(cutil.as_dc_charpointer("email@unexistent.no")) == ffi.NULL
+
+
+def test_get_info_closed():
+    ctx = ffi.gc(
+        lib.dc_context_new(lib.py_dc_callback, ffi.NULL, ffi.NULL),
+        lib.dc_context_unref,
+    )
+    info = cutil.from_dc_charpointer(lib.dc_get_info(ctx))
+    assert 'deltachat_core_version' in info
+    assert 'database_dir' not in info
+
+
+def test_get_info_open(tmpdir):
+    ctx = ffi.gc(
+        lib.dc_context_new(lib.py_dc_callback, ffi.NULL, ffi.NULL),
+        lib.dc_context_unref,
+    )
+    db_fname = tmpdir.join("test.db")
+    lib.dc_open(ctx, db_fname.strpath.encode("ascii"), ffi.NULL)
+    info = cutil.from_dc_charpointer(lib.dc_get_info(ctx))
+    assert 'deltachat_core_version' in info
+    assert 'database_dir' in info
+
+
+def test_is_open_closed():
+    ctx = ffi.gc(
+        lib.dc_context_new(lib.py_dc_callback, ffi.NULL, ffi.NULL),
+        lib.dc_context_unref,
+    )
+    assert lib.dc_is_open(ctx) == 0
+
+
+def test_is_open_actually_open(tmpdir):
+    ctx = ffi.gc(
+        lib.dc_context_new(lib.py_dc_callback, ffi.NULL, ffi.NULL),
+        lib.dc_context_unref,
+    )
+    db_fname = tmpdir.join("test.db")
+    lib.dc_open(ctx, db_fname.strpath.encode("ascii"), ffi.NULL)
+    assert lib.dc_is_open(ctx) == 1

python/tests/test_provider_info.py

@@ -0,0 +1,27 @@
+import pytest
+
+from deltachat import const
+from deltachat import provider
+
+
+def test_provider_info_from_email():
+    example = provider.Provider.from_email("email@example.com")
+    assert example.overview_page == "https://providers.delta.chat/example.com"
+    assert example.name == "Example"
+    assert example.markdown == "\n..."
+    assert example.status_date == "2018-09"
+    assert example.status == const.DC_PROVIDER_STATUS_PREPARATION
+
+
+def test_provider_info_from_domain():
+    example = provider.Provider("example.com")
+    assert example.overview_page == "https://providers.delta.chat/example.com"
+    assert example.name == "Example"
+    assert example.markdown == "\n..."
+    assert example.status_date == "2018-09"
+    assert example.status == const.DC_PROVIDER_STATUS_PREPARATION
+
+
+def test_provider_info_none():
+    with pytest.raises(provider.ProviderNotFoundError):
+        provider.Provider.from_email("email@unexistent.no")

python/tox.ini

@@ -1,7 +1,6 @@
 [tox]
 # make sure to update environment list in travis.yml and appveyor.yml
 envlist =
-    py27
     py35
     lint
     auditwheels
@@ -17,11 +16,15 @@ passenv =
     DCC_PY_LIVECONFIG
 deps = 
     pytest
-    pytest-faulthandler
+    pytest-rerunfailures
+    pytest-timeout
+    pytest-xdist
     pdbpp
+    requests
 
 [testenv:auditwheels]
 skipsdist = True
+deps = auditwheel
 commands = 
     python tests/auditwheels.py {toxworkdir}/wheelhouse
 
@@ -42,7 +45,7 @@ commands =
 [testenv:doc]
 basepython = python3.5
 deps =
-    sphinx==2.0.1
+    sphinx==2.2.0
     breathe
 
 changedir = doc
@@ -51,10 +54,12 @@ commands =
 
 
 [pytest]
+addopts = -v -rs --reruns 3 --reruns-delay 2
 python_files = tests/test_*.py 
 norecursedirs = .tox 
 xfail_strict=true
-timeout = 60
+timeout = 60 
+timeout_method = thread
 
 [flake8]
 max-line-length = 120

run-integration-tests.sh

@@ -23,7 +23,7 @@ if [ $? != 0 ]; then
 fi
 
 pushd python
-if [ -e "./liveconfig" ]; then
+if [ -e "./liveconfig" && -z "$DCC_PY_LIVECONFIG" ]; then
     export DCC_PY_LIVECONFIG=liveconfig
 fi
 tox "$@"

rust-toolchain

@@ -1 +1 @@
-nightly-2019-07-10
+nightly-2019-08-13

spec.md

@@ -0,0 +1,373 @@
+# Chat-over-Email specification
+
+Version 0.19.0
+
+This document describes how emails can be used
+to implement typical messenger functions
+while staying compatible to existing MUAs.
+
+- [Encryption](#encryption)
+- [Outgoing messages](#outgoing-messages)
+- [Incoming messages](#incoming-messages)
+- [Forwarded messages](#forwarded-messages)
+- [Groups](#groups)
+    - [Outgoing group messages](#outgoing-group-messages)
+    - [Incoming group messages](#incoming-group-messages)
+    - [Add and remove members](#add-and-remove-members)
+    - [Change group name](#change-group-name)
+    - [Set group image](#set-group-image)
+- [Set profile image](#set-profile-image)
+- [Miscellaneous](#miscellaneous)
+
+
+# Encryption
+
+Messages SHOULD be encrypted by the
+[Autocrypt](https://autocrypt.org/level1.html) standard;
+`prefer-encrypt=mutual` MAY be set by default.
+
+Meta data (at least the subject and all chat-headers) SHOULD be encrypted
+by the [Memoryhole](https://github.com/autocrypt/memoryhole) standard.
+If Memoryhole is not used,
+the subject of encrypted messages SHOULD be replaced by the string
+`Chat: Encrypted message` where the part after the colon MAY be localized.
+
+
+# Outgoing messages
+
+Messengers MUST add a `Chat-Version: 1.0` header to outgoing messages.
+For filtering and smart appearance of the messages in normal MUAs,
+the `Subject` header SHOULD start with the characters `Chat:`
+and SHOULD be an excerpt of the message.
+Replies to messages MAY follow the typical `Re:`-format.
+
+The body MAY contain text which MUST have the content type `text/plain`
+or `mulipart/alternative` containing `text/plain`.
+
+The text MAY be divided into a user-text-part and a footer-part using the
+line `-- ` (minus, minus, space, lineend).
+
+The user-text-part MUST contain only user generated content.
+User generated content are eg. texts a user has actually typed
+or pasted or forwarded from another user.
+Full quotes, footers or sth. like that MUST NOT go to the user-text-part.
+
+    From: sender@domain
+    To: rcpt@domain
+    Chat-Version: 1.0
+    Content-Type: text/plain
+    Subject: Chat: Hello ...
+
+    Hello world!
+
+
+# Incoming messages
+
+The `Chat-Version` header MAY be used
+to detect if a messages comes from a compatible messenger.
+
+The `Subject` header MUST NOT be used
+to detect compatible messengers, groups or whatever.
+
+Messenger SHOULD show the `Subject`
+if the message comes from a normal MUA together with the email-body.
+The email-body SHOULD be converted
+to plain text, full-quotes and similar regions SHOULD be cut.
+
+Attachments SHOULD be shown where possible.
+If an attachment cannot be shown, a non-distracting warning SHOULD be printed.
+
+
+# Forwarded messages
+
+Forwarded messages are outgoing messages that contain a forwarded-header
+before the user generated content.
+
+The forwarded header MUST contain two lines: 
+The first line contains the text
+`---------- Forwarded message ----------`
+(10 minus, space, text `Forwarded message`, space, 10 minus). 
+The second line starts with `From: ` followed by the original sender
+which SHOULD be anonymized or just a placeholder.
+
+    From: sender@domain
+    To: rcpt@domain
+    Chat-Version: 1.0
+    Content-Type: text/plain
+    Subject: Chat: Forwarded message
+
+    ---------- Forwarded message ----------
+    From: Messenger
+
+    Hello world!
+
+Incoming forwarded messages are detected by the header.
+The messenger SHOULD mark these messages in a way that
+it becomes obvious that the message is not created by the sender.
+Note that most messengers do not show the original sender of forwarded messages
+but MUAs typically expose the sender in the UI.
+
+
+# Groups
+
+Groups are chats with usually more than one recipient,
+each defined by an email-address.
+The sender plus the recipients are the group members.
+
+To allow different groups with the same members,
+groups are identified by a group-id.
+The group-id MUST be created only from the characters
+`0`-`9`, `A`-`Z`, `a`-`z` `_` and `-`
+and MUST have a length of at least 11 characters.
+
+Groups MUST have a group-name.
+The group-name is any non-zero-length UTF-8 string.
+
+Groups MAY have a group-image.
+
+
+## Outgoing groups messages
+
+All group members MUST be added to the `From`/`To` headers.
+The group-id MUST be written to the `Chat-Group-ID` header.
+The group-name MUST be written to `Chat-Group-Name` header
+(the forced presence of this header makes it easier
+to join a group chat on a second device any time).
+
+The `Subject` header of outgoing group messages
+SHOULD start with the characters `Chat:`
+followed by the group-name and a colon followed by an excerpt of the message.
+
+To identify the group-id on replies from normal MUAs,
+the group-id MUST also be added to the message-id of outgoing messages.
+The message-id MUST have the format `Gr.<group-id>.<unique data>`.
+
+    From: member1@domain
+    To: member2@domain, member3@domain
+    Chat-Version: 1.0
+    Chat-Group-ID: 12345uvwxyZ
+    Chat-Group-Name: My Group
+    Message-ID: Gr.12345uvwxyZ.0001@domain
+    Subject: Chat: My Group: Hello group ...
+
+    Hello group - this group contains three members
+
+Messengers adding the member list in the form `Name <email-address>`
+MUST take care only to spread the names authorized by the contacts themselves.
+Otherwise, names as _Daddy_ or _Honey_ may be spread
+(this issue is also true for normal MUAs, however,
+for more contact- and chat-centralized apps
+such situations happen more frequently).
+
+
+## Incoming group messages
+
+The messenger MUST search incoming messages for the group-id
+in the following headers: `Chat-Group-ID`,
+`Message-ID`, `In-Reply-To` and `References` (in this order).
+
+If the messenger finds a valid and existent group-id,
+the message SHOULD be assigned to the given group.
+If the messenger finds a valid but not existent group-id,
+the messenger MAY create a new group.
+If no group-id is found,
+the message MAY be assigned
+to a normal single-user chat with the email-address given in `From`.
+
+
+## Add and remove members
+
+Messenger clients MUST construct the member list
+from the `From`/`To` headers only on the first group message
+or if they see a `Chat-Group-Member-Added`
+or `Chat-Group-Member-Removed` action header.
+Both headers MUST have the email-address
+of the added or removed member as the value.
+Messenger clients MUST NOT construct the member list
+on other group messages
+(this is to avoid accidentally altered To-lists in normal MUAs;
+the user does not expect adding a user to a _message_
+will also add him to the _group_ "forever").
+
+The messenger SHOULD send an explicit mail for each added or removed member.
+The body of the message SHOULD contain
+a localized description about what happened
+and the message SHOULD appear as a message or action from the sender.
+
+    From: member1@domain
+    To: member2@domain, member3@domain, member4@domain
+    Chat-Version: 1.0
+    Chat-Group-ID: 12345uvwxyZ
+    Chat-Group-Name: My Group
+    Chat-Group-Member-Added: member4@domain
+    Message-ID: Gr.12345uvwxyZ.0002@domain
+    Subject: Chat: My Group: Hello, ...
+
+    Hello, I've added member4@domain to our group.  Now we have 4 members.
+
+To remove a member:
+
+    From: member1@domain
+    To: member2@domain, member3@domain
+    Chat-Version: 1.0
+    Chat-Group-ID: 12345uvwxyZ
+    Chat-Group-Name: My Group
+    Chat-Group-Member-Removed: member4@domain
+    Message-ID: Gr.12345uvwxyZ.0003@domain
+    Subject: Chat: My Group: Hello, ...
+
+    Hello, I've removed member4@domain from our group.  Now we have 3 members.
+
+
+## Change group name
+
+To change the group-name,
+the messenger MUST send the action header `Chat-Group-Name-Changed`
+with the value set to the old group name to all group members.
+The new group name goes to the header `Chat-Group-Name`.
+
+The messenger SHOULD send an explicit mail for each name change.
+The body of the message SHOULD contain
+a localized description about what happened
+and the message SHOULD appear as a message or action from the sender.
+
+    From: member1@domain
+    To: member2@domain, member3@domain
+    Chat-Version: 1.0
+    Chat-Group-ID: 12345uvwxyZ
+    Chat-Group-Name: Our Group
+    Chat-Group-Name-Changed: My Group
+    Message-ID: Gr.12345uvwxyZ.0004@domain
+    Subject: Chat: Our Group: Hello, ...
+
+    Hello, I've changed the group name from "My Group" to "Our Group".
+
+
+## Set group image
+
+A group MAY have a group-image.
+To change or set the group-image,
+the messenger MUST attach an image file to a message
+and MUST add the header `Chat-Group-Image`
+with the value set to the image name.
+
+To remove the group-image,
+the messenger MUST add the header `Chat-Group-Image: 0`.
+
+The messenger SHOULD send an explicit mail for each group image change.
+The body of the message SHOULD contain
+a localized description about what happened
+and the message SHOULD appear as a message or action from the sender.
+
+
+    From: member1@domain
+    To: member2@domain, member3@domain
+    Chat-Version: 1.0
+    Chat-Group-ID: 12345uvwxyZ
+    Chat-Group-Name: Our Group
+    Chat-Group-Image: image.jpg
+    Message-ID: Gr.12345uvwxyZ.0005@domain
+    Subject: Chat: Our Group: Hello, ...
+    Content-Type: multipart/mixed; boundary="==break=="
+
+    --==break==
+    Content-Type: text/plain
+
+    Hello, I've changed the group image.
+    --==break==
+    Content-Type: image/jpeg
+    Content-Disposition: attachment; filename="image.jpg"
+
+    /9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAYEBQYFBAYGBQYHBw ...
+    --==break==--
+
+The image format SHOULD be image/jpeg or image/png.
+To save data, it is RECOMMENDED
+to add a `Chat-Group-Image` only on image changes.
+
+
+# Set profile image
+
+A user MAY have a profile-image that MAY be spread to his contacts.
+To change or set the profile-image,
+the messenger MUST attach an image file to a message
+and MUST add the header `Chat-Profile-Image`
+with the value set to the image name.
+
+To remove the profile-image,
+the messenger MUST add the header `Chat-Profile-Image: 0`.
+
+To spread the image,
+the messenger MAY send the profile image
+together with the next mail to a given contact
+(to do this only once,
+the messenger has to keep a `profile_image_update_state` somewhere).
+Alternatively, the messenger MAY send an explicit mail
+for each profile-image change to all contacts using a compatible messenger.
+The messenger SHOULD NOT send an explicit mail to normal MUAs.
+
+    From: sender@domain
+    To: rcpt@domain
+    Chat-Version: 1.0
+    Chat-Profile-Image: photo.jpg
+    Subject: Chat: Hello, ...
+    Content-Type: multipart/mixed; boundary="==break=="
+
+    --==break==
+    Content-Type: text/plain
+
+    Hello, I've changed my profile image.
+    --==break==
+    Content-Type: image/jpeg
+    Content-Disposition: attachment; filename="photo.jpg"
+
+    AKCgkJi3j4l5kjoldfUAKCgkJi3j4lldfHjgWICwgIEBQYFBA ...
+    --==break==--
+
+The image format SHOULD be image/jpeg or image/png.
+Note that `Chat-Profile-Image` may appear together with all other headers,
+eg. there may be a `Chat-Profile-Image` and a `Chat-Group-Image` header
+in the same message.
+To save data, it is RECOMMENDED to add a `Chat-Profile-Image` header
+only on image changes.
+
+
+# Miscellaneous
+
+Messengers SHOULD use the header `Chat-Predecessor`
+instead of `In-Reply-To` as the latter one results
+in infinite threads on typical MUAs.
+
+Messengers SHOULD add a `Chat-Voice-message: 1` header
+if an attached audio file is a voice message.
+
+Messengers MAY add a `Chat-Duration` header
+to specify the duration of attached audio or video files.
+The value MUST be the duration in milliseconds.
+This allows the receiver to show the time without knowing the file format.
+
+    Chat-Predecessor: foo123@domain
+    Chat-Voice-Message: 1
+    Chat-Duration: 10000
+
+Messengers MAY send and receive Message Disposition Notifications
+(MDNs, [RFC 8098](https://tools.ietf.org/html/rfc8098),
+[RFC 3503](https://tools.ietf.org/html/rfc3503))
+using the `Chat-Disposition-Notification-To` header
+instead of the `Disposition-Notification-To`
+(which unfortunately forces many other MUAs
+to send weird mails not following any standard).
+
+
+## Sync messages
+
+If some action is required by a message header,
+the action should only be performed if the _effective date_ is newer
+than the date the last action was performed.
+
+We define the effective date of a message
+as the sending time of the message as indicated by its Date header,
+or the time of first receipt if that date is in the future or unavailable.
+
+
+Copyright © 2017-2019 Delta Chat contributors.

src/aheader.rs

@@ -3,11 +3,10 @@ use std::ffi::CStr;
 use std::str::FromStr;
 use std::{fmt, str};
 
-use mmime::mailimf_types::*;
+use mmime::mailimf::types::*;
 
 use crate::constants::*;
 use crate::contact::*;
-use crate::dc_tools::as_str;
 use crate::key::*;
 
 /// Possible values for encryption preference
@@ -64,11 +63,8 @@ impl Aheader {
         }
     }
 
-    pub fn from_imffields(
-        wanted_from: *const libc::c_char,
-        header: *const mailimf_fields,
-    ) -> Option<Self> {
-        if wanted_from.is_null() || header.is_null() {
+    pub fn from_imffields(wanted_from: &str, header: *const mailimf_fields) -> Option<Self> {
+        if header.is_null() {
             return None;
         }
 
@@ -94,7 +90,7 @@ impl Aheader {
 
                     match Self::from_str(value) {
                         Ok(test) => {
-                            if addr_cmp(&test.addr, as_str(wanted_from)) {
+                            if addr_cmp(&test.addr, wanted_from) {
                                 if fine_header.is_none() {
                                     fine_header = Some(test);
                                 } else {

src/chatlist.rs

@@ -1,11 +1,10 @@
+use crate::chat::*;
 use crate::constants::*;
 use crate::contact::*;
 use crate::context::*;
-use crate::dc_chat::*;
-use crate::dc_lot::*;
-use crate::dc_msg::*;
-use crate::dc_tools::*;
 use crate::error::Result;
+use crate::lot::Lot;
+use crate::message::Message;
 use crate::stock::StockMessage;
 
 /// An object representing a single chatlist in memory.
@@ -32,17 +31,13 @@ use crate::stock::StockMessage;
 /// first entry and only present on new messages, there is the rough idea that it can be optionally always
 /// present and sorted into the list by date. Rendering the deaddrop in the described way
 /// would not add extra work in the UI then.
-pub struct Chatlist<'a> {
-    context: &'a Context,
+#[derive(Debug)]
+pub struct Chatlist {
     /// Stores pairs of `chat_id, message_id`
     ids: Vec<(u32, u32)>,
 }
 
-impl<'a> Chatlist<'a> {
-    pub fn get_context(&self) -> &Context {
-        self.context
-    }
-
+impl Chatlist {
     /// Get a list of chats.
     /// The list can be filtered by query parameters.
     ///
@@ -86,7 +81,7 @@ impl<'a> Chatlist<'a> {
     /// `query_contact_id`: An optional contact ID for filtering the list. Only chats including this contact ID
     ///     are returned.
     pub fn try_load(
-        context: &'a Context,
+        context: &Context,
         listflags: usize,
         query: Option<&str>,
         query_contact_id: Option<u32>,
@@ -196,12 +191,12 @@ impl<'a> Chatlist<'a> {
 
         if 0 != add_archived_link_item && dc_get_archived_cnt(context) > 0 {
             if ids.is_empty() && 0 != listflags & DC_GCL_ADD_ALLDONE_HINT {
-                ids.push((DC_CHAT_ID_ALLDONE_HINT as u32, 0));
+                ids.push((DC_CHAT_ID_ALLDONE_HINT, 0));
             }
-            ids.push((DC_CHAT_ID_ARCHIVED_LINK as u32, 0));
+            ids.push((DC_CHAT_ID_ARCHIVED_LINK, 0));
         }
 
-        Ok(Chatlist { context, ids })
+        Ok(Chatlist { ids })
     }
 
     /// Find out the number of chats.
@@ -248,57 +243,58 @@ impl<'a> Chatlist<'a> {
     /// - dc_lot_t::timestamp: the timestamp of the message.  0 if not applicable.
     /// - dc_lot_t::state: The state of the message as one of the DC_STATE_* constants (see #dc_msg_get_state()).
     //    0 if not applicable.
-    pub unsafe fn get_summary(&self, index: usize, mut chat: *mut Chat<'a>) -> *mut dc_lot_t {
+    pub fn get_summary(&self, context: &Context, index: usize, chat: Option<&Chat>) -> Lot {
         // The summary is created by the chat, not by the last message.
         // This is because we may want to display drafts here or stuff as
         // "is typing".
         // Also, sth. as "No messages" would not work if the summary comes from a message.
 
-        let mut ret = dc_lot_new();
+        let mut ret = Lot::new();
         if index >= self.ids.len() {
-            (*ret).text2 = "ErrBadChatlistIndex".strdup();
+            ret.text2 = Some("ErrBadChatlistIndex".to_string());
             return ret;
         }
 
+        let chat_loaded: Chat;
+        let chat = if let Some(chat) = chat {
+            chat
+        } else {
+            if let Ok(chat) = Chat::load_from_db(context, self.ids[index].0) {
+                chat_loaded = chat;
+                &chat_loaded
+            } else {
+                return ret;
+            }
+        };
+
         let lastmsg_id = self.ids[index].1;
         let mut lastcontact = None;
 
-        if chat.is_null() {
-            chat = dc_chat_new(self.context);
-            let chat_to_delete = chat;
-            if !dc_chat_load_from_db(chat, self.ids[index].0) {
-                (*ret).text2 = "ErrCannotReadChat".strdup();
-                dc_chat_unref(chat_to_delete);
-
-                return ret;
-            }
-        }
-
         let lastmsg = if 0 != lastmsg_id {
-            let lastmsg = dc_msg_new_untyped(self.context);
-            dc_msg_load_from_db(lastmsg, self.context, lastmsg_id);
+            if let Ok(lastmsg) = Message::load_from_db(context, lastmsg_id) {
+                if lastmsg.from_id != 1 as libc::c_uint
+                    && (chat.typ == Chattype::Group || chat.typ == Chattype::VerifiedGroup)
+                {
+                    lastcontact = Contact::load_from_db(context, lastmsg.from_id).ok();
+                }
 
-            if (*lastmsg).from_id != 1 as libc::c_uint
-                && ((*chat).type_0 == DC_CHAT_TYPE_GROUP
-                    || (*chat).type_0 == DC_CHAT_TYPE_VERIFIED_GROUP)
-            {
-                lastcontact = Contact::load_from_db(self.context, (*lastmsg).from_id).ok();
+                Some(lastmsg)
+            } else {
+                None
             }
-            lastmsg
         } else {
-            std::ptr::null_mut()
+            None
         };
 
-        if (*chat).id == DC_CHAT_ID_ARCHIVED_LINK as u32 {
-            (*ret).text2 = dc_strdup(0 as *const libc::c_char)
-        } else if lastmsg.is_null() || (*lastmsg).from_id == DC_CONTACT_ID_UNDEFINED as u32 {
-            (*ret).text2 = self.context.stock_str(StockMessage::NoMessages).strdup();
+        if chat.id == DC_CHAT_ID_ARCHIVED_LINK {
+            ret.text2 = None;
+        } else if lastmsg.is_none() || lastmsg.as_ref().unwrap().from_id == DC_CONTACT_ID_UNDEFINED
+        {
+            ret.text2 = Some(context.stock_str(StockMessage::NoMessages).to_string());
         } else {
-            dc_lot_fill(ret, lastmsg, chat, lastcontact.as_ref(), self.context);
+            ret.fill(&mut lastmsg.unwrap(), chat, lastcontact.as_ref(), context);
         }
 
-        dc_msg_unref(lastmsg);
-
         ret
     }
 }
@@ -306,11 +302,10 @@ impl<'a> Chatlist<'a> {
 pub fn dc_get_archived_cnt(context: &Context) -> u32 {
     context
         .sql
-        .query_row_col(
+        .query_get_value(
             context,
             "SELECT COUNT(*) FROM chats WHERE blocked=0 AND archived=1;",
             params![],
-            0,
         )
         .unwrap_or_default()
 }
@@ -320,7 +315,7 @@ fn get_last_deaddrop_fresh_msg(context: &Context) -> u32 {
     // only few fresh messages.
     context
         .sql
-        .query_row_col(
+        .query_get_value(
             context,
             "SELECT m.id  FROM msgs m  LEFT JOIN chats c ON c.id=m.chat_id  \
              WHERE m.state=10   \
@@ -328,7 +323,6 @@ fn get_last_deaddrop_fresh_msg(context: &Context) -> u32 {
              AND c.blocked=2 \
              ORDER BY m.timestamp DESC, m.id DESC;",
             params![],
-            0,
         )
         .unwrap_or_default()
 }

src/config.rs

@@ -3,9 +3,9 @@ use strum_macros::{AsRefStr, Display, EnumIter, EnumProperty, EnumString};
 
 use crate::constants::DC_VERSION_STR;
 use crate::context::Context;
-use crate::dc_job::*;
 use crate::dc_tools::*;
 use crate::error::Error;
+use crate::job::*;
 use crate::stock::StockMessage;
 
 /// The available configuration keys.
@@ -33,6 +33,7 @@ pub enum Config {
     E2eeEnabled,
     #[strum(props(default = "1"))]
     MdnsEnabled,
+    #[strum(props(default = "1"))]
     InboxWatch,
     #[strum(props(default = "1"))]
     SentboxWatch,
@@ -48,11 +49,14 @@ pub enum Config {
     ConfiguredMailUser,
     ConfiguredMailPw,
     ConfiguredMailPort,
+    ConfiguredMailSecurity,
     ConfiguredSendServer,
     ConfiguredSendUser,
     ConfiguredSendPw,
     ConfiguredSendPort,
     ConfiguredServerFlags,
+    ConfiguredSendSecurity,
+    ConfiguredE2EEEnabled,
     Configured,
     // Deprecated
     #[strum(serialize = "sys.version")]
@@ -69,9 +73,9 @@ impl Context {
         let value = match key {
             Config::Selfavatar => {
                 let rel_path = self.sql.get_config(self, key);
-                rel_path.map(|p| dc_get_abs_path_safe(self, &p).to_str().unwrap().to_string())
+                rel_path.map(|p| dc_get_abs_path(self, &p).to_str().unwrap().to_string())
             }
-            Config::SysVersion => Some(std::str::from_utf8(DC_VERSION_STR).unwrap().into()),
+            Config::SysVersion => Some((&*DC_VERSION_STR).clone()),
             Config::SysMsgsizeMaxRecommended => Some(format!("{}", 24 * 1024 * 1024 / 4 * 3)),
             Config::SysConfigKeys => Some(get_config_keys_string()),
             _ => self.sql.get_config(self, key),
@@ -99,17 +103,17 @@ impl Context {
             }
             Config::InboxWatch => {
                 let ret = self.sql.set_config(self, key, value);
-                unsafe { dc_interrupt_imap_idle(self) };
+                interrupt_imap_idle(self);
                 ret
             }
             Config::SentboxWatch => {
                 let ret = self.sql.set_config(self, key, value);
-                unsafe { dc_interrupt_sentbox_idle(self) };
+                interrupt_sentbox_idle(self);
                 ret
             }
             Config::MvboxWatch => {
                 let ret = self.sql.set_config(self, key, value);
-                unsafe { dc_interrupt_mvbox_idle(self) };
+                interrupt_mvbox_idle(self);
                 ret
             }
             Config::Selfstatus => {
@@ -120,8 +124,7 @@ impl Context {
                     value
                 };
 
-                let ret = self.sql.set_config(self, key, val);
-                ret
+                self.sql.set_config(self, key, val)
             }
             _ => self.sql.set_config(self, key, value),
         }

src/configure/auto_mozilla.rs

@@ -0,0 +1,213 @@
+use libc::free;
+use quick_xml;
+use quick_xml::events::{BytesEnd, BytesStart, BytesText};
+
+use crate::constants::*;
+use crate::context::Context;
+use crate::dc_tools::*;
+use crate::login_param::LoginParam;
+
+use super::read_autoconf_file;
+/* ******************************************************************************
+ * Thunderbird's Autoconfigure
+ ******************************************************************************/
+/* documentation: https://developer.mozilla.org/en-US/docs/Mozilla/Thunderbird/Autoconfiguration */
+#[repr(C)]
+struct moz_autoconfigure_t<'a> {
+    pub in_0: &'a LoginParam,
+    pub in_emaildomain: &'a str,
+    pub in_emaillocalpart: &'a str,
+    pub out: LoginParam,
+    pub out_imap_set: libc::c_int,
+    pub out_smtp_set: libc::c_int,
+    pub tag_server: libc::c_int,
+    pub tag_config: libc::c_int,
+}
+
+pub unsafe fn moz_autoconfigure(
+    context: &Context,
+    url: &str,
+    param_in: &LoginParam,
+) -> Option<LoginParam> {
+    let xml_raw = read_autoconf_file(context, url);
+    if xml_raw.is_null() {
+        return None;
+    }
+
+    // Split address into local part and domain part.
+    let p = param_in.addr.find("@");
+    if p.is_none() {
+        free(xml_raw as *mut libc::c_void);
+        return None;
+    }
+    let (in_emaillocalpart, in_emaildomain) = param_in.addr.split_at(p.unwrap());
+    let in_emaildomain = &in_emaildomain[1..];
+
+    let mut reader = quick_xml::Reader::from_str(as_str(xml_raw));
+    reader.trim_text(true);
+
+    let mut buf = Vec::new();
+
+    let mut moz_ac = moz_autoconfigure_t {
+        in_0: param_in,
+        in_emaildomain,
+        in_emaillocalpart,
+        out: LoginParam::new(),
+        out_imap_set: 0,
+        out_smtp_set: 0,
+        tag_server: 0,
+        tag_config: 0,
+    };
+    loop {
+        match reader.read_event(&mut buf) {
+            Ok(quick_xml::events::Event::Start(ref e)) => {
+                moz_autoconfigure_starttag_cb(e, &mut moz_ac, &reader)
+            }
+            Ok(quick_xml::events::Event::End(ref e)) => moz_autoconfigure_endtag_cb(e, &mut moz_ac),
+            Ok(quick_xml::events::Event::Text(ref e)) => {
+                moz_autoconfigure_text_cb(e, &mut moz_ac, &reader)
+            }
+            Err(e) => {
+                error!(
+                    context,
+                    "Configure xml: Error at position {}: {:?}",
+                    reader.buffer_position(),
+                    e
+                );
+            }
+            Ok(quick_xml::events::Event::Eof) => break,
+            _ => (),
+        }
+        buf.clear();
+    }
+
+    if moz_ac.out.mail_server.is_empty()
+        || moz_ac.out.mail_port == 0
+        || moz_ac.out.send_server.is_empty()
+        || moz_ac.out.send_port == 0
+    {
+        let r = moz_ac.out.to_string();
+        warn!(context, "Bad or incomplete autoconfig: {}", r,);
+        free(xml_raw as *mut libc::c_void);
+        return None;
+    }
+
+    free(xml_raw as *mut libc::c_void);
+    Some(moz_ac.out)
+}
+
+fn moz_autoconfigure_text_cb<B: std::io::BufRead>(
+    event: &BytesText,
+    moz_ac: &mut moz_autoconfigure_t,
+    reader: &quick_xml::Reader<B>,
+) {
+    let val = event.unescape_and_decode(reader).unwrap_or_default();
+
+    let addr = &moz_ac.in_0.addr;
+    let email_local = moz_ac.in_emaillocalpart;
+    let email_domain = moz_ac.in_emaildomain;
+
+    let val = val
+        .trim()
+        .replace("%EMAILADDRESS%", addr)
+        .replace("%EMAILLOCALPART%", email_local)
+        .replace("%EMAILDOMAIN%", email_domain);
+
+    if moz_ac.tag_server == 1 {
+        match moz_ac.tag_config {
+            10 => moz_ac.out.mail_server = val,
+            11 => moz_ac.out.mail_port = val.parse().unwrap_or_default(),
+            12 => moz_ac.out.mail_user = val,
+            13 => {
+                let val_lower = val.to_lowercase();
+                if val_lower == "ssl" {
+                    moz_ac.out.server_flags |= DC_LP_IMAP_SOCKET_SSL as i32
+                }
+                if val_lower == "starttls" {
+                    moz_ac.out.server_flags |= DC_LP_IMAP_SOCKET_STARTTLS as i32
+                }
+                if val_lower == "plain" {
+                    moz_ac.out.server_flags |= DC_LP_IMAP_SOCKET_PLAIN as i32
+                }
+            }
+            _ => {}
+        }
+    } else if moz_ac.tag_server == 2 {
+        match moz_ac.tag_config {
+            10 => moz_ac.out.send_server = val,
+            11 => moz_ac.out.send_port = val.parse().unwrap_or_default(),
+            12 => moz_ac.out.send_user = val,
+            13 => {
+                let val_lower = val.to_lowercase();
+                if val_lower == "ssl" {
+                    moz_ac.out.server_flags |= DC_LP_SMTP_SOCKET_SSL as i32
+                }
+                if val_lower == "starttls" {
+                    moz_ac.out.server_flags |= DC_LP_SMTP_SOCKET_STARTTLS as i32
+                }
+                if val_lower == "plain" {
+                    moz_ac.out.server_flags |= DC_LP_SMTP_SOCKET_PLAIN as i32
+                }
+            }
+            _ => {}
+        }
+    }
+}
+
+fn moz_autoconfigure_endtag_cb(event: &BytesEnd, moz_ac: &mut moz_autoconfigure_t) {
+    let tag = String::from_utf8_lossy(event.name()).trim().to_lowercase();
+
+    if tag == "incomingserver" {
+        moz_ac.tag_server = 0;
+        moz_ac.tag_config = 0;
+        moz_ac.out_imap_set = 1;
+    } else if tag == "outgoingserver" {
+        moz_ac.tag_server = 0;
+        moz_ac.tag_config = 0;
+        moz_ac.out_smtp_set = 1;
+    } else {
+        moz_ac.tag_config = 0;
+    }
+}
+
+fn moz_autoconfigure_starttag_cb<B: std::io::BufRead>(
+    event: &BytesStart,
+    moz_ac: &mut moz_autoconfigure_t,
+    reader: &quick_xml::Reader<B>,
+) {
+    let tag = String::from_utf8_lossy(event.name()).trim().to_lowercase();
+
+    if tag == "incomingserver" {
+        moz_ac.tag_server = if let Some(typ) = event.attributes().find(|attr| {
+            attr.as_ref()
+                .map(|a| String::from_utf8_lossy(a.key).trim().to_lowercase() == "type")
+                .unwrap_or_default()
+        }) {
+            let typ = typ
+                .unwrap()
+                .unescape_and_decode_value(reader)
+                .unwrap_or_default()
+                .to_lowercase();
+
+            if typ == "imap" && moz_ac.out_imap_set == 0 {
+                1
+            } else {
+                0
+            }
+        } else {
+            0
+        };
+        moz_ac.tag_config = 0;
+    } else if tag == "outgoingserver" {
+        moz_ac.tag_server = if moz_ac.out_smtp_set == 0 { 2 } else { 0 };
+        moz_ac.tag_config = 0;
+    } else if tag == "hostname" {
+        moz_ac.tag_config = 10;
+    } else if tag == "port" {
+        moz_ac.tag_config = 11;
+    } else if tag == "sockettype" {
+        moz_ac.tag_config = 13;
+    } else if tag == "username" {
+        moz_ac.tag_config = 12;
+    }
+}

src/configure/auto_outlook.rs

@@ -0,0 +1,214 @@
+use std::ptr;
+
+use libc::free;
+use quick_xml;
+use quick_xml::events::{BytesEnd, BytesStart, BytesText};
+
+use crate::constants::*;
+use crate::context::Context;
+use crate::dc_tools::*;
+use crate::login_param::LoginParam;
+
+use super::read_autoconf_file;
+/* ******************************************************************************
+ * Outlook's Autodiscover
+ ******************************************************************************/
+#[repr(C)]
+struct outlk_autodiscover_t<'a> {
+    pub in_0: &'a LoginParam,
+    pub out: LoginParam,
+    pub out_imap_set: libc::c_int,
+    pub out_smtp_set: libc::c_int,
+    pub tag_config: libc::c_int,
+    pub config: [*mut libc::c_char; 6],
+    pub redirect: *mut libc::c_char,
+}
+
+pub unsafe fn outlk_autodiscover(
+    context: &Context,
+    url__: &str,
+    param_in: &LoginParam,
+) -> Option<LoginParam> {
+    let mut xml_raw: *mut libc::c_char = ptr::null_mut();
+    let mut url = url__.strdup();
+    let mut outlk_ad = outlk_autodiscover_t {
+        in_0: param_in,
+        out: LoginParam::new(),
+        out_imap_set: 0,
+        out_smtp_set: 0,
+        tag_config: 0,
+        config: [ptr::null_mut(); 6],
+        redirect: ptr::null_mut(),
+    };
+    let ok_to_continue;
+    let mut i = 0;
+    loop {
+        if !(i < 10) {
+            ok_to_continue = true;
+            break;
+        }
+        libc::memset(
+            &mut outlk_ad as *mut outlk_autodiscover_t as *mut libc::c_void,
+            0,
+            ::std::mem::size_of::<outlk_autodiscover_t>(),
+        );
+        xml_raw = read_autoconf_file(context, as_str(url));
+        if xml_raw.is_null() {
+            ok_to_continue = false;
+            break;
+        }
+
+        let mut reader = quick_xml::Reader::from_str(as_str(xml_raw));
+        reader.trim_text(true);
+
+        let mut buf = Vec::new();
+
+        loop {
+            match reader.read_event(&mut buf) {
+                Ok(quick_xml::events::Event::Start(ref e)) => {
+                    outlk_autodiscover_starttag_cb(e, &mut outlk_ad)
+                }
+                Ok(quick_xml::events::Event::End(ref e)) => {
+                    outlk_autodiscover_endtag_cb(e, &mut outlk_ad)
+                }
+                Ok(quick_xml::events::Event::Text(ref e)) => {
+                    outlk_autodiscover_text_cb(e, &mut outlk_ad, &reader)
+                }
+                Err(e) => {
+                    error!(
+                        context,
+                        "Configure xml: Error at position {}: {:?}",
+                        reader.buffer_position(),
+                        e
+                    );
+                }
+                Ok(quick_xml::events::Event::Eof) => break,
+                _ => (),
+            }
+            buf.clear();
+        }
+
+        if !(!outlk_ad.config[5].is_null()
+            && 0 != *outlk_ad.config[5usize].offset(0isize) as libc::c_int)
+        {
+            ok_to_continue = true;
+            break;
+        }
+        free(url as *mut libc::c_void);
+        url = dc_strdup(outlk_ad.config[5usize]);
+
+        outlk_clean_config(&mut outlk_ad);
+        free(xml_raw as *mut libc::c_void);
+        xml_raw = ptr::null_mut();
+        i += 1;
+    }
+
+    if ok_to_continue {
+        if outlk_ad.out.mail_server.is_empty()
+            || outlk_ad.out.mail_port == 0
+            || outlk_ad.out.send_server.is_empty()
+            || outlk_ad.out.send_port == 0
+        {
+            let r = outlk_ad.out.to_string();
+            warn!(context, "Bad or incomplete autoconfig: {}", r,);
+            free(url as *mut libc::c_void);
+            free(xml_raw as *mut libc::c_void);
+            outlk_clean_config(&mut outlk_ad);
+
+            return None;
+        }
+    }
+    free(url as *mut libc::c_void);
+    free(xml_raw as *mut libc::c_void);
+    outlk_clean_config(&mut outlk_ad);
+    Some(outlk_ad.out)
+}
+
+unsafe fn outlk_clean_config(mut outlk_ad: *mut outlk_autodiscover_t) {
+    for i in 0..6 {
+        free((*outlk_ad).config[i] as *mut libc::c_void);
+        (*outlk_ad).config[i] = ptr::null_mut();
+    }
+}
+
+fn outlk_autodiscover_text_cb<B: std::io::BufRead>(
+    event: &BytesText,
+    outlk_ad: &mut outlk_autodiscover_t,
+    reader: &quick_xml::Reader<B>,
+) {
+    let val = event.unescape_and_decode(reader).unwrap_or_default();
+
+    unsafe {
+        free(outlk_ad.config[outlk_ad.tag_config as usize].cast());
+        outlk_ad.config[outlk_ad.tag_config as usize] = val.trim().strdup();
+    }
+}
+
+unsafe fn outlk_autodiscover_endtag_cb(event: &BytesEnd, outlk_ad: &mut outlk_autodiscover_t) {
+    let tag = String::from_utf8_lossy(event.name()).trim().to_lowercase();
+
+    if tag == "protocol" {
+        if !outlk_ad.config[1].is_null() {
+            let port = dc_atoi_null_is_0(outlk_ad.config[3]);
+            let ssl_on = (!outlk_ad.config[4].is_null()
+                && strcasecmp(
+                    outlk_ad.config[4],
+                    b"on\x00" as *const u8 as *const libc::c_char,
+                ) == 0) as libc::c_int;
+            let ssl_off = (!outlk_ad.config[4].is_null()
+                && strcasecmp(
+                    outlk_ad.config[4],
+                    b"off\x00" as *const u8 as *const libc::c_char,
+                ) == 0) as libc::c_int;
+            if strcasecmp(
+                outlk_ad.config[1],
+                b"imap\x00" as *const u8 as *const libc::c_char,
+            ) == 0
+                && outlk_ad.out_imap_set == 0
+            {
+                outlk_ad.out.mail_server = to_string(outlk_ad.config[2]);
+                outlk_ad.out.mail_port = port;
+                if 0 != ssl_on {
+                    outlk_ad.out.server_flags |= DC_LP_IMAP_SOCKET_SSL as i32
+                } else if 0 != ssl_off {
+                    outlk_ad.out.server_flags |= DC_LP_IMAP_SOCKET_PLAIN as i32
+                }
+                outlk_ad.out_imap_set = 1
+            } else if strcasecmp(
+                outlk_ad.config[1usize],
+                b"smtp\x00" as *const u8 as *const libc::c_char,
+            ) == 0
+                && outlk_ad.out_smtp_set == 0
+            {
+                outlk_ad.out.send_server = to_string(outlk_ad.config[2]);
+                outlk_ad.out.send_port = port;
+                if 0 != ssl_on {
+                    outlk_ad.out.server_flags |= DC_LP_SMTP_SOCKET_SSL as i32
+                } else if 0 != ssl_off {
+                    outlk_ad.out.server_flags |= DC_LP_SMTP_SOCKET_PLAIN as i32
+                }
+                outlk_ad.out_smtp_set = 1
+            }
+        }
+        outlk_clean_config(outlk_ad);
+    }
+    outlk_ad.tag_config = 0;
+}
+
+fn outlk_autodiscover_starttag_cb(event: &BytesStart, outlk_ad: &mut outlk_autodiscover_t) {
+    let tag = String::from_utf8_lossy(event.name()).trim().to_lowercase();
+
+    if tag == "protocol" {
+        unsafe { outlk_clean_config(outlk_ad) };
+    } else if tag == "type" {
+        outlk_ad.tag_config = 1
+    } else if tag == "server" {
+        outlk_ad.tag_config = 2
+    } else if tag == "port" {
+        outlk_ad.tag_config = 3
+    } else if tag == "ssl" {
+        outlk_ad.tag_config = 4
+    } else if tag == "redirecturl" {
+        outlk_ad.tag_config = 5
+    };
+}

src/configure/mod.rs

@@ -0,0 +1,674 @@
+use percent_encoding::{utf8_percent_encode, NON_ALPHANUMERIC};
+
+use crate::constants::*;
+use crate::context::Context;
+use crate::dc_tools::*;
+use crate::e2ee;
+use crate::imap::*;
+use crate::job::*;
+use crate::login_param::LoginParam;
+use crate::oauth2::*;
+use crate::param::Params;
+
+mod auto_outlook;
+use auto_outlook::outlk_autodiscover;
+mod auto_mozilla;
+use auto_mozilla::moz_autoconfigure;
+
+macro_rules! progress {
+    ($context:tt, $progress:expr) => {
+        assert!(
+            $progress <= 1000,
+            "value in range 0..1000 expected with: 0=error, 1..999=progress, 1000=success"
+        );
+        $context.call_cb($crate::events::Event::ConfigureProgress($progress));
+    };
+}
+
+// connect
+pub unsafe fn configure(context: &Context) {
+    if dc_has_ongoing(context) {
+        warn!(context, "There is already another ongoing process running.",);
+        return;
+    }
+    job_kill_action(context, Action::ConfigureImap);
+    job_add(context, Action::ConfigureImap, 0, Params::new(), 0);
+}
+
+/// Check if the context is already configured.
+pub fn dc_is_configured(context: &Context) -> bool {
+    context.sql.get_config_bool(context, "configured")
+}
+
+/*******************************************************************************
+ * Configure JOB
+ ******************************************************************************/
+// the other dc_job_do_DC_JOB_*() functions are declared static in the c-file
+#[allow(non_snake_case, unused_must_use)]
+pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context) {
+    let mut success = false;
+    let mut imap_connected_here = false;
+    let mut smtp_connected_here = false;
+    let mut ongoing_allocated_here = false;
+
+    let mut param_autoconfig: Option<LoginParam> = None;
+    if dc_alloc_ongoing(context) {
+        ongoing_allocated_here = true;
+        if !context.sql.is_open() {
+            error!(context, "Cannot configure, database not opened.",);
+        } else {
+            context.inbox.read().unwrap().disconnect(context);
+            context
+                .sentbox_thread
+                .read()
+                .unwrap()
+                .imap
+                .disconnect(context);
+            context
+                .mvbox_thread
+                .read()
+                .unwrap()
+                .imap
+                .disconnect(context);
+            context.smtp.clone().lock().unwrap().disconnect();
+            info!(context, "Configure ...",);
+
+            let s_a = context.running_state.clone();
+            let s = s_a.read().unwrap();
+
+            // Variables that are shared between steps:
+            let mut param = LoginParam::from_database(context, "");
+            // need all vars here to be mutable because rust thinks the same step could be called multiple times
+            // and also initialize, because otherwise rust thinks it's used while unitilized, even if thats not the case as the loop goes only forward
+            let mut param_domain = "undefined.undefined".to_owned();
+            let mut param_addr_urlencoded: String =
+                "Internal Error: this value should never be used".to_owned();
+            let mut keep_flags = std::i32::MAX;
+
+            const STEP_3_INDEX: u8 = 13;
+            let mut step_counter: u8 = 0;
+            while !s.shall_stop_ongoing {
+                step_counter = step_counter + 1;
+
+                let success = match step_counter {
+                    // Read login parameters from the database
+                    1 => {
+                        progress!(context, 1);
+                        if param.addr.is_empty() {
+                            error!(context, "Please enter an email address.",);
+                        }
+                        !param.addr.is_empty()
+                    }
+                    // Step 1: Load the parameters and check email-address and password
+                    2 => {
+                        if 0 != param.server_flags & 0x2 {
+                            // the used oauth2 addr may differ, check this.
+                            // if dc_get_oauth2_addr() is not available in the oauth2 implementation,
+                            // just use the given one.
+                            progress!(context, 10);
+                            if let Some(oauth2_addr) =
+                                dc_get_oauth2_addr(context, &param.addr, &param.mail_pw)
+                                    .and_then(|e| e.parse().ok())
+                            {
+                                param.addr = oauth2_addr;
+                                context
+                                    .sql
+                                    .set_config(context, "addr", Some(param.addr.as_str()))
+                                    .ok();
+                            }
+                            progress!(context, 20);
+                        }
+                        true // no oauth? - just continue it's no error
+                    }
+                    3 => {
+                        if let Ok(parsed) = param.addr.parse() {
+                            let parsed: EmailAddress = parsed;
+                            param_domain = parsed.domain;
+                            param_addr_urlencoded =
+                                utf8_percent_encode(&param.addr, NON_ALPHANUMERIC).to_string();
+                            true
+                        } else {
+                            error!(context, "Bad email-address.");
+                            false
+                        }
+                    }
+                    // Step 2: Autoconfig
+                    4 => {
+                        progress!(context, 200);
+                        if param.mail_server.is_empty()
+                            && param.mail_port == 0
+                            /*&&param.mail_user.is_empty() -- the user can enter a loginname which is used by autoconfig then */
+                            && param.send_server.is_empty()
+                            && param.send_port == 0
+                            && param.send_user.is_empty()
+                            /*&&param.send_pw.is_empty() -- the password cannot be auto-configured and is no criterion for autoconfig or not */
+                            && param.server_flags & !0x2 == 0
+                        {
+                            keep_flags = param.server_flags & 0x2;
+                        } else {
+                            // Autoconfig is not needed so skip it.
+                            step_counter = STEP_3_INDEX - 1;
+                        }
+                        true
+                    }
+                    /* A.  Search configurations from the domain used in the email-address, prefer encrypted */
+                    5 => {
+                        if param_autoconfig.is_none() {
+                            let url = format!(
+                                "https://autoconfig.{}/mail/config-v1.1.xml?emailaddress={}",
+                                param_domain, param_addr_urlencoded
+                            );
+                            param_autoconfig = moz_autoconfigure(context, &url, &param);
+                        }
+                        true
+                    }
+                    6 => {
+                        progress!(context, 300);
+                        if param_autoconfig.is_none() {
+                            // the doc does not mention `emailaddress=`, however, Thunderbird adds it, see https://releases.mozilla.org/pub/thunderbird/ ,  which makes some sense
+                            let url = format!(
+                                            "https://{}/.well-known/autoconfig/mail/config-v1.1.xml?emailaddress={}",
+                                            param_domain,
+                                            param_addr_urlencoded
+                                        );
+                            param_autoconfig = moz_autoconfigure(context, &url, &param);
+                        }
+                        true
+                    }
+                    /* Outlook section start ------------- */
+                    /* Outlook uses always SSL but different domains (this comment describes the next two steps) */
+                    7 => {
+                        progress!(context, 310);
+                        if param_autoconfig.is_none() {
+                            let url = format!(
+                                "https://{}{}/autodiscover/autodiscover.xml",
+                                "", param_domain
+                            );
+                            param_autoconfig = outlk_autodiscover(context, &url, &param);
+                        }
+                        true
+                    }
+                    8 => {
+                        progress!(context, 320);
+                        if param_autoconfig.is_none() {
+                            let url = format!(
+                                "https://{}{}/autodiscover/autodiscover.xml",
+                                "autodiscover.", param_domain
+                            );
+                            param_autoconfig = outlk_autodiscover(context, &url, &param);
+                        }
+                        true
+                    }
+                    /* ----------- Outlook section end */
+                    9 => {
+                        progress!(context, 330);
+                        if param_autoconfig.is_none() {
+                            let url = format!(
+                                "http://autoconfig.{}/mail/config-v1.1.xml?emailaddress={}",
+                                param_domain, param_addr_urlencoded
+                            );
+                            param_autoconfig = moz_autoconfigure(context, &url, &param);
+                        }
+                        true
+                    }
+                    10 => {
+                        progress!(context, 340);
+                        if param_autoconfig.is_none() {
+                            // do not transfer the email-address unencrypted
+                            let url = format!(
+                                "http://{}/.well-known/autoconfig/mail/config-v1.1.xml",
+                                param_domain
+                            );
+                            param_autoconfig = moz_autoconfigure(context, &url, &param);
+                        }
+                        true
+                    }
+                    /* B.  If we have no configuration yet, search configuration in Thunderbird's centeral database */
+                    11 => {
+                        progress!(context, 350);
+                        if param_autoconfig.is_none() {
+                            /* always SSL for Thunderbird's database */
+                            let url =
+                                format!("https://autoconfig.thunderbird.net/v1.1/{}", param_domain);
+                            param_autoconfig = moz_autoconfigure(context, &url, &param);
+                        }
+                        true
+                    }
+                    /* C.  Do we have any result? */
+                    12 => {
+                        progress!(context, 500);
+                        if let Some(ref cfg) = param_autoconfig {
+                            info!(context, "Got autoconfig: {}", &cfg);
+                            if !cfg.mail_user.is_empty() {
+                                param.mail_user = cfg.mail_user.clone();
+                            }
+                            param.mail_server = cfg.mail_server.clone(); /* all other values are always NULL when entering autoconfig */
+                            param.mail_port = cfg.mail_port;
+                            param.send_server = cfg.send_server.clone();
+                            param.send_port = cfg.send_port;
+                            param.send_user = cfg.send_user.clone();
+                            param.server_flags = cfg.server_flags;
+                            /* although param_autoconfig's data are no longer needed from, it is important to keep the object as
+                            we may enter "deep guessing" if we could not read a configuration */
+                        }
+                        param.server_flags |= keep_flags;
+                        true
+                    }
+                    // Step 3: Fill missing fields with defaults
+                    13 => {
+                        // if you move this, don't forget to update STEP_3_INDEX, too
+                        if param.mail_server.is_empty() {
+                            param.mail_server = format!("imap.{}", param_domain,)
+                        }
+                        if param.mail_port == 0 {
+                            param.mail_port = if 0 != param.server_flags & (0x100 | 0x400) {
+                                143
+                            } else {
+                                993
+                            }
+                        }
+                        if param.mail_user.is_empty() {
+                            param.mail_user = param.addr.clone();
+                        }
+                        if param.send_server.is_empty() && !param.mail_server.is_empty() {
+                            param.send_server = param.mail_server.clone();
+                            if param.send_server.starts_with("imap.") {
+                                param.send_server = param.send_server.replacen("imap", "smtp", 1);
+                            }
+                        }
+                        if param.send_port == 0 {
+                            param.send_port =
+                                if 0 != param.server_flags & DC_LP_SMTP_SOCKET_STARTTLS as i32 {
+                                    587
+                                } else if 0 != param.server_flags & DC_LP_SMTP_SOCKET_PLAIN as i32 {
+                                    25
+                                } else {
+                                    465
+                                }
+                        }
+                        if param.send_user.is_empty() && !param.mail_user.is_empty() {
+                            param.send_user = param.mail_user.clone();
+                        }
+                        if param.send_pw.is_empty() && !param.mail_pw.is_empty() {
+                            param.send_pw = param.mail_pw.clone()
+                        }
+                        if !dc_exactly_one_bit_set(param.server_flags & DC_LP_AUTH_FLAGS as i32) {
+                            param.server_flags &= !(DC_LP_AUTH_FLAGS as i32);
+                            param.server_flags |= DC_LP_AUTH_NORMAL as i32
+                        }
+                        if param.mail_security == 0 {
+                            param.mail_security = if param.send_port == 143 {
+                                2 // StartTLS
+                            } else {
+                                1 // SSL/TLS
+                            }
+                        }
+                        if param.send_security == 0 {
+                            param.send_security = match param.send_port {
+                                587 => 2, // StartTLS
+                                25 => 3,  // Plain
+                                _ => 1,   // SSL/TLS
+                            }
+                        }
+                        /* do we have a complete configuration? */
+                        if param.mail_server.is_empty()
+                            || param.mail_port == 0
+                            || param.mail_user.is_empty()
+                            || param.mail_pw.is_empty()
+                            || param.send_server.is_empty()
+                            || param.send_port == 0
+                            || param.send_user.is_empty()
+                            || param.send_pw.is_empty()
+                            || param.server_flags == 0
+                        {
+                            error!(context, "Account settings incomplete.");
+                            false
+                        } else {
+                            true
+                        }
+                    }
+                    14 => {
+                        progress!(context, 600);
+                        /* try to connect to IMAP - if we did not got an autoconfig,
+                        do some further tries with different settings and username variations */
+                        let ok_to_continue8;
+                        let mut username_variation = 0;
+                        loop {
+                            if !(username_variation <= 1) {
+                                ok_to_continue8 = true;
+                                break;
+                            }
+                            info!(context, "Trying: {}", &param);
+
+                            if context.inbox.read().unwrap().connect(context, &param) {
+                                ok_to_continue8 = true;
+                                break;
+                            }
+                            if !param_autoconfig.is_none() {
+                                ok_to_continue8 = false;
+                                break;
+                            }
+                            // probe STARTTLS/993
+                            if s.shall_stop_ongoing {
+                                ok_to_continue8 = false;
+                                break;
+                            }
+                            progress!(context, 650 + username_variation * 30);
+                            param.server_flags &= !(0x100 | 0x200 | 0x400);
+                            param.server_flags |= 0x100;
+                            info!(context, "Trying: {}", &param);
+
+                            if context.inbox.read().unwrap().connect(context, &param) {
+                                ok_to_continue8 = true;
+                                break;
+                            }
+                            // probe STARTTLS/143
+                            if s.shall_stop_ongoing {
+                                ok_to_continue8 = false;
+                                break;
+                            }
+                            progress!(context, 660 + username_variation * 30);
+                            param.mail_port = 143;
+                            info!(context, "Trying: {}", &param);
+
+                            if context.inbox.read().unwrap().connect(context, &param) {
+                                ok_to_continue8 = true;
+                                break;
+                            }
+                            if 0 != username_variation {
+                                ok_to_continue8 = false;
+                                break;
+                            }
+                            // next probe round with only the localpart of the email-address as the loginname
+                            if s.shall_stop_ongoing {
+                                ok_to_continue8 = false;
+                                break;
+                            }
+                            progress!(context, 670 + username_variation * 30);
+                            param.server_flags &= !(0x100 | 0x200 | 0x400);
+                            param.server_flags |= 0x200;
+                            param.mail_port = 993;
+
+                            if let Some(at) = param.mail_user.find('@') {
+                                param.mail_user = param.mail_user.split_at(at).0.to_string();
+                            }
+                            if let Some(at) = param.send_user.find('@') {
+                                param.send_user = param.send_user.split_at(at).0.to_string();
+                            }
+
+                            username_variation += 1
+                        }
+                        if ok_to_continue8 {
+                            // success, so we are connected and should disconnect in cleanup
+                            imap_connected_here = true;
+                        }
+                        ok_to_continue8
+                    }
+                    15 => {
+                        progress!(context, 800);
+                        let success;
+                        /* try to connect to SMTP - if we did not got an autoconfig, the first try was SSL-465 and we do a second try with STARTTLS-587 */
+                        if !context
+                            .smtp
+                            .clone()
+                            .lock()
+                            .unwrap()
+                            .connect(context, &param)
+                        {
+                            if !param_autoconfig.is_none() {
+                                success = false;
+                            } else if s.shall_stop_ongoing {
+                                success = false;
+                            } else {
+                                progress!(context, 850);
+                                param.server_flags &= !(DC_LP_SMTP_SOCKET_FLAGS as i32);
+                                param.server_flags |= DC_LP_SMTP_SOCKET_STARTTLS as i32;
+                                param.send_port = 587;
+                                info!(context, "Trying: {}", &param);
+
+                                if !context
+                                    .smtp
+                                    .clone()
+                                    .lock()
+                                    .unwrap()
+                                    .connect(context, &param)
+                                {
+                                    if s.shall_stop_ongoing {
+                                        success = false;
+                                    } else {
+                                        progress!(context, 860);
+                                        param.server_flags &= !(DC_LP_SMTP_SOCKET_FLAGS as i32);
+                                        param.server_flags |= DC_LP_SMTP_SOCKET_STARTTLS as i32;
+                                        param.send_port = 25;
+                                        info!(context, "Trying: {}", &param);
+
+                                        if !context
+                                            .smtp
+                                            .clone()
+                                            .lock()
+                                            .unwrap()
+                                            .connect(context, &param)
+                                        {
+                                            success = false;
+                                        } else {
+                                            success = true;
+                                        }
+                                    }
+                                } else {
+                                    success = true;
+                                }
+                            }
+                        } else {
+                            success = true;
+                        }
+                        if success {
+                            smtp_connected_here = true;
+                        }
+                        success
+                    }
+                    16 => {
+                        progress!(context, 900);
+                        let flags: libc::c_int = if 0
+                            != context
+                                .sql
+                                .get_config_int(context, "mvbox_watch")
+                                .unwrap_or_else(|| 1)
+                            || 0 != context
+                                .sql
+                                .get_config_int(context, "mvbox_move")
+                                .unwrap_or_else(|| 1)
+                        {
+                            DC_CREATE_MVBOX as i32
+                        } else {
+                            0
+                        };
+                        context
+                            .inbox
+                            .read()
+                            .unwrap()
+                            .configure_folders(context, flags);
+                        true
+                    }
+                    17 => {
+                        progress!(context, 910);
+                        /* configuration success - write back the configured parameters with the "configured_" prefix; also write the "configured"-flag */
+                        param
+                            .save_to_database(
+                                context,
+                                "configured_", /*the trailing underscore is correct*/
+                            )
+                            .ok();
+
+                        context.sql.set_config_bool(context, "configured", true);
+                        true
+                    }
+                    18 => {
+                        progress!(context, 920);
+                        // we generate the keypair just now - we could also postpone this until the first message is sent, however,
+                        // this may result in a unexpected and annoying delay when the user sends his very first message
+                        // (~30 seconds on a Moto G4 play) and might looks as if message sending is always that slow.
+                        e2ee::ensure_secret_key_exists(context);
+                        success = true;
+                        info!(context, "Configure completed.");
+                        progress!(context, 940);
+                        break; // We are done here
+                    }
+
+                    _ => {
+                        error!(context, "Internal error: step counter out of bound",);
+                        break;
+                    }
+                };
+
+                if !success {
+                    break;
+                }
+            }
+        }
+    }
+    if imap_connected_here {
+        context.inbox.read().unwrap().disconnect(context);
+    }
+    if smtp_connected_here {
+        context.smtp.clone().lock().unwrap().disconnect();
+    }
+
+    /*
+    if !success {
+        // disconnect if configure did not succeed
+        if imap_connected_here {
+            // context.inbox.read().unwrap().disconnect(context);
+        }
+        if smtp_connected_here {
+            // context.smtp.clone().lock().unwrap().disconnect();
+        }
+    } else {
+        assert!(imap_connected_here && smtp_connected_here);
+        info!(
+            context,
+            0, "Keeping IMAP/SMTP connections open after successful configuration"
+        );
+    }
+    */
+    if ongoing_allocated_here {
+        dc_free_ongoing(context);
+    }
+
+    progress!(context, if success { 1000 } else { 0 });
+}
+
+/*******************************************************************************
+ * Ongoing process allocation/free/check
+ ******************************************************************************/
+
+pub fn dc_alloc_ongoing(context: &Context) -> bool {
+    if dc_has_ongoing(context) {
+        warn!(context, "There is already another ongoing process running.",);
+
+        false
+    } else {
+        let s_a = context.running_state.clone();
+        let mut s = s_a.write().unwrap();
+
+        s.ongoing_running = true;
+        s.shall_stop_ongoing = false;
+
+        true
+    }
+}
+
+pub fn dc_free_ongoing(context: &Context) {
+    let s_a = context.running_state.clone();
+    let mut s = s_a.write().unwrap();
+
+    s.ongoing_running = false;
+    s.shall_stop_ongoing = true;
+}
+
+fn dc_has_ongoing(context: &Context) -> bool {
+    let s_a = context.running_state.clone();
+    let s = s_a.read().unwrap();
+
+    s.ongoing_running || !s.shall_stop_ongoing
+}
+
+/*******************************************************************************
+ * Connect to configured account
+ ******************************************************************************/
+pub fn dc_connect_to_configured_imap(context: &Context, imap: &Imap) -> libc::c_int {
+    let mut ret_connected = 0;
+
+    if imap.is_connected() {
+        ret_connected = 1
+    } else if context
+        .sql
+        .get_config_int(context, "configured")
+        .unwrap_or_default()
+        == 0
+    {
+        warn!(context, "Not configured, cannot connect.",);
+    } else {
+        let param = LoginParam::from_database(context, "configured_");
+        // the trailing underscore is correct
+
+        if imap.connect(context, &param) {
+            ret_connected = 2;
+        }
+    }
+
+    ret_connected
+}
+
+/*******************************************************************************
+ * Configure a Context
+ ******************************************************************************/
+
+/// Signal an ongoing process to stop.
+pub fn dc_stop_ongoing_process(context: &Context) {
+    let s_a = context.running_state.clone();
+    let mut s = s_a.write().unwrap();
+
+    if s.ongoing_running && !s.shall_stop_ongoing {
+        info!(context, "Signaling the ongoing process to stop ASAP.",);
+        s.shall_stop_ongoing = true;
+    } else {
+        info!(context, "No ongoing process to stop.",);
+    };
+}
+
+pub fn read_autoconf_file(context: &Context, url: &str) -> *mut libc::c_char {
+    info!(context, "Testing {} ...", url);
+
+    match reqwest::Client::new()
+        .get(url)
+        .send()
+        .and_then(|mut res| res.text())
+    {
+        Ok(res) => unsafe { res.strdup() },
+        Err(_err) => {
+            info!(context, "Can\'t read file.",);
+
+            std::ptr::null_mut()
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+
+    use crate::config::*;
+    use crate::configure::dc_job_do_DC_JOB_CONFIGURE_IMAP;
+    use crate::test_utils::*;
+
+    #[test]
+    fn test_no_panic_on_bad_credentials() {
+        let t = dummy_context();
+        t.ctx
+            .set_config(Config::Addr, Some("probably@unexistant.addr"))
+            .unwrap();
+        t.ctx.set_config(Config::MailPw, Some("123456")).unwrap();
+        unsafe {
+            dc_job_do_DC_JOB_CONFIGURE_IMAP(&t.ctx);
+        }
+    }
+}

src/constants.rs

@@ -1,102 +1,124 @@
 //! Constants
-#![allow(non_camel_case_types)]
-use num_traits::{FromPrimitive, ToPrimitive};
-use rusqlite as sql;
-use rusqlite::types::*;
+#![allow(non_camel_case_types, dead_code)]
 
-pub const DC_VERSION_STR: &'static [u8; 14] = b"1.0.0-alpha.3\x00";
+use deltachat_derive::*;
+use lazy_static::lazy_static;
 
-pub const DC_MOVE_STATE_MOVING: u32 = 3;
-pub const DC_MOVE_STATE_STAY: u32 = 2;
-pub const DC_MOVE_STATE_PENDING: u32 = 1;
-pub const DC_MOVE_STATE_UNDEFINED: u32 = 0;
+lazy_static! {
+    pub static ref DC_VERSION_STR: String = env!("CARGO_PKG_VERSION").to_string();
+}
+
+#[repr(u8)]
+#[derive(Debug, Display, Clone, Copy, PartialEq, Eq, FromPrimitive, ToPrimitive, ToSql, FromSql)]
+pub enum MoveState {
+    Undefined = 0,
+    Pending = 1,
+    Stay = 2,
+    Moving = 3,
+}
+
+impl Default for MoveState {
+    fn default() -> Self {
+        MoveState::Undefined
+    }
+}
+
+// some defaults
+const DC_E2EE_DEFAULT_ENABLED: i32 = 1;
+pub const DC_MDNS_DEFAULT_ENABLED: i32 = 1;
+const DC_INBOX_WATCH_DEFAULT: i32 = 1;
+const DC_SENTBOX_WATCH_DEFAULT: i32 = 1;
+const DC_MVBOX_WATCH_DEFAULT: i32 = 1;
+const DC_MVBOX_MOVE_DEFAULT: i32 = 1;
+
+#[derive(Debug, Display, Clone, Copy, PartialEq, Eq, FromPrimitive, ToPrimitive, FromSql, ToSql)]
+#[repr(u8)]
+pub enum Blocked {
+    Not = 0,
+    Manually = 1,
+    Deaddrop = 2,
+}
+
+impl Default for Blocked {
+    fn default() -> Self {
+        Blocked::Not
+    }
+}
+
+pub const DC_IMAP_SEEN: u32 = 0x1;
+
+pub const DC_HANDSHAKE_CONTINUE_NORMAL_PROCESSING: i32 = 0x01;
+pub const DC_HANDSHAKE_STOP_NORMAL_PROCESSING: i32 = 0x02;
+pub const DC_HANDSHAKE_ADD_DELETE_JOB: i32 = 0x04;
 
 pub const DC_GCL_ARCHIVED_ONLY: usize = 0x01;
 pub const DC_GCL_NO_SPECIALS: usize = 0x02;
 pub const DC_GCL_ADD_ALLDONE_HINT: usize = 0x04;
 
-pub const DC_GCM_ADDDAYMARKER: usize = 0x01;
+const DC_GCM_ADDDAYMARKER: usize = 0x01;
 
 pub const DC_GCL_VERIFIED_ONLY: usize = 0x01;
 pub const DC_GCL_ADD_SELF: usize = 0x02;
 
-/// param1 is a directory where the keys are written to
-pub const DC_IMEX_EXPORT_SELF_KEYS: usize = 1;
-/// param1 is a directory where the keys are searched in and read from
-pub const DC_IMEX_IMPORT_SELF_KEYS: usize = 2;
-/// param1 is a directory where the backup is written to
-pub const DC_IMEX_EXPORT_BACKUP: usize = 11;
-/// param1 is the file with the backup to import
-pub const DC_IMEX_IMPORT_BACKUP: usize = 12;
-
-/// id=contact
-pub const DC_QR_ASK_VERIFYCONTACT: usize = 200;
-/// text1=groupname
-pub const DC_QR_ASK_VERIFYGROUP: usize = 202;
-/// id=contact
-pub const DC_QR_FPR_OK: usize = 210;
-/// id=contact
-pub const DC_QR_FPR_MISMATCH: usize = 220;
-/// test1=formatted fingerprint
-pub const DC_QR_FPR_WITHOUT_ADDR: usize = 230;
-/// id=contact
-pub const DC_QR_ADDR: usize = 320;
-/// text1=text
-pub const DC_QR_TEXT: usize = 330;
-/// text1=URL
-pub const DC_QR_URL: usize = 332;
-/// text1=error string
-pub const DC_QR_ERROR: usize = 400;
+// values for DC_PARAM_FORCE_PLAINTEXT
+pub(crate) const DC_FP_NO_AUTOCRYPT_HEADER: i32 = 2;
+pub(crate) const DC_FP_ADD_AUTOCRYPT_HEADER: i32 = 1;
 
 /// virtual chat showing all messages belonging to chats flagged with chats.blocked=2
-pub const DC_CHAT_ID_DEADDROP: usize = 1;
+pub(crate) const DC_CHAT_ID_DEADDROP: u32 = 1;
 /// messages that should be deleted get this chat_id; the messages are deleted from the working thread later then. This is also needed as rfc724_mid should be preset as long as the message is not deleted on the server (otherwise it is downloaded again)
-pub const DC_CHAT_ID_TRASH: usize = 3;
+pub const DC_CHAT_ID_TRASH: u32 = 3;
 /// a message is just in creation but not yet assigned to a chat (eg. we may need the message ID to set up blobs; this avoids unready message to be sent and shown)
-pub const DC_CHAT_ID_MSGS_IN_CREATION: usize = 4;
+const DC_CHAT_ID_MSGS_IN_CREATION: u32 = 4;
 /// virtual chat showing all messages flagged with msgs.starred=2
-pub const DC_CHAT_ID_STARRED: usize = 5;
+pub const DC_CHAT_ID_STARRED: u32 = 5;
 /// only an indicator in a chatlist
-pub const DC_CHAT_ID_ARCHIVED_LINK: usize = 6;
+pub const DC_CHAT_ID_ARCHIVED_LINK: u32 = 6;
 /// only an indicator in a chatlist
-pub const DC_CHAT_ID_ALLDONE_HINT: usize = 7;
+pub const DC_CHAT_ID_ALLDONE_HINT: u32 = 7;
 /// larger chat IDs are "real" chats, their messages are "real" messages.
-pub const DC_CHAT_ID_LAST_SPECIAL: usize = 9;
+pub const DC_CHAT_ID_LAST_SPECIAL: u32 = 9;
 
-pub const DC_CHAT_TYPE_UNDEFINED: i32 = 0;
-pub const DC_CHAT_TYPE_SINGLE: i32 = 100;
-pub const DC_CHAT_TYPE_GROUP: i32 = 120;
-pub const DC_CHAT_TYPE_VERIFIED_GROUP: i32 = 130;
+#[derive(
+    Debug,
+    Display,
+    Clone,
+    Copy,
+    PartialEq,
+    Eq,
+    FromPrimitive,
+    ToPrimitive,
+    FromSql,
+    ToSql,
+    IntoStaticStr,
+)]
+#[repr(u32)]
+pub enum Chattype {
+    Undefined = 0,
+    Single = 100,
+    Group = 120,
+    VerifiedGroup = 130,
+}
 
-pub const DC_MSG_ID_MARKER1: usize = 1;
-pub const DC_MSG_ID_DAYMARKER: usize = 9;
-pub const DC_MSG_ID_LAST_SPECIAL: usize = 9;
+impl Default for Chattype {
+    fn default() -> Self {
+        Chattype::Undefined
+    }
+}
 
-pub const DC_STATE_UNDEFINED: i32 = 0;
-pub const DC_STATE_IN_FRESH: i32 = 10;
-pub const DC_STATE_IN_NOTICED: i32 = 13;
-pub const DC_STATE_IN_SEEN: i32 = 16;
-pub const DC_STATE_OUT_PREPARING: i32 = 18;
-pub const DC_STATE_OUT_DRAFT: i32 = 19;
-pub const DC_STATE_OUT_PENDING: i32 = 20;
-pub const DC_STATE_OUT_FAILED: i32 = 24;
-/// to check if a mail was sent, use dc_msg_is_sent()
-pub const DC_STATE_OUT_DELIVERED: i32 = 26;
-pub const DC_STATE_OUT_MDN_RCVD: i32 = 28;
+pub const DC_MSG_ID_MARKER1: u32 = 1;
+const DC_MSG_ID_DAYMARKER: u32 = 9;
+pub const DC_MSG_ID_LAST_SPECIAL: u32 = 9;
 
 /// approx. max. length returned by dc_msg_get_text()
-pub const DC_MAX_GET_TEXT_LEN: usize = 30000;
+const DC_MAX_GET_TEXT_LEN: usize = 30000;
 /// approx. max. length returned by dc_get_msg_info()
-pub const DC_MAX_GET_INFO_LEN: usize = 100000;
+const DC_MAX_GET_INFO_LEN: usize = 100000;
 
-pub const DC_CONTACT_ID_UNDEFINED: usize = 0;
-pub const DC_CONTACT_ID_SELF: usize = 1;
-pub const DC_CONTACT_ID_DEVICE: usize = 2;
-pub const DC_CONTACT_ID_LAST_SPECIAL: usize = 9;
-
-pub const DC_TEXT1_DRAFT: usize = 1;
-pub const DC_TEXT1_USERNAME: usize = 2;
-pub const DC_TEXT1_SELF: usize = 3;
+pub const DC_CONTACT_ID_UNDEFINED: u32 = 0;
+pub const DC_CONTACT_ID_SELF: u32 = 1;
+pub const DC_CONTACT_ID_DEVICE: u32 = 2;
+pub const DC_CONTACT_ID_LAST_SPECIAL: u32 = 9;
 
 pub const DC_CREATE_MVBOX: usize = 1;
 
@@ -106,7 +128,7 @@ pub const DC_CREATE_MVBOX: usize = 1;
 // via dc_set_config() using the key "server_flags".
 
 /// Force OAuth2 authorization. This flag does not skip automatic configuration.
-/// Before calling dc_configure() with DC_LP_AUTH_OAUTH2 set,
+/// Before calling configure() with DC_LP_AUTH_OAUTH2 set,
 /// the user has to confirm access at the URL returned by dc_get_oauth2_url().
 pub const DC_LP_AUTH_OAUTH2: usize = 0x2;
 
@@ -147,7 +169,13 @@ pub const DC_LP_IMAP_SOCKET_FLAGS: usize =
 pub const DC_LP_SMTP_SOCKET_FLAGS: usize =
     (DC_LP_SMTP_SOCKET_STARTTLS | DC_LP_SMTP_SOCKET_SSL | DC_LP_SMTP_SOCKET_PLAIN);
 
-#[derive(Debug, Display, Clone, Copy, PartialEq, Eq, FromPrimitive, ToPrimitive)]
+// QR code scanning (view from Bob, the joiner)
+pub const DC_VC_AUTH_REQUIRED: i32 = 2;
+pub const DC_VC_CONTACT_CONFIRM: i32 = 6;
+pub const DC_BOB_ERROR: i32 = 0;
+pub const DC_BOB_SUCCESS: i32 = 1;
+
+#[derive(Debug, Display, Clone, Copy, PartialEq, Eq, FromPrimitive, ToPrimitive, FromSql, ToSql)]
 #[repr(i32)]
 pub enum Viewtype {
     Unknown = 0,
@@ -192,6 +220,12 @@ pub enum Viewtype {
     File = 60,
 }
 
+impl Default for Viewtype {
+    fn default() -> Self {
+        Viewtype::Unknown
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -202,323 +236,70 @@ mod tests {
     }
 }
 
-impl ToSql for Viewtype {
-    fn to_sql(&self) -> sql::Result<ToSqlOutput> {
-        let num: i64 = self
-            .to_i64()
-            .expect("impossible: Viewtype -> i64 conversion failed");
-
-        Ok(ToSqlOutput::Owned(Value::Integer(num)))
-    }
-}
-
-impl FromSql for Viewtype {
-    fn column_result(col: ValueRef) -> FromSqlResult<Self> {
-        let inner = FromSql::column_result(col)?;
-        FromPrimitive::from_i64(inner).ok_or(FromSqlError::InvalidType)
-    }
-}
-
 // These constants are used as events
 // reported to the callback given to dc_context_new().
 // If you do not want to handle an event, it is always safe to return 0,
 // so there is no need to add a "case" for every event.
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, FromPrimitive, ToPrimitive)]
-#[repr(u32)]
-pub enum Event {
-    /// The library-user may write an informational string to the log.
-    /// Passed to the callback given to dc_context_new().
-    /// This event should not be reported to the end-user using a popup or something like that.
-    /// @param data1 0
-    /// @param data2 (const char*) Info string in english language.
-    ///     Must not be free()'d or modified and is valid only until the callback returns.
-    /// @return 0
-    INFO = 100,
-
-    /// Emitted when SMTP connection is established and login was successful.
-    ///
-    /// @param data1 0
-    /// @param data2 (const char*) Info string in english language.
-    ///     Must not be free()'d or modified and is valid only until the callback returns.
-    /// @return 0
-    SMTP_CONNECTED = 101,
-
-    /// Emitted when IMAP connection is established and login was successful.
-    ///
-    /// @param data1 0
-    /// @param data2 (const char*) Info string in english language.
-    ///     Must not be free()'d or modified and is valid only until the callback returns.
-    /// @return 0
-    IMAP_CONNECTED = 102,
-
-    /// Emitted when a message was successfully sent to the SMTP server.
-    ///
-    /// @param data1 0
-    /// @param data2 (const char*) Info string in english language.
-    ///     Must not be free()'d or modified and is valid only until the callback returns.
-    /// @return 0
-    SMTP_MESSAGE_SENT = 103,
-
-    /// The library-user should write a warning string to the log.
-    /// Passed to the callback given to dc_context_new().
-    ///
-    /// This event should not be reported to the end-user using a popup or something like that.
-    ///
-    /// @param data1 0
-    /// @param data2 (const char*) Warning string in english language.
-    ///     Must not be free()'d or modified and is valid only until the callback returns.
-    /// @return 0
-    WARNING = 300,
-
-    /// The library-user should report an error to the end-user.
-    /// Passed to the callback given to dc_context_new().
-    ///
-    /// As most things are asynchronous, things may go wrong at any time and the user
-    /// should not be disturbed by a dialog or so.  Instead, use a bubble or so.
-    ///
-    /// However, for ongoing processes (eg. dc_configure())
-    /// or for functions that are expected to fail (eg. dc_continue_key_transfer())
-    /// it might be better to delay showing these events until the function has really
-    /// failed (returned false). It should be sufficient to report only the _last_ error
-    /// in a messasge box then.
-    ///
-    /// @param data1 0
-    /// @param data2 (const char*) Error string, always set, never NULL. Frequent error strings are
-    ///     localized using #DC_EVENT_GET_STRING, however, most error strings will be in english language.
-    ///     Must not be free()'d or modified and is valid only until the callback returns.
-    /// @return 0
-    ERROR = 400,
-
-    /// An action cannot be performed because there is no network available.
-    ///
-    /// The library will typically try over after a some time
-    /// and when dc_maybe_network() is called.
-    ///
-    /// Network errors should be reported to users in a non-disturbing way,
-    /// however, as network errors may come in a sequence,
-    /// it is not useful to raise each an every error to the user.
-    /// For this purpose, data1 is set to 1 if the error is probably worth reporting.
-    ///
-    /// Moreover, if the UI detects that the device is offline,
-    /// it is probably more useful to report this to the user
-    /// instead of the string from data2.
-    ///
-    /// @param data1 (int) 1=first/new network error, should be reported the user;
-    ///     0=subsequent network error, should be logged only
-    /// @param data2 (const char*) Error string, always set, never NULL.
-    ///     Must not be free()'d or modified and is valid only until the callback returns.
-    /// @return 0
-    ERROR_NETWORK = 401,
-
-    /// An action cannot be performed because the user is not in the group.
-    /// Reported eg. after a call to
-    /// dc_set_chat_name(), dc_set_chat_profile_image(),
-    /// dc_add_contact_to_chat(), dc_remove_contact_from_chat(),
-    /// dc_send_text_msg() or another sending function.
-    ///
-    /// @param data1 0
-    /// @param data2 (const char*) Info string in english language.
-    ///     Must not be free()'d or modified
-    ///     and is valid only until the callback returns.
-    /// @return 0
-    ERROR_SELF_NOT_IN_GROUP = 410,
-
-    /// Messages or chats changed.  One or more messages or chats changed for various
-    /// reasons in the database:
-    /// - Messages sent, received or removed
-    /// - Chats created, deleted or archived
-    /// - A draft has been set
-    ///
-    /// @param data1 (int) chat_id for single added messages
-    /// @param data2 (int) msg_id for single added messages
-    /// @return 0
-    MSGS_CHANGED = 2000,
-
-    /// There is a fresh message. Typically, the user will show an notification
-    /// when receiving this message.
-    ///
-    /// There is no extra #DC_EVENT_MSGS_CHANGED event send together with this event.
-    ///
-    /// @param data1 (int) chat_id
-    /// @param data2 (int) msg_id
-    /// @return 0
-    INCOMING_MSG = 2005,
-
-    /// A single message is sent successfully. State changed from  DC_STATE_OUT_PENDING to
-    /// DC_STATE_OUT_DELIVERED, see dc_msg_get_state().
-    ///
-    /// @param data1 (int) chat_id
-    /// @param data2 (int) msg_id
-    /// @return 0
-    MSG_DELIVERED = 2010,
-
-    /// A single message could not be sent. State changed from DC_STATE_OUT_PENDING or DC_STATE_OUT_DELIVERED to
-    /// DC_STATE_OUT_FAILED, see dc_msg_get_state().
-    ///
-    /// @param data1 (int) chat_id
-    /// @param data2 (int) msg_id
-    /// @return 0
-    MSG_FAILED = 2012,
-
-    /// A single message is read by the receiver. State changed from DC_STATE_OUT_DELIVERED to
-    /// DC_STATE_OUT_MDN_RCVD, see dc_msg_get_state().
-    ///
-    /// @param data1 (int) chat_id
-    /// @param data2 (int) msg_id
-    /// @return 0
-    MSG_READ = 2015,
-
-    /// Chat changed.  The name or the image of a chat group was changed or members were added or removed.
-    /// Or the verify state of a chat has changed.
-    /// See dc_set_chat_name(), dc_set_chat_profile_image(), dc_add_contact_to_chat()
-    /// and dc_remove_contact_from_chat().
-    ///
-    /// @param data1 (int) chat_id
-    /// @param data2 0
-    /// @return 0
-    CHAT_MODIFIED = 2020,
-
-    /// Contact(s) created, renamed, blocked or deleted.
-    ///
-    /// @param data1 (int) If not 0, this is the contact_id of an added contact that should be selected.
-    /// @param data2 0
-    /// @return 0
-    CONTACTS_CHANGED = 2030,
-
-    /// Location of one or more contact has changed.
-    ///
-    /// @param data1 (int) contact_id of the contact for which the location has changed.
-    ///     If the locations of several contacts have been changed,
-    ///     eg. after calling dc_delete_all_locations(), this parameter is set to 0.
-    /// @param data2 0
-    /// @return 0
-    LOCATION_CHANGED = 2035,
-
-    /// Inform about the configuration progress started by dc_configure().
-    ///
-    /// @param data1 (int) 0=error, 1-999=progress in permille, 1000=success and done
-    /// @param data2 0
-    /// @return 0
-    CONFIGURE_PROGRESS = 2041,
-
-    /// Inform about the import/export progress started by dc_imex().
-    ///
-    /// @param data1 (int) 0=error, 1-999=progress in permille, 1000=success and done
-    /// @param data2 0
-    /// @return 0
-    IMEX_PROGRESS = 2051,
-
-    /// A file has been exported. A file has been written by dc_imex().
-    /// This event may be sent multiple times by a single call to dc_imex().
-    ///
-    /// A typical purpose for a handler of this event may be to make the file public to some system
-    /// services.
-    ///
-    /// @param data1 (const char*) Path and file name.
-    ///     Must not be free()'d or modified and is valid only until the callback returns.
-    /// @param data2 0
-    /// @return 0
-    IMEX_FILE_WRITTEN = 2052,
-
-    /// Progress information of a secure-join handshake from the view of the inviter
-    /// (Alice, the person who shows the QR code).
-    ///
-    /// These events are typically sent after a joiner has scanned the QR code
-    /// generated by dc_get_securejoin_qr().
-    ///
-    /// @param data1 (int) ID of the contact that wants to join.
-    /// @param data2 (int) Progress as:
-    ///     300=vg-/vc-request received, typically shown as "bob@addr joins".
-    ///     600=vg-/vc-request-with-auth received, vg-member-added/vc-contact-confirm sent, typically shown as "bob@addr verified".
-    ///     800=vg-member-added-received received, shown as "bob@addr securely joined GROUP", only sent for the verified-group-protocol.
-    ///     1000=Protocol finished for this contact.
-    /// @return 0
-    SECUREJOIN_INVITER_PROGRESS = 2060,
-
-    /// Progress information of a secure-join handshake from the view of the joiner
-    /// (Bob, the person who scans the QR code).
-    /// The events are typically sent while dc_join_securejoin(), which
-    /// may take some time, is executed.
-    /// @param data1 (int) ID of the inviting contact.
-    /// @param data2 (int) Progress as:
-    ///     400=vg-/vc-request-with-auth sent, typically shown as "alice@addr verified, introducing myself."
-    ///     (Bob has verified alice and waits until Alice does the same for him)
-    /// @return 0
-    SECUREJOIN_JOINER_PROGRESS = 2061,
-
-    // the following events are functions that should be provided by the frontends
-    /// Requeste a localized string from the frontend.
-    /// @param data1 (int) ID of the string to request, one of the DC_STR_/// constants.
-    /// @param data2 (int) The count. If the requested string contains a placeholder for a numeric value,
-    ///     the ui may use this value to return different strings on different plural forms.
-    /// @return (const char*) Null-terminated UTF-8 string.
-    ///     The string will be free()'d by the core,
-    ///     so it must be allocated using malloc() or a compatible function.
-    ///     Return 0 if the ui cannot provide the requested string
-    ///     the core will use a default string in english language then.
-    GET_STRING = 2091,
-}
-
-pub const DC_EVENT_FILE_COPIED: usize = 2055; // deprecated;
-pub const DC_EVENT_IS_OFFLINE: usize = 2081; // deprecated;
-pub const DC_ERROR_SEE_STRING: usize = 0; // deprecated;
-pub const DC_ERROR_SELF_NOT_IN_GROUP: usize = 1; // deprecated;
-pub const DC_STR_SELFNOTINGRP: usize = 21; // deprecated;
+const DC_EVENT_FILE_COPIED: usize = 2055; // deprecated;
+const DC_EVENT_IS_OFFLINE: usize = 2081; // deprecated;
+const DC_ERROR_SEE_STRING: usize = 0; // deprecated;
+const DC_ERROR_SELF_NOT_IN_GROUP: usize = 1; // deprecated;
+const DC_STR_SELFNOTINGRP: usize = 21; // deprecated;
 
 /// Values for dc_get|set_config("show_emails")
-pub const DC_SHOW_EMAILS_OFF: usize = 0;
-pub const DC_SHOW_EMAILS_ACCEPTED_CONTACTS: usize = 1;
-pub const DC_SHOW_EMAILS_ALL: usize = 2;
+const DC_SHOW_EMAILS_OFF: usize = 0;
+const DC_SHOW_EMAILS_ACCEPTED_CONTACTS: usize = 1;
+const DC_SHOW_EMAILS_ALL: usize = 2;
 
 // TODO: Strings need some doumentation about used placeholders.
 // These constants are used to request strings using #DC_EVENT_GET_STRING.
 
-pub const DC_STR_NOMESSAGES: usize = 1;
-pub const DC_STR_SELF: usize = 2;
-pub const DC_STR_DRAFT: usize = 3;
-pub const DC_STR_MEMBER: usize = 4;
-pub const DC_STR_CONTACT: usize = 6;
-pub const DC_STR_VOICEMESSAGE: usize = 7;
-pub const DC_STR_DEADDROP: usize = 8;
-pub const DC_STR_IMAGE: usize = 9;
-pub const DC_STR_VIDEO: usize = 10;
-pub const DC_STR_AUDIO: usize = 11;
-pub const DC_STR_FILE: usize = 12;
-pub const DC_STR_STATUSLINE: usize = 13;
-pub const DC_STR_NEWGROUPDRAFT: usize = 14;
-pub const DC_STR_MSGGRPNAME: usize = 15;
-pub const DC_STR_MSGGRPIMGCHANGED: usize = 16;
-pub const DC_STR_MSGADDMEMBER: usize = 17;
-pub const DC_STR_MSGDELMEMBER: usize = 18;
-pub const DC_STR_MSGGROUPLEFT: usize = 19;
-pub const DC_STR_GIF: usize = 23;
-pub const DC_STR_ENCRYPTEDMSG: usize = 24;
-pub const DC_STR_E2E_AVAILABLE: usize = 25;
-pub const DC_STR_ENCR_TRANSP: usize = 27;
-pub const DC_STR_ENCR_NONE: usize = 28;
-pub const DC_STR_CANTDECRYPT_MSG_BODY: usize = 29;
-pub const DC_STR_FINGERPRINTS: usize = 30;
-pub const DC_STR_READRCPT: usize = 31;
-pub const DC_STR_READRCPT_MAILBODY: usize = 32;
-pub const DC_STR_MSGGRPIMGDELETED: usize = 33;
-pub const DC_STR_E2E_PREFERRED: usize = 34;
-pub const DC_STR_CONTACT_VERIFIED: usize = 35;
-pub const DC_STR_CONTACT_NOT_VERIFIED: usize = 36;
-pub const DC_STR_CONTACT_SETUP_CHANGED: usize = 37;
-pub const DC_STR_ARCHIVEDCHATS: usize = 40;
-pub const DC_STR_STARREDMSGS: usize = 41;
-pub const DC_STR_AC_SETUP_MSG_SUBJECT: usize = 42;
-pub const DC_STR_AC_SETUP_MSG_BODY: usize = 43;
-pub const DC_STR_SELFTALK_SUBTITLE: usize = 50;
-pub const DC_STR_CANNOT_LOGIN: usize = 60;
-pub const DC_STR_SERVER_RESPONSE: usize = 61;
-pub const DC_STR_MSGACTIONBYUSER: usize = 62;
-pub const DC_STR_MSGACTIONBYME: usize = 63;
-pub const DC_STR_MSGLOCATIONENABLED: usize = 64;
-pub const DC_STR_MSGLOCATIONDISABLED: usize = 65;
-pub const DC_STR_LOCATION: usize = 66;
-pub const DC_STR_COUNT: usize = 66;
+const DC_STR_NOMESSAGES: usize = 1;
+const DC_STR_SELF: usize = 2;
+const DC_STR_DRAFT: usize = 3;
+const DC_STR_MEMBER: usize = 4;
+const DC_STR_CONTACT: usize = 6;
+const DC_STR_VOICEMESSAGE: usize = 7;
+const DC_STR_DEADDROP: usize = 8;
+const DC_STR_IMAGE: usize = 9;
+const DC_STR_VIDEO: usize = 10;
+const DC_STR_AUDIO: usize = 11;
+const DC_STR_FILE: usize = 12;
+const DC_STR_STATUSLINE: usize = 13;
+const DC_STR_NEWGROUPDRAFT: usize = 14;
+const DC_STR_MSGGRPNAME: usize = 15;
+const DC_STR_MSGGRPIMGCHANGED: usize = 16;
+const DC_STR_MSGADDMEMBER: usize = 17;
+const DC_STR_MSGDELMEMBER: usize = 18;
+const DC_STR_MSGGROUPLEFT: usize = 19;
+const DC_STR_GIF: usize = 23;
+const DC_STR_ENCRYPTEDMSG: usize = 24;
+const DC_STR_E2E_AVAILABLE: usize = 25;
+const DC_STR_ENCR_TRANSP: usize = 27;
+const DC_STR_ENCR_NONE: usize = 28;
+const DC_STR_CANTDECRYPT_MSG_BODY: usize = 29;
+const DC_STR_FINGERPRINTS: usize = 30;
+const DC_STR_READRCPT: usize = 31;
+const DC_STR_READRCPT_MAILBODY: usize = 32;
+const DC_STR_MSGGRPIMGDELETED: usize = 33;
+const DC_STR_E2E_PREFERRED: usize = 34;
+const DC_STR_CONTACT_VERIFIED: usize = 35;
+const DC_STR_CONTACT_NOT_VERIFIED: usize = 36;
+const DC_STR_CONTACT_SETUP_CHANGED: usize = 37;
+const DC_STR_ARCHIVEDCHATS: usize = 40;
+const DC_STR_STARREDMSGS: usize = 41;
+const DC_STR_AC_SETUP_MSG_SUBJECT: usize = 42;
+const DC_STR_AC_SETUP_MSG_BODY: usize = 43;
+const DC_STR_SELFTALK_SUBTITLE: usize = 50;
+const DC_STR_CANNOT_LOGIN: usize = 60;
+const DC_STR_SERVER_RESPONSE: usize = 61;
+const DC_STR_MSGACTIONBYUSER: usize = 62;
+const DC_STR_MSGACTIONBYME: usize = 63;
+const DC_STR_MSGLOCATIONENABLED: usize = 64;
+const DC_STR_MSGLOCATIONDISABLED: usize = 65;
+const DC_STR_LOCATION: usize = 66;
+const DC_STR_COUNT: usize = 66;
 
 pub const DC_JOB_DELETE_MSG_ON_IMAP: i32 = 110;
 
@@ -528,12 +309,3 @@ pub enum KeyType {
     Public = 0,
     Private = 1,
 }
-
-pub const DC_CMD_GROUPNAME_CHANGED: libc::c_int = 2;
-pub const DC_CMD_GROUPIMAGE_CHANGED: libc::c_int = 3;
-pub const DC_CMD_MEMBER_ADDED_TO_GROUP: libc::c_int = 4;
-pub const DC_CMD_MEMBER_REMOVED_FROM_GROUP: libc::c_int = 5;
-pub const DC_CMD_AUTOCRYPT_SETUP_MESSAGE: libc::c_int = 6;
-pub const DC_CMD_SECUREJOIN_MESSAGE: libc::c_int = 7;
-pub const DC_CMD_LOCATION_STREAMING_ENABLED: libc::c_int = 8;
-pub const DC_CMD_LOCATION_ONLY: libc::c_int = 9;

src/contact.rs

@@ -1,24 +1,23 @@
+use std::path::PathBuf;
+
+use deltachat_derive::*;
 use itertools::Itertools;
-use num_traits::{FromPrimitive, ToPrimitive};
 use rusqlite;
-use rusqlite::types::*;
 
 use crate::aheader::EncryptPreference;
 use crate::config::Config;
 use crate::constants::*;
 use crate::context::Context;
-use crate::dc_array::*;
-use crate::dc_e2ee::*;
-use crate::dc_loginparam::*;
 use crate::dc_tools::*;
+use crate::e2ee;
 use crate::error::Result;
+use crate::events::Event;
 use crate::key::*;
+use crate::login_param::LoginParam;
+use crate::message::MessageState;
 use crate::peerstate::*;
 use crate::sql;
 use crate::stock::StockMessage;
-use crate::types::*;
-
-const DC_GCL_VERIFIED_ONLY: u32 = 0x01;
 
 /// Contacts with at least this origin value are shown in the contact list.
 const DC_ORIGIN_MIN_CONTACT_LIST: i32 = 0x100;
@@ -33,8 +32,8 @@ const DC_ORIGIN_MIN_CONTACT_LIST: i32 = 0x100;
 /// For this purpose, internally, two names are tracked -
 /// authorized-name and given-name.
 /// By default, these names are equal, but functions working with contact names
-pub struct Contact<'a> {
-    context: &'a Context,
+#[derive(Debug)]
+pub struct Contact {
     /// The contact ID.
     ///
     /// Special message IDs:
@@ -60,7 +59,9 @@ pub struct Contact<'a> {
 }
 
 /// Possible origins of a contact.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, FromPrimitive, ToPrimitive)]
+#[derive(
+    Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, FromPrimitive, ToPrimitive, FromSql, ToSql,
+)]
 #[repr(i32)]
 pub enum Origin {
     Unknown = 0,
@@ -98,20 +99,9 @@ pub enum Origin {
     ManuallyCreated = 0x4000000,
 }
 
-impl ToSql for Origin {
-    fn to_sql(&self) -> rusqlite::Result<ToSqlOutput> {
-        let num: i64 = self
-            .to_i64()
-            .expect("impossible: Origin -> i64 conversion failed");
-
-        Ok(ToSqlOutput::Owned(Value::Integer(num)))
-    }
-}
-
-impl FromSql for Origin {
-    fn column_result(col: ValueRef) -> FromSqlResult<Self> {
-        let inner = FromSql::column_result(col)?;
-        FromPrimitive::from_i64(inner).ok_or(FromSqlError::InvalidType)
+impl Default for Origin {
+    fn default() -> Self {
+        Origin::Unknown
     }
 }
 
@@ -139,7 +129,7 @@ pub enum Modifier {
     Created,
 }
 
-#[derive(Debug, PartialEq, Eq, Clone, Copy)]
+#[derive(Debug, PartialEq, Eq, Clone, Copy, FromPrimitive)]
 #[repr(u8)]
 pub enum VerifiedStatus {
     /// Contact is not verified.
@@ -150,11 +140,10 @@ pub enum VerifiedStatus {
     BidirectVerified = 2,
 }
 
-impl<'a> Contact<'a> {
-    pub fn load_from_db(context: &'a Context, contact_id: u32) -> Result<Self> {
-        if contact_id == DC_CONTACT_ID_SELF as u32 {
+impl Contact {
+    pub fn load_from_db(context: &Context, contact_id: u32) -> Result<Self> {
+        if contact_id == DC_CONTACT_ID_SELF {
             let contact = Contact {
-                context,
                 id: contact_id,
                 name: context.stock_str(StockMessage::SelfMsg).into(),
                 authname: "".into(),
@@ -173,7 +162,6 @@ impl<'a> Contact<'a> {
             params![contact_id as i32],
             |row| {
                 let contact = Self {
-                    context,
                     id: contact_id,
                     name: row.get::<_, String>(0)?,
                     authname: row.get::<_, String>(4)?,
@@ -192,7 +180,7 @@ impl<'a> Contact<'a> {
     }
 
     /// Check if a contact is blocked.
-    pub fn is_blocked_load(context: &'a Context, id: u32) -> bool {
+    pub fn is_blocked_load(context: &Context, id: u32) -> bool {
         Self::load_from_db(context, id)
             .map(|contact| contact.blocked)
             .unwrap_or_default()
@@ -226,15 +214,13 @@ impl<'a> Contact<'a> {
         let (contact_id, sth_modified) =
             Contact::add_or_lookup(context, name, addr, Origin::ManuallyCreated)?;
         let blocked = Contact::is_blocked_load(context, contact_id);
-        context.call_cb(
-            Event::CONTACTS_CHANGED,
-            (if sth_modified == Modifier::Created {
-                contact_id
+        context.call_cb(Event::ContactsChanged(
+            if sth_modified == Modifier::Created {
+                Some(contact_id)
             } else {
-                0
-            }) as uintptr_t,
-            0 as uintptr_t,
-        );
+                None
+            },
+        ));
         if blocked {
             Contact::unblock(context, contact_id);
         }
@@ -251,11 +237,14 @@ impl<'a> Contact<'a> {
             context,
             &context.sql,
             "UPDATE msgs SET state=? WHERE from_id=? AND state=?;",
-            params![DC_STATE_IN_NOTICED, id as i32, DC_STATE_IN_FRESH],
+            params![MessageState::InNoticed, id as i32, MessageState::InFresh],
         )
         .is_ok()
         {
-            context.call_cb(Event::MSGS_CHANGED, 0, 0);
+            context.call_cb(Event::MsgsChanged {
+                chat_id: 0,
+                msg_id: 0,
+            });
         }
     }
 
@@ -278,7 +267,7 @@ impl<'a> Contact<'a> {
             return 1;
         }
 
-        context.sql.query_row_col(
+        context.sql.query_get_value(
             context,
             "SELECT id FROM contacts WHERE addr=?1 COLLATE NOCASE AND id>?2 AND origin>=?3 AND blocked=0;",
             params![
@@ -286,7 +275,6 @@ impl<'a> Contact<'a> {
                 DC_CONTACT_ID_LAST_SPECIAL as i32,
                 DC_ORIGIN_MIN_CONTACT_LIST,
             ],
-            0
         ).unwrap_or_default()
     }
 
@@ -319,7 +307,6 @@ impl<'a> Contact<'a> {
         if !may_be_valid_addr(&addr) {
             warn!(
                 context,
-                0,
                 "Bad address \"{}\" for contact \"{}\".",
                 addr,
                 if !name.as_ref().is_empty() {
@@ -328,7 +315,7 @@ impl<'a> Contact<'a> {
                     "<unset>"
                 },
             );
-            bail!("Bad address supplied");
+            bail!("Bad address supplied: {:?}", addr);
         }
 
         let mut update_addr = false;
@@ -343,19 +330,22 @@ impl<'a> Contact<'a> {
                 let row_id = row.get(0)?;
                 let row_name: String = row.get(1)?;
                 let row_addr: String = row.get(2)?;
-                let row_origin = row.get(3)?;
+                let row_origin: Origin = row.get(3)?;
                 let row_authname: String = row.get(4)?;
 
-                if !name.as_ref().is_empty() && !row_name.is_empty() {
-                    if origin >= row_origin && name.as_ref() != row_name {
+                if !name.as_ref().is_empty() {
+                    if !row_name.is_empty() {
+                        if origin >= row_origin && name.as_ref() != row_name {
+                            update_name = true;
+                        }
+                    } else {
                         update_name = true;
                     }
-                } else {
-                    update_name = true;
-                }
-                if origin == Origin::IncomingUnknownFrom && name.as_ref() != row_authname {
-                    update_authname = true;
+                    if origin == Origin::IncomingUnknownFrom && name.as_ref() != row_authname {
+                        update_authname = true;
+                    }
                 }
+
                 Ok((row_id, row_name, row_addr, row_origin, row_authname))
             },
         ) {
@@ -395,7 +385,7 @@ impl<'a> Contact<'a> {
                     context,
                     &context.sql,
                     "UPDATE chats SET name=? WHERE type=? AND id IN(SELECT chat_id FROM chats_contacts WHERE contact_id=?);",
-                    params![name.as_ref(), 100, row_id]
+                    params![name.as_ref(), Chattype::Single, row_id]
                 ).ok();
                 }
                 sth_modified = Modifier::Modified;
@@ -412,7 +402,7 @@ impl<'a> Contact<'a> {
                 row_id = sql::get_rowid(context, &context.sql, "contacts", "addr", addr);
                 sth_modified = Modifier::Created;
             } else {
-                error!(context, 0, "Cannot add contact.");
+                error!(context, "Cannot add contact.");
             }
         }
 
@@ -433,19 +423,13 @@ impl<'a> Contact<'a> {
     /// To add a single contact entered by the user, you should prefer `Contact::create`,
     /// however, for adding a bunch of addresses, this function is _much_ faster.
     ///
-    /// The `adr_book` is a multiline string in the format `Name one\nAddress one\nName two\nAddress two`.
+    /// The `addr_book` is a multiline string in the format `Name one\nAddress one\nName two\nAddress two`.
     ///
     /// Returns the number of modified contacts.
-    pub fn add_address_book(context: &Context, adr_book: impl AsRef<str>) -> Result<usize> {
+    pub fn add_address_book(context: &Context, addr_book: impl AsRef<str>) -> Result<usize> {
         let mut modify_cnt = 0;
 
-        for chunk in &adr_book.as_ref().lines().chunks(2) {
-            let chunk = chunk.collect::<Vec<_>>();
-            if chunk.len() < 2 {
-                break;
-            }
-            let name = chunk[0];
-            let addr = chunk[1];
+        for (name, addr) in split_address_book(addr_book.as_ref()).into_iter() {
             let name = normalize_name(name);
             let (_, modified) = Contact::add_or_lookup(context, name, addr, Origin::AdressBook)?;
             if modified != Modifier::None {
@@ -453,7 +437,7 @@ impl<'a> Contact<'a> {
             }
         }
         if modify_cnt > 0 {
-            context.call_cb(Event::CONTACTS_CHANGED, 0 as uintptr_t, 0 as uintptr_t);
+            context.call_cb(Event::ContactsChanged(None));
         }
 
         Ok(modify_cnt)
@@ -472,15 +456,17 @@ impl<'a> Contact<'a> {
         context: &Context,
         listflags: u32,
         query: Option<impl AsRef<str>>,
-    ) -> Result<*mut dc_array_t> {
+    ) -> Result<Vec<u32>> {
         let self_addr = context
             .get_config(Config::ConfiguredAddr)
             .unwrap_or_default();
 
         let mut add_self = false;
-        let mut ret = dc_array_t::new(100);
+        let mut ret = Vec::new();
+        let flag_verified_only = listflags_has(listflags, DC_GCL_VERIFIED_ONLY);
+        let flag_add_self = listflags_has(listflags, DC_GCL_ADD_SELF);
 
-        if (listflags & DC_GCL_VERIFIED_ONLY) > 0 || query.is_some() {
+        if flag_verified_only || query.is_some() {
             let s3str_like_cmd = format!(
                 "%{}%",
                 query
@@ -504,12 +490,12 @@ impl<'a> Contact<'a> {
                     0x100,
                     &s3str_like_cmd,
                     &s3str_like_cmd,
-                    if 0 != listflags & 0x1 { 0 } else { 1 },
+                    if flag_verified_only { 0 } else { 1 },
                 ],
                 |row| row.get::<_, i32>(0),
                 |ids| {
                     for id in ids {
-                        ret.add_id(id? as u32);
+                        ret.push(id? as u32);
                     }
                     Ok(())
                 },
@@ -537,59 +523,58 @@ impl<'a> Contact<'a> {
                 |row| row.get::<_, i32>(0),
                 |ids| {
                     for id in ids {
-                        ret.add_id(id? as u32);
+                        ret.push(id? as u32);
                     }
                     Ok(())
                 }
             )?;
         }
 
-        if 0 != listflags & DC_GCL_ADD_SELF as u32 && add_self {
-            ret.add_id(DC_CONTACT_ID_SELF as u32);
+        if flag_add_self && add_self {
+            ret.push(DC_CONTACT_ID_SELF);
         }
 
-        Ok(ret.into_raw())
+        Ok(ret)
     }
 
     pub fn get_blocked_cnt(context: &Context) -> usize {
         context
             .sql
-            .query_row_col::<_, isize>(
+            .query_get_value::<_, isize>(
                 context,
                 "SELECT COUNT(*) FROM contacts WHERE id>? AND blocked!=0",
                 params![DC_CONTACT_ID_LAST_SPECIAL as i32],
-                0,
             )
             .unwrap_or_default() as usize
     }
 
     /// Get blocked contacts.
-    pub fn get_all_blocked(context: &Context) -> *mut dc_array_t {
+    pub fn get_all_blocked(context: &Context) -> Vec<u32> {
         context
             .sql
             .query_map(
                 "SELECT id FROM contacts WHERE id>? AND blocked!=0 ORDER BY LOWER(name||addr),id;",
                 params![DC_CONTACT_ID_LAST_SPECIAL as i32],
-                |row| row.get::<_, i32>(0),
+                |row| row.get::<_, u32>(0),
                 |ids| {
-                    let mut ret = dc_array_t::new(100);
-
-                    for id in ids {
-                        ret.add_id(id? as u32);
-                    }
-
-                    Ok(ret.into_raw())
+                    ids.collect::<std::result::Result<Vec<_>, _>>()
+                        .map_err(Into::into)
                 },
             )
-            .unwrap_or_else(|_| std::ptr::null_mut())
+            .unwrap_or_default()
     }
 
-    pub fn get_encrinfo(context: &Context, contact_id: u32) -> String {
+    /// Returns a textual summary of the encryption state for the contact.
+    ///
+    /// This function returns a string explaining the encryption state
+    /// of the contact and if the connection is encrypted the
+    /// fingerprints of the keys involved.
+    pub fn get_encrinfo(context: &Context, contact_id: u32) -> Result<String> {
         let mut ret = String::new();
 
         if let Ok(contact) = Contact::load_from_db(context, contact_id) {
             let peerstate = Peerstate::from_addr(context, &context.sql, &contact.addr);
-            let loginparam = dc_loginparam_read(context, &context.sql, "configured_");
+            let loginparam = LoginParam::from_database(context, "configured_");
 
             let mut self_key = Key::from_self_public(context, &loginparam.addr, &context.sql);
 
@@ -603,7 +588,7 @@ impl<'a> Contact<'a> {
                     });
                 ret += &p;
                 if self_key.is_none() {
-                    unsafe { dc_ensure_secret_key_exists(context) };
+                    e2ee::ensure_secret_key_exists(context)?;
                     self_key = Key::from_self_public(context, &loginparam.addr, &context.sql);
                 }
                 let p = context.stock_str(StockMessage::FingerPrints);
@@ -646,7 +631,7 @@ impl<'a> Contact<'a> {
             }
         }
 
-        ret
+        Ok(ret)
     }
 
     /// Delete a contact. The contact is deleted from the local device. It may happen that this is not
@@ -655,28 +640,26 @@ impl<'a> Contact<'a> {
     /// May result in a `#DC_EVENT_CONTACTS_CHANGED` event.
     pub fn delete(context: &Context, contact_id: u32) -> Result<()> {
         ensure!(
-            contact_id > DC_CONTACT_ID_LAST_SPECIAL as u32,
+            contact_id > DC_CONTACT_ID_LAST_SPECIAL,
             "Can not delete special contact"
         );
 
         let count_contacts: i32 = context
             .sql
-            .query_row_col(
+            .query_get_value(
                 context,
                 "SELECT COUNT(*) FROM chats_contacts WHERE contact_id=?;",
                 params![contact_id as i32],
-                0,
             )
             .unwrap_or_default();
 
         let count_msgs: i32 = if count_contacts > 0 {
             context
                 .sql
-                .query_row_col(
+                .query_get_value(
                     context,
                     "SELECT COUNT(*) FROM msgs WHERE from_id=? OR to_id=?;",
                     params![contact_id as i32, contact_id as i32],
-                    0,
                 )
                 .unwrap_or_default()
         } else {
@@ -691,11 +674,11 @@ impl<'a> Contact<'a> {
                 params![contact_id as i32],
             ) {
                 Ok(_) => {
-                    context.call_cb(Event::CONTACTS_CHANGED, 0, 0);
+                    context.call_cb(Event::ContactsChanged(None));
                     return Ok(());
                 }
                 Err(err) => {
-                    error!(context, 0, "delete_contact {} failed ({})", contact_id, err);
+                    error!(context, "delete_contact {} failed ({})", contact_id, err);
                     return Err(err);
                 }
             }
@@ -703,7 +686,7 @@ impl<'a> Contact<'a> {
 
         info!(
             context,
-            0, "could not delete contact {}, there are {} messages with it", contact_id, count_msgs
+            "could not delete contact {}, there are {} messages with it", contact_id, count_msgs
         );
         bail!("Could not delete contact with messages in it");
     }
@@ -779,9 +762,11 @@ impl<'a> Contact<'a> {
     /// Get the contact's profile image.
     /// This is the image set by each remote user on their own
     /// using dc_set_config(context, "selfavatar", image).
-    pub fn get_profile_image(&self) -> Option<String> {
-        if self.id == DC_CONTACT_ID_SELF as u32 {
-            return self.context.get_config(Config::Selfavatar);
+    pub fn get_profile_image(&self, context: &Context) -> Option<PathBuf> {
+        if self.id == DC_CONTACT_ID_SELF {
+            if let Some(p) = context.get_config(Config::Selfavatar) {
+                return Some(PathBuf::from(p));
+            }
         }
         // TODO: else get image_abs from contact param
         None
@@ -792,7 +777,7 @@ impl<'a> Contact<'a> {
     /// and can be used for an fallback avatar with white initials
     /// as well as for headlines in bubbles of group chats.
     pub fn get_color(&self) -> u32 {
-        dc_str_to_color_safe(&self.addr)
+        dc_str_to_color(&self.addr)
     }
 
     /// Check if a contact was verified. E.g. by a secure-join QR code scan
@@ -800,29 +785,33 @@ impl<'a> Contact<'a> {
     ///
     /// The UI may draw a checkbox or something like that beside verified contacts.
     ///
-    pub fn is_verified(&self) -> VerifiedStatus {
-        self.is_verified_ex(None)
+    pub fn is_verified(&self, context: &Context) -> VerifiedStatus {
+        self.is_verified_ex(context, None)
     }
 
     /// Same as `Contact::is_verified` but allows speeding up things
     /// by adding the peerstate belonging to the contact.
     /// If you do not have the peerstate available, it is loaded automatically.
-    pub fn is_verified_ex(&self, peerstate: Option<&Peerstate<'a>>) -> VerifiedStatus {
+    pub fn is_verified_ex(
+        &self,
+        context: &Context,
+        peerstate: Option<&Peerstate>,
+    ) -> VerifiedStatus {
         // We're always sort of secured-verified as we could verify the key on this device any time with the key
         // on this device
-        if self.id == DC_CONTACT_ID_SELF as u32 {
+        if self.id == DC_CONTACT_ID_SELF {
             return VerifiedStatus::BidirectVerified;
         }
 
         if let Some(peerstate) = peerstate {
-            if peerstate.verified_key().is_some() {
+            if peerstate.verified_key.is_some() {
                 return VerifiedStatus::BidirectVerified;
             }
         }
 
-        let peerstate = Peerstate::from_addr(self.context, &self.context.sql, &self.addr);
+        let peerstate = Peerstate::from_addr(context, &context.sql, &self.addr);
         if let Some(ps) = peerstate {
-            if ps.verified_key().is_some() {
+            if ps.verified_key.is_some() {
                 return VerifiedStatus::BidirectVerified;
             }
         }
@@ -854,11 +843,10 @@ impl<'a> Contact<'a> {
 
         context
             .sql
-            .query_row_col::<_, isize>(
+            .query_get_value::<_, isize>(
                 context,
                 "SELECT COUNT(*) FROM contacts WHERE id>?;",
                 params![DC_CONTACT_ID_LAST_SPECIAL as i32],
-                0,
             )
             .unwrap_or_default() as usize
     }
@@ -904,26 +892,14 @@ impl<'a> Contact<'a> {
     }
 }
 
-pub fn get_first_name<'a>(full_name: &'a str) -> &'a str {
+fn get_first_name<'a>(full_name: &'a str) -> &'a str {
     full_name.splitn(2, ' ').next().unwrap_or_default()
 }
 
 /// Returns false if addr is an invalid address, otherwise true.
 pub fn may_be_valid_addr(addr: &str) -> bool {
-    if addr.is_empty() {
-        return false;
-    }
-
-    let at = addr.find('@').unwrap_or_default();
-    if at < 1 {
-        return false;
-    }
-    let dot = addr.find('.').unwrap_or_default();
-    if dot < 1 || dot > addr.len() - 3 || dot < at + 2 {
-        return false;
-    }
-
-    true
+    let res = addr.parse::<EmailAddress>();
+    res.is_ok()
 }
 
 pub fn addr_normalize(addr: &str) -> &str {
@@ -963,11 +939,7 @@ fn set_block_contact(context: &Context, contact_id: u32, new_blocking: bool) {
                     params![new_blocking, 100, contact_id as i32],
                 ).is_ok() {
                     Contact::mark_noticed(context, contact_id);
-                    context.call_cb(
-                        Event::CONTACTS_CHANGED,
-                        0,
-                        0,
-                    );
+                    context.call_cb(Event::ContactsChanged(None));
                 }
             }
         }
@@ -1055,6 +1027,21 @@ pub fn addr_equals_self(context: &Context, addr: impl AsRef<str>) -> bool {
     false
 }
 
+fn split_address_book(book: &str) -> Vec<(&str, &str)> {
+    book.lines()
+        .chunks(2)
+        .into_iter()
+        .filter_map(|mut chunk| {
+            let name = chunk.next().unwrap();
+            let addr = match chunk.next() {
+                Some(a) => a,
+                None => return None,
+            };
+            Some((name, addr))
+        })
+        .collect()
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -1090,4 +1077,14 @@ mod tests {
     fn test_get_first_name() {
         assert_eq!(get_first_name("John Doe"), "John");
     }
+
+    #[test]
+    fn test_split_address_book() {
+        let book = "Name one\nAddress one\nName two\nAddress two\nrest name";
+        let list = split_address_book(&book);
+        assert_eq!(
+            list,
+            vec![("Name one", "Address one"), ("Name two", "Address two")]
+        )
+    }
 }

src/dc_array.rs

@@ -1,13 +1,11 @@
-use crate::dc_location::dc_location;
-use crate::dc_tools::*;
-use crate::types::*;
+use crate::location::Location;
 
 /* * the structure behind dc_array_t */
-#[derive(Clone)]
+#[derive(Debug, Clone)]
 #[allow(non_camel_case_types)]
 pub enum dc_array_t {
-    Locations(Vec<dc_location>),
-    Uint(Vec<uintptr_t>),
+    Locations(Vec<Location>),
+    Uint(Vec<u32>),
 }
 
 impl dc_array_t {
@@ -20,23 +18,15 @@ impl dc_array_t {
         dc_array_t::Locations(Vec::with_capacity(capacity))
     }
 
-    pub fn into_raw(self) -> *mut Self {
-        Box::into_raw(Box::new(self))
-    }
-
-    pub fn add_uint(&mut self, item: uintptr_t) {
+    pub fn add_id(&mut self, item: u32) {
         if let Self::Uint(array) = self {
             array.push(item);
         } else {
-            panic!("Attempt to add uint to array of other type");
+            panic!("Attempt to add id to array of other type");
         }
     }
 
-    pub fn add_id(&mut self, item: uint32_t) {
-        self.add_uint(item as uintptr_t);
-    }
-
-    pub fn add_location(&mut self, location: dc_location) {
+    pub fn add_location(&mut self, location: Location) {
         if let Self::Locations(array) = self {
             array.push(location)
         } else {
@@ -44,30 +34,14 @@ impl dc_array_t {
         }
     }
 
-    pub fn get_uint(&self, index: usize) -> uintptr_t {
-        if let Self::Uint(array) = self {
-            array[index]
-        } else {
-            panic!("Attempt to get uint from array of other type");
-        }
-    }
-
-    pub fn get_id(&self, index: usize) -> uint32_t {
+    pub fn get_id(&self, index: usize) -> u32 {
         match self {
             Self::Locations(array) => array[index].location_id,
-            Self::Uint(array) => array[index] as uint32_t,
+            Self::Uint(array) => array[index] as u32,
         }
     }
 
-    pub fn get_ptr(&self, index: size_t) -> *mut libc::c_void {
-        if let Self::Uint(array) = self {
-            array[index] as *mut libc::c_void
-        } else {
-            panic!("Not an array of pointers");
-        }
-    }
-
-    pub fn get_location(&self, index: usize) -> &dc_location {
+    pub fn get_location(&self, index: usize) -> &Location {
         if let Self::Locations(array) = self {
             &array[index]
         } else {
@@ -75,34 +49,6 @@ impl dc_array_t {
         }
     }
 
-    pub fn get_latitude(&self, index: usize) -> libc::c_double {
-        self.get_location(index).latitude
-    }
-
-    pub fn get_longitude(&self, index: size_t) -> libc::c_double {
-        self.get_location(index).longitude
-    }
-
-    pub fn get_accuracy(&self, index: size_t) -> libc::c_double {
-        self.get_location(index).accuracy
-    }
-
-    pub fn get_timestamp(&self, index: size_t) -> i64 {
-        self.get_location(index).timestamp
-    }
-
-    pub fn get_chat_id(&self, index: size_t) -> uint32_t {
-        self.get_location(index).chat_id
-    }
-
-    pub fn get_contact_id(&self, index: size_t) -> uint32_t {
-        self.get_location(index).contact_id
-    }
-
-    pub fn get_msg_id(&self, index: size_t) -> uint32_t {
-        self.get_location(index).msg_id
-    }
-
     pub fn is_empty(&self) -> bool {
         match self {
             Self::Locations(array) => array.is_empty(),
@@ -125,7 +71,7 @@ impl dc_array_t {
         }
     }
 
-    pub fn search_id(&self, needle: uintptr_t) -> Option<usize> {
+    pub fn search_id(&self, needle: u32) -> Option<usize> {
         if let Self::Uint(array) = self {
             for (i, &u) in array.iter().enumerate() {
                 if u == needle {
@@ -145,297 +91,72 @@ impl dc_array_t {
             panic!("Attempt to sort array of something other than uints");
         }
     }
-}
 
-impl From<Vec<dc_location>> for dc_array_t {
-    fn from(array: Vec<dc_location>) -> Self {
-        dc_array_t::Locations(array)
-    }
-}
-
-pub unsafe fn dc_array_unref(array: *mut dc_array_t) {
-    if array.is_null() {
-        return;
-    }
-    Box::from_raw(array);
-}
-
-pub unsafe fn dc_array_add_uint(array: *mut dc_array_t, item: uintptr_t) {
-    if !array.is_null() {
-        (*array).add_uint(item);
-    }
-}
-
-pub unsafe fn dc_array_add_id(array: *mut dc_array_t, item: uint32_t) {
-    if !array.is_null() {
-        (*array).add_id(item);
-    }
-}
-
-pub unsafe fn dc_array_add_ptr(array: *mut dc_array_t, item: *mut libc::c_void) {
-    dc_array_add_uint(array, item as uintptr_t);
-}
-
-pub unsafe fn dc_array_get_cnt(array: *const dc_array_t) -> size_t {
-    if array.is_null() {
-        0
-    } else {
-        (*array).len()
-    }
-}
-
-pub unsafe fn dc_array_get_uint(array: *const dc_array_t, index: size_t) -> uintptr_t {
-    if array.is_null() || index >= (*array).len() {
-        0
-    } else {
-        (*array).get_uint(index)
-    }
-}
-
-pub unsafe fn dc_array_get_id(array: *const dc_array_t, index: size_t) -> uint32_t {
-    if array.is_null() || index >= (*array).len() {
-        0
-    } else {
-        (*array).get_id(index)
-    }
-}
-
-pub unsafe fn dc_array_get_ptr(array: *const dc_array_t, index: size_t) -> *mut libc::c_void {
-    if array.is_null() || index >= (*array).len() {
-        std::ptr::null_mut()
-    } else {
-        (*array).get_ptr(index)
-    }
-}
-
-pub unsafe fn dc_array_get_latitude(array: *const dc_array_t, index: size_t) -> libc::c_double {
-    if array.is_null() || index >= (*array).len() {
-        0.0
-    } else {
-        (*array).get_latitude(index)
-    }
-}
-
-pub unsafe fn dc_array_get_longitude(array: *const dc_array_t, index: size_t) -> libc::c_double {
-    if array.is_null() || index >= (*array).len() {
-        0.0
-    } else {
-        (*array).get_longitude(index)
-    }
-}
-
-pub unsafe fn dc_array_get_accuracy(array: *const dc_array_t, index: size_t) -> libc::c_double {
-    if array.is_null() || index >= (*array).len() {
-        0.0
-    } else {
-        (*array).get_accuracy(index)
-    }
-}
-
-pub unsafe fn dc_array_get_timestamp(array: *const dc_array_t, index: size_t) -> i64 {
-    if array.is_null() || index >= (*array).len() {
-        0
-    } else {
-        (*array).get_timestamp(index)
-    }
-}
-
-pub unsafe fn dc_array_get_chat_id(array: *const dc_array_t, index: size_t) -> uint32_t {
-    if array.is_null() || index >= (*array).len() {
-        0
-    } else {
-        (*array).get_chat_id(index)
-    }
-}
-
-pub unsafe fn dc_array_get_contact_id(array: *const dc_array_t, index: size_t) -> uint32_t {
-    if array.is_null() || index >= (*array).len() {
-        0
-    } else {
-        (*array).get_contact_id(index)
-    }
-}
-
-pub unsafe fn dc_array_get_msg_id(array: *const dc_array_t, index: size_t) -> uint32_t {
-    if array.is_null() || index >= (*array).len() {
-        0
-    } else {
-        (*array).get_msg_id(index)
-    }
-}
-
-pub unsafe fn dc_array_get_marker(array: *const dc_array_t, index: size_t) -> *mut libc::c_char {
-    if array.is_null() || index >= (*array).len() {
-        return std::ptr::null_mut();
-    }
-
-    if let dc_array_t::Locations(v) = &*array {
-        if let Some(s) = &v[index].marker {
-            s.strdup()
+    pub fn as_ptr(&self) -> *const u32 {
+        if let dc_array_t::Uint(v) = self {
+            v.as_ptr()
         } else {
-            std::ptr::null_mut()
+            panic!("Attempt to convert array of something other than uints to raw");
         }
-    } else {
-        std::ptr::null_mut()
     }
 }
 
-/**
- * Return the independent-state of the location at the given index.
- * Independent locations do not belong to the track of the user.
- *
- * @memberof dc_array_t
- * @param array The array object.
- * @param index Index of the item. Must be between 0 and dc_array_get_cnt()-1.
- * @return 0=Location belongs to the track of the user,
- *     1=Location was reported independently.
- */
-pub unsafe fn dc_array_is_independent(array: *const dc_array_t, index: size_t) -> libc::c_int {
-    if array.is_null() || index >= (*array).len() {
-        return 0;
-    }
-
-    if let dc_array_t::Locations(v) = &*array {
-        v[index].independent as libc::c_int
-    } else {
-        panic!("Attempt to get location independent field from array of something other than locations");
+impl From<Vec<u32>> for dc_array_t {
+    fn from(array: Vec<u32>) -> Self {
+        dc_array_t::Uint(array)
     }
 }
 
-pub unsafe fn dc_array_search_id(
-    array: *const dc_array_t,
-    needle: uint32_t,
-    ret_index: *mut size_t,
-) -> bool {
-    if array.is_null() {
-        return false;
-    }
-    if let Some(i) = (*array).search_id(needle as uintptr_t) {
-        if !ret_index.is_null() {
-            *ret_index = i
-        }
-        true
-    } else {
-        false
-    }
-}
-
-pub unsafe fn dc_array_get_raw(array: *const dc_array_t) -> *const uintptr_t {
-    if array.is_null() {
-        return 0 as *const uintptr_t;
-    }
-    if let dc_array_t::Uint(v) = &*array {
-        v.as_ptr()
-    } else {
-        panic!("Attempt to convert array of something other than uints to raw");
-    }
-}
-
-pub fn dc_array_new(initsize: size_t) -> *mut dc_array_t {
-    dc_array_t::new(initsize).into_raw()
-}
-
-pub fn dc_array_new_locations(initsize: size_t) -> *mut dc_array_t {
-    dc_array_t::new_locations(initsize).into_raw()
-}
-
-pub unsafe fn dc_array_empty(array: *mut dc_array_t) {
-    if array.is_null() {
-        return;
-    }
-    (*array).clear()
-}
-
-pub unsafe fn dc_array_duplicate(array: *const dc_array_t) -> *mut dc_array_t {
-    if array.is_null() {
-        std::ptr::null_mut()
-    } else {
-        (*array).clone().into_raw()
-    }
-}
-
-pub unsafe fn dc_array_get_string(
-    array: *const dc_array_t,
-    sep: *const libc::c_char,
-) -> *mut libc::c_char {
-    if array.is_null() || sep.is_null() {
-        return dc_strdup(b"\x00" as *const u8 as *const libc::c_char);
-    }
-    if let dc_array_t::Uint(v) = &*array {
-        let cnt = v.len();
-        let sep = as_str(sep);
-
-        let res = v
-            .iter()
-            .enumerate()
-            .fold(String::with_capacity(2 * cnt), |res, (i, n)| {
-                if i == 0 {
-                    res + &n.to_string()
-                } else {
-                    res + sep + &n.to_string()
-                }
-            });
-        res.strdup()
-    } else {
-        panic!("Attempt to get string from array of other type");
+impl From<Vec<Location>> for dc_array_t {
+    fn from(array: Vec<Location>) -> Self {
+        dc_array_t::Locations(array)
     }
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::x::*;
-    use std::ffi::CStr;
 
     #[test]
     fn test_dc_array() {
-        unsafe {
-            let arr = dc_array_new(7 as size_t);
-            assert_eq!(dc_array_get_cnt(arr), 0);
+        let mut arr = dc_array_t::new(7);
+        assert!(arr.is_empty());
 
-            for i in 0..1000 {
-                dc_array_add_id(arr, (i + 2) as uint32_t);
-            }
-
-            assert_eq!(dc_array_get_cnt(arr), 1000);
-
-            for i in 0..1000 {
-                assert_eq!(
-                    dc_array_get_id(arr, i as size_t),
-                    (i + 1i32 * 2i32) as libc::c_uint
-                );
-            }
-
-            assert_eq!(dc_array_get_id(arr, -1i32 as size_t), 0);
-            assert_eq!(dc_array_get_id(arr, 1000 as size_t), 0);
-            assert_eq!(dc_array_get_id(arr, 1001 as size_t), 0);
-
-            dc_array_empty(arr);
-
-            assert_eq!(dc_array_get_cnt(arr), 0);
-
-            dc_array_add_id(arr, 13 as uint32_t);
-            dc_array_add_id(arr, 7 as uint32_t);
-            dc_array_add_id(arr, 666 as uint32_t);
-            dc_array_add_id(arr, 0 as uint32_t);
-            dc_array_add_id(arr, 5000 as uint32_t);
-
-            (*arr).sort_ids();
-
-            assert_eq!(dc_array_get_id(arr, 0 as size_t), 0);
-            assert_eq!(dc_array_get_id(arr, 1 as size_t), 7);
-            assert_eq!(dc_array_get_id(arr, 2 as size_t), 13);
-            assert_eq!(dc_array_get_id(arr, 3 as size_t), 666);
-
-            let str = dc_array_get_string(arr, b"-\x00" as *const u8 as *const libc::c_char);
-            assert_eq!(
-                CStr::from_ptr(str as *const libc::c_char).to_str().unwrap(),
-                "0-7-13-666-5000"
-            );
-            free(str as *mut libc::c_void);
-
-            dc_array_unref(arr);
+        for i in 0..1000 {
+            arr.add_id(i + 2);
         }
+
+        assert_eq!(arr.len(), 1000);
+
+        for i in 0..1000 {
+            assert_eq!(arr.get_id(i), (i + 2) as u32);
+        }
+
+        arr.clear();
+
+        assert!(arr.is_empty());
+
+        arr.add_id(13);
+        arr.add_id(7);
+        arr.add_id(666);
+        arr.add_id(0);
+        arr.add_id(5000);
+
+        arr.sort_ids();
+
+        assert_eq!(arr.get_id(0), 0);
+        assert_eq!(arr.get_id(1), 7);
+        assert_eq!(arr.get_id(2), 13);
+        assert_eq!(arr.get_id(3), 666);
     }
 
+    #[test]
+    #[should_panic]
+    fn test_dc_array_out_of_bounds() {
+        let mut arr = dc_array_t::new(7);
+        for i in 0..1000 {
+            arr.add_id(i + 2);
+        }
+        arr.get_id(1000);
+    }
 }

src/dc_dehtml.rs

@@ -1,8 +1,6 @@
 use lazy_static::lazy_static;
-
-use crate::dc_saxparser::*;
-use crate::dc_tools::*;
-use crate::x::*;
+use quick_xml;
+use quick_xml::events::{BytesEnd, BytesStart, BytesText};
 
 lazy_static! {
     static ref LINE_RE: regex::Regex = regex::Regex::new(r"(\r?\n)+").unwrap();
@@ -23,67 +21,79 @@ enum AddText {
 
 // dc_dehtml() returns way too many lineends; however, an optimisation on this issue is not needed as
 // the lineends are typically remove in further processing by the caller
-pub unsafe fn dc_dehtml(buf_terminated: *mut libc::c_char) -> *mut libc::c_char {
-    dc_trim(buf_terminated);
-    if *buf_terminated.offset(0isize) as libc::c_int == 0i32 {
-        return dc_strdup(b"\x00" as *const u8 as *const libc::c_char);
+pub fn dc_dehtml(buf_terminated: &str) -> String {
+    let buf_terminated = buf_terminated.trim();
+
+    if buf_terminated.is_empty() {
+        return "".into();
     }
 
     let mut dehtml = Dehtml {
-        strbuilder: String::with_capacity(strlen(buf_terminated)),
+        strbuilder: String::with_capacity(buf_terminated.len()),
         add_text: AddText::YesRemoveLineEnds,
         last_href: None,
     };
-    let mut saxparser = dc_saxparser_t {
-        starttag_cb: None,
-        endtag_cb: None,
-        text_cb: None,
-        userdata: 0 as *mut libc::c_void,
-    };
-    dc_saxparser_init(
-        &mut saxparser,
-        &mut dehtml as *mut Dehtml as *mut libc::c_void,
-    );
-    dc_saxparser_set_tag_handler(
-        &mut saxparser,
-        Some(dehtml_starttag_cb),
-        Some(dehtml_endtag_cb),
-    );
-    dc_saxparser_set_text_handler(&mut saxparser, Some(dehtml_text_cb));
-    dc_saxparser_parse(&mut saxparser, buf_terminated);
 
-    dehtml.strbuilder.strdup()
+    let mut reader = quick_xml::Reader::from_str(buf_terminated);
+
+    let mut buf = Vec::new();
+
+    loop {
+        match reader.read_event(&mut buf) {
+            Ok(quick_xml::events::Event::Start(ref e)) => {
+                dehtml_starttag_cb(e, &mut dehtml, &reader)
+            }
+            Ok(quick_xml::events::Event::End(ref e)) => dehtml_endtag_cb(e, &mut dehtml),
+            Ok(quick_xml::events::Event::Text(ref e)) => dehtml_text_cb(e, &mut dehtml),
+            Ok(quick_xml::events::Event::CData(ref e)) => dehtml_cdata_cb(e, &mut dehtml),
+            Err(e) => {
+                eprintln!(
+                    "Parse html error: Error at position {}: {:?}",
+                    reader.buffer_position(),
+                    e
+                );
+            }
+            Ok(quick_xml::events::Event::Eof) => break,
+            _ => (),
+        }
+        buf.clear();
+    }
+
+    dehtml.strbuilder
 }
 
-unsafe fn dehtml_text_cb(
-    userdata: *mut libc::c_void,
-    text: *const libc::c_char,
-    _len: libc::c_int,
-) {
-    let dehtml = &mut *(userdata as *mut Dehtml);
-
+fn dehtml_text_cb(event: &BytesText, dehtml: &mut Dehtml) {
     if dehtml.add_text == AddText::YesPreserveLineEnds
         || dehtml.add_text == AddText::YesRemoveLineEnds
     {
-        let last_added = std::ffi::CStr::from_ptr(text)
-            .to_str()
-            .expect("invalid utf8");
-        // TODO: why does len does not match?
-        // assert_eq!(last_added.len(), len as usize);
+        let last_added = escaper::decode_html_buf_sloppy(event.escaped()).unwrap_or_default();
 
         if dehtml.add_text == AddText::YesRemoveLineEnds {
-            dehtml.strbuilder += LINE_RE.replace_all(last_added.as_ref(), "\r").as_ref();
+            dehtml.strbuilder += LINE_RE.replace_all(&last_added, "\r").as_ref();
         } else {
-            dehtml.strbuilder += last_added.as_ref();
+            dehtml.strbuilder += &last_added;
         }
     }
 }
 
-unsafe fn dehtml_endtag_cb(userdata: *mut libc::c_void, tag: *const libc::c_char) {
-    let mut dehtml = &mut *(userdata as *mut Dehtml);
-    let tag = std::ffi::CStr::from_ptr(tag).to_string_lossy();
+fn dehtml_cdata_cb(event: &BytesText, dehtml: &mut Dehtml) {
+    if dehtml.add_text == AddText::YesPreserveLineEnds
+        || dehtml.add_text == AddText::YesRemoveLineEnds
+    {
+        let last_added = escaper::decode_html_buf_sloppy(event.escaped()).unwrap_or_default();
 
-    match tag.as_ref() {
+        if dehtml.add_text == AddText::YesRemoveLineEnds {
+            dehtml.strbuilder += LINE_RE.replace_all(&last_added, "\r").as_ref();
+        } else {
+            dehtml.strbuilder += &last_added;
+        }
+    }
+}
+
+fn dehtml_endtag_cb(event: &BytesEnd, dehtml: &mut Dehtml) {
+    let tag = String::from_utf8_lossy(event.name()).trim().to_lowercase();
+
+    match tag.as_str() {
         "p" | "div" | "table" | "td" | "style" | "script" | "title" | "pre" => {
             dehtml.strbuilder += "\n\n";
             dehtml.add_text = AddText::YesRemoveLineEnds;
@@ -105,15 +115,14 @@ unsafe fn dehtml_endtag_cb(userdata: *mut libc::c_void, tag: *const libc::c_char
     }
 }
 
-unsafe fn dehtml_starttag_cb(
-    userdata: *mut libc::c_void,
-    tag: *const libc::c_char,
-    attr: *mut *mut libc::c_char,
+fn dehtml_starttag_cb<B: std::io::BufRead>(
+    event: &BytesStart,
+    dehtml: &mut Dehtml,
+    reader: &quick_xml::Reader<B>,
 ) {
-    let mut dehtml = &mut *(userdata as *mut Dehtml);
-    let tag = std::ffi::CStr::from_ptr(tag).to_string_lossy();
+    let tag = String::from_utf8_lossy(event.name()).trim().to_lowercase();
 
-    match tag.as_ref() {
+    match tag.as_str() {
         "p" | "div" | "table" | "td" => {
             dehtml.strbuilder += "\n\n";
             dehtml.add_text = AddText::YesRemoveLineEnds;
@@ -130,14 +139,21 @@ unsafe fn dehtml_starttag_cb(
             dehtml.add_text = AddText::YesPreserveLineEnds;
         }
         "a" => {
-            let text_c = std::ffi::CStr::from_ptr(dc_attr_find(
-                attr,
-                b"href\x00" as *const u8 as *const libc::c_char,
-            ));
-            let text_r = text_c.to_str().expect("invalid utf8");
-            if !text_r.is_empty() {
-                dehtml.last_href = Some(text_r.to_string());
-                dehtml.strbuilder += "[";
+            if let Some(href) = event.html_attributes().find(|attr| {
+                attr.as_ref()
+                    .map(|a| String::from_utf8_lossy(a.key).trim().to_lowercase() == "href")
+                    .unwrap_or_default()
+            }) {
+                let href = href
+                    .unwrap()
+                    .unescape_and_decode_value(reader)
+                    .unwrap_or_default()
+                    .to_lowercase();
+
+                if !href.is_empty() {
+                    dehtml.last_href = Some(href);
+                    dehtml.strbuilder += "[";
+                }
             }
         }
         "b" | "strong" => {
@@ -149,3 +165,28 @@ unsafe fn dehtml_starttag_cb(
         _ => {}
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_dc_dehtml() {
+        let cases = vec![
+            (
+                "<a href='https://example.com'> Foo </a>",
+                "[ Foo ](https://example.com)",
+            ),
+            ("<img href='/foo.png'>", ""),
+            ("<b> bar </b>", "* bar *"),
+            ("<b> bar <i> foo", "* bar _ foo"),
+            ("&amp; bar", "& bar"),
+            // Note missing '
+            ("<a href='/foo.png>Hi</a> ", ""),
+            ("", ""),
+        ];
+        for (input, output) in cases {
+            assert_eq!(dc_dehtml(input), output);
+        }
+    }
+}

src/dc_jobthread.rs

@@ -1,209 +0,0 @@
-use std::sync::{Arc, Condvar, Mutex};
-
-use crate::context::Context;
-use crate::dc_configure::*;
-use crate::imap::Imap;
-use crate::x::*;
-
-#[repr(C)]
-pub struct dc_jobthread_t {
-    pub name: &'static str,
-    pub folder_config_name: &'static str,
-    pub imap: Imap,
-    pub state: Arc<(Mutex<JobState>, Condvar)>,
-}
-
-pub fn dc_jobthread_init(
-    name: &'static str,
-    folder_config_name: &'static str,
-    imap: Imap,
-) -> dc_jobthread_t {
-    dc_jobthread_t {
-        name,
-        folder_config_name,
-        imap,
-        state: Arc::new((Mutex::new(Default::default()), Condvar::new())),
-    }
-}
-
-#[derive(Debug, Default)]
-pub struct JobState {
-    idle: bool,
-    jobs_needed: i32,
-    suspended: i32,
-    using_handle: i32,
-}
-
-pub unsafe fn dc_jobthread_suspend(
-    context: &Context,
-    jobthread: &dc_jobthread_t,
-    suspend: libc::c_int,
-) {
-    if 0 != suspend {
-        info!(context, 0, "Suspending {}-thread.", jobthread.name,);
-        {
-            jobthread.state.0.lock().unwrap().suspended = 1;
-        }
-        dc_jobthread_interrupt_idle(context, jobthread);
-        loop {
-            let using_handle = jobthread.state.0.lock().unwrap().using_handle;
-            if using_handle == 0 {
-                return;
-            }
-            std::thread::sleep(std::time::Duration::from_micros(300 * 1000));
-        }
-    } else {
-        info!(context, 0, "Unsuspending {}-thread.", jobthread.name);
-
-        let &(ref lock, ref cvar) = &*jobthread.state.clone();
-        let mut state = lock.lock().unwrap();
-
-        state.suspended = 0;
-        state.idle = true;
-        cvar.notify_one();
-    }
-}
-
-pub unsafe fn dc_jobthread_interrupt_idle(context: &Context, jobthread: &dc_jobthread_t) {
-    {
-        jobthread.state.0.lock().unwrap().jobs_needed = 1;
-    }
-
-    info!(context, 0, "Interrupting {}-IDLE...", jobthread.name);
-
-    jobthread.imap.interrupt_idle();
-
-    let &(ref lock, ref cvar) = &*jobthread.state.clone();
-    let mut state = lock.lock().unwrap();
-
-    state.idle = true;
-    cvar.notify_one();
-}
-
-pub unsafe fn dc_jobthread_fetch(
-    context: &Context,
-    jobthread: &mut dc_jobthread_t,
-    use_network: libc::c_int,
-) {
-    let start;
-
-    {
-        let &(ref lock, _) = &*jobthread.state.clone();
-        let mut state = lock.lock().unwrap();
-
-        if 0 != state.suspended {
-            return;
-        }
-
-        state.using_handle = 1;
-    }
-
-    if 0 != use_network {
-        start = clock();
-        if !(0 == connect_to_imap(context, jobthread)) {
-            info!(context, 0, "{}-fetch started...", jobthread.name);
-            jobthread.imap.fetch(context);
-
-            if jobthread.imap.should_reconnect() {
-                info!(
-                    context,
-                    0, "{}-fetch aborted, starting over...", jobthread.name,
-                );
-                jobthread.imap.fetch(context);
-            }
-            info!(
-                context,
-                0,
-                "{}-fetch done in {:.3} ms.",
-                jobthread.name,
-                clock().wrapping_sub(start) as f64 / 1000.0,
-            );
-        }
-    }
-
-    jobthread.state.0.lock().unwrap().using_handle = 0;
-}
-
-/* ******************************************************************************
- * the typical fetch, idle, interrupt-idle
- ******************************************************************************/
-
-unsafe fn connect_to_imap(context: &Context, jobthread: &dc_jobthread_t) -> libc::c_int {
-    if jobthread.imap.is_connected() {
-        return 1;
-    }
-
-    let mut ret_connected = dc_connect_to_configured_imap(context, &jobthread.imap);
-
-    if !(0 == ret_connected) {
-        if context
-            .sql
-            .get_config_int(context, "folders_configured")
-            .unwrap_or_default()
-            < 3
-        {
-            jobthread.imap.configure_folders(context, 0x1);
-        }
-
-        if let Some(mvbox_name) = context
-            .sql
-            .get_config(context, jobthread.folder_config_name)
-        {
-            jobthread.imap.set_watch_folder(mvbox_name);
-        } else {
-            jobthread.imap.disconnect(context);
-            ret_connected = 0;
-        }
-    }
-
-    ret_connected
-}
-
-pub unsafe fn dc_jobthread_idle(
-    context: &Context,
-    jobthread: &dc_jobthread_t,
-    use_network: libc::c_int,
-) {
-    {
-        let &(ref lock, ref cvar) = &*jobthread.state.clone();
-        let mut state = lock.lock().unwrap();
-
-        if 0 != state.jobs_needed {
-            info!(
-                context,
-                0,
-                "{}-IDLE will not be started as it was interrupted while not ideling.",
-                jobthread.name,
-            );
-            state.jobs_needed = 0;
-            return;
-        }
-
-        if 0 != state.suspended {
-            while !state.idle {
-                state = cvar.wait(state).unwrap();
-            }
-            state.idle = false;
-            return;
-        }
-
-        state.using_handle = 1;
-
-        if 0 == use_network {
-            state.using_handle = 0;
-
-            while !state.idle {
-                state = cvar.wait(state).unwrap();
-            }
-            state.idle = false;
-            return;
-        }
-    }
-
-    connect_to_imap(context, jobthread);
-    info!(context, 0, "{}-IDLE started...", jobthread.name,);
-    jobthread.imap.idle(context);
-    info!(context, 0, "{}-IDLE ended.", jobthread.name);
-
-    jobthread.state.0.lock().unwrap().using_handle = 0;
-}

src/dc_location.rs

@@ -1,754 +0,0 @@
-use std::ffi::CString;
-
-use crate::constants::Event;
-use crate::constants::*;
-use crate::context::*;
-use crate::dc_array::*;
-use crate::dc_chat::*;
-use crate::dc_job::*;
-use crate::dc_msg::*;
-use crate::dc_saxparser::*;
-use crate::dc_tools::*;
-use crate::param::*;
-use crate::sql;
-use crate::stock::StockMessage;
-use crate::types::*;
-use crate::x::*;
-
-// location handling
-#[derive(Clone, Default)]
-#[allow(non_camel_case_types)]
-pub struct dc_location {
-    pub location_id: uint32_t,
-    pub latitude: libc::c_double,
-    pub longitude: libc::c_double,
-    pub accuracy: libc::c_double,
-    pub timestamp: i64,
-    pub contact_id: uint32_t,
-    pub msg_id: uint32_t,
-    pub chat_id: uint32_t,
-    pub marker: Option<String>,
-    pub independent: uint32_t,
-}
-
-impl dc_location {
-    pub fn new() -> Self {
-        dc_location {
-            location_id: 0,
-            latitude: 0.0,
-            longitude: 0.0,
-            accuracy: 0.0,
-            timestamp: 0,
-            contact_id: 0,
-            msg_id: 0,
-            chat_id: 0,
-            marker: None,
-            independent: 0,
-        }
-    }
-}
-
-#[derive(Clone)]
-#[allow(non_camel_case_types)]
-pub struct dc_kml_t {
-    pub addr: *mut libc::c_char,
-    pub locations: Option<Vec<dc_location>>,
-    pub tag: libc::c_int,
-    pub curr: dc_location,
-}
-
-impl dc_kml_t {
-    pub fn new() -> Self {
-        dc_kml_t {
-            addr: std::ptr::null_mut(),
-            locations: None,
-            tag: 0,
-            curr: dc_location::new(),
-        }
-    }
-}
-
-// location streaming
-pub unsafe fn dc_send_locations_to_chat(
-    context: &Context,
-    chat_id: uint32_t,
-    seconds: libc::c_int,
-) {
-    let now = time();
-    let mut msg: *mut dc_msg_t = 0 as *mut dc_msg_t;
-    let is_sending_locations_before: bool;
-    if !(seconds < 0i32 || chat_id <= 9i32 as libc::c_uint) {
-        is_sending_locations_before = dc_is_sending_locations_to_chat(context, chat_id);
-        if sql::execute(
-            context,
-            &context.sql,
-            "UPDATE chats    \
-             SET locations_send_begin=?,        \
-             locations_send_until=?  \
-             WHERE id=?",
-            params![
-                if 0 != seconds { now } else { 0 },
-                if 0 != seconds {
-                    now + seconds as i64
-                } else {
-                    0
-                },
-                chat_id as i32,
-            ],
-        )
-        .is_ok()
-        {
-            if 0 != seconds && !is_sending_locations_before {
-                msg = dc_msg_new(context, Viewtype::Text);
-                (*msg).text =
-                    Some(context.stock_system_msg(StockMessage::MsgLocationEnabled, "", "", 0));
-                (*msg).param.set_int(Param::Cmd, 8);
-                dc_send_msg(context, chat_id, msg);
-            } else if 0 == seconds && is_sending_locations_before {
-                let stock_str = CString::new(context.stock_system_msg(
-                    StockMessage::MsgLocationDisabled,
-                    "",
-                    "",
-                    0,
-                ))
-                .unwrap();
-                dc_add_device_msg(context, chat_id, stock_str.as_ptr());
-            }
-            context.call_cb(
-                Event::CHAT_MODIFIED,
-                chat_id as uintptr_t,
-                0i32 as uintptr_t,
-            );
-            if 0 != seconds {
-                schedule_MAYBE_SEND_LOCATIONS(context, 0i32);
-                dc_job_add(
-                    context,
-                    5007i32,
-                    chat_id as libc::c_int,
-                    Params::new(),
-                    seconds + 1i32,
-                );
-            }
-        }
-    }
-    dc_msg_unref(msg);
-}
-
-/*******************************************************************************
- * job to send locations out to all chats that want them
- ******************************************************************************/
-#[allow(non_snake_case)]
-unsafe fn schedule_MAYBE_SEND_LOCATIONS(context: &Context, flags: libc::c_int) {
-    if 0 != flags & 0x1 || !dc_job_action_exists(context, 5005) {
-        dc_job_add(context, 5005, 0, Params::new(), 60);
-    };
-}
-
-pub fn dc_is_sending_locations_to_chat(context: &Context, chat_id: u32) -> bool {
-    context
-        .sql
-        .exists(
-            "SELECT id  FROM chats  WHERE (? OR id=?)   AND locations_send_until>?;",
-            params![if chat_id == 0 { 1 } else { 0 }, chat_id as i32, time()],
-        )
-        .unwrap_or_default()
-}
-
-pub fn dc_set_location(
-    context: &Context,
-    latitude: libc::c_double,
-    longitude: libc::c_double,
-    accuracy: libc::c_double,
-) -> libc::c_int {
-    if latitude == 0.0 && longitude == 0.0 {
-        return 1;
-    }
-
-    context.sql.query_map(
-        "SELECT id FROM chats WHERE locations_send_until>?;",
-        params![time()], |row| row.get::<_, i32>(0),
-        |chats| {
-            let mut continue_streaming = false;
-
-            for chat in chats {
-                let chat_id = chat?;
-                context.sql.execute(
-                    "INSERT INTO locations  \
-                     (latitude, longitude, accuracy, timestamp, chat_id, from_id) VALUES (?,?,?,?,?,?);",
-                    params![
-                        latitude,
-                        longitude,
-                        accuracy,
-                        time(),
-                        chat_id,
-                        1,
-                    ]
-                )?;
-                continue_streaming = true;
-            }
-            if continue_streaming {
-                context.call_cb(Event::LOCATION_CHANGED, 1, 0);
-            };
-            unsafe { schedule_MAYBE_SEND_LOCATIONS(context, 0) };
-            Ok(continue_streaming as libc::c_int)
-        }
-    ).unwrap_or_default()
-}
-
-pub fn dc_get_locations(
-    context: &Context,
-    chat_id: uint32_t,
-    contact_id: uint32_t,
-    timestamp_from: i64,
-    mut timestamp_to: i64,
-) -> *mut dc_array_t {
-    if timestamp_to == 0 {
-        timestamp_to = time() + 10;
-    }
-
-    context
-        .sql
-        .query_map(
-            "SELECT l.id, l.latitude, l.longitude, l.accuracy, l.timestamp, l.independent, \
-             m.id, l.from_id, l.chat_id, m.txt \
-             FROM locations l  LEFT JOIN msgs m ON l.id=m.location_id  WHERE (? OR l.chat_id=?) \
-             AND (? OR l.from_id=?) \
-             AND (l.independent=1 OR (l.timestamp>=? AND l.timestamp<=?)) \
-             ORDER BY l.timestamp DESC, l.id DESC, m.id DESC;",
-            params![
-                if chat_id == 0 { 1 } else { 0 },
-                chat_id as i32,
-                if contact_id == 0 { 1 } else { 0 },
-                contact_id as i32,
-                timestamp_from,
-                timestamp_to,
-            ],
-            |row| {
-                let msg_id = row.get(6)?;
-                let txt: String = row.get(9)?;
-                let marker = if msg_id != 0 && is_marker(&txt) {
-                    Some(txt)
-                } else {
-                    None
-                };
-
-                let loc = dc_location {
-                    location_id: row.get(0)?,
-                    latitude: row.get(1)?,
-                    longitude: row.get(2)?,
-                    accuracy: row.get(3)?,
-                    timestamp: row.get(4)?,
-                    independent: row.get(5)?,
-                    msg_id: msg_id,
-                    contact_id: row.get(7)?,
-                    chat_id: row.get(8)?,
-                    marker: marker,
-                };
-                Ok(loc)
-            },
-            |locations| {
-                let mut ret = Vec::new();
-
-                for location in locations {
-                    ret.push(location?);
-                }
-                Ok(dc_array_t::from(ret).into_raw())
-            },
-        )
-        .unwrap_or_else(|_| std::ptr::null_mut())
-}
-
-fn is_marker(txt: &str) -> bool {
-    txt.len() == 1 && txt.chars().next().unwrap() != ' '
-}
-
-pub fn dc_delete_all_locations(context: &Context) -> bool {
-    if sql::execute(context, &context.sql, "DELETE FROM locations;", params![]).is_err() {
-        return false;
-    }
-    context.call_cb(Event::LOCATION_CHANGED, 0, 0);
-    true
-}
-
-pub fn dc_get_location_kml(
-    context: &Context,
-    chat_id: uint32_t,
-    last_added_location_id: *mut uint32_t,
-) -> *mut libc::c_char {
-    let mut success: libc::c_int = 0;
-    let now = time();
-    let mut location_count: libc::c_int = 0;
-    let mut ret = String::new();
-
-    let self_addr = context
-        .sql
-        .get_config(context, "configured_addr")
-        .unwrap_or_default();
-
-    if let Ok((locations_send_begin, locations_send_until, locations_last_sent)) = context.sql.query_row(
-        "SELECT locations_send_begin, locations_send_until, locations_last_sent  FROM chats  WHERE id=?;",
-        params![chat_id as i32], |row| {
-            let send_begin: i64 = row.get(0)?;
-            let send_until: i64 = row.get(1)?;
-            let last_sent: i64 = row.get(2)?;
-
-            Ok((send_begin, send_until, last_sent))
-        }
-    ) {
-        if !(locations_send_begin == 0 || now > locations_send_until) {
-            ret += &format!(
-                "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<kml xmlns=\"http://www.opengis.net/kml/2.2\">\n<Document addr=\"{}\">\n",
-                self_addr,
-            );
-
-            context.sql.query_map(
-                "SELECT id, latitude, longitude, accuracy, timestamp\
-                 FROM locations  WHERE from_id=? \
-                 AND timestamp>=? \
-                 AND (timestamp>=? OR timestamp=(SELECT MAX(timestamp) FROM locations WHERE from_id=?)) \
-                 AND independent=0 \
-                 GROUP BY timestamp \
-                 ORDER BY timestamp;",
-                params![1, locations_send_begin, locations_last_sent, 1],
-                |row| {
-                    let location_id: i32 = row.get(0)?;
-                    let latitude: f64 = row.get(1)?;
-                    let longitude: f64 = row.get(2)?;
-                    let accuracy: f64 = row.get(3)?;
-                    let timestamp = unsafe { get_kml_timestamp(row.get(4)?) };
-
-                    Ok((location_id, latitude, longitude, accuracy, timestamp))
-                },
-                |rows| {
-                    for row in rows {
-                        let (location_id, latitude, longitude, accuracy, timestamp) = row?;
-                        ret += &format!(
-                            "<Placemark><Timestamp><when>{}</when></Timestamp><Point><coordinates accuracy=\"{}\">{},{}</coordinates></Point></Placemark>\n\x00",
-                            as_str(timestamp),
-                            accuracy,
-                            longitude,
-                            latitude
-                        );
-                        location_count += 1;
-                        if !last_added_location_id.is_null() {
-                            unsafe { *last_added_location_id = location_id as u32 };
-                        }
-                        unsafe { free(timestamp as *mut libc::c_void) };
-                    }
-                    Ok(())
-                }
-            ).unwrap(); // TODO: better error handling
-        }
-    }
-
-    if location_count > 0 {
-        ret += "</Document>\n</kml>";
-        success = 1;
-    }
-
-    if 0 != success {
-        unsafe { ret.strdup() }
-    } else {
-        std::ptr::null_mut()
-    }
-}
-
-/*******************************************************************************
- * create kml-files
- ******************************************************************************/
-unsafe fn get_kml_timestamp(utc: i64) -> *mut libc::c_char {
-    // Returns a string formatted as YYYY-MM-DDTHH:MM:SSZ. The trailing `Z` indicates UTC.
-    let res = chrono::NaiveDateTime::from_timestamp(utc, 0)
-        .format("%Y-%m-%dT%H:%M:%SZ")
-        .to_string();
-    res.strdup()
-}
-
-pub unsafe fn dc_get_message_kml(
-    timestamp: i64,
-    latitude: libc::c_double,
-    longitude: libc::c_double,
-) -> *mut libc::c_char {
-    let timestamp_str = get_kml_timestamp(timestamp);
-    let latitude_str = dc_ftoa(latitude);
-    let longitude_str = dc_ftoa(longitude);
-
-    let ret = dc_mprintf(
-        b"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n\
-         <kml xmlns=\"http://www.opengis.net/kml/2.2\">\n\
-         <Document>\n\
-         <Placemark>\
-         <Timestamp><when>%s</when></Timestamp>\
-         <Point><coordinates>%s,%s</coordinates></Point>\
-         </Placemark>\n\
-         </Document>\n\
-         </kml>\x00" as *const u8 as *const libc::c_char,
-        timestamp_str,
-        longitude_str, // reverse order!
-        latitude_str,
-    );
-
-    free(latitude_str as *mut libc::c_void);
-    free(longitude_str as *mut libc::c_void);
-    free(timestamp_str as *mut libc::c_void);
-
-    ret
-}
-
-pub fn dc_set_kml_sent_timestamp(context: &Context, chat_id: u32, timestamp: i64) -> bool {
-    sql::execute(
-        context,
-        &context.sql,
-        "UPDATE chats SET locations_last_sent=? WHERE id=?;",
-        params![timestamp, chat_id as i32],
-    )
-    .is_ok()
-}
-
-pub fn dc_set_msg_location_id(context: &Context, msg_id: u32, location_id: u32) -> bool {
-    sql::execute(
-        context,
-        &context.sql,
-        "UPDATE msgs SET location_id=? WHERE id=?;",
-        params![location_id, msg_id as i32],
-    )
-    .is_ok()
-}
-
-pub unsafe fn dc_save_locations(
-    context: &Context,
-    chat_id: u32,
-    contact_id: u32,
-    locations_opt: &Option<Vec<dc_location>>,
-    independent: libc::c_int,
-) -> u32 {
-    if chat_id <= 9 || locations_opt.is_none() {
-        return 0;
-    }
-
-    let locations = locations_opt.as_ref().unwrap();
-    context
-        .sql
-        .prepare2(
-            "SELECT id FROM locations WHERE timestamp=? AND from_id=?",
-            "INSERT INTO locations\
-             (timestamp, from_id, chat_id, latitude, longitude, accuracy, independent) \
-             VALUES (?,?,?,?,?,?,?);",
-            |mut stmt_test, mut stmt_insert, conn| {
-                let mut newest_timestamp = 0;
-                let mut newest_location_id = 0;
-
-                for location in locations {
-                    let exists =
-                        stmt_test.exists(params![location.timestamp, contact_id as i32])?;
-
-                    if 0 != independent || !exists {
-                        stmt_insert.execute(params![
-                            location.timestamp,
-                            contact_id as i32,
-                            chat_id as i32,
-                            location.latitude,
-                            location.longitude,
-                            location.accuracy,
-                            independent,
-                        ])?;
-
-                        if location.timestamp > newest_timestamp {
-                            newest_timestamp = location.timestamp;
-                            newest_location_id = sql::get_rowid2_with_conn(
-                                context,
-                                conn,
-                                "locations",
-                                "timestamp",
-                                location.timestamp,
-                                "from_id",
-                                contact_id as i32,
-                            );
-                        }
-                    }
-                }
-                Ok(newest_location_id)
-            },
-        )
-        .unwrap_or_default()
-}
-
-pub unsafe fn dc_kml_parse(
-    context: &Context,
-    content: *const libc::c_char,
-    content_bytes: size_t,
-) -> dc_kml_t {
-    let mut kml = dc_kml_t::new();
-    let mut content_nullterminated: *mut libc::c_char = 0 as *mut libc::c_char;
-    let mut saxparser: dc_saxparser_t = dc_saxparser_t {
-        starttag_cb: None,
-        endtag_cb: None,
-        text_cb: None,
-        userdata: 0 as *mut libc::c_void,
-    };
-
-    if content_bytes > (1 * 1024 * 1024) {
-        warn!(
-            context,
-            0, "A kml-files with {} bytes is larger than reasonably expected.", content_bytes,
-        );
-    } else {
-        content_nullterminated = dc_null_terminate(content, content_bytes as libc::c_int);
-        if !content_nullterminated.is_null() {
-            kml.locations = Some(Vec::with_capacity(100));
-            dc_saxparser_init(
-                &mut saxparser,
-                &mut kml as *mut dc_kml_t as *mut libc::c_void,
-            );
-            dc_saxparser_set_tag_handler(
-                &mut saxparser,
-                Some(kml_starttag_cb),
-                Some(kml_endtag_cb),
-            );
-            dc_saxparser_set_text_handler(&mut saxparser, Some(kml_text_cb));
-            dc_saxparser_parse(&mut saxparser, content_nullterminated);
-        }
-    }
-
-    free(content_nullterminated as *mut libc::c_void);
-
-    kml
-}
-
-unsafe fn kml_text_cb(userdata: *mut libc::c_void, text: *const libc::c_char, _len: libc::c_int) {
-    let mut kml: *mut dc_kml_t = userdata as *mut dc_kml_t;
-    if 0 != (*kml).tag & (0x4 | 0x10) {
-        let mut val: *mut libc::c_char = dc_strdup(text);
-        dc_str_replace(
-            &mut val,
-            b"\n\x00" as *const u8 as *const libc::c_char,
-            b"\x00" as *const u8 as *const libc::c_char,
-        );
-        dc_str_replace(
-            &mut val,
-            b"\r\x00" as *const u8 as *const libc::c_char,
-            b"\x00" as *const u8 as *const libc::c_char,
-        );
-        dc_str_replace(
-            &mut val,
-            b"\t\x00" as *const u8 as *const libc::c_char,
-            b"\x00" as *const u8 as *const libc::c_char,
-        );
-        dc_str_replace(
-            &mut val,
-            b" \x00" as *const u8 as *const libc::c_char,
-            b"\x00" as *const u8 as *const libc::c_char,
-        );
-        if 0 != (*kml).tag & 0x4 && strlen(val) >= 19 {
-            // YYYY-MM-DDTHH:MM:SSZ
-            // 0   4  7  10 13 16 19
-            let val_r = as_str(val);
-            match chrono::NaiveDateTime::parse_from_str(val_r, "%Y-%m-%dT%H:%M:%SZ") {
-                Ok(res) => {
-                    (*kml).curr.timestamp = res.timestamp();
-                    if (*kml).curr.timestamp > time() {
-                        (*kml).curr.timestamp = time();
-                    }
-                }
-                Err(_err) => {
-                    (*kml).curr.timestamp = time();
-                }
-            }
-        } else if 0 != (*kml).tag & 0x10 {
-            let mut comma: *mut libc::c_char = strchr(val, ',' as i32);
-            if !comma.is_null() {
-                let longitude: *mut libc::c_char = val;
-                let latitude: *mut libc::c_char = comma.offset(1isize);
-                *comma = 0 as libc::c_char;
-                comma = strchr(latitude, ',' as i32);
-                if !comma.is_null() {
-                    *comma = 0 as libc::c_char
-                }
-                (*kml).curr.latitude = dc_atof(latitude);
-                (*kml).curr.longitude = dc_atof(longitude)
-            }
-        }
-        free(val as *mut libc::c_void);
-    };
-}
-
-unsafe fn kml_endtag_cb(userdata: *mut libc::c_void, tag: *const libc::c_char) {
-    let mut kml: *mut dc_kml_t = userdata as *mut dc_kml_t;
-    if strcmp(tag, b"placemark\x00" as *const u8 as *const libc::c_char) == 0 {
-        if 0 != (*kml).tag & 0x1
-            && 0 != (*kml).curr.timestamp
-            && 0. != (*kml).curr.latitude
-            && 0. != (*kml).curr.longitude
-        {
-            let location = (*kml).curr.clone();
-            ((*kml).locations.as_mut().unwrap()).push(location);
-        }
-        (*kml).tag = 0
-    };
-}
-
-/*******************************************************************************
- * parse kml-files
- ******************************************************************************/
-unsafe fn kml_starttag_cb(
-    userdata: *mut libc::c_void,
-    tag: *const libc::c_char,
-    attr: *mut *mut libc::c_char,
-) {
-    let mut kml: *mut dc_kml_t = userdata as *mut dc_kml_t;
-    if strcmp(tag, b"document\x00" as *const u8 as *const libc::c_char) == 0 {
-        let addr: *const libc::c_char =
-            dc_attr_find(attr, b"addr\x00" as *const u8 as *const libc::c_char);
-        if !addr.is_null() {
-            (*kml).addr = dc_strdup(addr)
-        }
-    } else if strcmp(tag, b"placemark\x00" as *const u8 as *const libc::c_char) == 0 {
-        (*kml).tag = 0x1;
-        (*kml).curr.timestamp = 0;
-        (*kml).curr.latitude = 0 as libc::c_double;
-        (*kml).curr.longitude = 0.0f64;
-        (*kml).curr.accuracy = 0.0f64
-    } else if strcmp(tag, b"timestamp\x00" as *const u8 as *const libc::c_char) == 0
-        && 0 != (*kml).tag & 0x1
-    {
-        (*kml).tag = 0x1 | 0x2
-    } else if strcmp(tag, b"when\x00" as *const u8 as *const libc::c_char) == 0
-        && 0 != (*kml).tag & 0x2
-    {
-        (*kml).tag = 0x1 | 0x2 | 0x4
-    } else if strcmp(tag, b"point\x00" as *const u8 as *const libc::c_char) == 0
-        && 0 != (*kml).tag & 0x1
-    {
-        (*kml).tag = 0x1 | 0x8
-    } else if strcmp(tag, b"coordinates\x00" as *const u8 as *const libc::c_char) == 0
-        && 0 != (*kml).tag & 0x8
-    {
-        (*kml).tag = 0x1 | 0x8 | 0x10;
-        let accuracy: *const libc::c_char =
-            dc_attr_find(attr, b"accuracy\x00" as *const u8 as *const libc::c_char);
-        if !accuracy.is_null() {
-            (*kml).curr.accuracy = dc_atof(accuracy)
-        }
-    };
-}
-
-pub unsafe fn dc_kml_unref(kml: &mut dc_kml_t) {
-    free((*kml).addr as *mut libc::c_void);
-}
-
-#[allow(non_snake_case)]
-pub unsafe fn dc_job_do_DC_JOB_MAYBE_SEND_LOCATIONS(context: &Context, _job: *mut dc_job_t) {
-    let now = time();
-    let mut continue_streaming: libc::c_int = 1;
-    info!(
-        context,
-        0, " ----------------- MAYBE_SEND_LOCATIONS -------------- ",
-    );
-
-    context
-        .sql
-        .query_map(
-            "SELECT id, locations_send_begin, locations_last_sent \
-             FROM chats \
-             WHERE locations_send_until>?;",
-            params![now],
-            |row| {
-                let chat_id: i32 = row.get(0)?;
-                let locations_send_begin: i64 = row.get(1)?;
-                let locations_last_sent: i64 = row.get(2)?;
-                continue_streaming = 1;
-
-                // be a bit tolerant as the timer may not align exactly with time(NULL)
-                if now - locations_last_sent < (60 - 3) {
-                    Ok(None)
-                } else {
-                    Ok(Some((chat_id, locations_send_begin, locations_last_sent)))
-                }
-            },
-            |rows| {
-                context.sql.prepare(
-                    "SELECT id \
-                     FROM locations \
-                     WHERE from_id=? \
-                     AND timestamp>=? \
-                     AND timestamp>? \
-                     AND independent=0 \
-                     ORDER BY timestamp;",
-                    |mut stmt_locations, _| {
-                        for (chat_id, locations_send_begin, locations_last_sent) in
-                            rows.filter_map(|r| match r {
-                                Ok(Some(v)) => Some(v),
-                                _ => None,
-                            })
-                        {
-                            // TODO: do I need to reset?
-                            if !stmt_locations
-                                .exists(params![1, locations_send_begin, locations_last_sent,])
-                                .unwrap_or_default()
-                            {
-                                // if there is no new location, there's nothing to send.
-                                // however, maybe we want to bypass this test eg. 15 minutes
-                                continue;
-                            }
-                            // pending locations are attached automatically to every message,
-                            // so also to this empty text message.
-                            // DC_CMD_LOCATION is only needed to create a nicer subject.
-                            //
-                            // for optimisation and to avoid flooding the sending queue,
-                            // we could sending these messages only if we're really online.
-                            // the easiest way to determine this, is to check for an empty message queue.
-                            // (might not be 100%, however, as positions are sent combined later
-                            // and dc_set_location() is typically called periodically, this is ok)
-                            let mut msg = dc_msg_new(context, Viewtype::Text);
-                            (*msg).hidden = 1;
-                            (*msg).param.set_int(Param::Cmd, 9);
-                            dc_send_msg(context, chat_id as u32, msg);
-                            dc_msg_unref(msg);
-                        }
-                        Ok(())
-                    },
-                )
-            },
-        )
-        .unwrap(); // TODO: Better error handling
-
-    if 0 != continue_streaming {
-        schedule_MAYBE_SEND_LOCATIONS(context, 0x1);
-    }
-}
-
-#[allow(non_snake_case)]
-pub unsafe fn dc_job_do_DC_JOB_MAYBE_SEND_LOC_ENDED(context: &Context, job: &mut dc_job_t) {
-    // this function is called when location-streaming _might_ have ended for a chat.
-    // the function checks, if location-streaming is really ended;
-    // if so, a device-message is added if not yet done.
-
-    let chat_id = (*job).foreign_id;
-
-    if let Ok((send_begin, send_until)) = context.sql.query_row(
-        "SELECT locations_send_begin, locations_send_until  FROM chats  WHERE id=?",
-        params![chat_id as i32],
-        |row| Ok((row.get::<_, i64>(0)?, row.get::<_, i64>(1)?)),
-    ) {
-        if !(send_begin != 0 && time() <= send_until) {
-            // still streaming -
-            // may happen as several calls to dc_send_locations_to_chat()
-            // do not un-schedule pending DC_MAYBE_SEND_LOC_ENDED jobs
-            if !(send_begin == 0 && send_until == 0) {
-                // not streaming, device-message already sent
-                if context.sql.execute(
-                    "UPDATE chats    SET locations_send_begin=0, locations_send_until=0  WHERE id=?",
-                    params![chat_id as i32],
-                ).is_ok() {
-                    let stock_str = CString::new(context.stock_system_msg(StockMessage::MsgLocationDisabled, "", "", 0)).unwrap();
-                    dc_add_device_msg(context, chat_id, stock_str.as_ptr());
-                    context.call_cb(
-                        Event::CHAT_MODIFIED,
-                        chat_id as usize,
-                        0,
-                    );
-                }
-            }
-        }
-    }
-}

src/dc_loginparam.rs

@@ -1,214 +0,0 @@
-use std::borrow::Cow;
-
-use crate::context::Context;
-use crate::sql::Sql;
-
-#[derive(Default, Debug)]
-#[allow(non_camel_case_types)]
-pub struct dc_loginparam_t {
-    pub addr: String,
-    pub mail_server: String,
-    pub mail_user: String,
-    pub mail_pw: String,
-    pub mail_port: i32,
-    pub send_server: String,
-    pub send_user: String,
-    pub send_pw: String,
-    pub send_port: i32,
-    pub server_flags: i32,
-}
-
-impl dc_loginparam_t {
-    pub fn addr_str(&self) -> &str {
-        self.addr.as_str()
-    }
-}
-
-pub fn dc_loginparam_new() -> dc_loginparam_t {
-    Default::default()
-}
-
-pub fn dc_loginparam_read(
-    context: &Context,
-    sql: &Sql,
-    prefix: impl AsRef<str>,
-) -> dc_loginparam_t {
-    let prefix = prefix.as_ref();
-
-    let key = format!("{}addr", prefix);
-    let addr = sql
-        .get_config(context, key)
-        .unwrap_or_default()
-        .trim()
-        .to_string();
-
-    let key = format!("{}mail_server", prefix);
-    let mail_server = sql.get_config(context, key).unwrap_or_default();
-
-    let key = format!("{}mail_port", prefix);
-    let mail_port = sql.get_config_int(context, key).unwrap_or_default();
-
-    let key = format!("{}mail_user", prefix);
-    let mail_user = sql.get_config(context, key).unwrap_or_default();
-
-    let key = format!("{}mail_pw", prefix);
-    let mail_pw = sql.get_config(context, key).unwrap_or_default();
-
-    let key = format!("{}send_server", prefix);
-    let send_server = sql.get_config(context, key).unwrap_or_default();
-
-    let key = format!("{}send_port", prefix);
-    let send_port = sql.get_config_int(context, key).unwrap_or_default();
-
-    let key = format!("{}send_user", prefix);
-    let send_user = sql.get_config(context, key).unwrap_or_default();
-
-    let key = format!("{}send_pw", prefix);
-    let send_pw = sql.get_config(context, key).unwrap_or_default();
-
-    let key = format!("{}server_flags", prefix);
-    let server_flags = sql.get_config_int(context, key).unwrap_or_default();
-
-    dc_loginparam_t {
-        addr: addr.to_string(),
-        mail_server,
-        mail_user,
-        mail_pw,
-        mail_port,
-        send_server,
-        send_user,
-        send_pw,
-        send_port,
-        server_flags,
-    }
-}
-
-pub fn dc_loginparam_write(
-    context: &Context,
-    loginparam: &dc_loginparam_t,
-    sql: &Sql,
-    prefix: impl AsRef<str>,
-) {
-    let prefix = prefix.as_ref();
-
-    let key = format!("{}addr", prefix);
-    sql.set_config(context, key, Some(&loginparam.addr)).ok();
-
-    let key = format!("{}mail_server", prefix);
-    sql.set_config(context, key, Some(&loginparam.mail_server))
-        .ok();
-
-    let key = format!("{}mail_port", prefix);
-    sql.set_config_int(context, key, loginparam.mail_port).ok();
-
-    let key = format!("{}mail_user", prefix);
-    sql.set_config(context, key, Some(&loginparam.mail_user))
-        .ok();
-
-    let key = format!("{}mail_pw", prefix);
-    sql.set_config(context, key, Some(&loginparam.mail_pw)).ok();
-
-    let key = format!("{}send_server", prefix);
-    sql.set_config(context, key, Some(&loginparam.send_server))
-        .ok();
-
-    let key = format!("{}send_port", prefix);
-    sql.set_config_int(context, key, loginparam.send_port).ok();
-
-    let key = format!("{}send_user", prefix);
-    sql.set_config(context, key, Some(&loginparam.send_user))
-        .ok();
-
-    let key = format!("{}send_pw", prefix);
-    sql.set_config(context, key, Some(&loginparam.send_pw)).ok();
-
-    let key = format!("{}server_flags", prefix);
-    sql.set_config_int(context, key, loginparam.server_flags)
-        .ok();
-}
-
-fn unset_empty(s: &String) -> Cow<String> {
-    if s.is_empty() {
-        Cow::Owned("unset".to_string())
-    } else {
-        Cow::Borrowed(s)
-    }
-}
-
-pub fn dc_loginparam_get_readable(loginparam: &dc_loginparam_t) -> String {
-    let unset = "0";
-    let pw = "***";
-
-    let flags_readable = get_readable_flags(loginparam.server_flags);
-
-    format!(
-        "{} {}:{}:{}:{} {}:{}:{}:{} {}",
-        unset_empty(&loginparam.addr),
-        unset_empty(&loginparam.mail_user),
-        if !loginparam.mail_pw.is_empty() {
-            pw
-        } else {
-            unset
-        },
-        unset_empty(&loginparam.mail_server),
-        loginparam.mail_port,
-        unset_empty(&loginparam.send_user),
-        if !loginparam.send_pw.is_empty() {
-            pw
-        } else {
-            unset
-        },
-        unset_empty(&loginparam.send_server),
-        loginparam.send_port,
-        flags_readable,
-    )
-}
-
-fn get_readable_flags(flags: i32) -> String {
-    let mut res = String::new();
-    for bit in 0..31 {
-        if 0 != flags & 1 << bit {
-            let mut flag_added = 0;
-            if 1 << bit == 0x2 {
-                res += "OAUTH2 ";
-                flag_added = 1;
-            }
-            if 1 << bit == 0x4 {
-                res += "AUTH_NORMAL ";
-                flag_added = 1;
-            }
-            if 1 << bit == 0x100 {
-                res += "IMAP_STARTTLS ";
-                flag_added = 1;
-            }
-            if 1 << bit == 0x200 {
-                res += "IMAP_SSL ";
-                flag_added = 1;
-            }
-            if 1 << bit == 0x400 {
-                res += "IMAP_PLAIN ";
-                flag_added = 1;
-            }
-            if 1 << bit == 0x10000 {
-                res += "SMTP_STARTTLS ";
-                flag_added = 1
-            }
-            if 1 << bit == 0x20000 {
-                res += "SMTP_SSL ";
-                flag_added = 1
-            }
-            if 1 << bit == 0x40000 {
-                res += "SMTP_PLAIN ";
-                flag_added = 1
-            }
-            if 0 == flag_added {
-                res += &format!("{:#0x}", 1 << bit);
-            }
-        }
-    }
-    if res.is_empty() {
-        res += "0";
-    }
-
-    res
-}

src/dc_lot.rs

@@ -1,185 +0,0 @@
-use crate::contact::*;
-use crate::context::Context;
-use crate::dc_chat::*;
-use crate::dc_msg::*;
-use crate::dc_tools::*;
-use crate::stock::StockMessage;
-use crate::types::*;
-use crate::x::*;
-use std::ffi::CString;
-use std::ptr;
-
-/* * Structure behind dc_lot_t */
-#[derive(Copy, Clone)]
-#[repr(C)]
-pub struct dc_lot_t {
-    pub magic: uint32_t,
-    pub text1_meaning: libc::c_int,
-    pub text1: *mut libc::c_char,
-    pub text2: *mut libc::c_char,
-    pub timestamp: i64,
-    pub state: libc::c_int,
-    pub id: uint32_t,
-    pub fingerprint: *mut libc::c_char,
-    pub invitenumber: *mut libc::c_char,
-    pub auth: *mut libc::c_char,
-}
-
-/* *
- * @class dc_lot_t
- *
- * An object containing a set of values.
- * The meaning of the values is defined by the function returning the object.
- * Lot objects are created
- * eg. by chatlist.get_summary() or dc_msg_get_summary().
- *
- * NB: _Lot_ is used in the meaning _heap_ here.
- */
-pub unsafe fn dc_lot_new() -> *mut dc_lot_t {
-    let mut lot: *mut dc_lot_t;
-    lot = calloc(1, ::std::mem::size_of::<dc_lot_t>()) as *mut dc_lot_t;
-    assert!(!lot.is_null());
-
-    (*lot).magic = 0x107107i32 as uint32_t;
-    (*lot).text1_meaning = 0i32;
-
-    lot
-}
-
-pub unsafe fn dc_lot_empty(mut lot: *mut dc_lot_t) {
-    if lot.is_null() || (*lot).magic != 0x107107i32 as libc::c_uint {
-        return;
-    }
-    free((*lot).text1 as *mut libc::c_void);
-    (*lot).text1 = 0 as *mut libc::c_char;
-    (*lot).text1_meaning = 0i32;
-    free((*lot).text2 as *mut libc::c_void);
-    (*lot).text2 = 0 as *mut libc::c_char;
-    free((*lot).fingerprint as *mut libc::c_void);
-    (*lot).fingerprint = 0 as *mut libc::c_char;
-    free((*lot).invitenumber as *mut libc::c_void);
-    (*lot).invitenumber = 0 as *mut libc::c_char;
-    free((*lot).auth as *mut libc::c_void);
-    (*lot).auth = 0 as *mut libc::c_char;
-    (*lot).timestamp = 0;
-    (*lot).state = 0i32;
-    (*lot).id = 0i32 as uint32_t;
-}
-
-pub unsafe fn dc_lot_unref(mut set: *mut dc_lot_t) {
-    if set.is_null() || (*set).magic != 0x107107i32 as libc::c_uint {
-        return;
-    }
-    dc_lot_empty(set);
-    (*set).magic = 0i32 as uint32_t;
-    free(set as *mut libc::c_void);
-}
-
-pub unsafe fn dc_lot_get_text1(lot: *const dc_lot_t) -> *mut libc::c_char {
-    if lot.is_null() || (*lot).magic != 0x107107i32 as libc::c_uint {
-        return 0 as *mut libc::c_char;
-    }
-
-    dc_strdup_keep_null((*lot).text1)
-}
-
-pub unsafe fn dc_lot_get_text2(lot: *const dc_lot_t) -> *mut libc::c_char {
-    if lot.is_null() || (*lot).magic != 0x107107i32 as libc::c_uint {
-        return 0 as *mut libc::c_char;
-    }
-
-    dc_strdup_keep_null((*lot).text2)
-}
-
-pub unsafe fn dc_lot_get_text1_meaning(lot: *const dc_lot_t) -> libc::c_int {
-    if lot.is_null() || (*lot).magic != 0x107107i32 as libc::c_uint {
-        return 0i32;
-    }
-
-    (*lot).text1_meaning
-}
-
-pub unsafe fn dc_lot_get_state(lot: *const dc_lot_t) -> libc::c_int {
-    if lot.is_null() || (*lot).magic != 0x107107i32 as libc::c_uint {
-        return 0i32;
-    }
-
-    (*lot).state
-}
-
-pub unsafe fn dc_lot_get_id(lot: *const dc_lot_t) -> uint32_t {
-    if lot.is_null() || (*lot).magic != 0x107107i32 as libc::c_uint {
-        return 0i32 as uint32_t;
-    }
-
-    (*lot).id
-}
-
-pub unsafe fn dc_lot_get_timestamp(lot: *const dc_lot_t) -> i64 {
-    if lot.is_null() || (*lot).magic != 0x107107i32 as libc::c_uint {
-        return 0;
-    }
-
-    (*lot).timestamp
-}
-
-/* library-internal */
-/* in practice, the user additionally cuts the string himself pixel-accurate */
-pub unsafe fn dc_lot_fill(
-    mut lot: *mut dc_lot_t,
-    msg: *mut dc_msg_t,
-    chat: *const Chat,
-    contact: Option<&Contact>,
-    context: &Context,
-) {
-    if lot.is_null() || (*lot).magic != 0x107107i32 as libc::c_uint || msg.is_null() {
-        return;
-    }
-    if (*msg).state == 19i32 {
-        (*lot).text1 = context.stock_str(StockMessage::Draft).strdup();
-        (*lot).text1_meaning = 1i32
-    } else if (*msg).from_id == 1i32 as libc::c_uint {
-        if 0 != dc_msg_is_info(msg) || 0 != dc_chat_is_self_talk(chat) {
-            (*lot).text1 = 0 as *mut libc::c_char;
-            (*lot).text1_meaning = 0i32
-        } else {
-            (*lot).text1 = context.stock_str(StockMessage::SelfMsg).strdup();
-            (*lot).text1_meaning = 3i32
-        }
-    } else if chat.is_null() {
-        (*lot).text1 = 0 as *mut libc::c_char;
-        (*lot).text1_meaning = 0i32
-    } else if (*chat).type_0 == 120i32 || (*chat).type_0 == 130i32 {
-        if 0 != dc_msg_is_info(msg) || contact.is_none() {
-            (*lot).text1 = 0 as *mut libc::c_char;
-            (*lot).text1_meaning = 0i32
-        } else {
-            if !chat.is_null() && (*chat).id == 1i32 as libc::c_uint {
-                if let Some(contact) = contact {
-                    (*lot).text1 = contact.get_display_name().strdup();
-                } else {
-                    (*lot).text1 = std::ptr::null_mut();
-                }
-            } else {
-                if let Some(contact) = contact {
-                    (*lot).text1 = contact.get_first_name().strdup();
-                } else {
-                    (*lot).text1 = std::ptr::null_mut();
-                }
-            }
-            (*lot).text1_meaning = 2i32;
-        }
-    }
-
-    let msgtext_c = (*msg)
-        .text
-        .as_ref()
-        .map(|s| CString::yolo(String::as_str(s)));
-    let msgtext_ptr = msgtext_c.map_or(ptr::null(), |s| s.as_ptr());
-
-    (*lot).text2 =
-        dc_msg_get_summarytext_by_raw((*msg).type_0, msgtext_ptr, &mut (*msg).param, 160, context);
-
-    (*lot).timestamp = dc_msg_get_timestamp(msg);
-    (*lot).state = (*msg).state;
-}