adapt to reality

.circleci/config.yml

@@ -15,7 +15,7 @@ restore-workspace: &restore-workspace
 restore-cache: &restore-cache
   restore_cache:
     keys:
-      - cargo-v3-{{ 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:
@@ -44,7 +44,7 @@ jobs:
           command: cargo generate-lockfile
       - restore_cache:
           keys:
-            - cargo-v3-{{ 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
@@ -60,7 +60,7 @@ jobs:
           paths:
             - crate
       - save_cache:
-          key: cargo-v3-{{ 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"
@@ -121,54 +121,39 @@ jobs:
     steps:
       - checkout
       - run: bash ci_scripts/run-doxygen.sh
-      - run: mkdir -p workspace/c-docs
+      - run: mkdir -p workspace/c-docs 
       - run: cp -av deltachat-ffi/{html,xml} workspace/c-docs/
       - persist_to_workspace:
           root: workspace
           paths:
             - c-docs
 
-  # build_test_docs_wheel:
-  #   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: |
-  #            mkdir -p workspace/python
-  #            # 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:
-  #           # - c-docs
-  #           - py-docs
-  #           - wheelhouse
-
-  remote_tests_rust:
-    machine: true
+  build_test_docs_wheel:
+    docker:
+      - image: deltachat/coredeps
+        environment:
+            TESTS: 1
+            DOCS: 1
+    working_directory: /mnt/crate
     steps:
-      - checkout
-      - run: ci_scripts/remote_tests_rust.sh
-    
-  remote_tests_python:
-    machine: true
-    steps:
-      - checkout
-      #- attach_workspace:
-      #    at: workspace
-      - run: ci_scripts/remote_tests_python.sh
-    # workspace/py-docs workspace/wheelhouse workspace/c-docs
+      - *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: |
+             mkdir -p workspace/python
+             # 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:
+            # - c-docs
+            - py-docs
+            - wheelhouse
 
   upload_docs_wheels:
     machine: true
@@ -196,15 +181,15 @@ workflows:
   test:
     jobs:
       - cargo_fetch
+      - build_doxygen
 
-      - remote_tests_rust
-
-      - remote_tests_python
-
-      # - upload_docs_wheels:
-      #     requires:
-      #       - build_test_docs_wheel
-      #       - build_doxygen
+      - build_test_docs_wheel:
+          requires:
+            - cargo_fetch
+      - upload_docs_wheels:
+          requires:
+            - build_test_docs_wheel
+            - build_doxygen 
       - rustfmt:
           requires:
             - cargo_fetch
@@ -212,12 +197,10 @@ workflows:
           requires:
            - cargo_fetch
 
-      - build_doxygen
-
       # Linux Desktop 64bit
-      # - test_x86_64-unknown-linux-gnu:
-      #     requires:
-      #       - cargo_fetch
+      - test_x86_64-unknown-linux-gnu:
+          requires:
+            - cargo_fetch
 
       # Linux Desktop 32bit
       # - test_i686-unknown-linux-gnu:

.gitignore

@@ -23,5 +23,3 @@ python/liveconfig*
 # ignore doxgen generated files
 deltachat-ffi/html
 deltachat-ffi/xml
-
-.rsynclist

CHANGELOG.md

@@ -1,142 +1,6 @@
-# Changelog 
+# API changes
 
-## 1.0.0-beta.10 (pending)
-
-- fix grpid-determination from in-reply-to and references headers. @hpk42
-
-- only send Autocrypt-gossip headers on encrypted messages. @dignifiedquire
-
-- fix reply-to-encrypted message to also be encrypted. @hpk42
-
-- remove last unsafe code from dc_receive_imf :) @hpk42
-
-
-## 1.0.0-beta.9
-
-- historic: we now use the mailparse crate and lettre-email to generate mime
-  messages.  This got rid of mmime completely, the C2rust generated port of the libetpan 
-  mime-parse -- IOW 22KLocs of cumbersome code removed! see 
-  https://github.com/deltachat/deltachat-core-rust/pull/904#issuecomment-561163330
-  many thanks @dignifiedquire for making everybody's life easier 
-  and @jonhoo (from rust-imap fame) for suggesting to use the mailparse crate :) 
-
-- lots of improvements and better error handling in many rust modules 
-  thanks @link2xt @flub @r10s, @hpk42 and @dignifiedquire 
-
-- @r10s introduced a new device chat which has an initial
-  welcome message.  See 
-  https://c.delta.chat/classdc__context__t.html#a1a2aad98bd23c1d21ee42374e241f389
-  for the main new FFI-API.
-
-- fix moving self-sent messages, thanks @r10s, @flub, @hpk42
-
-- fix flakyness/sometimes-failing verified/join-protocols, 
-  thanks @flub, @r10s, @hpk42
-
-- fix reply-to-encrypted message to keep encryption 
-
-- new DC_EVENT_SECUREJOIN_MEMBER_ADDED event 
-
-- many little fixes and rustifications (@link2xt, @flub, @hpk42)
-
-
-## 1.0.0-beta.8
-
-- now uses async-email/async-imap as the new base 
-  which makes imap-idle interruptible and thus fixes
-  several issues around the imap thread being in zombie state . 
-  thanks @dignifiedquire, @hpk42 and @link2xt. 
-
-- fixes imap-protocol parsing bugs that lead to infinitely
-  repeated crashing while trying to receive messages with
-  a subjec that contained non-utf8. thanks @link2xt
-
-- fixed logic to find encryption subkey -- previously 
-  delta chat would use the primary key for encryption
-  (which works with RSA but not ECC). thanks @link2xt
-
-- introduce a new device chat where core and UIs can 
-  add "device" messages.  Android uses it for an initial
-  welcome message. thanks @r10s
-
-- fix time smearing (when two message are virtually send
-  in the same second, there would be misbehaviour because
-  we didn't persist smeared time). thanks @r10s
-
-- fix double-dotted extensions like .html.zip or .tar.gz  
-  to not mangle them when creating blobfiles.  thanks @flub
-
-- fix backup/exports where the wrong sql file would be modified,
-  leading to problems when exporting twice.  thanks @hpk42
-
-- several other little fixes and improvements 
-
-
-## 1.0.0-beta.7
-
-- fix location-streaming #782
-
-- fix display of messages that could not be decrypted #785
- 
-- fix smtp MAILER-DAEMON bug #786 
-
-- fix a logging of durations #783
-
-- add more error logging #779
-
-- do not panic on some bad utf-8 mime #776
-
-## 1.0.0-beta.6
-
-- fix chatlist.get_msg_id to return id, instead of wrongly erroring
-
-## 1.0.0-beta.5
-
-- fix dc_get_msg() to return empty messages when asked for special ones 
-
-## 1.0.0-beta.4
-
-- fix more than one sending of autocrypt setup message
-
-- fix recognition of mailto-address-qr-codes, add tests
-
-- tune down error to warning when adding self to chat
-
-## 1.0.0-beta.3
-
-- add back `dc_empty_server()` #682
-
-- if `show_emails` is set to `DC_SHOW_EMAILS_ALL`,
-  email-based contact requests are added to the chatlist directly
-
-- fix IMAP hangs #717 and cleanups
-
-- several rPGP fixes
-
-- code streamlining and rustifications
-
-
-## 1.0.0-beta.2
-
-- https://c.delta.chat docs are now regenerated again through our CI 
-
-- several rPGP cleanups, security fixes and better multi-platform support 
-
-- reconnect on io errors and broken pipes (imap)
-
-- probe SMTP with real connection not just setup
-
-- various imap/smtp related fixes
-
-- use to_string_lossy in most places instead of relying on valid utf-8
-  encodings
- 
-- rework, rustify and test autoconfig-reading and parsing 
-
-- some rustifications/boolifications of c-ints 
-
-
-## 1.0.0-beta.1 
+## 1.0.0-beta1 
 
 - first beta of the Delta Chat Rust core library. many fixes of crashes
   and other issues compared to 1.0.0-alpha.5.

Cargo.toml

@@ -1,28 +1,27 @@
 [package]
 name = "deltachat"
-version = "1.0.0-beta.9"
+version = "1.0.0-beta.1"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2018"
 license = "MPL"
 
 [dependencies]
 deltachat_derive = { path = "./deltachat_derive" }
+mmime = { version = "0.1.2", path = "./mmime" }
 
 libc = "0.2.51"
-pgp = { git = "https://github.com/rpgp/rpgp", branch = "master", default-features = false }
-hex = "0.4.0"
+pgp = { version = "0.2.3", default-features = false }
+hex = "0.3.2"
 sha2 = "0.8.0"
 rand = "0.6.5"
 smallvec = "0.6.9"
-reqwest = { version = "0.9.15", default-features = false, features = ["rustls-tls"] }
+reqwest = "0.9.15"
 num-derive = "0.2.5"
 num-traits = "0.2.6"
-lettre = { git = "https://github.com/deltachat/lettre", branch = "feat/mail" }
-lettre_email = { git = "https://github.com/deltachat/lettre", branch = "feat/mail" }
-async-imap = { git = "https://github.com/async-email/async-imap", branch="master" }
-async-tls = "0.6"
-async-std = { version = "1.0", features = ["unstable"] }
-base64 = "0.11"
+native-tls = "0.2.3"
+lettre = { git = "https://github.com/deltachat/lettre", branch = "master" }
+imap = { git = "https://github.com/jonhoo/rust-imap", branch = "master" }
+base64 = "0.10"
 charset = "0.1"
 percent-encoding = "2.0"
 serde = { version = "1.0", features = ["derive"] }
@@ -47,14 +46,8 @@ 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"
-sanitize-filename = "0.2.1"
-stop-token = { version = "0.1.1", features = ["unstable"] }
-rustls = "0.16.0"
-webpki-roots = "0.18.0"
-webpki = "0.21.0"
-mailparse = "0.10.1"
-encoded-words = { git = "https://github.com/async-email/encoded-words", branch="master" }
 
 [dev-dependencies]
 tempfile = "3.0"
@@ -66,6 +59,7 @@ proptest = "0.9.4"
 members = [
   "deltachat-ffi",
   "deltachat_derive",
+  "mmime",
 ]
 
 [[example]]
@@ -79,6 +73,6 @@ path = "examples/repl/main.rs"
 
 [features]
 default = ["nightly", "ringbuf"]
-vendored = []
+vendored = ["native-tls/vendored", "reqwest/default-tls-vendored"]
 nightly = ["pgp/nightly"]
 ringbuf = ["pgp/ringbuf"]

README.md

@@ -1,9 +1,11 @@
 # Delta Chat Rust
 
-> Deltachat-core written in Rust 
+> Project porting deltachat-core to rust
 
 [![CircleCI build status][circle-shield]][circle] [![Appveyor build status][appveyor-shield]][appveyor]
 
+Current commit on deltachat/deltachat-core: `12ef73c8e76185f9b78e844ea673025f56a959ab`.
+
 ## Installing Rust and Cargo
 
 To download and install the official compiler for the Rust programming language, and the Cargo package manager, run the command in your user environment:
@@ -14,7 +16,7 @@ curl https://sh.rustup.rs -sSf | sh
 
 ## Using the CLI client
 
-Compile and run Delta Chat Core command line utility, using `cargo`:
+Compile and run Delta Chat Core using `cargo`:
 
 ```
 cargo run --example repl -- /path/to/db
@@ -87,15 +89,6 @@ $ cargo test --all
 $ cargo build -p deltachat_ffi --release
 ```
 
-## Debugging environment variables 
-
-- `DCC_IMAP_DEBUG`: if set IMAP protocol commands and responses will be
-  printed
-
-- `DCC_MIME_DEBUG`: if set outgoing and incoming message will be printed 
-
-
-
 ### Expensive tests
 
 Some tests are expensive and marked with `#[ignore]`, to run these

assets/icon-device.svg

@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:version="0.92.4 5da689c313, 2019-01-14"
-   sodipodi:docname="icon-device.svg"
-   id="svg4344"
-   preserveAspectRatio="xMidYMid meet"
-   viewBox="0 0 45 45"
-   height="60"
-   width="60"
-   version="1.0"
-   inkscape:export-filename="/home/kerle/Workspace/deltachat-core-rust/assets/icon-device.png"
-   inkscape:export-xdpi="409.60001"
-   inkscape:export-ydpi="409.60001">
-  <defs
-     id="defs4348" />
-  <sodipodi:namedview
-     inkscape:current-layer="svg4344"
-     inkscape:window-maximized="0"
-     inkscape:window-y="0"
-     inkscape:window-x="0"
-     inkscape:cy="28.471578"
-     inkscape:cx="28.03926"
-     inkscape:zoom="5.6"
-     units="px"
-     showgrid="false"
-     id="namedview4346"
-     inkscape:window-height="1019"
-     inkscape:window-width="1248"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10"
-     borderopacity="1"
-     inkscape:document-rotation="0"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     inkscape:snap-global="false" />
-  <metadata
-     id="metadata4336">
-Created by potrace 1.15, written by Peter Selinger 2001-2017
-<rdf:RDF>
-  <cc:Work
-     rdf:about="">
-    <dc:format>image/svg+xml</dc:format>
-    <dc:type
-       rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-    <dc:title />
-  </cc:Work>
-</rdf:RDF>
-</metadata>
-  <circle
-     style="opacity:1;fill:#ffffff;fill-opacity:1;stroke-width:0.731071"
-     id="path859"
-     cx="22.5"
-     cy="22.5"
-     r="22.5" />
-  <circle
-     r="22.5"
-     cy="22.5"
-     cx="22.5"
-     id="path4917"
-     style="fill:#364e54;fill-opacity:0.67681497;stroke-width:0.58855402"
-     inkscape:export-xdpi="409"
-     inkscape:export-ydpi="409" />
-  <g
-     id="g4342"
-     transform="matrix(0.00255113,0,0,-0.00255113,5.586152,38.200477)"
-     style="fill:#ffffff;fill-opacity:1"
-     stroke="none"
-     fill="#000000">
-    <path
-       inkscape:connector-curvature="0"
-       id="path4338"
-       d="m 8175,12765 c -703,-114 -1248,-608 -1387,-1258 -17,-82 -21,-136 -22,-277 0,-202 15,-307 70,-470 149,-446 499,-733 1009,-828 142,-26 465,-23 619,6 691,131 1201,609 1328,1244 31,158 31,417 0,565 -114,533 -482,889 -1038,1004 -133,27 -448,35 -579,14 z"
-       style="fill:#ffffff;fill-opacity:1" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path4340"
-       d="m 7070,9203 c -212,-20 -275,-27 -397,-48 -691,-117 -1400,-444 -2038,-940 -182,-142 -328,-270 -585,-517 -595,-571 -911,-974 -927,-1181 -6,-76 11,-120 69,-184 75,-80 159,-108 245,-79 109,37 263,181 632,595 539,606 774,826 1035,969 135,75 231,105 341,106 82,1 94,-2 138,-27 116,-68 161,-209 122,-376 -9,-36 -349,-868 -757,-1850 -407,-982 -785,-1892 -838,-2021 -287,-694 -513,-1389 -615,-1889 -70,-342 -90,-683 -52,-874 88,-440 381,-703 882,-792 124,-23 401,-30 562,-16 783,69 1674,461 2561,1125 796,596 1492,1354 1607,1751 43,146 -33,308 -168,360 -61,23 -100,15 -173,-36 -105,-74 -202,-170 -539,-529 -515,-551 -762,-783 -982,-927 -251,-164 -437,-186 -543,-65 -56,64 -74,131 -67,247 13,179 91,434 249,815 135,324 1588,4102 1646,4280 106,325 151,561 159,826 9,281 -22,463 -112,652 -58,122 -114,199 -211,292 -245,233 -582,343 -1044,338 -91,-1 -181,-3 -200,-5 z"
-       style="fill:#ffffff;fill-opacity:1" />
-  </g>
-</svg>

assets/icon-saved-messages.svg

@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:version="0.92.4 5da689c313, 2019-01-14"
-   sodipodi:docname="icon-saved-messages.svg"
-   id="svg4344"
-   preserveAspectRatio="xMidYMid meet"
-   viewBox="0 0 45 45"
-   height="60"
-   width="60"
-   version="1.0"
-   inkscape:export-filename="/home/kerle/test-icon.png"
-   inkscape:export-xdpi="409.60001"
-   inkscape:export-ydpi="409.60001">
-  <defs
-     id="defs4348" />
-  <sodipodi:namedview
-     inkscape:lockguides="false"
-     inkscape:current-layer="svg4344"
-     inkscape:window-maximized="0"
-     inkscape:window-y="130"
-     inkscape:window-x="89"
-     inkscape:cy="43.28624"
-     inkscape:cx="-21.066324"
-     inkscape:zoom="4"
-     units="px"
-     showgrid="false"
-     id="namedview4346"
-     inkscape:window-height="855"
-     inkscape:window-width="1395"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10"
-     borderopacity="1"
-     inkscape:document-rotation="0"
-     bordercolor="#666666"
-     pagecolor="#ffffff" />
-  <metadata
-     id="metadata4336">
-Created by potrace 1.15, written by Peter Selinger 2001-2017
-<rdf:RDF>
-  <cc:Work
-     rdf:about="">
-    <dc:format>image/svg+xml</dc:format>
-    <dc:type
-       rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-    <dc:title />
-  </cc:Work>
-</rdf:RDF>
-</metadata>
-  <circle
-     style="opacity:1;fill:#ffffff;fill-opacity:1;stroke-width:0.731071"
-     id="path859"
-     cx="22.5"
-     cy="22.5"
-     r="22.5" />
-  <circle
-     r="22.5"
-     cy="22.50293"
-     cx="22.5"
-     id="path4917"
-     style="fill:#87aade;fill-opacity:1;stroke-width:0.58855402" />
-  <path
-     inkscape:connector-curvature="0"
-     d="M 13.5,7.5 V 39 h 0.08654 L 22.533801,29.370239 31.482419,39 h 0.01758 V 7.5 Z m 9.004056,4.108698 1.879508,4.876388 5.039514,0.359779 -3.879358,3.363728 1.227764,5.095749 -4.276893,-2.796643 -4.280949,2.788618 1.237229,-5.093073 -3.873949,-3.371754 5.040866,-0.350417 z"
-     style="fill:#ffffff;stroke-width:0.58409804"
-     id="rect846" />
-</svg>

ci_scripts/README.md

@@ -1,46 +1,52 @@
+
 # Continuous Integration Scripts for Delta Chat
 
-Continuous Integration, run through CircleCI and an own build machine.
-
-## Description of scripts 
-
-- `../.circleci/config.yml` describing the build jobs that are run
-  by Circle-CI
-
-- `remote_tests_python.sh` rsyncs to a build machine and runs
-  `run-python-test.sh` remotely on the build machine. 
-
-- `remote_tests_rust.sh` rsyncs to the build machine and runs
-  `run-rust-test.sh` remotely on the build machine. 
-
-- `doxygen/Dockerfile` specifies an image that contains
-  the doxygen tool which is used by `run-doxygen.sh` 
-  to generate C-docs which are then uploaded 
-  via `ci_upload.sh` to `https://c.delta.chat/_unofficial_unreleased_docs/<BRANCH>`
-  (and the master branch is linked to https://c.delta.chat proper). 
+Continuous Integration is run through CircleCI
+but is largely independent of it. 
 
 
-## Triggering runs on the build machine locally (fast!)
+## Generating docker containers for performing build step work 
 
-There is experimental support for triggering a remote Python or Rust test run 
-from your local checkout/branch. You will need to be authorized to login to 
-the build machine (ask your friendly sysadmin on #deltachat freenode) to type::
+All tests, docs and wheel building is run in docker containers:
 
-    ci_scripts/manual_remote_tests.sh rust
-    ci_scripts/manual_remote_tests.sh python
+- **coredeps/Dockerfile** specifies an image that contains all 
+  of Delta Chat's core dependencies as linkable libraries. 
+  It also serves to run python tests and build wheels 
+  (binary packages for Python). 
 
-This will **rsync** your current checkout to the remote build machine 
-(no need to commit before) and then run either rust or python tests. 
+- **doxygen/Dockerfile** specifies an image that contains
+  the doxygen tool which is used to generate C-docs. 
 
-# Outdated files (for later re-use)
+To run tests locally you can pull existing images from "docker.io",
+the hub for sharing Docker images::
 
-`coredeps/Dockerfile` specifies an image that contains all 
-of Delta Chat's core dependencies. It used to run 
-python tests and build wheels (binary packages for Python)
+    docker pull deltachat/coredeps
+    docker pull deltachat/doxygen 
 
-You can build the docker images yourself locally
+or you can build the docker images yourself locally
 to avoid the relatively large download:: 
  
     cd ci_scripts  # where all CI things are 
     docker build -t deltachat/coredeps docker-coredeps
     docker build -t deltachat/doxygen docker-doxygen 
+
+## ci_run.sh (main entrypoint called by circle-ci)
+
+Once you have the docker images available 
+you can run python testing, documentation generation 
+and building binary wheels:: 
+
+    sh DOCS=1 TESTS=1 ci_scripts/ci_run.sh 
+    
+## ci_upload.sh (uploading artifacts on success) 
+
+- python docs to `https://py.delta.chat/_unofficial_unreleased_docs/<BRANCH>`
+
+- doxygen docs to `https://c.delta.chat/_unofficial_unreleased_docs/<BRANCH>`
+
+- python wheels to `https://m.devpi.net/dc/<BRANCH>`
+  so that you install fully self-contained wheels like this:
+  `pip install -U -i https://m.devpi.net/dc/<BRANCH> deltachat`
+
+
+

ci_scripts/ci_upload.sh

@@ -14,24 +14,20 @@ DOXYDOCDIR=${3:?directory where doxygen docs to be found}
 export BRANCH=${CIRCLE_BRANCH:?specify branch for uploading purposes}
 
 
-# DISABLED: 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/" \
-#  delta@py.delta.chat:build/${BRANCH}
+# 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/" \
+  delta@py.delta.chat:build/${BRANCH}
 
 # C docs to c.delta.chat
-ssh -o BatchMode=yes -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null delta@c.delta.chat mkdir -p build-c/${BRANCH}
+ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null delta@c.delta.chat mkdir -p build-c/${BRANCH}
 rsync -avz \
   -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" \
   "$DOXYDOCDIR/html/" \
   delta@c.delta.chat:build-c/${BRANCH}
 
-exit 0
-
-# OUTDATED -- for re-use from python release-scripts 
-
 echo -----------------------
 echo upload wheels 
 echo -----------------------

ci_scripts/docker-coredeps/Dockerfile

@@ -5,6 +5,16 @@ RUN echo /usr/local/lib64 > /etc/ld.so.conf.d/local.conf && \
     echo /usr/local/lib >> /etc/ld.so.conf.d/local.conf
 ENV PKG_CONFIG_PATH /usr/local/lib64/pkgconfig:/usr/local/lib/pkgconfig
 
+ENV PIP_DISABLE_PIP_VERSION_CHECK 1
+
+# Install python tools (auditwheels,tox, ...)
+ADD deps/build_python.sh /builder/build_python.sh
+RUN mkdir tmp1 && cd tmp1 && bash /builder/build_python.sh && cd .. && rm -r tmp1
+
+# Install Rust nightly 
+ADD deps/build_rust.sh /builder/build_rust.sh
+RUN mkdir tmp1 && cd tmp1 && bash /builder/build_rust.sh && cd .. && rm -r tmp1
+
 # Install a recent Perl, needed to install OpenSSL
 ADD deps/build_perl.sh /builder/build_perl.sh
 RUN mkdir tmp1 && cd tmp1 && bash /builder/build_perl.sh && cd .. && rm -r tmp1
@@ -13,12 +23,3 @@ RUN mkdir tmp1 && cd tmp1 && bash /builder/build_perl.sh && cd .. && rm -r tmp1
 ADD deps/build_openssl.sh /builder/build_openssl.sh
 RUN mkdir tmp1 && cd tmp1 && bash /builder/build_openssl.sh && cd .. && rm -r tmp1
 
-ENV PIP_DISABLE_PIP_VERSION_CHECK 1
-
-# Install python tools (auditwheels,tox, ...)
-ADD deps/build_python.sh /builder/build_python.sh
-RUN mkdir tmp1 && cd tmp1 && bash /builder/build_python.sh && cd .. && rm -r tmp1
-
-# Install Rust nightly
-ADD deps/build_rust.sh /builder/build_rust.sh
-RUN mkdir tmp1 && cd tmp1 && bash /builder/build_rust.sh && cd .. && rm -r tmp1

ci_scripts/docker-coredeps/deps/build_perl.sh

@@ -1,11 +1,11 @@
 #!/bin/bash
 
-PERL_VERSION=5.30.0
-# PERL_SHA256=7e929f64d4cb0e9d1159d4a59fc89394e27fa1f7004d0836ca0d514685406ea8
+PERL_VERSION=5.28.0
+PERL_SHA256=7e929f64d4cb0e9d1159d4a59fc89394e27fa1f7004d0836ca0d514685406ea8
 curl -O https://www.cpan.org/src/5.0/perl-${PERL_VERSION}.tar.gz
-# echo "${PERL_SHA256}  perl-${PERL_VERSION}.tar.gz" | sha256sum -c -
-tar -xzf perl-${PERL_VERSION}.tar.gz
-cd perl-${PERL_VERSION}
+echo "${PERL_SHA256}  perl-${PERL_VERSION}.tar.gz" | sha256sum -c -
+tar xzf perl-${PERL_VERSION}.tar.gz
+cd perl-${PERL_VERSION} 
 
 ./Configure -de
 make

ci_scripts/docker-coredeps/deps/build_rust.sh

@@ -1,8 +1,11 @@
 #!/bin/bash
 
-set -e -x
+set -e -x 
 
-# Install Rust
-curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2019-09-12 -y
+# Install Rust 
+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-07-10-x86_64-unknown-linux-gnu/share/

ci_scripts/manual_remote_tests.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-set -xe
-export CIRCLE_JOB=remote_tests_${1:?need to specify 'rust' or 'python'} 
-export CIRCLE_BUILD_NUM=$USER
-export CIRCLE_BRANCH=`git branch | grep \* | cut -d ' ' -f2`
-export CIRCLE_PROJECT_REPONAME=$(basename `git rev-parse --show-toplevel`)
-
-time bash ci_scripts/$CIRCLE_JOB.sh 

ci_scripts/old/gh-actions-rust.yml

@@ -1,77 +0,0 @@
-name: CI
-
-on:
-  pull_request:
-  push:
-
-env:
-  RUSTFLAGS: -Dwarnings
-
-jobs:
-  build_and_test:
-    name: Build and test
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest, windows-latest, macOS-latest]
-        rust: [nightly]
-
-    steps:
-    - uses: actions/checkout@master
-
-    - name: Install ${{ matrix.rust }}
-      uses: actions-rs/toolchain@v1
-      with:
-        toolchain: ${{ matrix.rust }}
-        override: true
-
-    - name: check
-      uses: actions-rs/cargo@v1
-      if: matrix.rust == 'nightly'
-      with:
-        command:  check
-        args: --all --bins --examples --tests
-
-    - name: tests
-      uses: actions-rs/cargo@v1
-      with:
-        command: test
-        args: --all
-
-    - name: tests ignored
-      uses: actions-rs/cargo@v1
-      with:
-        command: test
-        args: --all --release -- --ignored
-
-  check_fmt:
-    name: Checking fmt and docs
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@master
-
-    - uses: actions-rs/toolchain@v1
-      with:
-          profile: minimal
-          toolchain: nightly
-          override: true
-          components: rustfmt
-
-    - name: fmt
-      run: cargo fmt --all -- --check
-
-#  clippy_check:
-#    name: Clippy check
-#    runs-on: ubuntu-latest
-#
-#    steps:
-#    - uses: actions/checkout@v1
-#    - uses: actions-rs/toolchain@v1
-#      with:
-#          profile: minimal
-#          toolchain: nightly
-#          override: true
-#          components: clippy
-#
-#    - name: clippy
-#      run: cargo clippy --all

ci_scripts/remote_tests_python.sh

@@ -1,46 +0,0 @@
-#!/bin/bash 
-
-export BRANCH=${CIRCLE_BRANCH:?branch to build}
-export REPONAME=${CIRCLE_PROJECT_REPONAME:?repository name}
-export SSHTARGET=ci@b1.delta.chat
-
-# we construct the BUILDDIR such that we can easily share the
-# CARGO_TARGET_DIR between runs ("..")
-export BUILDDIR=ci_builds/$REPONAME/$BRANCH/${CIRCLE_JOB:?jobname}/${CIRCLE_BUILD_NUM:?circle-build-number}
-
-echo "--- Copying files to $SSHTARGET:$BUILDDIR"
-
-set -xe
-
-ssh -oBatchMode=yes -oStrictHostKeyChecking=no  $SSHTARGET mkdir -p "$BUILDDIR"
-git ls-files >.rsynclist 
-# we seem to need .git for setuptools_scm versioning 
-find .git >>.rsynclist
-rsync --delete --files-from=.rsynclist -az ./ "$SSHTARGET:$BUILDDIR"
-
-set +x
-
-echo "--- Running $CIRCLE_JOB remotely"
-
-ssh $SSHTARGET <<_HERE
-    set +x -e
-    cd $BUILDDIR
-    # let's share the target dir with our last run on this branch/job-type
-    # cargo will make sure to block/unblock us properly 
-    export CARGO_TARGET_DIR=\`pwd\`/../target
-    export TARGET=release
-    export DCC_PY_LIVECONFIG=$DCC_PY_LIVECONFIG
-
-    #we rely on tox/virtualenv being available in the host
-    #rm -rf virtualenv venv
-    #virtualenv -q -p python3.7 venv 
-    #source venv/bin/activate
-    #pip install -q tox virtualenv
-
-    set -x
-    which python
-    source \$HOME/venv/bin/activate
-    which python
-
-    bash ci_scripts/run-python-test.sh 
-_HERE

ci_scripts/remote_tests_rust.sh

@@ -1,32 +0,0 @@
-#!/bin/bash 
-
-export BRANCH=${CIRCLE_BRANCH:?branch to build}
-export REPONAME=${CIRCLE_PROJECT_REPONAME:?repository name}
-export SSHTARGET=ci@b1.delta.chat
-
-# we construct the BUILDDIR such that we can easily share the
-# CARGO_TARGET_DIR between runs ("..")
-export BUILDDIR=ci_builds/$REPONAME/$BRANCH/${CIRCLE_JOB:?jobname}/${CIRCLE_BUILD_NUM:?circle-build-number}
-
-set -e
-
-echo "--- Copying files to $SSHTARGET:$BUILDDIR"
-
-ssh -oBatchMode=yes -oStrictHostKeyChecking=no  $SSHTARGET mkdir -p "$BUILDDIR"
-git ls-files >.rsynclist 
-rsync --delete --files-from=.rsynclist -az ./ "$SSHTARGET:$BUILDDIR"
-
-echo "--- Running $CIRCLE_JOB remotely"
-
-ssh $SSHTARGET <<_HERE
-    set +x -e
-    cd $BUILDDIR
-    # let's share the target dir with our last run on this branch/job-type
-    # cargo will make sure to block/unblock us properly 
-    export CARGO_TARGET_DIR=\`pwd\`/../target
-    export TARGET=x86_64-unknown-linux-gnu
-    export RUSTC_WRAPPER=sccache
-
-    bash ci_scripts/run-rust-test.sh
-_HERE
-

ci_scripts/run-python-test.sh

@@ -1,24 +0,0 @@
-#!/bin/bash
-#
-# Run functional tests for Delta Chat core using the python bindings 
-# and tox/pytest. 
-
-set -e -x
-
-# for core-building and python install step
-export DCC_RS_TARGET=release
-export DCC_RS_DEV=`pwd`
-
-cd python
-
-python install_python_bindings.py onlybuild
-
-# remove and inhibit writing PYC files 
-rm -rf tests/__pycache__
-rm -rf src/deltachat/__pycache__
-export PYTHONDONTWRITEBYTECODE=1
-
-# run python tests (tox invokes pytest to run tests in python/tests)
-#TOX_PARALLEL_NO_SPINNER=1 tox -e lint,doc
-tox -e lint
-tox -e doc,py37

ci_scripts/run-python.sh

@@ -43,8 +43,8 @@ if [ -n "$TESTS" ]; then
     # 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 -- --reruns 3 -k "not qr"
-    tox --workdir "$TOXWORKDIR" -e py37 -- --reruns 3 -k "qr"
+    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

ci_scripts/run-rust-test.sh

@@ -2,7 +2,7 @@
 
 set -ex
 
-#export RUST_TEST_THREADS=1
+export RUST_TEST_THREADS=1
 export RUST_BACKTRACE=1
 export RUSTFLAGS='--deny warnings'
 export OPT="--target=$TARGET"
@@ -37,9 +37,7 @@ else
     export OPT_RELEASE_IGNORED="${OPT_RELEASE} -- --ignored"
 fi
 
-# Run all the test configurations 
-# RUSTC_WRAPPER=SCCACHE seems to destroy parallelism / prolong the test
-unset RUSTC_WRAPPER
+# Run all the test configurations:
 $CARGO_CMD $CARGO_SUBCMD $OPT
 $CARGO_CMD $CARGO_SUBCMD $OPT_RELEASE
 $CARGO_CMD $CARGO_SUBCMD $OPT_RELEASE_IGNORED

deltachat-ffi/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.0.0-beta.9"
+version = "1.0.0-beta.1"
 description = "Deltachat FFI"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2018"
@@ -20,7 +20,6 @@ deltachat-provider-database = "0.2.1"
 libc = "0.2"
 human-panic = "1.0.1"
 num-traits = "0.2.6"
-failure = "0.1.6"
 
 [features]
 default = ["vendored", "nightly", "ringbuf"]

deltachat-ffi/deltachat.h

@@ -338,8 +338,6 @@ char*           dc_get_blobdir               (const dc_context_t* context);
  * - `send_pw`      = SMTP-password, guessed if left out
  * - `send_port`    = SMTP-port, guessed if left out
  * - `server_flags` = IMAP-/SMTP-flags as a combination of @ref DC_LP flags, guessed if left out
- * - `imap_certificate_checks` = how to check IMAP certificates, one of the @ref DC_CERTCK flags, defaults to #DC_CERTCK_AUTO (0)
- * - `smtp_certificate_checks` = how to check SMTP certificates, one of the @ref DC_CERTCK flags, defaults to #DC_CERTCK_AUTO (0)
  * - `displayname`  = Own name to use when sending messages.  MUAs are allowed to spread this way eg. using CC, defaults to empty
  * - `selfstatus`   = Own status to display eg. in email footers, defaults to a standard text
  * - `selfavatar`   = File containing avatar. Will be copied to blob directory.
@@ -501,9 +499,15 @@ char*           dc_get_oauth2_url            (dc_context_t* context, const char*
  * To interrupt a configuration prematurely, use dc_stop_ongoing_process();
  * this is not needed if #DC_EVENT_CONFIGURE_PROGRESS reports success.
  *
- * If #DC_EVENT_CONFIGURE_PROGRESS reports failure,
- * the core continues to use the last working configuration
- * and parameters as `addr`, `mail_pw` etc. are set to that.
+ * On a successfull configuration,
+ * the core makes a copy of the parameters mentioned above:
+ * the original parameters as are never modified by the core.
+ *
+ * UI-implementors should keep this in mind -
+ * eg. if the UI wants to prefill a configure-edit-dialog with these parameters,
+ * the UI should reset them if the user cancels the dialog
+ * after a configure-attempts has failed.
+ * Otherwise the parameters may not reflect the current configuation.
  *
  * @memberof dc_context_t
  * @param context The context object as created by dc_context_new().
@@ -1092,84 +1096,6 @@ uint32_t        dc_send_text_msg             (dc_context_t* context, uint32_t ch
 void            dc_set_draft                 (dc_context_t* context, uint32_t chat_id, dc_msg_t* msg);
 
 
-/**
- * Add a message to the device-chat.
- * Device-messages usually contain update information
- * and some hints that are added during the program runs, multi-device etc.
- * The device-message may be defined by a label;
- * if a message with the same label was added or skipped before,
- * the message is not added again, even if the message was deleted in between.
- * If needed, the device-chat is created before.
- *
- * Sends the event #DC_EVENT_MSGS_CHANGED on success.
- * To check, if a given chat is a device-chat, see dc_chat_is_device_talk()
- *
- * @memberof dc_context_t
- * @param context The context as created by dc_context_new().
- * @param label A unique name for the message to add.
- *     The label is typically not displayed to the user and
- *     must be created from the characters `A-Z`, `a-z`, `0-9`, `_` or `-`.
- *     If you pass NULL here, the message is added unconditionally.
- * @param msg Message to be added to the device-chat.
- *     The message appears to the user as an incoming message.
- *     If you pass NULL here, only the given label will be added
- *     and block adding messages with that label in the future.
- * @return The ID of the just added message,
- *     if the message was already added or no message to add is given, 0 is returned.
- *
- * Example:
- * ~~~
- * dc_msg_t* welcome_msg = dc_msg_new(DC_MSG_TEXT);
- * dc_msg_set_text(welcome_msg, "great that you give this app a try!");
- *
- * dc_msg_t* changelog_msg = dc_msg_new(DC_MSG_TEXT);
- * dc_msg_set_text(changelog_msg, "we have added 3 new emojis :)");
- *
- * if (dc_add_device_msg(context, "welcome", welcome_msg)) {
- *     // do not add the changelog on a new installations -
- *     // not now and not when this code is executed again
- *     dc_add_device_msg(context, "update-123", NULL);
- * } else {
- *     // welcome message was not added now, this is an oder installation,
- *     // add a changelog
- *     dc_add_device_msg(context, "update-123", changelog_msg);
- * }
- * ~~~
- */
-uint32_t        dc_add_device_msg            (dc_context_t* context, const char* label, dc_msg_t* msg);
-
-
-/**
- * Init device-messages and saved-messages chat.
- * This function adds the device-chat and saved-messages chat
- * and adds one or more welcome or update-messages.
- * The ui can add messages on its own using dc_add_device_msg() -
- * for ordering, either before or after or even without calling this function.
- *
- * Chat and message creation is done only once.
- * So if the user has manually deleted things, they won't be re-created
- * (however, not seen device messages are added and may re-create the device-chat).
- *
- * @memberof dc_context_t
- * @param context The context as created by dc_context_new().
- * @return None.
- */
-void            dc_update_device_chats       (dc_context_t* context);
-
-
-/**
- * Check if a device-message with a given label was ever added.
- * Device-messages can be added dc_add_device_msg().
- *
- * @memberof dc_context_t
- * @param context The context as created by dc_context_new().
- * @param label Label of the message to check.
- * @return 1=A message with this label was added at some point,
- *     0=A message with this label was never added.
- */
-int             dc_was_device_msg_ever_added (dc_context_t* context, const char* label);
-
-
 /**
  * Get draft for a chat, if any.
  * See dc_set_draft() for more details about drafts.
@@ -1285,7 +1211,7 @@ void            dc_marknoticed_all_chats     (dc_context_t* context);
  * @memberof dc_context_t
  * @param context The context object as returned from dc_context_new().
  * @param chat_id The chat ID to get all messages with media from.
- * @param msg_type Specify a message type to query here, one of the @ref DC_MSG constants.
+ * @param msg_type Specify a message type to query here, one of the DC_MSG_* constats.
  * @param msg_type2 Alternative message type to search for. 0 to skip.
  * @param msg_type3 Alternative message type to search for. 0 to skip.
  * @return An array with messages from the given chat ID that have the wanted message types.
@@ -1587,16 +1513,6 @@ char*           dc_get_mime_headers          (dc_context_t* context, uint32_t ms
  */
 void            dc_delete_msgs               (dc_context_t* context, const uint32_t* msg_ids, int msg_cnt);
 
-/**
- * Empty IMAP server folder: delete all messages. 
- *
- * @memberof dc_context_t
- * @param context The context object as created by dc_context_new()
- * @param flags What to delete, a combination of the @ref DC_EMPTY flags
- * @return None.
- */
-void            dc_empty_server              (dc_context_t* context, uint32_t flags);
-
 
 /**
  * Forward messages to another chat.
@@ -2684,6 +2600,8 @@ int             dc_chat_get_type             (const dc_chat_t* chat);
  *
  * To change the name, use dc_set_chat_name()
  *
+ * See also: dc_chat_get_subtitle()
+ *
  * @memberof dc_chat_t
  * @param chat The chat object.
  * @return Chat name as a string. Must be released using dc_str_unref() after usage. Never NULL.
@@ -2691,13 +2609,13 @@ int             dc_chat_get_type             (const dc_chat_t* chat);
 char*           dc_chat_get_name             (const dc_chat_t* chat);
 
 
-/*
+/**
  * Get a subtitle for a chat.  The subtitle is eg. the email-address or the
  * number of group members.
  *
- * Deprecated function. Subtitles should be created in the ui
- * where plural forms and other specials can be handled more gracefully.
+ * See also: dc_chat_get_name()
  *
+ * @memberof dc_chat_t
  * @param chat The chat object to calulate the subtitle for.
  * @return Subtitle as a string. Must be released using dc_str_unref() after usage. Never NULL.
  */
@@ -2787,37 +2705,6 @@ int             dc_chat_is_unpromoted        (const dc_chat_t* chat);
 int             dc_chat_is_self_talk         (const dc_chat_t* chat);
 
 
-/**
- * Check if a chat is a device-talk.
- * Device-talks contain update information
- * and some hints that are added during the program runs, multi-device etc.
- *
- * From the ui view, device-talks are not very special,
- * the user can delete and forward messages, archive the chat, set notifications etc.
- *
- * Messages can be added to the device-talk using dc_add_device_msg()
- *
- * @memberof dc_chat_t
- * @param chat The chat object.
- * @return 1=chat is device-talk, 0=chat is no device-talk
- */
-int             dc_chat_is_device_talk       (const dc_chat_t* chat);
-
-
-/**
- * Check if messages can be sent to a give chat.
- * This is not true eg. for the deaddrop or for the device-talk, cmp. dc_chat_is_device_talk().
- *
- * Calling dc_send_msg() for these chats will fail
- * and the ui may decide to hide input controls therefore.
- *
- * @memberof dc_chat_t
- * @param chat The chat object.
- * @return 1=chat is writable, 0=chat is not writable
- */
-int             dc_chat_can_send              (const dc_chat_t* chat);
-
-
 /**
  * Check if a chat is verified.  Verified chats contain only verified members
  * and encryption is alwasy enabled.  Verified chats are created using
@@ -3473,8 +3360,7 @@ void            dc_msg_latefiling_mediasize   (dc_msg_t* msg, int width, int hei
 
 
 #define         DC_CONTACT_ID_SELF           1
-#define         DC_CONTACT_ID_INFO           2 // centered messages as "member added", used in all chats
-#define         DC_CONTACT_ID_DEVICE         5 // messages "update info" in the device-chat
+#define         DC_CONTACT_ID_DEVICE         2
 #define         DC_CONTACT_ID_LAST_SPECIAL   9
 
 
@@ -3993,67 +3879,6 @@ int64_t          dc_lot_get_timestamp     (const dc_lot_t* lot);
 #define DC_LP_IMAP_SOCKET_FLAGS (DC_LP_IMAP_SOCKET_STARTTLS|DC_LP_IMAP_SOCKET_SSL|DC_LP_IMAP_SOCKET_PLAIN) // if none of these flags are set, the default is chosen
 #define DC_LP_SMTP_SOCKET_FLAGS (DC_LP_SMTP_SOCKET_STARTTLS|DC_LP_SMTP_SOCKET_SSL|DC_LP_SMTP_SOCKET_PLAIN) // if none of these flags are set, the default is chosen
 
-/**
- * @defgroup DC_CERTCK DC_CERTCK
- *
- * These constants configure TLS certificate checks for IMAP and SMTP connections.
- *
- * These constants are set via dc_set_config()
- * using keys "imap_certificate_checks" and "smtp_certificate_checks".
- *
- * @addtogroup DC_CERTCK
- * @{
- */
-
-/**
- * Configure certificate checks automatically.
- */
-#define DC_CERTCK_AUTO 0
-
-/**
- * Strictly check TLS certificates;
- * require that both the certificate and hostname are valid.
- */
-#define DC_CERTCK_STRICT 1
-
-/**
- * Accept invalid hostnames, but not invalid certificates.
- */
-#define DC_CERTCK_ACCEPT_INVALID_HOSTNAMES 2
-
-/**
- * Accept invalid certificates, including self-signed ones
- * or having incorrect hostname.
- */
-#define DC_CERTCK_ACCEPT_INVALID_CERTIFICATES 3
-
-/**
- * @}
- */
-
-
-/**
- * @defgroup DC_EMPTY DC_EMPTY
- *
- * These constants configure emptying imap folders with dc_empty_server()
- *
- * @addtogroup DC_EMPTY
- * @{
- */
-
-/**
- * Clear all mvbox messages.
- */
-#define DC_EMPTY_MVBOX 0x01
-
-/**
- * Clear all INBOX messages.
- */
-#define DC_EMPTY_INBOX 0x02
-
-/**
- * @}
- */
 
 
 /**
@@ -4068,6 +3893,7 @@ int64_t          dc_lot_get_timestamp     (const dc_lot_t* lot);
  * @{
  */
 
+
 /**
  * The library-user may write an informational string to the log.
  * Passed to the callback given to dc_context_new().
@@ -4133,16 +3959,6 @@ int64_t          dc_lot_get_timestamp     (const dc_lot_t* lot);
  */
 #define DC_EVENT_IMAP_MESSAGE_MOVED   105
 
-/**
- * Emitted when an IMAP folder was emptied. 
- *
- * @param data1 0
- * @param data2 (const char*) folder name. 
- *     Must not be unref'd or modified and is valid only until the callback returns.
- * @return 0
- */
-#define DC_EVENT_IMAP_FOLDER_EMPTIED  106
-
 /**
  * Emitted when a new blob file was successfully written 
  *
@@ -4405,16 +4221,6 @@ int64_t          dc_lot_get_timestamp     (const dc_lot_t* lot);
 #define DC_EVENT_SECUREJOIN_JOINER_PROGRESS       2061
 
 
-/**
- * This event is sent out to the inviter when a joiner successfully joined a group.
- *
- * @param data1 (int) chat_id
- * @param data2 (int) contact_id
- * @return 0
- */
-#define DC_EVENT_SECUREJOIN_MEMBER_ADDED 2062
-
-
 /**
  * @}
  */
@@ -4532,8 +4338,7 @@ void            dc_array_add_id              (dc_array_t*, uint32_t); // depreca
 #define DC_STR_MSGLOCATIONDISABLED        65
 #define DC_STR_LOCATION                   66
 #define DC_STR_STICKER                    67
-#define DC_STR_DEVICE_MESSAGES            68
-#define DC_STR_COUNT                      68
+#define DC_STR_COUNT                      67
 
 /*
  * @}

deltachat-ffi/src/lib.rs

@@ -22,16 +22,14 @@ use std::sync::RwLock;
 use libc::uintptr_t;
 use num_traits::{FromPrimitive, ToPrimitive};
 
-use deltachat::constants::DC_MSG_ID_LAST_SPECIAL;
 use deltachat::contact::Contact;
 use deltachat::context::Context;
-use deltachat::message::MsgId;
+use deltachat::dc_tools::{
+    as_path, dc_strdup, to_opt_string_lossy, to_string_lossy, OsStrExt, StrExt,
+};
 use deltachat::stock::StockMessage;
 use deltachat::*;
 
-mod string;
-use self::string::*;
-
 // as C lacks a good and portable error handling,
 // in general, the C Interface is forgiving wrt to bad parameters.
 // - objects returned by some functions
@@ -130,7 +128,6 @@ impl ContextWrapper {
                     | Event::SmtpMessageSent(msg)
                     | Event::ImapMessageDeleted(msg)
                     | Event::ImapMessageMoved(msg)
-                    | Event::ImapFolderEmptied(msg)
                     | Event::NewBlobFile(msg)
                     | Event::DeletedBlobFile(msg)
                     | Event::Warning(msg)
@@ -144,12 +141,9 @@ impl ContextWrapper {
                     | Event::IncomingMsg { chat_id, msg_id }
                     | Event::MsgDelivered { chat_id, msg_id }
                     | Event::MsgFailed { chat_id, msg_id }
-                    | Event::MsgRead { chat_id, msg_id } => ffi_cb(
-                        self,
-                        event_id,
-                        chat_id as uintptr_t,
-                        msg_id.to_u32() as uintptr_t,
-                    ),
+                    | Event::MsgRead { chat_id, msg_id } => {
+                        ffi_cb(self, event_id, chat_id as uintptr_t, msg_id as uintptr_t)
+                    }
                     Event::ChatModified(chat_id) => ffi_cb(self, event_id, chat_id as uintptr_t, 0),
                     Event::ContactsChanged(id) | Event::LocationChanged(id) => {
                         let id = id.unwrap_or_default();
@@ -175,15 +169,6 @@ impl ContextWrapper {
                         contact_id as uintptr_t,
                         progress as uintptr_t,
                     ),
-                    Event::SecurejoinMemberAdded {
-                        chat_id,
-                        contact_id,
-                    } => ffi_cb(
-                        self,
-                        event_id,
-                        chat_id as uintptr_t,
-                        contact_id as uintptr_t,
-                    ),
                 }
             }
             None => 0,
@@ -470,7 +455,7 @@ pub unsafe extern "C" fn dc_perform_imap_jobs(context: *mut dc_context_t) {
     }
     let ffi_context = &*context;
     ffi_context
-        .with_inner(|ctx| job::perform_inbox_jobs(ctx))
+        .with_inner(|ctx| job::perform_imap_jobs(ctx))
         .unwrap_or(())
 }
 
@@ -482,20 +467,19 @@ pub unsafe extern "C" fn dc_perform_imap_fetch(context: *mut dc_context_t) {
     }
     let ffi_context = &*context;
     ffi_context
-        .with_inner(|ctx| job::perform_inbox_fetch(ctx))
+        .with_inner(|ctx| job::perform_imap_fetch(ctx))
         .unwrap_or(())
 }
 
 #[no_mangle]
 pub unsafe extern "C" fn dc_perform_imap_idle(context: *mut dc_context_t) {
-    // TODO rename function in co-ordination with UIs
     if context.is_null() {
         eprintln!("ignoring careless call to dc_perform_imap_idle()");
         return;
     }
     let ffi_context = &*context;
     ffi_context
-        .with_inner(|ctx| job::perform_inbox_idle(ctx))
+        .with_inner(|ctx| job::perform_imap_idle(ctx))
         .unwrap_or(())
 }
 
@@ -507,7 +491,7 @@ pub unsafe extern "C" fn dc_interrupt_imap_idle(context: *mut dc_context_t) {
     }
     let ffi_context = &*context;
     ffi_context
-        .with_inner(|ctx| job::interrupt_inbox_idle(ctx, true))
+        .with_inner(|ctx| job::interrupt_imap_idle(ctx))
         .unwrap_or(())
 }
 
@@ -697,8 +681,7 @@ pub unsafe extern "C" fn dc_create_chat_by_msg_id(context: *mut dc_context_t, ms
     let ffi_context = &*context;
     ffi_context
         .with_inner(|ctx| {
-            chat::create_by_msg_id(ctx, MsgId::new(msg_id))
-                .unwrap_or_log_default(ctx, "Failed to create chat")
+            chat::create_by_msg_id(ctx, msg_id).unwrap_or_log_default(ctx, "Failed to create chat")
         })
         .unwrap_or(0)
 }
@@ -732,7 +715,10 @@ pub unsafe extern "C" fn dc_get_chat_id_by_contact_id(
     }
     let ffi_context = &*context;
     ffi_context
-        .with_inner(|ctx| chat::get_by_contact_id(ctx, contact_id).unwrap_or(0))
+        .with_inner(|ctx| {
+            chat::get_by_contact_id(ctx, contact_id)
+                .unwrap_or_log_default(ctx, "Failed to get chat")
+        })
         .unwrap_or(0)
 }
 
@@ -753,7 +739,6 @@ pub unsafe extern "C" fn dc_prepare_msg(
             chat::prepare_msg(ctx, chat_id, &mut ffi_msg.message)
                 .unwrap_or_log_default(ctx, "Failed to prepare message")
         })
-        .map(|msg_id| msg_id.to_u32())
         .unwrap_or(0)
 }
 
@@ -774,7 +759,6 @@ pub unsafe extern "C" fn dc_send_msg(
             chat::send_msg(ctx, chat_id, &mut ffi_msg.message)
                 .unwrap_or_log_default(ctx, "Failed to send message")
         })
-        .map(|msg_id| msg_id.to_u32())
         .unwrap_or(0)
 }
 
@@ -793,7 +777,6 @@ pub unsafe extern "C" fn dc_send_text_msg(
     ffi_context
         .with_inner(|ctx| {
             chat::send_text_msg(ctx, chat_id, text_to_send)
-                .map(|msg_id| msg_id.to_u32())
                 .unwrap_or_log_default(ctx, "Failed to send text message")
         })
         .unwrap_or(0)
@@ -821,69 +804,6 @@ pub unsafe extern "C" fn dc_set_draft(
         .unwrap_or(())
 }
 
-#[no_mangle]
-pub unsafe extern "C" fn dc_add_device_msg(
-    context: *mut dc_context_t,
-    label: *const libc::c_char,
-    msg: *mut dc_msg_t,
-) -> u32 {
-    if context.is_null() || (label.is_null() && msg.is_null()) {
-        eprintln!("ignoring careless call to dc_add_device_msg()");
-        return 0;
-    }
-    let ffi_context = &mut *context;
-    let msg = if msg.is_null() {
-        None
-    } else {
-        let ffi_msg: &mut MessageWrapper = &mut *msg;
-        Some(&mut ffi_msg.message)
-    };
-    ffi_context
-        .with_inner(|ctx| {
-            chat::add_device_msg(
-                ctx,
-                to_opt_string_lossy(label).as_ref().map(|x| x.as_str()),
-                msg,
-            )
-            .unwrap_or_log_default(ctx, "Failed to add device message")
-        })
-        .map(|msg_id| msg_id.to_u32())
-        .unwrap_or(0)
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_update_device_chats(context: *mut dc_context_t) {
-    if context.is_null() {
-        eprintln!("ignoring careless call to dc_update_device_chats()");
-        return;
-    }
-    let ffi_context = &mut *context;
-    ffi_context
-        .with_inner(|ctx| {
-            ctx.update_device_chats()
-                .unwrap_or_log_default(ctx, "Failed to add device message")
-        })
-        .unwrap_or(())
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_was_device_msg_ever_added(
-    context: *mut dc_context_t,
-    label: *const libc::c_char,
-) -> libc::c_int {
-    if context.is_null() || label.is_null() {
-        eprintln!("ignoring careless call to dc_was_device_msg_ever_added()");
-        return 0;
-    }
-    let ffi_context = &mut *context;
-    ffi_context
-        .with_inner(|ctx| {
-            chat::was_device_msg_ever_added(ctx, &to_string_lossy(label)).unwrap_or(false)
-                as libc::c_int
-        })
-        .unwrap_or(0)
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_get_draft(context: *mut dc_context_t, chat_id: u32) -> *mut dc_msg_t {
     if context.is_null() {
@@ -921,19 +841,9 @@ pub unsafe extern "C" fn dc_get_chat_msgs(
         return ptr::null_mut();
     }
     let ffi_context = &*context;
-    let marker_flag = if marker1before <= DC_MSG_ID_LAST_SPECIAL {
-        None
-    } else {
-        Some(MsgId::new(marker1before))
-    };
     ffi_context
         .with_inner(|ctx| {
-            let arr = dc_array_t::from(
-                chat::get_chat_msgs(ctx, chat_id, flags, marker_flag)
-                    .iter()
-                    .map(|msg_id| msg_id.to_u32())
-                    .collect::<Vec<u32>>(),
-            );
+            let arr = dc_array_t::from(chat::get_chat_msgs(ctx, chat_id, flags, marker1before));
             Box::into_raw(Box::new(arr))
         })
         .unwrap_or_else(|_| ptr::null_mut())
@@ -977,12 +887,7 @@ pub unsafe extern "C" fn dc_get_fresh_msgs(
     let ffi_context = &*context;
     ffi_context
         .with_inner(|ctx| {
-            let arr = dc_array_t::from(
-                ctx.get_fresh_msgs()
-                    .iter()
-                    .map(|msg_id| msg_id.to_u32())
-                    .collect::<Vec<u32>>(),
-            );
+            let arr = dc_array_t::from(ctx.get_fresh_msgs());
             Box::into_raw(Box::new(arr))
         })
         .unwrap_or_else(|_| ptr::null_mut())
@@ -1044,12 +949,13 @@ pub unsafe extern "C" fn dc_get_chat_media(
         from_prim(or_msg_type3).expect(&format!("incorrect or_msg_type3 = {}", or_msg_type3));
     ffi_context
         .with_inner(|ctx| {
-            let arr = dc_array_t::from(
-                chat::get_chat_media(ctx, chat_id, msg_type, or_msg_type2, or_msg_type3)
-                    .iter()
-                    .map(|msg_id| msg_id.to_u32())
-                    .collect::<Vec<u32>>(),
-            );
+            let arr = dc_array_t::from(chat::get_chat_media(
+                ctx,
+                chat_id,
+                msg_type,
+                or_msg_type2,
+                or_msg_type3,
+            ));
             Box::into_raw(Box::new(arr))
         })
         .unwrap_or_else(|_| ptr::null_mut())
@@ -1082,16 +988,7 @@ pub unsafe extern "C" fn dc_get_next_media(
         from_prim(or_msg_type3).expect(&format!("incorrect or_msg_type3 = {}", or_msg_type3));
     ffi_context
         .with_inner(|ctx| {
-            chat::get_next_media(
-                ctx,
-                MsgId::new(msg_id),
-                direction,
-                msg_type,
-                or_msg_type2,
-                or_msg_type3,
-            )
-            .map(|msg_id| msg_id.to_u32())
-            .unwrap_or(0)
+            chat::get_next_media(ctx, msg_id, direction, msg_type, or_msg_type2, or_msg_type3)
         })
         .unwrap_or(0)
 }
@@ -1162,12 +1059,7 @@ pub unsafe extern "C" fn dc_search_msgs(
     let ffi_context = &*context;
     ffi_context
         .with_inner(|ctx| {
-            let arr = dc_array_t::from(
-                ctx.search_msgs(chat_id, to_string_lossy(query))
-                    .iter()
-                    .map(|msg_id| msg_id.to_u32())
-                    .collect::<Vec<u32>>(),
-            );
+            let arr = dc_array_t::from(ctx.search_msgs(chat_id, to_string_lossy(query)));
             Box::into_raw(Box::new(arr))
         })
         .unwrap_or_else(|_| ptr::null_mut())
@@ -1319,7 +1211,7 @@ pub unsafe extern "C" fn dc_get_msg_info(
     }
     let ffi_context = &*context;
     ffi_context
-        .with_inner(|ctx| message::get_msg_info(ctx, MsgId::new(msg_id)).strdup())
+        .with_inner(|ctx| message::get_msg_info(ctx, msg_id).strdup())
         .unwrap_or_else(|_| ptr::null_mut())
 }
 
@@ -1335,7 +1227,7 @@ pub unsafe extern "C" fn dc_get_mime_headers(
     let ffi_context = &*context;
     ffi_context
         .with_inner(|ctx| {
-            message::get_mime_headers(ctx, MsgId::new(msg_id))
+            message::get_mime_headers(ctx, msg_id)
                 .map(|s| s.strdup())
                 .unwrap_or_else(|| ptr::null_mut())
         })
@@ -1353,21 +1245,11 @@ pub unsafe extern "C" fn dc_delete_msgs(
         return;
     }
     let ffi_context = &*context;
-    let msg_ids = convert_and_prune_message_ids(msg_ids, msg_cnt);
-    ffi_context
-        .with_inner(|ctx| message::delete_msgs(ctx, &msg_ids[..]))
-        .unwrap_or(())
-}
 
-#[no_mangle]
-pub unsafe extern "C" fn dc_empty_server(context: *mut dc_context_t, flags: u32) {
-    if context.is_null() || flags == 0 {
-        eprintln!("ignoring careless call to dc_empty_server()");
-        return;
-    }
-    let ffi_context = &*context;
+    let ids = std::slice::from_raw_parts(msg_ids, msg_cnt as usize);
+
     ffi_context
-        .with_inner(|ctx| message::dc_empty_server(ctx, flags))
+        .with_inner(|ctx| message::delete_msgs(ctx, ids))
         .unwrap_or(())
 }
 
@@ -1386,11 +1268,12 @@ pub unsafe extern "C" fn dc_forward_msgs(
         eprintln!("ignoring careless call to dc_forward_msgs()");
         return;
     }
-    let msg_ids = convert_and_prune_message_ids(msg_ids, msg_cnt);
+    let ids = std::slice::from_raw_parts(msg_ids, msg_cnt as usize);
+
     let ffi_context = &*context;
     ffi_context
         .with_inner(|ctx| {
-            chat::forward_msgs(ctx, &msg_ids[..], chat_id)
+            chat::forward_msgs(ctx, ids, chat_id)
                 .unwrap_or_log_default(ctx, "Failed to forward message")
         })
         .unwrap_or_default()
@@ -1418,10 +1301,11 @@ pub unsafe extern "C" fn dc_markseen_msgs(
         eprintln!("ignoring careless call to dc_markseen_msgs()");
         return;
     }
-    let msg_ids = convert_and_prune_message_ids(msg_ids, msg_cnt);
+    let ids = std::slice::from_raw_parts(msg_ids, msg_cnt as usize);
+
     let ffi_context = &*context;
     ffi_context
-        .with_inner(|ctx| message::markseen_msgs(ctx, &msg_ids[..]))
+        .with_inner(|ctx| message::markseen_msgs(ctx, ids))
         .ok();
 }
 
@@ -1436,10 +1320,12 @@ pub unsafe extern "C" fn dc_star_msgs(
         eprintln!("ignoring careless call to dc_star_msgs()");
         return;
     }
-    let msg_ids = convert_and_prune_message_ids(msg_ids, msg_cnt);
+
+    let ids = std::slice::from_raw_parts(msg_ids, msg_cnt as usize);
+
     let ffi_context = &*context;
     ffi_context
-        .with_inner(|ctx| message::star_msgs(ctx, &msg_ids[..], star == 1))
+        .with_inner(|ctx| message::star_msgs(ctx, ids, star == 1))
         .ok();
 }
 
@@ -1452,23 +1338,11 @@ pub unsafe extern "C" fn dc_get_msg(context: *mut dc_context_t, msg_id: u32) ->
     let ffi_context = &*context;
     ffi_context
         .with_inner(|ctx| {
-            let message = match message::Message::load_from_db(ctx, MsgId::new(msg_id)) {
+            let message = match message::Message::load_from_db(ctx, msg_id) {
                 Ok(msg) => msg,
                 Err(e) => {
-                    if msg_id <= constants::DC_MSG_ID_LAST_SPECIAL {
-                        // C-core API returns empty messages, do the same
-                        warn!(
-                            ctx,
-                            "dc_get_msg called with special msg_id={}, returning empty msg", msg_id
-                        );
-                        message::Message::default()
-                    } else {
-                        error!(
-                            ctx,
-                            "dc_get_msg could not retrieve msg_id {}: {}", msg_id, e
-                        );
-                        return ptr::null_mut();
-                    }
+                    error!(ctx, "Error getting msg #{}: {}", msg_id, e);
+                    return ptr::null_mut();
                 }
             };
             let ffi_msg = MessageWrapper { context, message };
@@ -1751,8 +1625,7 @@ pub unsafe extern "C" fn dc_continue_key_transfer(
     let ffi_context = &*context;
     ffi_context
         .with_inner(|ctx| {
-            match imex::continue_key_transfer(ctx, MsgId::new(msg_id), &to_string_lossy(setup_code))
-            {
+            match imex::continue_key_transfer(ctx, msg_id, &to_string_lossy(setup_code)) {
                 Ok(()) => 1,
                 Err(err) => {
                     error!(ctx, "dc_continue_key_transfer: {}", err);
@@ -2163,11 +2036,7 @@ pub unsafe extern "C" fn dc_chatlist_get_msg_id(
         return 0;
     }
     let ffi_list = &*chatlist;
-    ffi_list
-        .list
-        .get_msg_id(index as usize)
-        .map(|msg_id| msg_id.to_u32())
-        .unwrap_or(0)
+    ffi_list.list.get_msg_id(index as usize)
 }
 
 #[no_mangle]
@@ -2337,26 +2206,6 @@ pub unsafe extern "C" fn dc_chat_is_self_talk(chat: *mut dc_chat_t) -> libc::c_i
     ffi_chat.chat.is_self_talk() as libc::c_int
 }
 
-#[no_mangle]
-pub unsafe extern "C" fn dc_chat_is_device_talk(chat: *mut dc_chat_t) -> libc::c_int {
-    if chat.is_null() {
-        eprintln!("ignoring careless call to dc_chat_is_device_talk()");
-        return 0;
-    }
-    let ffi_chat = &*chat;
-    ffi_chat.chat.is_device_talk() as libc::c_int
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_chat_can_send(chat: *mut dc_chat_t) -> libc::c_int {
-    if chat.is_null() {
-        eprintln!("ignoring careless call to dc_chat_can_send()");
-        return 0;
-    }
-    let ffi_chat = &*chat;
-    ffi_chat.chat.can_send() as libc::c_int
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_chat_is_verified(chat: *mut dc_chat_t) -> libc::c_int {
     if chat.is_null() {
@@ -2429,7 +2278,7 @@ pub unsafe extern "C" fn dc_msg_get_id(msg: *mut dc_msg_t) -> u32 {
         return 0;
     }
     let ffi_msg = &*msg;
-    ffi_msg.message.get_id().to_u32()
+    ffi_msg.message.get_id()
 }
 
 #[no_mangle]
@@ -3116,14 +2965,3 @@ impl<T, E> ResultNullableExt<T> for Result<T, E> {
         }
     }
 }
-
-fn convert_and_prune_message_ids(msg_ids: *const u32, msg_cnt: libc::c_int) -> Vec<MsgId> {
-    let ids = unsafe { std::slice::from_raw_parts(msg_ids, msg_cnt as usize) };
-    let msg_ids: Vec<MsgId> = ids
-        .iter()
-        .filter(|id| **id > DC_MSG_ID_LAST_SPECIAL)
-        .map(|id| MsgId::new(*id))
-        .collect();
-
-    msg_ids
-}

deltachat-ffi/src/providers.rs

@@ -2,7 +2,7 @@ extern crate deltachat_provider_database;
 
 use std::ptr;
 
-use crate::string::{to_string_lossy, StrExt};
+use deltachat::dc_tools::{as_str, StrExt};
 use deltachat_provider_database::StatusState;
 
 #[no_mangle]
@@ -12,7 +12,7 @@ pub type dc_provider_t = deltachat_provider_database::Provider;
 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(&to_string_lossy(domain)) {
+    match deltachat_provider_database::get_provider_info(as_str(domain)) {
         Some(provider) => provider,
         None => ptr::null(),
     }
@@ -22,8 +22,7 @@ pub unsafe extern "C" fn dc_provider_new_from_domain(
 pub unsafe extern "C" fn dc_provider_new_from_email(
     email: *const libc::c_char,
 ) -> *const dc_provider_t {
-    let email = to_string_lossy(email);
-    let domain = deltachat_provider_database::get_domain_from_email(&email);
+    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(),

deltachat-ffi/src/string.rs

@@ -1,350 +0,0 @@
-use failure::Fail;
-use std::ffi::{CStr, CString};
-
-/// Duplicates a string
-///
-/// returns an empty string if NULL is given, never returns NULL (exits on errors)
-///
-/// # Examples
-///
-/// ```rust,norun
-/// use deltachat::dc_tools::{dc_strdup, to_string_lossy};
-/// unsafe {
-///     let str_a = b"foobar\x00" as *const u8 as *const libc::c_char;
-///     let str_a_copy = dc_strdup(str_a);
-///     assert_eq!(to_string_lossy(str_a_copy), "foobar");
-///     assert_ne!(str_a, str_a_copy);
-/// }
-/// ```
-pub unsafe fn dc_strdup(s: *const libc::c_char) -> *mut libc::c_char {
-    let ret: *mut libc::c_char;
-    if !s.is_null() {
-        ret = libc::strdup(s);
-        assert!(!ret.is_null());
-    } else {
-        ret = libc::calloc(1, 1) as *mut libc::c_char;
-        assert!(!ret.is_null());
-    }
-
-    ret
-}
-
-/// Error type for the [OsStrExt] trait
-#[derive(Debug, Fail, PartialEq)]
-pub enum CStringError {
-    /// The string contains an interior null byte
-    #[fail(display = "String contains an interior null byte")]
-    InteriorNullByte,
-    /// The string is not valid Unicode
-    #[fail(display = "String is not valid unicode")]
-    NotUnicode,
-}
-
-/// Extra convenience methods on [std::ffi::OsStr] to work with `*libc::c_char`.
-///
-/// The primary function of this trait is to more easily convert
-/// [OsStr], [OsString] or [Path] into pointers to C strings.  This always
-/// allocates a new string since it is very common for the source
-/// string not to have the required terminal null byte.
-///
-/// It is implemented for `AsRef<std::ffi::OsStr>>` trait, which
-/// allows any type which implements this trait to transparently use
-/// this.  This is how the conversion for [Path] works.
-///
-/// [OsStr]: std::ffi::OsStr
-/// [OsString]: std::ffi::OsString
-/// [Path]: std::path::Path
-///
-/// # Example
-///
-/// ```
-/// use deltachat::dc_tools::{dc_strdup, OsStrExt};
-/// let path = std::path::Path::new("/some/path");
-/// let path_c = path.to_c_string().unwrap();
-/// unsafe {
-///     let mut c_ptr: *mut libc::c_char = dc_strdup(path_c.as_ptr());
-/// }
-/// ```
-pub trait OsStrExt {
-    /// Convert a  [std::ffi::OsStr] to an [std::ffi::CString]
-    ///
-    /// This is useful to convert e.g. a [std::path::Path] to
-    /// [*libc::c_char] by using
-    /// [Path::as_os_str()](std::path::Path::as_os_str) and
-    /// [CStr::as_ptr()](std::ffi::CStr::as_ptr).
-    ///
-    /// This returns [CString] and not [&CStr] because not all [OsStr]
-    /// slices end with a null byte, particularly those coming from
-    /// [Path] do not have a null byte and having to handle this as
-    /// the caller would defeat the point of this function.
-    ///
-    /// On Windows this requires that the [OsStr] contains valid
-    /// unicode, which should normally be the case for a [Path].
-    ///
-    /// [CString]: std::ffi::CString
-    /// [CStr]: std::ffi::CStr
-    /// [OsStr]: std::ffi::OsStr
-    /// [Path]: std::path::Path
-    ///
-    /// # Errors
-    ///
-    /// Since a C `*char` is terminated by a NULL byte this conversion
-    /// will fail, when the [OsStr] has an interior null byte.  The
-    /// function will return
-    /// `[Err]([CStringError::InteriorNullByte])`.  When converting
-    /// from a [Path] it should be safe to
-    /// [`.unwrap()`](std::result::Result::unwrap) this anyway since a
-    /// [Path] should not contain interior null bytes.
-    ///
-    /// On windows when the string contains invalid Unicode
-    /// `[Err]([CStringError::NotUnicode])` is returned.
-    fn to_c_string(&self) -> Result<CString, CStringError>;
-}
-
-impl<T: AsRef<std::ffi::OsStr>> OsStrExt for T {
-    #[cfg(not(target_os = "windows"))]
-    fn to_c_string(&self) -> Result<CString, CStringError> {
-        use std::os::unix::ffi::OsStrExt;
-        CString::new(self.as_ref().as_bytes()).map_err(|err| match err {
-            std::ffi::NulError { .. } => CStringError::InteriorNullByte,
-        })
-    }
-
-    #[cfg(target_os = "windows")]
-    fn to_c_string(&self) -> Result<CString, CStringError> {
-        os_str_to_c_string_unicode(&self)
-    }
-}
-
-// Implementation for os_str_to_c_string on windows.
-#[allow(dead_code)]
-fn os_str_to_c_string_unicode(
-    os_str: &dyn AsRef<std::ffi::OsStr>,
-) -> Result<CString, CStringError> {
-    match os_str.as_ref().to_str() {
-        Some(val) => CString::new(val.as_bytes()).map_err(|err| match err {
-            std::ffi::NulError { .. } => CStringError::InteriorNullByte,
-        }),
-        None => Err(CStringError::NotUnicode),
-    }
-}
-
-/// Convenience methods/associated functions for working with [CString]
-///
-/// This is helps transitioning from unsafe code.
-pub trait CStringExt {
-    /// Create a new [CString], yolo style
-    ///
-    /// This unwrap the result, panicking when there are embedded NULL
-    /// bytes.
-    fn yolo<T: Into<Vec<u8>>>(t: T) -> CString {
-        CString::new(t).expect("String contains null byte, can not be CString")
-    }
-}
-
-impl CStringExt for CString {}
-
-/// Convenience methods to make transitioning from raw C strings easier.
-///
-/// To interact with (legacy) C APIs we often need to convert from
-/// Rust strings to raw C strings.  This can be clumsy to do correctly
-/// and the compiler sometimes allows it in an unsafe way.  These
-/// methods make it more succinct and help you get it right.
-pub trait StrExt {
-    /// Allocate a new raw C `*char` version of this string.
-    ///
-    /// This allocates a new raw C string which must be freed using
-    /// `free`.  It takes care of some common pitfalls with using
-    /// [CString.as_ptr].
-    ///
-    /// [CString.as_ptr]: std::ffi::CString.as_ptr
-    ///
-    /// # Panics
-    ///
-    /// This function will panic when the original string contains an
-    /// interior null byte as this can not be represented in raw C
-    /// strings.
-    unsafe fn strdup(&self) -> *mut libc::c_char;
-}
-
-impl<T: AsRef<str>> StrExt for T {
-    unsafe fn strdup(&self) -> *mut libc::c_char {
-        let tmp = CString::yolo(self.as_ref());
-        dc_strdup(tmp.as_ptr())
-    }
-}
-
-pub fn to_string_lossy(s: *const libc::c_char) -> String {
-    if s.is_null() {
-        return "".into();
-    }
-
-    let cstr = unsafe { CStr::from_ptr(s) };
-
-    cstr.to_string_lossy().to_string()
-}
-
-pub fn to_opt_string_lossy(s: *const libc::c_char) -> Option<String> {
-    if s.is_null() {
-        return None;
-    }
-
-    Some(to_string_lossy(s))
-}
-
-/// Convert a C `*char` pointer to a [std::path::Path] slice.
-///
-/// This converts a `*libc::c_char` pointer to a [Path] slice.  This
-/// essentially has to convert the pointer to [std::ffi::OsStr] to do
-/// so and thus is the inverse of [OsStrExt::to_c_string].  Just like
-/// [OsStrExt::to_c_string] requires valid Unicode on Windows, this
-/// requires that the pointer contains valid UTF-8 on Windows.
-///
-/// Because this returns a reference the [Path] silce can not outlive
-/// the original pointer.
-///
-/// [Path]: std::path::Path
-#[cfg(not(target_os = "windows"))]
-pub fn as_path<'a>(s: *const libc::c_char) -> &'a std::path::Path {
-    assert!(!s.is_null(), "cannot be used on null pointers");
-    use std::os::unix::ffi::OsStrExt;
-    unsafe {
-        let c_str = std::ffi::CStr::from_ptr(s).to_bytes();
-        let os_str = std::ffi::OsStr::from_bytes(c_str);
-        std::path::Path::new(os_str)
-    }
-}
-
-// as_path() implementation for windows, documented above.
-#[cfg(target_os = "windows")]
-pub fn as_path<'a>(s: *const libc::c_char) -> &'a std::path::Path {
-    as_path_unicode(s)
-}
-
-// Implementation for as_path() on Windows.
-//
-// Having this as a separate function means it can be tested on unix
-// too.
-#[allow(dead_code)]
-fn as_path_unicode<'a>(s: *const libc::c_char) -> &'a std::path::Path {
-    assert!(!s.is_null(), "cannot be used on null pointers");
-
-    let cstr = unsafe { CStr::from_ptr(s) };
-    let str = cstr.to_str().unwrap_or_else(|err| panic!("{}", err));
-
-    std::path::Path::new(str)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use libc::{free, strcmp};
-
-    #[test]
-    fn test_os_str_to_c_string_cwd() {
-        let some_dir = std::env::current_dir().unwrap();
-        some_dir.as_os_str().to_c_string().unwrap();
-    }
-
-    #[test]
-    fn test_os_str_to_c_string_unicode() {
-        let some_str = String::from("/some/valid/utf8");
-        let some_dir = std::path::Path::new(&some_str);
-        assert_eq!(
-            some_dir.as_os_str().to_c_string().unwrap(),
-            CString::new("/some/valid/utf8").unwrap()
-        );
-    }
-
-    #[test]
-    fn test_os_str_to_c_string_nul() {
-        let some_str = std::ffi::OsString::from("foo\x00bar");
-        assert_eq!(
-            some_str.to_c_string().err().unwrap(),
-            CStringError::InteriorNullByte
-        )
-    }
-
-    #[test]
-    fn test_path_to_c_string_cwd() {
-        let some_dir = std::env::current_dir().unwrap();
-        some_dir.to_c_string().unwrap();
-    }
-
-    #[test]
-    fn test_path_to_c_string_unicode() {
-        let some_str = String::from("/some/valid/utf8");
-        let some_dir = std::path::Path::new(&some_str);
-        assert_eq!(
-            some_dir.as_os_str().to_c_string().unwrap(),
-            CString::new("/some/valid/utf8").unwrap()
-        );
-    }
-
-    #[test]
-    fn test_os_str_to_c_string_unicode_fn() {
-        let some_str = std::ffi::OsString::from("foo");
-        assert_eq!(
-            os_str_to_c_string_unicode(&some_str).unwrap(),
-            CString::new("foo").unwrap()
-        );
-    }
-
-    #[test]
-    fn test_path_to_c_string_unicode_fn() {
-        let some_str = String::from("/some/path");
-        let some_path = std::path::Path::new(&some_str);
-        assert_eq!(
-            os_str_to_c_string_unicode(&some_path).unwrap(),
-            CString::new("/some/path").unwrap()
-        );
-    }
-
-    #[test]
-    fn test_os_str_to_c_string_unicode_fn_nul() {
-        let some_str = std::ffi::OsString::from("fooz\x00bar");
-        assert_eq!(
-            os_str_to_c_string_unicode(&some_str).err().unwrap(),
-            CStringError::InteriorNullByte
-        );
-    }
-
-    #[test]
-    fn test_as_path() {
-        let some_path = CString::new("/some/path").unwrap();
-        let ptr = some_path.as_ptr();
-        assert_eq!(as_path(ptr), std::ffi::OsString::from("/some/path"))
-    }
-
-    #[test]
-    fn test_as_path_unicode_fn() {
-        let some_path = CString::new("/some/path").unwrap();
-        let ptr = some_path.as_ptr();
-        assert_eq!(as_path_unicode(ptr), std::ffi::OsString::from("/some/path"));
-    }
-
-    #[test]
-    fn test_cstring_yolo() {
-        assert_eq!(CString::new("hello").unwrap(), CString::yolo("hello"));
-    }
-
-    #[test]
-    fn test_strdup_str() {
-        unsafe {
-            let s = "hello".strdup();
-            let cmp = strcmp(s, b"hello\x00" as *const u8 as *const libc::c_char);
-            free(s as *mut libc::c_void);
-            assert_eq!(cmp, 0);
-        }
-    }
-
-    #[test]
-    fn test_strdup_string() {
-        unsafe {
-            let s = String::from("hello").strdup();
-            let cmp = strcmp(s, b"hello\x00" as *const u8 as *const libc::c_char);
-            free(s as *mut libc::c_void);
-            assert_eq!(cmp, 0);
-        }
-    }
-}

examples/repl/cmdline.rs

@@ -14,16 +14,17 @@ use deltachat::imex::*;
 use deltachat::job::*;
 use deltachat::location;
 use deltachat::lot::LotState;
-use deltachat::message::{self, Message, MessageState, MsgId};
+use deltachat::message::{self, Message, MessageState};
 use deltachat::peerstate::*;
 use deltachat::qr::*;
 use deltachat::sql;
 use deltachat::Event;
+use libc::free;
 
 /// Reset database tables. This function is called from Core cmdline.
 /// Argument is a bitmask, executing single or multiple actions in one call.
 /// e.g. bitmask 7 triggers actions definded with bits 1, 2 and 4.
-pub fn dc_reset_tables(context: &Context, bits: i32) -> i32 {
+pub unsafe fn dc_reset_tables(context: &Context, bits: i32) -> i32 {
     info!(context, "Resetting tables ({})...", bits);
     if 0 != bits & 1 {
         sql::execute(context, &context.sql, "DELETE FROM jobs;", params![]).unwrap();
@@ -85,7 +86,7 @@ pub fn dc_reset_tables(context: &Context, bits: i32) -> i32 {
 
     context.call_cb(Event::MsgsChanged {
         chat_id: 0,
-        msg_id: MsgId::new(0),
+        msg_id: 0,
     });
 
     1
@@ -94,7 +95,7 @@ pub fn dc_reset_tables(context: &Context, bits: i32) -> i32 {
 fn dc_poke_eml_file(context: &Context, filename: impl AsRef<Path>) -> Result<(), Error> {
     let data = dc_read_file(context, filename)?;
 
-    dc_receive_imf(context, &data, "import", 0, 0);
+    unsafe { dc_receive_imf(context, &data, "import", 0, 0) };
     Ok(())
 }
 
@@ -106,19 +107,18 @@ fn dc_poke_eml_file(context: &Context, filename: impl AsRef<Path>) -> Result<(),
 /// @param context The context as created by dc_context_new().
 /// @param spec The file or directory to import. NULL for the last command.
 /// @return 1=success, 0=error.
-fn poke_spec(context: &Context, spec: Option<&str>) -> libc::c_int {
+fn poke_spec(context: &Context, spec: *const libc::c_char) -> libc::c_int {
     if !context.sql.is_open() {
         error!(context, "Import: Database not opened.");
         return 0;
     }
 
+    let real_spec: String;
     let mut read_cnt = 0;
 
-    let real_spec: String;
-
     /* if `spec` is given, remember it for later usage; if it is not given, try to use the last one */
-    if let Some(spec) = spec {
-        real_spec = spec.to_string();
+    if !spec.is_null() {
+        real_spec = to_string_lossy(spec);
         context
             .sql
             .set_raw_config(context, "import_spec", Some(&real_spec))
@@ -132,8 +132,10 @@ fn poke_spec(context: &Context, spec: Option<&str>) -> libc::c_int {
         real_spec = rs.unwrap();
     }
     if let Some(suffix) = dc_get_filesuffix_lc(&real_spec) {
-        if suffix == "eml" && dc_poke_eml_file(context, &real_spec).is_ok() {
-            read_cnt += 1
+        if suffix == "eml" {
+            if dc_poke_eml_file(context, &real_spec).is_ok() {
+                read_cnt += 1
+            }
         }
     } else {
         /* import a directory */
@@ -168,13 +170,13 @@ fn poke_spec(context: &Context, spec: Option<&str>) -> libc::c_int {
     if read_cnt > 0 {
         context.call_cb(Event::MsgsChanged {
             chat_id: 0,
-            msg_id: MsgId::new(0),
+            msg_id: 0,
         });
     }
     1
 }
 
-fn log_msg(context: &Context, prefix: impl AsRef<str>, msg: &Message) {
+unsafe fn log_msg(context: &Context, prefix: impl AsRef<str>, msg: &Message) {
     let contact = Contact::get_by_id(context, msg.get_from_id()).expect("invalid contact");
     let contact_name = contact.get_name();
     let contact_id = contact.get_id();
@@ -190,9 +192,9 @@ fn log_msg(context: &Context, prefix: impl AsRef<str>, msg: &Message) {
     let msgtext = msg.get_text();
     info!(
         context,
-        "{}{}{}{}: {} (Contact#{}): {} {}{}{}{}{} [{}]",
+        "{}#{}{}{}: {} (Contact#{}): {} {}{}{}{}{} [{}]",
         prefix.as_ref(),
-        msg.get_id(),
+        msg.get_id() as libc::c_int,
         if msg.get_showpadlock() { "🔒" } else { "" },
         if msg.has_location() { "📍" } else { "" },
         &contact_name,
@@ -219,17 +221,17 @@ fn log_msg(context: &Context, prefix: impl AsRef<str>, msg: &Message) {
     );
 }
 
-fn log_msglist(context: &Context, msglist: &Vec<MsgId>) -> Result<(), Error> {
+unsafe fn log_msglist(context: &Context, msglist: &Vec<u32>) -> Result<(), Error> {
     let mut lines_out = 0;
     for &msg_id in msglist {
-        if msg_id.is_daymarker() {
+        if msg_id == 9 as libc::c_uint {
             info!(
                 context,
                 "--------------------------------------------------------------------------------"
             );
 
             lines_out += 1
-        } else if !msg_id.is_special() {
+        } else if msg_id > 0 {
             if lines_out == 0 {
                 info!(
                     context,
@@ -238,7 +240,7 @@ fn log_msglist(context: &Context, msglist: &Vec<MsgId>) -> Result<(), Error> {
                 lines_out += 1
             }
             let msg = Message::load_from_db(context, msg_id)?;
-            log_msg(context, "", &msg);
+            log_msg(context, "Msg", &msg);
         }
     }
     if lines_out > 0 {
@@ -250,7 +252,7 @@ fn log_msglist(context: &Context, msglist: &Vec<MsgId>) -> Result<(), Error> {
     Ok(())
 }
 
-fn log_contactlist(context: &Context, contacts: &Vec<u32>) {
+unsafe fn log_contactlist(context: &Context, contacts: &Vec<u32>) {
     let mut contacts = contacts.clone();
     if !contacts.contains(&1) {
         contacts.push(1);
@@ -302,7 +304,7 @@ fn chat_prefix(chat: &Chat) -> &'static str {
     chat.typ.into()
 }
 
-pub fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::Error> {
+pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::Error> {
     let chat_id = *context.cmdline_sel_chat_id.read().unwrap();
     let mut sel_chat = if chat_id > 0 {
         Chat::load_from_db(context, chat_id).ok()
@@ -313,6 +315,11 @@ pub fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::Error> {
     let mut args = line.splitn(3, ' ');
     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() as *const _
+    };
     let arg2 = args.next().unwrap_or_default();
 
     let blobdir = context.get_blobdir();
@@ -346,7 +353,6 @@ pub fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::Error> {
                  configure\n\
                  connect\n\
                  disconnect\n\
-                 interrupt\n\
                  maybenetwork\n\
                  housekeeping\n\
                  help imex (Import/Export)\n\
@@ -372,7 +378,6 @@ pub fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::Error> {
                  sendimage <file> [<text>]\n\
                  sendfile <file> [<text>]\n\
                  draft [<text>]\n\
-                 devicemsg <text>\n\
                  listmedia\n\
                  archive <chat-id>\n\
                  unarchive <chat-id>\n\
@@ -399,7 +404,6 @@ pub fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::Error> {
                  checkqr <qr-content>\n\
                  event <event-id to test>\n\
                  fileinfo <file>\n\
-                 emptyserver <flags> (1=MVBOX 2=INBOX)\n\
                  clear -- clear screen\n\
                  exit or quit\n\
                  ============================================="
@@ -414,17 +418,17 @@ pub fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::Error> {
         },
         "get-setupcodebegin" => {
             ensure!(!arg1.is_empty(), "Argument <msg-id> missing.");
-            let msg_id: MsgId = MsgId::new(arg1.parse()?);
+            let msg_id: u32 = arg1.parse()?;
             let msg = Message::load_from_db(context, msg_id)?;
             if msg.is_setupmessage() {
                 let setupcodebegin = msg.get_setupcodebegin(context);
                 println!(
-                    "The setup code for setup message {} starts with: {}",
+                    "The setup code for setup message Msg#{} starts with: {}",
                     msg_id,
                     setupcodebegin.unwrap_or_default(),
                 );
             } else {
-                bail!("{} is no setup message.", msg_id,);
+                bail!("Msg#{} is no setup message.", msg_id,);
             }
         }
         "continue-key-transfer" => {
@@ -432,7 +436,7 @@ pub fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::Error> {
                 !arg1.is_empty() && !arg2.is_empty(),
                 "Arguments <msg-id> <setup-code> expected"
             );
-            continue_key_transfer(context, MsgId::new(arg1.parse()?), &arg2)?;
+            continue_key_transfer(context, arg1.parse()?, &arg2)?;
         }
         "has-backup" => {
             has_backup(context, blobdir)?;
@@ -462,7 +466,7 @@ pub fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::Error> {
             );
         }
         "poke" => {
-            ensure!(0 != poke_spec(context, Some(arg1)), "Poke failed");
+            ensure!(0 != poke_spec(context, arg1_c), "Poke failed");
         }
         "reset" => {
             ensure!(!arg1.is_empty(), "Argument <bits> missing: 1=jobs, 2=peerstates, 4=private keys, 8=rest but server config");
@@ -488,9 +492,6 @@ pub fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::Error> {
         "info" => {
             println!("{:#?}", context.get_info());
         }
-        "interrupt" => {
-            interrupt_inbox_idle(context, true);
-        }
         "maybenetwork" => {
             maybe_network(context);
         }
@@ -515,12 +516,15 @@ pub fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::Error> {
 
                 for i in (0..cnt).rev() {
                     let chat = Chat::load_from_db(context, chatlist.get_chat_id(i))?;
+                    let temp_subtitle = chat.get_subtitle(context);
+                    let temp_name = chat.get_name();
                     info!(
                         context,
-                        "{}#{}: {} [{} fresh]",
+                        "{}#{}: {} [{}] [{} fresh]",
                         chat_prefix(&chat),
                         chat.get_id(),
-                        chat.get_name(),
+                        temp_name,
+                        temp_subtitle,
                         chat::get_fresh_msg_cnt(context, chat.get_id()),
                     );
                     let lot = chatlist.get_summary(context, i, Some(&chat));
@@ -577,35 +581,21 @@ pub fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::Error> {
             ensure!(sel_chat.is_some(), "Failed to select chat");
             let sel_chat = sel_chat.as_ref().unwrap();
 
-            let msglist = chat::get_chat_msgs(context, sel_chat.get_id(), 0x1, None);
-            let members = chat::get_chat_contacts(context, sel_chat.id);
-            let subtitle = if sel_chat.is_device_talk() {
-                "device-talk".to_string()
-            } else if sel_chat.get_type() == Chattype::Single && !members.is_empty() {
-                let contact = Contact::get_by_id(context, members[0])?;
-                contact.get_addr().to_string()
-            } else {
-                format!("{} member(s)", members.len())
-            };
+            let msglist = chat::get_chat_msgs(context, sel_chat.get_id(), 0x1, 0);
+            let temp2 = sel_chat.get_subtitle(context);
+            let temp_name = sel_chat.get_name();
             info!(
                 context,
-                "{}#{}: {} [{}]{}{}",
+                "{}#{}: {} [{}]{}",
                 chat_prefix(sel_chat),
                 sel_chat.get_id(),
-                sel_chat.get_name(),
-                subtitle,
+                temp_name,
+                temp2,
                 if sel_chat.is_sending_locations() {
                     "📍"
                 } else {
                     ""
                 },
-                match sel_chat.get_profile_image(context) {
-                    Some(icon) => match icon.to_str() {
-                        Some(icon) => format!(" Icon: {}", icon),
-                        _ => " Icon: Err".to_string(),
-                    },
-                    _ => "".to_string(),
-                },
             );
             log_msglist(context, &msglist)?;
             if let Some(draft) = chat::get_draft(context, sel_chat.get_id())? {
@@ -627,7 +617,7 @@ pub fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::Error> {
         }
         "createchatbymsg" => {
             ensure!(!arg1.is_empty(), "Argument <msg-id> missing");
-            let msg_id = MsgId::new(arg1.parse()?);
+            let msg_id: u32 = arg1.parse()?;
             let chat_id = chat::create_by_msg_id(context, msg_id)?;
             let chat = Chat::load_from_db(context, chat_id)?;
 
@@ -719,7 +709,7 @@ pub fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::Error> {
                 let marker = location.marker.as_ref().unwrap_or(&default_marker);
                 info!(
                     context,
-                    "Loc#{}: {}: lat={} lng={} acc={} Chat#{} Contact#{} {} {}",
+                    "Loc#{}: {}: lat={} lng={} acc={} Chat#{} Contact#{} Msg#{} {}",
                     location.location_id,
                     dc_timestamp_to_str(location.timestamp),
                     location.latitude,
@@ -823,18 +813,6 @@ pub fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::Error> {
                 println!("Draft deleted.");
             }
         }
-        "devicemsg" => {
-            ensure!(
-                !arg1.is_empty(),
-                "Please specify text to add as device message."
-            );
-            let mut msg = Message::new(Viewtype::Text);
-            msg.set_text(Some(arg1.to_string()));
-            chat::add_device_msg(context, None, Some(&mut msg))?;
-        }
-        "updatedevicechats" => {
-            context.update_device_chats()?;
-        }
         "listmedia" => {
             ensure!(sel_chat.is_some(), "No chat selected.");
 
@@ -848,9 +826,9 @@ pub fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::Error> {
             println!("{} images or videos: ", images.len());
             for (i, data) in images.iter().enumerate() {
                 if 0 == i {
-                    print!("{}", data);
+                    print!("Msg#{}", data);
                 } else {
-                    print!(", {}", data);
+                    print!(", Msg#{}", data);
                 }
             }
             print!("\n");
@@ -858,7 +836,11 @@ pub fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::Error> {
         "archive" | "unarchive" => {
             ensure!(!arg1.is_empty(), "Argument <chat-id> missing.");
             let chat_id = arg1.parse()?;
-            chat::archive(context, chat_id, arg0 == "archive")?;
+            chat::archive(
+                context,
+                chat_id,
+                if arg0 == "archive" { true } else { false },
+            )?;
         }
         "delchat" => {
             ensure!(!arg1.is_empty(), "Argument <chat-id> missing.");
@@ -867,7 +849,7 @@ pub fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::Error> {
         }
         "msginfo" => {
             ensure!(!arg1.is_empty(), "Argument <msg-id> missing.");
-            let id = MsgId::new(arg1.parse()?);
+            let id = arg1.parse()?;
             let res = message::get_msg_info(context, id);
             println!("{}", res);
         }
@@ -879,31 +861,31 @@ pub fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::Error> {
         }
         "forward" => {
             ensure!(
-                !arg1.is_empty() && !arg2.is_empty(),
+                !arg1.is_empty() && arg2.is_empty(),
                 "Arguments <msg-id> <chat-id> expected"
             );
 
-            let mut msg_ids = [MsgId::new(0); 1];
+            let mut msg_ids = [0; 1];
             let chat_id = arg2.parse()?;
-            msg_ids[0] = MsgId::new(arg1.parse()?);
+            msg_ids[0] = arg1.parse()?;
             chat::forward_msgs(context, &msg_ids, chat_id)?;
         }
         "markseen" => {
             ensure!(!arg1.is_empty(), "Argument <msg-id> missing.");
-            let mut msg_ids = [MsgId::new(0); 1];
-            msg_ids[0] = MsgId::new(arg1.parse()?);
+            let mut msg_ids = [0; 1];
+            msg_ids[0] = arg1.parse()?;
             message::markseen_msgs(context, &msg_ids);
         }
         "star" | "unstar" => {
             ensure!(!arg1.is_empty(), "Argument <msg-id> missing.");
-            let mut msg_ids = [MsgId::new(0); 1];
-            msg_ids[0] = MsgId::new(arg1.parse()?);
+            let mut msg_ids = [0; 1];
+            msg_ids[0] = arg1.parse()?;
             message::star_msgs(context, &msg_ids, arg0 == "star");
         }
         "delmsg" => {
             ensure!(!arg1.is_empty(), "Argument <msg-id> missing.");
-            let mut ids = [MsgId::new(0); 1];
-            ids[0] = MsgId::new(arg1.parse()?);
+            let mut ids = [0; 1];
+            ids[0] = arg1.parse()?;
             message::delete_msgs(context, &ids);
         }
         "listcontacts" | "contacts" | "listverified" => {
@@ -994,14 +976,11 @@ pub fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::Error> {
                 bail!("Command failed.");
             }
         }
-        "emptyserver" => {
-            ensure!(!arg1.is_empty(), "Argument <flags> missing");
-
-            message::dc_empty_server(context, arg1.parse()?);
-        }
         "" => (),
         _ => bail!("Unknown command: \"{}\" type ? for help.", arg0),
     }
 
+    free(arg1_c as *mut _);
+
     Ok(())
 }

examples/repl/main.rs

@@ -150,11 +150,11 @@ fn start_threads(c: Arc<RwLock<Context>>) {
     let ctx = c.clone();
     let handle_imap = std::thread::spawn(move || loop {
         while_running!({
-            perform_inbox_jobs(&ctx.read().unwrap());
-            perform_inbox_fetch(&ctx.read().unwrap());
+            perform_imap_jobs(&ctx.read().unwrap());
+            perform_imap_fetch(&ctx.read().unwrap());
             while_running!({
                 let context = ctx.read().unwrap();
-                perform_inbox_idle(&context);
+                perform_imap_idle(&context);
             });
         });
     });
@@ -202,7 +202,7 @@ fn stop_threads(context: &Context) {
         println!("Stopping threads");
         IS_RUNNING.store(false, Ordering::Relaxed);
 
-        interrupt_inbox_idle(context, true);
+        interrupt_imap_idle(context);
         interrupt_mvbox_idle(context);
         interrupt_sentbox_idle(context);
         interrupt_smtp_idle(context);
@@ -235,7 +235,7 @@ impl Completer for DcHelper {
     }
 }
 
-const IMEX_COMMANDS: [&str; 12] = [
+const IMEX_COMMANDS: [&'static str; 12] = [
     "initiate-key-transfer",
     "get-setupcodebegin",
     "continue-key-transfer",
@@ -250,7 +250,7 @@ const IMEX_COMMANDS: [&str; 12] = [
     "stop",
 ];
 
-const DB_COMMANDS: [&str; 11] = [
+const DB_COMMANDS: [&'static str; 11] = [
     "info",
     "open",
     "close",
@@ -264,7 +264,7 @@ const DB_COMMANDS: [&str; 11] = [
     "housekeeping",
 ];
 
-const CHAT_COMMANDS: [&str; 24] = [
+const CHAT_COMMANDS: [&'static str; 24] = [
     "listchats",
     "listarchived",
     "chat",
@@ -290,7 +290,7 @@ const CHAT_COMMANDS: [&str; 24] = [
     "unarchive",
     "delchat",
 ];
-const MESSAGE_COMMANDS: [&str; 8] = [
+const MESSAGE_COMMANDS: [&'static str; 8] = [
     "listmsgs",
     "msginfo",
     "listfresh",
@@ -300,7 +300,7 @@ const MESSAGE_COMMANDS: [&str; 8] = [
     "unstar",
     "delmsg",
 ];
-const CONTACT_COMMANDS: [&str; 6] = [
+const CONTACT_COMMANDS: [&'static str; 6] = [
     "listcontacts",
     "listverified",
     "addcontact",
@@ -308,7 +308,7 @@ const CONTACT_COMMANDS: [&str; 6] = [
     "delcontact",
     "cleanupcontacts",
 ];
-const MISC_COMMANDS: [&str; 9] = [
+const MISC_COMMANDS: [&'static str; 9] = [
     "getqr", "getbadqr", "checkqr", "event", "fileinfo", "clear", "exit", "quit", "help",
 ];
 
@@ -334,8 +334,8 @@ impl Hinter for DcHelper {
     }
 }
 
-static COLORED_PROMPT: &str = "\x1b[1;32m> \x1b[0m";
-static PROMPT: &str = "> ";
+static COLORED_PROMPT: &'static str = "\x1b[1;32m> \x1b[0m";
+static PROMPT: &'static str = "> ";
 
 impl Highlighter for DcHelper {
     fn highlight_prompt<'p>(&self, prompt: &'p str) -> Cow<'p, str> {
@@ -403,7 +403,7 @@ fn main_0(args: Vec<String>) -> Result<(), failure::Error> {
                 // TODO: ignore "set mail_pw"
                 rl.add_history_entry(line.as_str());
                 let ctx = ctx.clone();
-                match handle_cmd(line.trim(), ctx) {
+                match unsafe { handle_cmd(line.trim(), ctx) } {
                     Ok(ExitResult::Continue) => {}
                     Ok(ExitResult::Exit) => break,
                     Err(err) => println!("Error: {}", err),
@@ -434,7 +434,7 @@ enum ExitResult {
     Exit,
 }
 
-fn handle_cmd(line: &str, ctx: Arc<RwLock<Context>>) -> Result<ExitResult, failure::Error> {
+unsafe fn handle_cmd(line: &str, ctx: Arc<RwLock<Context>>) -> Result<ExitResult, failure::Error> {
     let mut args = line.splitn(2, ' ');
     let arg0 = args.next().unwrap_or_default();
     let arg1 = args.next().unwrap_or_default();
@@ -455,9 +455,9 @@ fn handle_cmd(line: &str, ctx: Arc<RwLock<Context>>) -> Result<ExitResult, failu
         }
         "imap-jobs" => {
             if HANDLE.clone().lock().unwrap().is_some() {
-                println!("inbox-jobs are already running in a thread.");
+                println!("imap-jobs are already running in a thread.");
             } else {
-                perform_inbox_jobs(&ctx.read().unwrap());
+                perform_imap_jobs(&ctx.read().unwrap());
             }
         }
         "configure" => {

examples/simple.rs

@@ -11,8 +11,7 @@ use deltachat::configure::*;
 use deltachat::contact::*;
 use deltachat::context::*;
 use deltachat::job::{
-    perform_inbox_fetch, perform_inbox_idle, perform_inbox_jobs, perform_smtp_idle,
-    perform_smtp_jobs,
+    perform_imap_fetch, perform_imap_idle, perform_imap_jobs, perform_smtp_idle, perform_smtp_jobs,
 };
 use deltachat::Event;
 
@@ -51,12 +50,12 @@ fn main() {
     let r1 = running.clone();
     let t1 = thread::spawn(move || {
         while *r1.read().unwrap() {
-            perform_inbox_jobs(&ctx1);
+            perform_imap_jobs(&ctx1);
             if *r1.read().unwrap() {
-                perform_inbox_fetch(&ctx1);
+                perform_imap_fetch(&ctx1);
 
                 if *r1.read().unwrap() {
-                    perform_inbox_idle(&ctx1);
+                    perform_imap_idle(&ctx1);
                 }
             }
         }
@@ -101,10 +100,20 @@ fn main() {
 
     thread::sleep(duration);
 
+    // let msglist = dc_get_chat_msgs(&ctx, chat_id, 0, 0);
+    // for i in 0..dc_array_get_cnt(msglist) {
+    //     let msg_id = dc_array_get_id(msglist, i);
+    //     let msg = dc_get_msg(context, msg_id);
+    //     let text = CStr::from_ptr(dc_msg_get_text(msg)).unwrap();
+    //     println!("Message {}: {}\n", i + 1, text.to_str().unwrap());
+    //     dc_msg_unref(msg);
+    // }
+    // dc_array_unref(msglist);
+
     println!("stopping threads");
 
-    *running.write().unwrap() = false;
-    deltachat::job::interrupt_inbox_idle(&ctx, true);
+    *running.clone().write().unwrap() = false;
+    deltachat::job::interrupt_imap_idle(&ctx);
     deltachat::job::interrupt_smtp_idle(&ctx);
 
     println!("joining");

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_string_lossy().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_or_default();
+        *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);
+        }
+        _ => {}
+    };
+}
+pub 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_mimeparser.txt

@@ -1,7 +0,0 @@
-# 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 03cab93c6d1f3a8245f63cf84dacb307944294fe6333c1e38f078a6600659c7a # shrinks to data = "a\t0aA\ta\t0 \ta\t0 \ta a\t\ta  A\tAA0a0a 0\t a\t aA   \t a\t  A0\t  AAa\taA0\taAAaA\t0\taa0a\ta Aa Aaaa A0A\t  a aA 0\t  A\t0\t0\t\t\t\t\t\tA \t\t a\tA Aa aAA0A0AA0aaA A\t\t  aa0\ta\t  \tAa\taA\t00  AA  A a\tA a aAAa \t 00\t0 \t\t  a A  0\t\t\t aAA Aa \taAAAA0a A0A\t\t1\\E$\t$R\tc\t^=\t\"\tQ<Uk\t\t>A\t\t&\t}v&\tM^\'|\tW5?dn\t\t+\t\tP\te`\t\t>:Brlq--?\t$#Q\tK=zJ\tb\"9*.\"\t`\tF&T*\tBs,\tg\'*\\\t:\t?l$\t\t|A\"HR:Hk\t\\KkV\t\t{=&!^e%:|_*0wV\t[$`\t:\t$%f\t\t[!\"Y. \tP\t\th\'?\'/?%:++NfQo#@\"+?\t(\\??{\t\'\'$Dzj\t0.?{s4?&?Y=/yj]Z=\t4n\t?Ja\"\t{I\t$\t;I}_8V\t&\t?N\'\tI2/\t9.\tFT%9%`\'\tz\to7Y\t|AXP&@G12g\t\'w\t\t%??\t\"h$?F\"\"6%q\\\\{\tT\t\"]$87$}h\'\t<\t$\tc%U:mT2:<v\t#Rl!;U\t\t\"^D\tRZ(BZ{n\t%[$fgH`\t{B}:*\t\t%%*F`%W\t//B}PQ\t\tsu2\tLz<1*!p-X\tnKv&&0\thm4<n\\.\\/.w\'\t<)E1g3#ood\t`?\t\\({N?,8_?h\ty\t0%\t*$A\t\t*w-ViQUj\tTiH\t%\t%&0p\'\'\tA%r**Fo\'Z\\\tNI*ely4=I?}$.o`\t$\ts\'&lt\t\",:~=Nv/0O%=+<LS\t%P\'\t$r%d.\t{G{/L:\t&I&8-`cy*\"{\t/%fP9.P<\t\t\'/`\t\t`\t\t`!t:\t::\t\tW\'X^\t@.uL&a\tN\t\t\t.\t?0*\tvUK>UJ\\\tQbj%w]P=Js\t\"R\t&s^?</=%\t\'VI:\" kT`{b*<\t\tF&?Y\t\t:/\t!C\'e0`\t\t\tx-\t*\\N\\wwu.I4\tb/y\t\"P:P%\"\t\tQ][\\\t^x\t\t):\t\t&s\t$1-\t\t\tXt`0\t;\t/UeCP*\"G\t\t\':\tk@91Hf&#\t(Uzz&`p2;\t{]\t\"I_%=\\%,XD\"\'06QfCd<;$:q^\t8:\"*\"H\t\to\t&xK/\t\ty0/<}<j<|*`~::b\t=S.=}=Ki\t<Y.\'{\tf\t{Ub*H%(_4*?*\tn2\t/\'\t\t\t/,4]\tt\t<y\t\t\tWi\t\tT&\"\t\t\t\t\t=/1Wu?\t\'A\"W-P\t$?e\\\t`\t6`vD\t8`\t\tccD J\tY&jI//?_\t\\j\t_\tsiq$\t?9\tQ\t.^%&..?%Jm??A%+<\tN&*\t.g\tS$W\"\"\tMpq\t\t:&\\\thTz&<iz%/%T&\'F\t\\]&\t\t}\t\t\tXr=dtp`:+<,\t%60Y*<(&K*kJ\todO\t=<V?&\tMU/\"\t= Y!)<\tV\t9\t)\t&v8q{\t\t&pT\t3\ttB,qcq\'i$;gv%j_%M_{[\"&;\t\t\t.B;6Y\\%\t\"\tY/a\t\\`:?\t<\t?]\taNwD;\\\t%l*74%5T?QS :~yR/E*R\t\t=u\t\\\t\t.Q<;\\\t_S/{&F$^\tw_>\'h=|%\t\t:W!\\<U2\'$\tb&`\t=|=L9\t\t\t\\WZ:! }{\t ;\t;\t\t 0.*\t.%\"\'r%{<Mh_t[[}\t-\tJo\"b/AC*-=`=T\tz$2\tC\t\t/k{47\"\t\t,q%\tZ\tT3\t\tf>%\t\'?%@^tx\t7\"1Bk{b{n\t\"Pj3\tHc\t\tt\tY<\t#?\tSh\\yk/N\\\t8 7=R4*9Cw&m\t\\-\'f\t|\'#t(Etu.Hdu(E\t%&v:\'aqW~A5\t\t w.s{J%lX<\"\t\'*%m<&:/B<&\':U}$&`.{)\t\t6S\t:/$*kQ-Z\t^\'t${/tH*\'v\t3\t=\t\tDyp:B\t`I_R&4SO\t\t&-j=*.\t87&\'e*( \t\t\t\'<$\\DJ<$p?{}\'&\tv\t\\Xk<Y:Y`!$K{\tF&\tzd\t\t*i$\tj\'\t<)R*\t%?\t!.\t=\"@#~:=*\t\tXO=_T,1\"\'.%%\"`{\\:\t\"\tfkeOb/\'$I~\ta\t|&\t[\\KK\"1&Z\t<k\t\t)%\'-~\"2n\tj\tW?*<@w{g%d\ta\\\'\'I\t;:ySR%ke:4\tc\t$=\t&9P]x4\tJ=\t6C6%a\t`0\tF\tm-\tTr\t}\t\tQum\t&@\typ|w2&\t\t3`i&t\t\tT5\"\t.&b&e*/==1.\'*\\[U*\tqPL%?$-0/}~|q`\t\t}\t$\tq==o+T$\'!H\t\ti&um\"?\"%%\t/\'p\tg>?{0{J{\t\t/\t\t{zKZ&>=\t[\"1h<H%z/8,/]s\tv{7\t\t:j*H,M//\t\t\td\'.)\t"

python/doc/api.rst

@@ -8,8 +8,8 @@ high level API reference
 
 - :class:`deltachat.account.Account` (your main entry point, creates the
   other classes)
-- :class:`deltachat.contact.Contact`
-- :class:`deltachat.chat.Chat`
+- :class:`deltachat.chatting.Contact`
+- :class:`deltachat.chatting.Chat`
 - :class:`deltachat.message.Message`
 
 Account
@@ -22,13 +22,13 @@ Account
 Contact
 -------
 
-.. autoclass:: deltachat.contact.Contact
+.. autoclass:: deltachat.chatting.Contact
     :members:
 
 Chat
 ----
 
-.. autoclass:: deltachat.chat.Chat
+.. autoclass:: deltachat.chatting.Chat
     :members:
 
 Message

python/install_python_bindings.py

@@ -9,23 +9,17 @@ import subprocess
 import sys
 
 if __name__ == "__main__":
-    target = os.environ.get("DCC_RS_TARGET")
-    if target is None:
-        os.environ["DCC_RS_TARGET"] = target = "release"
+    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
 
-    # build the core library  in release + debug mode because
-    # as of Nov 2019 rPGP generates RSA keys which take
-    # prohibitively long for non-release installs
     os.environ["RUSTFLAGS"] = "-g"
     subprocess.check_call([
         "cargo", "build", "-p", "deltachat_ffi", "--" + target
     ])
     subprocess.check_call("rm -rf build/ src/deltachat/*.so" , shell=True)
 
-    if len(sys.argv) <= 1 or sys.argv[1] != "onlybuild":
-        subprocess.check_call([
-            sys.executable, "-m", "pip", "install", "-e", "."
-        ])
+    subprocess.check_call([
+        sys.executable, "-m", "pip", "install", "-e", "."
+    ])

python/src/deltachat/_build.py

@@ -29,10 +29,7 @@ def ffibuilder():
             extra_link_args = []
         else:
             raise NotImplementedError("Compilation not supported yet on Windows, can you help?")
-        target_dir = os.environ.get("CARGO_TARGET_DIR")
-        if target_dir is None:
-            target_dir = os.path.join(projdir, 'target')
-        objs = [os.path.join(target_dir, target, 'libdeltachat.a')]
+        objs = [os.path.join(projdir, 'target', target, 'libdeltachat.a')]
         assert os.path.exists(objs[0]), objs
         incs = [os.path.join(projdir, 'deltachat-ffi')]
     else:

python/src/deltachat/account.py

@@ -15,14 +15,12 @@ import deltachat
 from . import const
 from .capi import ffi, lib
 from .cutil import as_dc_charpointer, from_dc_charpointer, iter_array, DCLot
-from .chat import Chat
-from .message import Message
-from .contact import Contact
+from .chatting import Contact, Chat, Message
 
 
 class Account(object):
     """ Each account is tied to a sqlite database file which is fully managed
-    by the underlying deltachat core library.  All public Account methods are
+    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, debug=True):
@@ -137,30 +135,11 @@ class Account(object):
         if not self.is_configured():
             raise ValueError("need to configure first")
 
-    def empty_server_folders(self, inbox=False, mvbox=False):
-        """ empty server folders. """
-        flags = 0
-        if inbox:
-            flags |= const.DC_EMPTY_INBOX
-        if mvbox:
-            flags |= const.DC_EMPTY_MVBOX
-        if not flags:
-            raise ValueError("no flags set")
-        lib.dc_empty_server(self._dc_context, flags)
-
     def get_infostring(self):
         """ return info of the configured account. """
         self.check_is_configured()
         return from_dc_charpointer(lib.dc_get_info(self._dc_context))
 
-    def get_latest_backupfile(self, backupdir):
-        """ return the latest backup file in a given directory.
-        """
-        res = lib.dc_imex_has_backup(self._dc_context, as_dc_charpointer(backupdir))
-        if res == ffi.NULL:
-            return None
-        return from_dc_charpointer(res)
-
     def get_blobdir(self):
         """ return the directory for files.
 
@@ -170,9 +149,9 @@ class Account(object):
         return from_dc_charpointer(lib.dc_get_blobdir(self._dc_context))
 
     def get_self_contact(self):
-        """ return this account's identity as a :class:`deltachat.contact.Contact`.
+        """ return this account's identity as a :class:`deltachat.chatting.Contact`.
 
-        :returns: :class:`deltachat.contact.Contact`
+        :returns: :class:`deltachat.chatting.Contact`
         """
         self.check_is_configured()
         return Contact(self._dc_context, const.DC_CONTACT_ID_SELF)
@@ -184,7 +163,7 @@ class Account(object):
 
         :param email: email-address (text type)
         :param name: display name for this contact (optional)
-        :returns: :class:`deltachat.contact.Contact` instance.
+        :returns: :class:`deltachat.chatting.Contact` instance.
         """
         name = as_dc_charpointer(name)
         email = as_dc_charpointer(email)
@@ -210,7 +189,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.contact.Contact` objects.
+        :returns: list of :class:`deltachat.chatting.Contact` objects.
         """
         flags = 0
         query = as_dc_charpointer(query)
@@ -228,7 +207,7 @@ class Account(object):
         """ create or get an existing 1:1 chat object for the specified contact or contact id.
 
         :param contact: chat_id (int) or contact object.
-        :returns: a :class:`deltachat.chat.Chat` object.
+        :returns: a :class:`deltachat.chatting.Chat` object.
         """
         if hasattr(contact, "id"):
             if contact._dc_context != self._dc_context:
@@ -245,7 +224,7 @@ class Account(object):
         the specified message.
 
         :param message: messsage id or message instance.
-        :returns: a :class:`deltachat.chat.Chat` object.
+        :returns: a :class:`deltachat.chatting.Chat` object.
         """
         if hasattr(message, "id"):
             if self._dc_context != message._dc_context:
@@ -263,7 +242,7 @@ class Account(object):
         Chats are unpromoted until the first message is sent.
 
         :param verified: if true only verified contacts can be added.
-        :returns: a :class:`deltachat.chat.Chat` object.
+        :returns: a :class:`deltachat.chatting.Chat` object.
         """
         bytes_name = name.encode("utf8")
         chat_id = lib.dc_create_group_chat(self._dc_context, int(verified), bytes_name)
@@ -272,7 +251,7 @@ class Account(object):
     def get_chats(self):
         """ return list of chats.
 
-        :returns: a list of :class:`deltachat.chat.Chat` objects.
+        :returns: a list of :class:`deltachat.chatting.Chat` objects.
         """
         dc_chatlist = ffi.gc(
             lib.dc_get_chatlist(self._dc_context, 0, ffi.NULL, 0),
@@ -290,24 +269,9 @@ class Account(object):
         return Chat(self, const.DC_CHAT_ID_DEADDROP)
 
     def get_message_by_id(self, msg_id):
-        """ return Message instance.
-        :param msg_id: integer id of this message.
-        :returns: :class:`deltachat.message.Message` instance.
-        """
+        """ return Message instance. """
         return Message.from_db(self, msg_id)
 
-    def get_chat_by_id(self, chat_id):
-        """ return Chat instance.
-        :param chat_id: integer id of this chat.
-        :returns: :class:`deltachat.chat.Chat` instance.
-        :raises: ValueError if chat does not exist.
-        """
-        res = lib.dc_get_chat(self._dc_context, chat_id)
-        if res == ffi.NULL:
-            raise ValueError("cannot get chat with id={}".format(chat_id))
-        lib.dc_chat_unref(res)
-        return Chat(self, chat_id)
-
     def mark_seen_messages(self, messages):
         """ mark the given set of messages as seen.
 
@@ -324,7 +288,7 @@ class Account(object):
         """ Forward list of messages to a chat.
 
         :param messages: list of :class:`deltachat.message.Message` object.
-        :param chat: :class:`deltachat.chat.Chat` object.
+        :param chat: :class:`deltachat.chatting.Chat` object.
         :returns: None
         """
         msg_ids = [msg.id for msg in messages]
@@ -436,7 +400,7 @@ class Account(object):
         """ 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.chat.Chat` instance
+        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)
         """
@@ -450,7 +414,7 @@ class Account(object):
         """ 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.chat.Chat` instance
+        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)
@@ -485,9 +449,8 @@ class Account(object):
 
     def stop_threads(self, wait=True):
         """ stop IMAP/SMTP threads. """
-        if self._threads.is_started():
-            self.stop_ongoing()
-            self._threads.stop(wait=wait)
+        self.stop_ongoing()
+        self._threads.stop(wait=wait)
 
     def shutdown(self, wait=True):
         """ stop threads and close and remove underlying dc_context and callbacks. """
@@ -518,20 +481,6 @@ class Account(object):
     def on_dc_event_imex_file_written(self, data1, data2):
         self._imex_events.put(data1)
 
-    def set_location(self, latitude=0.0, longitude=0.0, accuracy=0.0):
-        """set a new location. It effects all chats where we currently
-        have enabled location streaming.
-
-        :param latitude: float (use 0.0 if not known)
-        :param longitude: float (use 0.0 if not known)
-        :param accuracy: float (use 0.0 if not known)
-        :raises: ValueError if no chat is currently streaming locations
-        :returns: None
-        """
-        dc_res = lib.dc_set_location(self._dc_context, latitude, longitude, accuracy)
-        if dc_res == 0:
-            raise ValueError("no chat is streaming locations")
-
 
 class IOThreads:
     def __init__(self, dc_context, log_event=lambda *args: None):
@@ -573,10 +522,8 @@ class IOThreads:
         self._log_event("py-bindings-info", 0, "INBOX THREAD START")
         while not self._thread_quitflag:
             lib.dc_perform_imap_jobs(self._dc_context)
-            if not self._thread_quitflag:
-                lib.dc_perform_imap_fetch(self._dc_context)
-            if not self._thread_quitflag:
-                lib.dc_perform_imap_idle(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, "INBOX THREAD FINISHED")
 
     def mvbox_thread_run(self):

python/src/deltachat/chatting.py

@@ -1,15 +1,58 @@
-""" Chat and Location related API. """
+""" chatting related objects: Contact, Chat, Message. """
 
 import mimetypes
-import calendar
-from datetime import datetime
 import os
+from . import props
 from .cutil import as_dc_charpointer, from_dc_charpointer, iter_array
 from .capi import lib, ffi
 from . import const
 from .message import Message
 
 
+class Contact(object):
+    """ Delta-Chat Contact.
+
+    You obtain instances of it through :class:`deltachat.account.Account`.
+    """
+    def __init__(self, dc_context, id):
+        self._dc_context = dc_context
+        self.id = id
+
+    def __eq__(self, other):
+        return self._dc_context == other._dc_context and self.id == other.id
+
+    def __ne__(self, other):
+        return not (self == other)
+
+    def __repr__(self):
+        return "<Contact id={} addr={} dc_context={}>".format(self.id, self.addr, self._dc_context)
+
+    @property
+    def _dc_contact(self):
+        return ffi.gc(
+            lib.dc_get_contact(self._dc_context, self.id),
+            lib.dc_contact_unref
+        )
+
+    @props.with_doc
+    def addr(self):
+        """ normalized e-mail address for this account. """
+        return from_dc_charpointer(lib.dc_contact_get_addr(self._dc_contact))
+
+    @props.with_doc
+    def display_name(self):
+        """ display name for this contact. """
+        return from_dc_charpointer(lib.dc_contact_get_display_name(self._dc_contact))
+
+    def is_blocked(self):
+        """ Return True if the contact is blocked. """
+        return lib.dc_contact_is_blocked(self._dc_contact)
+
+    def is_verified(self):
+        """ Return True if the contact is verified. """
+        return lib.dc_contact_is_verified(self._dc_contact)
+
+
 class Chat(object):
     """ Chat object which manages members and through which you can send and retrieve messages.
 
@@ -269,10 +312,9 @@ class Chat(object):
     def get_contacts(self):
         """ get all contacts for this chat.
         :params: contact object.
-        :returns: list of :class:`deltachat.contact.Contact` objects for this chat
+        :returns: list of :class:`deltachat.chatting.Contact` objects for this chat
 
         """
-        from .contact import Contact
         dc_array = ffi.gc(
             lib.dc_get_chat_contacts(self._dc_context, self.id),
             lib.dc_array_unref
@@ -323,62 +365,3 @@ class Chat(object):
         if dc_res == ffi.NULL:
             return None
         return from_dc_charpointer(dc_res)
-
-    # ------  location streaming API ------------------------------
-
-    def is_sending_locations(self):
-        """return True if this chat has location-sending enabled currently.
-        :returns: True if location sending is enabled.
-        """
-        return lib.dc_is_sending_locations_to_chat(self._dc_context, self.id)
-
-    def enable_sending_locations(self, seconds):
-        """enable sending locations for this chat.
-
-        all subsequent messages will carry a location with them.
-        """
-        lib.dc_send_locations_to_chat(self._dc_context, self.id, seconds)
-
-    def get_locations(self, contact=None, timestamp_from=None, timestamp_to=None):
-        """return list of locations for the given contact in the given timespan.
-
-        :param contact: the contact for which locations shall be returned.
-        :param timespan_from: a datetime object or None (indicating "since beginning")
-        :param timespan_to: a datetime object or None (indicating up till now)
-        :returns: list of :class:`deltachat.chat.Location` objects.
-        """
-        if timestamp_from is None:
-            time_from = 0
-        else:
-            time_from = calendar.timegm(timestamp_from.utctimetuple())
-        if timestamp_to is None:
-            time_to = 0
-        else:
-            time_to = calendar.timegm(timestamp_to.utctimetuple())
-
-        if contact is None:
-            contact_id = 0
-        else:
-            contact_id = contact.id
-
-        dc_array = lib.dc_get_locations(self._dc_context, self.id, contact_id, time_from, time_to)
-        return [
-            Location(
-                latitude=lib.dc_array_get_latitude(dc_array, i),
-                longitude=lib.dc_array_get_longitude(dc_array, i),
-                accuracy=lib.dc_array_get_accuracy(dc_array, i),
-                timestamp=datetime.utcfromtimestamp(lib.dc_array_get_timestamp(dc_array, i)))
-            for i in range(lib.dc_array_get_cnt(dc_array))
-        ]
-
-
-class Location:
-    def __init__(self, latitude, longitude, accuracy, timestamp):
-        assert isinstance(timestamp, datetime)
-        self.latitude = latitude
-        self.longitude = longitude
-        self.accuracy = accuracy
-        self.timestamp = timestamp
-
-    def __eq__(self, other):
-        return self.__dict__ == other.__dict__

python/src/deltachat/const.py

@@ -47,8 +47,7 @@ DC_STATE_OUT_FAILED = 24
 DC_STATE_OUT_DELIVERED = 26
 DC_STATE_OUT_MDN_RCVD = 28
 DC_CONTACT_ID_SELF = 1
-DC_CONTACT_ID_INFO = 2
-DC_CONTACT_ID_DEVICE = 5
+DC_CONTACT_ID_DEVICE = 2
 DC_CONTACT_ID_LAST_SPECIAL = 9
 DC_MSG_TEXT = 10
 DC_MSG_IMAGE = 20
@@ -66,19 +65,12 @@ DC_LP_IMAP_SOCKET_PLAIN = 0x400
 DC_LP_SMTP_SOCKET_STARTTLS = 0x10000
 DC_LP_SMTP_SOCKET_SSL = 0x20000
 DC_LP_SMTP_SOCKET_PLAIN = 0x40000
-DC_CERTCK_AUTO = 0
-DC_CERTCK_STRICT = 1
-DC_CERTCK_ACCEPT_INVALID_HOSTNAMES = 2
-DC_CERTCK_ACCEPT_INVALID_CERTIFICATES = 3
-DC_EMPTY_MVBOX = 0x01
-DC_EMPTY_INBOX = 0x02
 DC_EVENT_INFO = 100
 DC_EVENT_SMTP_CONNECTED = 101
 DC_EVENT_IMAP_CONNECTED = 102
 DC_EVENT_SMTP_MESSAGE_SENT = 103
 DC_EVENT_IMAP_MESSAGE_DELETED = 104
 DC_EVENT_IMAP_MESSAGE_MOVED = 105
-DC_EVENT_IMAP_FOLDER_EMPTIED = 106
 DC_EVENT_NEW_BLOB_FILE = 150
 DC_EVENT_DELETED_BLOB_FILE = 151
 DC_EVENT_WARNING = 300
@@ -98,7 +90,6 @@ DC_EVENT_IMEX_PROGRESS = 2051
 DC_EVENT_IMEX_FILE_WRITTEN = 2052
 DC_EVENT_SECUREJOIN_INVITER_PROGRESS = 2060
 DC_EVENT_SECUREJOIN_JOINER_PROGRESS = 2061
-DC_EVENT_SECUREJOIN_MEMBER_ADDED = 2062
 DC_EVENT_FILE_COPIED = 2055
 DC_EVENT_IS_OFFLINE = 2081
 DC_EVENT_GET_STRING = 2091
@@ -151,14 +142,13 @@ DC_STR_MSGLOCATIONENABLED = 64
 DC_STR_MSGLOCATIONDISABLED = 65
 DC_STR_LOCATION = 66
 DC_STR_STICKER = 67
-DC_STR_DEVICE_MESSAGES = 68
-DC_STR_COUNT = 68
+DC_STR_COUNT = 67
 # end const generated
 
 
 def read_event_defines(f):
-    rex = re.compile(r'#define\s+((?:DC_EVENT|DC_QR|DC_MSG|DC_LP|DC_EMPTY|DC_CERTCK|DC_STATE|DC_STR|'
-                     r'DC_CONTACT_ID|DC_GCL|DC_CHAT|DC_PROVIDER)_\S+)\s+([x\d]+).*')
+    rex = re.compile(r'#define\s+((?:DC_EVENT_|DC_QR|DC_MSG|DC_LP|DC_STATE_|DC_STR|'
+                     r'DC_CONTACT_ID_|DC_GCL|DC_CHAT|DC_PROVIDER)\S+)\s+([x\d]+).*')
     for line in f:
         m = rex.match(line)
         if m:

python/src/deltachat/contact.py

@@ -1,49 +0,0 @@
-""" Contact object. """
-
-from . import props
-from .cutil import from_dc_charpointer
-from .capi import lib, ffi
-
-
-class Contact(object):
-    """ Delta-Chat Contact.
-
-    You obtain instances of it through :class:`deltachat.account.Account`.
-    """
-    def __init__(self, dc_context, id):
-        self._dc_context = dc_context
-        self.id = id
-
-    def __eq__(self, other):
-        return self._dc_context == other._dc_context and self.id == other.id
-
-    def __ne__(self, other):
-        return not (self == other)
-
-    def __repr__(self):
-        return "<Contact id={} addr={} dc_context={}>".format(self.id, self.addr, self._dc_context)
-
-    @property
-    def _dc_contact(self):
-        return ffi.gc(
-            lib.dc_get_contact(self._dc_context, self.id),
-            lib.dc_contact_unref
-        )
-
-    @props.with_doc
-    def addr(self):
-        """ normalized e-mail address for this account. """
-        return from_dc_charpointer(lib.dc_contact_get_addr(self._dc_contact))
-
-    @props.with_doc
-    def display_name(self):
-        """ display name for this contact. """
-        return from_dc_charpointer(lib.dc_contact_get_display_name(self._dc_contact))
-
-    def is_blocked(self):
-        """ Return True if the contact is blocked. """
-        return lib.dc_contact_is_blocked(self._dc_contact)
-
-    def is_verified(self):
-        """ Return True if the contact is verified. """
-        return lib.dc_contact_is_verified(self._dc_contact)

python/src/deltachat/message.py

@@ -1,4 +1,4 @@
-""" The Message object. """
+""" chatting related objects: Contact, Chat, Message. """
 
 import os
 import shutil
@@ -13,7 +13,7 @@ class Message(object):
     """ Message object.
 
     You obtain instances of it through :class:`deltachat.account.Account` or
-    :class:`deltachat.chat.Chat`.
+    :class:`deltachat.chatting.Chat`.
     """
     def __init__(self, account, dc_msg):
         self.account = account
@@ -58,6 +58,8 @@ class Message(object):
 
     def set_text(self, text):
         """set text of this message. """
+        assert self.id > 0, "message not prepared"
+        assert self.is_out_preparing()
         lib.dc_msg_set_text(self._dc_msg, as_dc_charpointer(text))
 
     @props.with_doc
@@ -160,25 +162,25 @@ class Message(object):
         if mime_headers:
             s = ffi.string(ffi.gc(mime_headers, lib.dc_str_unref))
             if isinstance(s, bytes):
-                return email.message_from_bytes(s)
+                s = s.decode("ascii")
             return email.message_from_string(s)
 
     @property
     def chat(self):
         """chat this message was posted in.
 
-        :returns: :class:`deltachat.chat.Chat` object
+        :returns: :class:`deltachat.chatting.Chat` object
         """
-        from .chat import Chat
+        from .chatting import Chat
         chat_id = lib.dc_msg_get_chat_id(self._dc_msg)
         return Chat(self.account, chat_id)
 
     def get_sender_contact(self):
         """return the contact of who wrote the message.
 
-        :returns: :class:`deltachat.chat.Contact` instance
+        :returns: :class:`deltachat.chatting.Contact` instance
         """
-        from .contact import Contact
+        from .chatting import Contact
         contact_id = lib.dc_msg_get_from_id(self._dc_msg)
         return Contact(self._dc_context, contact_id)
 

python/tests/conftest.py

@@ -4,7 +4,6 @@ import pytest
 import requests
 import time
 from deltachat import Account
-from deltachat import const
 from deltachat.capi import lib
 import tempfile
 
@@ -165,8 +164,8 @@ def acfactory(pytestconfig, tmpdir, request, session_liveconfig):
                 configdict["e2ee_enabled"] = "1"
 
             # Enable strict certificate checks for online accounts
-            configdict["imap_certificate_checks"] = str(const.DC_CERTCK_STRICT)
-            configdict["smtp_certificate_checks"] = str(const.DC_CERTCK_STRICT)
+            configdict["imap_certificate_checks"] = "1"
+            configdict["smtp_certificate_checks"] = "1"
 
             tmpdb = tmpdir.join("livedb%d" % self.live_count)
             ac = self.make_account(tmpdb.strpath, logid="ac{}".format(self.live_count))
@@ -180,12 +179,6 @@ def acfactory(pytestconfig, tmpdir, request, session_liveconfig):
             ac.start_threads(mvbox=mvbox, sentbox=sentbox)
             return ac
 
-        def get_one_online_account(self):
-            ac1 = self.get_online_configuring_account()
-            wait_successful_IMAP_SMTP_connection(ac1)
-            wait_configuration_progress(ac1, 1000)
-            return ac1
-
         def get_two_online_accounts(self):
             ac1 = self.get_online_configuring_account()
             ac2 = self.get_online_configuring_account()

python/tests/test_account.py

@@ -2,7 +2,6 @@ from __future__ import print_function
 import pytest
 import os
 import queue
-import time
 from deltachat import const, Account
 from deltachat.message import Message
 from datetime import datetime, timedelta
@@ -21,7 +20,7 @@ class TestOfflineAccountBasic:
         d = ac1.get_info()
         assert d["arch"]
         assert d["number_of_chats"] == "0"
-        assert d["bcc_self"] == "0"
+        assert d["bcc_self"] == "1"
 
     def test_is_not_configured(self, acfactory):
         ac1 = acfactory.get_unconfigured_account()
@@ -43,7 +42,7 @@ class TestOfflineAccountBasic:
     def test_has_bccself(self, acfactory):
         ac1 = acfactory.get_unconfigured_account()
         assert "bcc_self" in ac1.get_config("sys.config_keys").split()
-        assert ac1.get_config("bcc_self") == "0"
+        assert ac1.get_config("bcc_self") == "1"
 
     def test_selfcontact_if_unconfigured(self, acfactory):
         ac1 = acfactory.get_unconfigured_account()
@@ -122,12 +121,6 @@ class TestOfflineChat:
         str(chat1)
         repr(chat1)
 
-    def test_chat_by_id(self, chat1):
-        chat2 = chat1.account.get_chat_by_id(chat1.id)
-        assert chat2 == chat1
-        with pytest.raises(ValueError):
-            chat1.account.get_chat_by_id(123123)
-
     def test_chat_idempotent(self, chat1, ac1):
         contact1 = chat1.get_contacts()[0]
         chat2 = ac1.create_chat_by_contact(contact1.id)
@@ -405,9 +398,6 @@ class TestOnlineAccount:
         wait_successful_IMAP_SMTP_connection(ac1)
         wait_configuration_progress(ac1, 1000)
 
-        lp.sec("ac1: setting bcc_self=1")
-        ac1.set_config("bcc_self", "1")
-
         lp.sec("send out message with bcc to ourselves")
         msg_out = chat.send_text("message2")
         ev = ac1._evlogger.get_matching("DC_EVENT_MSGS_CHANGED")
@@ -430,51 +420,15 @@ class TestOnlineAccount:
         assert self_addr not in ev[2]
         ev = ac1._evlogger.get_matching("DC_EVENT_DELETED_BLOB_FILE")
 
-    def test_prepare_file_with_unicode(self, acfactory, lp):
-        ac1, ac2 = acfactory.get_two_online_accounts()
-        chat = self.get_chat(ac1, ac2)
-
-        lp.sec("ac1: prepare and send attachment + text to ac2")
-        blobdir = ac1.get_blobdir()
-        basename = "somedäüta.txt"
-        p = os.path.join(blobdir, basename)
-        with open(p, "w") as f:
-            f.write("some data")
-        msg = Message.new_empty(ac1, "file")
-        msg.set_text("hello ä world")
-        msg.set_file(p)
-        message = chat.prepare_message(msg)
-        assert message.is_out_preparing()
-        assert message.text == "hello ä world"
-        chat.send_prepared(message)
-
-        lp.sec("ac2: receive message")
-        ev = ac2._evlogger.get_matching("DC_EVENT_INCOMING_MSG|DC_EVENT_MSGS_CHANGED")
-        assert ev[2] > const.DC_CHAT_ID_LAST_SPECIAL
-        msg = ac2.get_message_by_id(ev[1])
-        assert msg.text == "hello ä world"
-        assert open(msg.filename).read() == "some data"
-        assert msg.filename.endswith(basename)
-
-    def test_mvbox_sentbox_threads(self, acfactory, lp):
-        lp.sec("ac1: start with mvbox thread")
+    def test_mvbox_sentbox_threads(self, acfactory):
         ac1 = acfactory.get_online_configuring_account(mvbox=True, sentbox=True)
-
-        lp.sec("ac2: start without mvbox/sentbox threads")
         ac2 = acfactory.get_online_configuring_account()
-
-        lp.sec("ac2: waiting for configuration")
         wait_configuration_progress(ac2, 1000)
-
-        lp.sec("ac1: waiting for configuration")
         wait_configuration_progress(ac1, 1000)
-
-        lp.sec("ac1: send message and wait for ac2 to receive it")
         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] > const.DC_CHAT_ID_LAST_SPECIAL
-        lp.sec("test finished")
 
     def test_move_works(self, acfactory):
         ac1 = acfactory.get_online_configuring_account()
@@ -487,46 +441,27 @@ class TestOnlineAccount:
         assert ev[2] > const.DC_CHAT_ID_LAST_SPECIAL
         ev = ac2._evlogger.get_matching("DC_EVENT_IMAP_MESSAGE_MOVED")
 
-    def test_move_works_on_self_sent(self, acfactory):
-        ac1 = acfactory.get_online_configuring_account(mvbox=True)
-        ac1.set_config("bcc_self", "1")
-        ac2 = acfactory.get_online_configuring_account()
-        wait_configuration_progress(ac2, 1000)
-        wait_configuration_progress(ac1, 1000)
-        chat = self.get_chat(ac1, ac2)
-        chat.send_text("message1")
-        chat.send_text("message2")
-        chat.send_text("message3")
-        ac1._evlogger.get_matching("DC_EVENT_IMAP_MESSAGE_MOVED")
-        ac1._evlogger.get_matching("DC_EVENT_IMAP_MESSAGE_MOVED")
-        ac1._evlogger.get_matching("DC_EVENT_IMAP_MESSAGE_MOVED")
-
-    def test_forward_messages(self, acfactory, lp):
+    def test_forward_messages(self, acfactory):
         ac1, ac2 = acfactory.get_two_online_accounts()
         chat = self.get_chat(ac1, ac2)
 
-        lp.sec("ac1: send message to ac2")
         msg_out = chat.send_text("message2")
 
-        lp.sec("ac2: wait for receive")
+        # wait for other account to receive
         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 == "message2"
 
-        lp.sec("ac2: check that the message arrive in deaddrop")
+        # check the message arrived in contact-requests/deaddrop
         chat2 = msg_in.chat
         assert msg_in in chat2.get_messages()
         assert not msg_in.is_forwarded()
         assert chat2.is_deaddrop()
         assert chat2 == ac2.get_deaddrop_chat()
-
-        lp.sec("ac2: create new chat and forward message to it")
         chat3 = ac2.create_group_chat("newgroup")
         assert not chat3.is_promoted()
         ac2.forward_messages([msg_in], chat3)
-
-        lp.sec("ac2: check new chat has a forwarded message")
         assert chat3.is_promoted()
         messages = chat3.get_messages()
         msg = messages[-1]
@@ -558,18 +493,6 @@ class TestOnlineAccount:
         assert msg_in.text == "message2"
         assert msg_in.is_forwarded()
 
-    def test_send_self_message_and_empty_folder(self, acfactory, lp):
-        ac1 = acfactory.get_one_online_account()
-        lp.sec("ac1: create self chat")
-        chat = ac1.create_chat_by_contact(ac1.get_self_contact())
-        chat.send_text("hello")
-        ac1._evlogger.get_matching("DC_EVENT_SMTP_MESSAGE_SENT")
-        ac1.empty_server_folders(inbox=True, mvbox=True)
-        ev = ac1._evlogger.get_matching("DC_EVENT_IMAP_FOLDER_EMPTIED")
-        assert ev[2] == "DeltaChat"
-        ev = ac1._evlogger.get_matching("DC_EVENT_IMAP_FOLDER_EMPTIED")
-        assert ev[2] == "INBOX"
-
     def test_send_and_receive_message_markseen(self, acfactory, lp):
         ac1, ac2 = acfactory.get_two_online_accounts()
 
@@ -660,71 +583,6 @@ class TestOnlineAccount:
         ev = ac1._evlogger.get_matching("DC_EVENT_SMTP_MESSAGE_SENT")
         assert not msg.is_encrypted()
 
-    def test_send_first_message_as_long_unicode_with_cr(self, acfactory, lp):
-        ac1, ac2 = acfactory.get_two_online_accounts()
-        ac2.set_config("save_mime_headers", "1")
-
-        lp.sec("ac1: create chat with ac2")
-        chat = self.get_chat(ac1, ac2, both_created=True)
-
-        lp.sec("sending multi-line non-unicode message from ac1 to ac2")
-        text1 = "hello\nworld"
-        msg_out = chat.send_text(text1)
-        assert not msg_out.is_encrypted()
-
-        lp.sec("sending multi-line unicode text message from ac1 to ac2")
-        text2 = "äalis\nthis is ßßÄ"
-        msg_out = chat.send_text(text2)
-        assert not msg_out.is_encrypted()
-
-        lp.sec("wait for ac2 to receive multi-line non-unicode message")
-        msg_in = ac2.wait_next_incoming_message()
-        assert msg_in.text == text1
-
-        lp.sec("wait for ac2 to receive multi-line unicode message")
-        msg_in = ac2.wait_next_incoming_message()
-        assert msg_in.text == text2
-        assert ac1.get_config("addr") in msg_in.chat.get_name()
-
-    def test_reply_encrypted(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")
-        msg_in = ac2.get_message_by_id(msg_out.id)
-        assert msg_in.text == "message1"
-        assert not msg_in.is_encrypted()
-
-        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
-        msg_back = ac1.get_message_by_id(ev[2])
-        assert msg_back.text == "message-back"
-        assert msg_back.is_encrypted()
-
-        lp.sec("ac1: e2ee_enabled=0 and see if reply is encrypted")
-        print("ac1: e2ee_enabled={}".format(ac1.get_config("e2ee_enabled")))
-        print("ac2: e2ee_enabled={}".format(ac2.get_config("e2ee_enabled")))
-        ac1.set_config("e2ee_enabled", "0")
-        chat.send_text("message2 -- should be encrypted")
-
-        lp.sec("wait for ac2 to receive message")
-        ev = ac2._evlogger.get_matching("DC_EVENT_INCOMING_MSG")
-        msg_in = ac2.get_message_by_id(ev[2])
-        assert msg_in.text == "message2 -- should be encrypted"
-        assert msg_in.is_encrypted()
-
     def test_saved_mime_on_received_message(self, acfactory, lp):
         ac1, ac2 = acfactory.get_two_online_accounts()
 
@@ -765,29 +623,18 @@ 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_all(self, acfactory, tmpdir, lp):
+    def test_import_export_online_all(self, acfactory, tmpdir):
         ac1 = acfactory.get_online_configuring_account()
         wait_configuration_progress(ac1, 1000)
 
-        lp.sec("create some chat content")
         contact1 = ac1.create_contact("some1@hello.com", name="some1")
         chat = ac1.create_chat_by_contact(contact1)
         chat.send_text("msg1")
         backupdir = tmpdir.mkdir("backup")
-
-        lp.sec("export all to {}".format(backupdir))
         path = ac1.export_all(backupdir.strpath)
         assert os.path.exists(path)
-        t = time.time()
 
-        lp.sec("get fresh empty account")
         ac2 = acfactory.get_unconfigured_account()
-
-        lp.sec("get latest backup file")
-        path2 = ac2.get_latest_backupfile(backupdir.strpath)
-        assert path2 == path
-
-        lp.sec("import backup and check it's proper")
         ac2.import_all(path)
         contacts = ac2.get_contacts(query="some1")
         assert len(contacts) == 1
@@ -798,17 +645,6 @@ class TestOnlineAccount:
         assert len(messages) == 1
         assert messages[0].text == "msg1"
 
-        # wait until a second passed since last backup
-        # because get_latest_backupfile() shall return the latest backup
-        # from a UI it's unlikely anyone manages to export two
-        # backups in one second.
-        time.sleep(max(0, 1 - (time.time() - t)))
-        lp.sec("Second-time export all to {}".format(backupdir))
-        path2 = ac1.export_all(backupdir.strpath)
-        assert os.path.exists(path2)
-        assert path2 != path
-        assert ac2.get_latest_backupfile(backupdir.strpath) == path2
-
     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
@@ -834,29 +670,6 @@ class TestOnlineAccount:
         msg.continue_key_transfer(setup_code)
         assert ac1.get_info()["fingerprint"] == ac2.get_info()["fingerprint"]
 
-    def test_ac_setup_message_twice(self, acfactory, lp):
-        ac1 = acfactory.get_online_configuring_account()
-        ac2 = acfactory.clone_online_account(ac1)
-        ac2._evlogger.set_timeout(30)
-        wait_configuration_progress(ac2, 1000)
-        wait_configuration_progress(ac1, 1000)
-
-        lp.sec("trigger ac setup message but ignore")
-        assert ac1.get_info()["fingerprint"] != ac2.get_info()["fingerprint"]
-        ac1.initiate_key_transfer()
-        ac2._evlogger.get_matching("DC_EVENT_INCOMING_MSG|DC_EVENT_MSGS_CHANGED")
-
-        lp.sec("trigger second ac setup message, wait for receive ")
-        setup_code2 = ac1.initiate_key_transfer()
-        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_code2[:2]
-
-        lp.sec("process second setup message")
-        msg.continue_key_transfer(setup_code2)
-        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")
@@ -878,7 +691,6 @@ class TestOnlineAccount:
         ac1._evlogger.get_matching("DC_EVENT_IMAP_MESSAGE_DELETED")
         ac2._evlogger.get_matching("DC_EVENT_IMAP_MESSAGE_DELETED")
         wait_securejoin_inviter_progress(ac1, 1000)
-        ac1._evlogger.get_matching("DC_EVENT_SECUREJOIN_MEMBER_ADDED")
 
     def test_qr_verified_group_and_chatting(self, acfactory, lp):
         ac1, ac2 = acfactory.get_two_online_accounts()
@@ -890,7 +702,6 @@ class TestOnlineAccount:
         chat2 = ac2.qr_join_chat(qr)
         assert chat2.id >= 10
         wait_securejoin_inviter_progress(ac1, 1000)
-        ac1._evlogger.get_matching("DC_EVENT_SECUREJOIN_MEMBER_ADDED")
 
         lp.sec("ac2: read member added message")
         msg = ac2.wait_next_incoming_message()
@@ -966,54 +777,6 @@ class TestOnlineAccount:
         assert chat1b.get_profile_image() is None
         assert chat.get_profile_image() is None
 
-    def test_send_receive_locations(self, acfactory, lp):
-        now = datetime.utcnow()
-        ac1, ac2 = acfactory.get_two_online_accounts()
-
-        lp.sec("ac1: create chat with ac2")
-        chat1 = self.get_chat(ac1, ac2)
-        chat2 = self.get_chat(ac2, ac1)
-
-        assert not chat1.is_sending_locations()
-        with pytest.raises(ValueError):
-            ac1.set_location(latitude=0.0, longitude=10.0)
-
-        ac1._evlogger.consume_events()
-        ac2._evlogger.consume_events()
-
-        lp.sec("ac1: enable location sending in chat")
-        chat1.enable_sending_locations(seconds=100)
-        assert chat1.is_sending_locations()
-        ac1._evlogger.get_matching("DC_EVENT_SMTP_MESSAGE_SENT")
-
-        ac1.set_location(latitude=2.0, longitude=3.0, accuracy=0.5)
-        ac1._evlogger.get_matching("DC_EVENT_LOCATION_CHANGED")
-        chat1.send_text("hello")
-        ac1._evlogger.get_matching("DC_EVENT_SMTP_MESSAGE_SENT")
-
-        lp.sec("ac2: wait for incoming location message")
-        ac2._evlogger.get_matching("DC_EVENT_INCOMING_MSG")  # "enabled-location streaming"
-
-        # currently core emits location changed before event_incoming message
-        ac2._evlogger.get_matching("DC_EVENT_LOCATION_CHANGED")
-        ac2._evlogger.get_matching("DC_EVENT_INCOMING_MSG")  # text message with location
-
-        locations = chat2.get_locations()
-        assert len(locations) == 1
-        assert locations[0].latitude == 2.0
-        assert locations[0].longitude == 3.0
-        assert locations[0].accuracy == 0.5
-        assert locations[0].timestamp > now
-
-        contact = ac2.create_contact(ac1.get_config("addr"))
-        locations2 = chat2.get_locations(contact=contact)
-        assert len(locations2) == 1
-        assert locations2 == locations
-
-        contact = ac2.create_contact("nonexisting@example.org")
-        locations3 = chat2.get_locations(contact=contact)
-        assert not locations3
-
 
 class TestOnlineConfigureFails:
     def test_invalid_password(self, acfactory):
@@ -1022,7 +785,7 @@ class TestOnlineConfigureFails:
         ac1.start_threads()
         wait_configuration_progress(ac1, 500)
         ev1 = ac1._evlogger.get_matching("DC_EVENT_ERROR_NETWORK")
-        assert "cannot login" in ev1[2].lower()
+        assert "authentication failed" in ev1[2].lower()
         wait_configuration_progress(ac1, 0, 0)
 
     def test_invalid_user(self, acfactory):
@@ -1031,7 +794,7 @@ class TestOnlineConfigureFails:
         ac1.start_threads()
         wait_configuration_progress(ac1, 500)
         ev1 = ac1._evlogger.get_matching("DC_EVENT_ERROR_NETWORK")
-        assert "cannot login" in ev1[2].lower()
+        assert "authentication failed" in ev1[2].lower()
         wait_configuration_progress(ac1, 0, 0)
 
     def test_invalid_domain(self, acfactory):

python/tests/test_increation.py

@@ -57,13 +57,13 @@ class TestOnlineInCreation:
 
         lp.sec("wait1 for original or forwarded messages to arrive")
         ev1 = ac2._evlogger.get_matching("DC_EVENT_MSGS_CHANGED")
-        assert ev1[1] > const.DC_CHAT_ID_LAST_SPECIAL
+        assert ev1[1] >= const.DC_CHAT_ID_LAST_SPECIAL
         received_original = ac2.get_message_by_id(ev1[2])
         assert cmp(received_original.filename, path, False)
 
         lp.sec("wait2 for original or forwarded messages to arrive")
         ev2 = ac2._evlogger.get_matching("DC_EVENT_MSGS_CHANGED")
-        assert ev2[1] > const.DC_CHAT_ID_LAST_SPECIAL
+        assert ev2[1] >= const.DC_CHAT_ID_LAST_SPECIAL
         assert ev2[1] != ev1[1]
         received_copy = ac2.get_message_by_id(ev2[2])
         assert cmp(received_copy.filename, path, False)

python/tests/test_lowlevel.py

@@ -41,7 +41,7 @@ def test_dc_close_events(tmpdir):
             else:
                 print("skipping event", *ev)
 
-    find("disconnecting inbox-thread")
+    find("disconnecting INBOX-watch")
     find("disconnecting sentbox-thread")
     find("disconnecting mvbox-thread")
     find("disconnecting SMTP")
@@ -95,13 +95,6 @@ def test_markseen_invalid_message_ids(acfactory):
     ac1._evlogger.ensure_event_not_queued("DC_EVENT_WARNING|DC_EVENT_ERROR")
 
 
-def test_get_special_message_id_returns_empty_message(acfactory):
-    ac1 = acfactory.get_configured_offline_account()
-    for i in range(1, 10):
-        msg = ac1.get_message_by_id(i)
-        assert msg.id == 0
-
-
 def test_provider_info():
     provider = lib.dc_provider_new_from_email(cutil.as_dc_charpointer("ex@example.com"))
     assert cutil.from_dc_charpointer(

python/tox.ini

@@ -1,25 +1,19 @@
 [tox]
 # make sure to update environment list in travis.yml and appveyor.yml
 envlist =
-    py37
+    py35
     lint
     auditwheels
 
 [testenv]
 commands = 
-    # (some qr tests are pretty heavy in terms of send/received
-    # messages and async-imap's likely has concurrency problems, 
-    # eg https://github.com/async-email/async-imap/issues/4 )
-    pytest -n6 --reruns 3 --reruns-delay 5 -v -rsXx -k "not qr" {posargs:tests} 
-    pytest -n6 --reruns 5 --reruns-delay 5 -v -rsXx -k "qr" {posargs:tests} 
-    # python tests/package_wheels.py {toxworkdir}/wheelhouse
+    pytest -v -rsXx {posargs:tests}
+    python tests/package_wheels.py {toxworkdir}/wheelhouse
 passenv = 
     TRAVIS 
     DCC_RS_DEV
     DCC_RS_TARGET
     DCC_PY_LIVECONFIG
-    CARGO_TARGET_DIR
-    RUSTC_WRAPPER
 deps = 
     pytest
     pytest-rerunfailures
@@ -34,6 +28,7 @@ deps = auditwheel
 commands = 
     python tests/auditwheels.py {toxworkdir}/wheelhouse
 
+
 [testenv:lint]
 skipsdist = True
 usedevelop = True
@@ -48,28 +43,18 @@ commands =
     rst-lint --encoding 'utf-8' README.rst
 
 [testenv:doc]
-changedir=doc
+basepython = python3.5
 deps =
     sphinx==2.2.0
     breathe
+
+changedir = doc
 commands =
-    sphinx-build -Q -w toxdoc-warnings.log -b html . _build/html
-
-
-[testenv:lintdoc]
-skipsdist = True
-usedevelop = True
-deps =
-    {[testenv:lint]deps}
-    {[testenv:doc]deps}
-commands =
-    {[testenv:lint]commands}
-    {[testenv:doc]commands}
-
+    sphinx-build -w docker-toxdoc-warnings.log -b html . _build/html
 
 
 [pytest]
-addopts = -v -rs 
+addopts = -v -rs --reruns 3 --reruns-delay 2
 python_files = tests/test_*.py 
 norecursedirs = .tox 
 xfail_strict=true

run-integration-tests.sh

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

rust-toolchain

@@ -1 +1 @@
-nightly-2019-11-06
+nightly-2019-08-13

set_core_version.py

@@ -1,63 +0,0 @@
-#!/usr/bin/env python
-
-import os
-import sys
-import re
-import pathlib
-import subprocess
-
-rex = re.compile(r'version = "(\S+)"')
-
-def read_toml_version(relpath):
-    p = pathlib.Path(relpath)
-    assert p.exists()
-    for line in open(str(p)):
-        m = rex.match(line)
-        if m is not None:
-            return m.group(1)
-    raise ValueError("no version found in {}".format(relpath))
-
-def replace_toml_version(relpath, newversion):
-    p = pathlib.Path(relpath)
-    assert p.exists()
-    tmp_path = str(p) + "_tmp"
-    with open(tmp_path, "w") as f:
-        for line in open(str(p)):
-            m = rex.match(line)
-            if m is not None:
-                f.write('version = "{}"\n'.format(newversion))
-            else:
-                f.write(line)
-    os.rename(tmp_path, str(p))
-
-if __name__ == "__main__":
-
-    if len(sys.argv) < 2:
-        for x in ("Cargo.toml", "deltachat-ffi/Cargo.toml"):
-            print("{}: {}".format(x, read_toml_version(x)))
-        raise SystemExit("need argument: new version, example 1.0.0-beta.27")
-    newversion = sys.argv[1]
-    if newversion.count(".") < 2:
-        raise SystemExit("need at least two dots in version")
-
-    core_toml = read_toml_version("Cargo.toml")
-    ffi_toml = read_toml_version("deltachat-ffi/Cargo.toml")
-    assert core_toml == ffi_toml, (core_toml, ffi_toml)
-
-    for line in open("CHANGELOG.md"):
-        ## 1.0.0-beta5
-        if line.startswith("## "):
-            if line[2:].strip().startswith(newversion):
-                break
-    else:
-        raise SystemExit("CHANGELOG.md contains no entry for version: {}".format(newversion))
-
-    replace_toml_version("Cargo.toml", newversion)
-    replace_toml_version("deltachat-ffi/Cargo.toml", newversion)
-
-    subprocess.call(["cargo", "update", "-p", "deltachat"])
-
-    print("after commit make sure to: ")
-    print("")
-    print("   git tag {}".format(newversion))
-    print("")

src/aheader.rs

@@ -1,14 +1,12 @@
-//! # Autocrypt header module
-//!
-//! Parse and create [Autocrypt-headers](https://autocrypt.org/en/latest/level1.html#the-autocrypt-header).
-
 use std::collections::BTreeMap;
+use std::ffi::CStr;
 use std::str::FromStr;
 use std::{fmt, str};
 
+use mmime::mailimf::types::*;
+
 use crate::constants::*;
 use crate::contact::*;
-use crate::context::Context;
 use crate::key::*;
 
 /// Possible values for encryption preference
@@ -42,13 +40,13 @@ impl str::FromStr for EncryptPreference {
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         match s {
             "mutual" => Ok(EncryptPreference::Mutual),
-            "nopreference" => Ok(EncryptPreference::NoPreference),
-            _ => Err(()),
+            "reset" => Ok(EncryptPreference::Reset),
+            _ => Ok(EncryptPreference::NoPreference),
         }
     }
 }
 
-/// Autocrypt header
+/// Parse and create [Autocrypt-headers](https://autocrypt.org/en/latest/level1.html#the-autocrypt-header).
 #[derive(Debug)]
 pub struct Aheader {
     pub addr: String,
@@ -57,7 +55,6 @@ pub struct Aheader {
 }
 
 impl Aheader {
-    /// Creates new autocrypt header
     pub fn new(addr: String, public_key: Key, prefer_encrypt: EncryptPreference) -> Self {
         Aheader {
             addr,
@@ -66,30 +63,45 @@ impl Aheader {
         }
     }
 
-    pub fn from_headers(
-        context: &Context,
-        wanted_from: &str,
-        headers: &[mailparse::MailHeader<'_>],
-    ) -> Option<Self> {
-        use mailparse::MailHeaderMap;
-
-        if let Ok(Some(value)) = headers.get_first_value("Autocrypt") {
-            match Self::from_str(&value) {
-                Ok(header) => {
-                    if addr_cmp(&header.addr, wanted_from) {
-                        return Some(header);
-                    }
-                }
-                Err(err) => {
-                    warn!(
-                        context,
-                        "found invalid autocrypt header {}: {:?}", value, err
-                    );
-                }
-            }
+    pub fn from_imffields(wanted_from: &str, header: *const mailimf_fields) -> Option<Self> {
+        if header.is_null() {
+            return None;
         }
 
-        None
+        let mut fine_header = None;
+        let mut cur = unsafe { (*(*header).fld_list).first };
+
+        while !cur.is_null() {
+            let field = unsafe { (*cur).data as *mut mailimf_field };
+            if !field.is_null()
+                && unsafe { (*field).fld_type } == MAILIMF_FIELD_OPTIONAL_FIELD as libc::c_int
+            {
+                let optional_field = unsafe { (*field).fld_data.fld_optional_field };
+                if !optional_field.is_null()
+                    && unsafe { !(*optional_field).fld_name.is_null() }
+                    && unsafe { CStr::from_ptr((*optional_field).fld_name).to_string_lossy() }
+                        == "Autocrypt"
+                {
+                    let value =
+                        unsafe { CStr::from_ptr((*optional_field).fld_value).to_string_lossy() };
+
+                    if let Ok(test) = Self::from_str(&value) {
+                        if addr_cmp(&test.addr, wanted_from) {
+                            if fine_header.is_none() {
+                                fine_header = Some(test);
+                            } else {
+                                // TODO: figure out what kind of error case this is
+                                return None;
+                            }
+                        }
+                    }
+                }
+            }
+
+            cur = unsafe { (*cur).next };
+        }
+
+        fine_header
     }
 }
 

src/blob.rs

@@ -1,595 +0,0 @@
-//! # Blob directory management
-
-use std::ffi::OsStr;
-use std::fmt;
-use std::fs;
-use std::io::Write;
-use std::path::{Path, PathBuf};
-
-use crate::context::Context;
-use crate::events::Event;
-
-/// Represents a file in the blob directory.
-///
-/// The object has a name, which will always be valid UTF-8.  Having a
-/// blob object does not imply the respective file exists, however
-/// when using one of the `create*()` methods a unique file is
-/// created.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct BlobObject<'a> {
-    blobdir: &'a Path,
-    name: String,
-}
-
-impl<'a> BlobObject<'a> {
-    /// Creates a new blob object with a unique name.
-    ///
-    /// Creates a new file in the blob directory.  The name will be
-    /// derived from the platform-agnostic basename of the suggested
-    /// name, followed by a random number and followed by a possible
-    /// extension.  The `data` will be written into the file without
-    /// race-conditions.
-    ///
-    /// # Errors
-    ///
-    /// [BlobError::CreateFailure] is used when the file could not
-    /// be created.  You can expect [BlobError.cause] to contain an
-    /// underlying error.
-    ///
-    /// [BlobError::WriteFailure] is used when the file could not
-    /// be written to.  You can expect [BlobError.cause] to contain an
-    /// underlying error.
-    pub fn create(
-        context: &'a Context,
-        suggested_name: impl AsRef<str>,
-        data: &[u8],
-    ) -> std::result::Result<BlobObject<'a>, BlobError> {
-        let blobdir = context.get_blobdir();
-        let (stem, ext) = BlobObject::sanitise_name(suggested_name.as_ref());
-        let (name, mut file) = BlobObject::create_new_file(&blobdir, &stem, &ext)?;
-        file.write_all(data)
-            .map_err(|err| BlobError::WriteFailure {
-                blobdir: blobdir.to_path_buf(),
-                blobname: name.clone(),
-                cause: err,
-                backtrace: failure::Backtrace::new(),
-            })?;
-        let blob = BlobObject {
-            blobdir,
-            name: format!("$BLOBDIR/{}", name),
-        };
-        context.call_cb(Event::NewBlobFile(blob.as_name().to_string()));
-        Ok(blob)
-    }
-
-    // Creates a new file, returning a tuple of the name and the handle.
-    fn create_new_file(dir: &Path, stem: &str, ext: &str) -> Result<(String, fs::File), BlobError> {
-        let max_attempt = 15;
-        let mut name = format!("{}{}", stem, ext);
-        for attempt in 0..max_attempt {
-            let path = dir.join(&name);
-            match fs::OpenOptions::new()
-                .create_new(true)
-                .write(true)
-                .open(&path)
-            {
-                Ok(file) => return Ok((name, file)),
-                Err(err) => {
-                    if attempt == max_attempt {
-                        return Err(BlobError::CreateFailure {
-                            blobdir: dir.to_path_buf(),
-                            blobname: name,
-                            cause: err,
-                            backtrace: failure::Backtrace::new(),
-                        });
-                    } else {
-                        name = format!("{}-{}{}", stem, rand::random::<u32>(), ext);
-                    }
-                }
-            }
-        }
-        // This is supposed to be unreachable, but the compiler doesn't know.
-        Err(BlobError::CreateFailure {
-            blobdir: dir.to_path_buf(),
-            blobname: name,
-            cause: std::io::Error::new(std::io::ErrorKind::Other, "supposedly unreachable"),
-            backtrace: failure::Backtrace::new(),
-        })
-    }
-
-    /// Creates a new blob object with unique name by copying an existing file.
-    ///
-    /// This creates a new blob as described in [BlobObject::create]
-    /// but also copies an existing file into it.  This is done in a
-    /// in way which avoids race-conditions when multiple files are
-    /// concurrently created.
-    ///
-    /// # Errors
-    ///
-    /// In addition to the errors in [BlobObject::create] the
-    /// [BlobError::CopyFailure] is used when the data can not be
-    /// copied.
-    pub fn create_and_copy(
-        context: &'a Context,
-        src: impl AsRef<Path>,
-    ) -> std::result::Result<BlobObject<'a>, BlobError> {
-        let mut src_file = fs::File::open(src.as_ref()).map_err(|err| BlobError::CopyFailure {
-            blobdir: context.get_blobdir().to_path_buf(),
-            blobname: String::from(""),
-            src: src.as_ref().to_path_buf(),
-            cause: err,
-            backtrace: failure::Backtrace::new(),
-        })?;
-        let (stem, ext) = BlobObject::sanitise_name(&src.as_ref().to_string_lossy());
-        let (name, mut dst_file) = BlobObject::create_new_file(context.get_blobdir(), &stem, &ext)?;
-        let name_for_err = name.clone();
-        std::io::copy(&mut src_file, &mut dst_file).map_err(|err| {
-            {
-                // Attempt to remove the failed file, swallow errors resulting from that.
-                let path = context.get_blobdir().join(&name_for_err);
-                fs::remove_file(path).ok();
-            }
-            BlobError::CopyFailure {
-                blobdir: context.get_blobdir().to_path_buf(),
-                blobname: name_for_err,
-                src: src.as_ref().to_path_buf(),
-                cause: err,
-                backtrace: failure::Backtrace::new(),
-            }
-        })?;
-        let blob = BlobObject {
-            blobdir: context.get_blobdir(),
-            name: format!("$BLOBDIR/{}", name),
-        };
-        context.call_cb(Event::NewBlobFile(blob.as_name().to_string()));
-        Ok(blob)
-    }
-
-    /// Creates a blob from a file, possibly copying it to the blobdir.
-    ///
-    /// If the source file is not a path to into the blob directory
-    /// the file will be copied into the blob directory first.  If the
-    /// source file is already in the blobdir it will not be copied
-    /// and only be created if it is a valid blobname, that is no
-    /// subdirectory is used and [BlobObject::sanitise_name] does not
-    /// modify the filename.
-    ///
-    /// # Errors
-    ///
-    /// This merely delegates to the [BlobObject::create_and_copy] and
-    /// the [BlobObject::from_path] methods.  See those for possible
-    /// errors.
-    pub fn create_from_path(
-        context: &Context,
-        src: impl AsRef<Path>,
-    ) -> std::result::Result<BlobObject, BlobError> {
-        if src.as_ref().starts_with(context.get_blobdir()) {
-            BlobObject::from_path(context, src)
-        } else {
-            BlobObject::create_and_copy(context, src)
-        }
-    }
-
-    /// Returns a [BlobObject] for an existing blob from a path.
-    ///
-    /// The path must designate a file directly in the blobdir and
-    /// must use a valid blob name.  That is after sanitisation the
-    /// name must still be the same, that means it must be valid UTF-8
-    /// and not have any special characters in it.
-    ///
-    /// # Errors
-    ///
-    /// [BlobError::WrongBlobdir] is used if the path is not in
-    /// the blob directory.
-    ///
-    /// [BlobError::WrongName] is used if the file name does not
-    /// remain identical after sanitisation.
-    pub fn from_path(
-        context: &Context,
-        path: impl AsRef<Path>,
-    ) -> std::result::Result<BlobObject, BlobError> {
-        let rel_path = path
-            .as_ref()
-            .strip_prefix(context.get_blobdir())
-            .map_err(|_| BlobError::WrongBlobdir {
-                blobdir: context.get_blobdir().to_path_buf(),
-                src: path.as_ref().to_path_buf(),
-                backtrace: failure::Backtrace::new(),
-            })?;
-        if !BlobObject::is_acceptible_blob_name(&rel_path) {
-            return Err(BlobError::WrongName {
-                blobname: path.as_ref().to_path_buf(),
-                backtrace: failure::Backtrace::new(),
-            });
-        }
-        let name = rel_path.to_str().ok_or_else(|| BlobError::WrongName {
-            blobname: path.as_ref().to_path_buf(),
-            backtrace: failure::Backtrace::new(),
-        })?;
-        BlobObject::from_name(context, name.to_string())
-    }
-
-    /// Returns a [BlobObject] for an existing blob.
-    ///
-    /// The `name` may optionally be prefixed with the `$BLOBDIR/`
-    /// prefixed, as returned by [BlobObject::as_name].  This is how
-    /// you want to create a [BlobObject] for a filename read from the
-    /// database.
-    ///
-    /// # Errors
-    ///
-    /// [BlobError::WrongName] is used if the name is not a valid
-    /// blobname, i.e. if [BlobObject::sanitise_name] does modify the
-    /// provided name.
-    pub fn from_name(
-        context: &'a Context,
-        name: String,
-    ) -> std::result::Result<BlobObject<'a>, BlobError> {
-        let name: String = match name.starts_with("$BLOBDIR/") {
-            true => name.splitn(2, '/').last().unwrap().to_string(),
-            false => name,
-        };
-        if !BlobObject::is_acceptible_blob_name(&name) {
-            return Err(BlobError::WrongName {
-                blobname: PathBuf::from(name),
-                backtrace: failure::Backtrace::new(),
-            });
-        }
-        Ok(BlobObject {
-            blobdir: context.get_blobdir(),
-            name: format!("$BLOBDIR/{}", name),
-        })
-    }
-
-    /// Returns the absolute path to the blob in the filesystem.
-    pub fn to_abs_path(&self) -> PathBuf {
-        let fname = Path::new(&self.name).strip_prefix("$BLOBDIR/").unwrap();
-        self.blobdir.join(fname)
-    }
-
-    /// Returns the blob name, as stored in the database.
-    ///
-    /// This returns the blob in the `$BLOBDIR/<name>` format used in
-    /// the database.  Do not use this unless you're about to store
-    /// this string in the database or [Params].  Eventually even
-    /// those conversions should be handled by the type system.
-    ///
-    /// [Params]: crate::param::Params
-    pub fn as_name(&self) -> &str {
-        &self.name
-    }
-
-    /// Returns the filename of the blob.
-    pub fn as_file_name(&self) -> &str {
-        self.name.rsplitn(2, '/').next().unwrap()
-    }
-
-    /// The path relative in the blob directory.
-    pub fn as_rel_path(&self) -> &Path {
-        Path::new(self.as_file_name())
-    }
-
-    /// Returns the extension of the blob.
-    ///
-    /// If a blob's filename has an extension, it is always guaranteed
-    /// to be lowercase.
-    pub fn suffix(&self) -> Option<&str> {
-        let ext = self.name.rsplitn(2, '.').next();
-        if ext == Some(&self.name) {
-            None
-        } else {
-            ext
-        }
-    }
-
-    /// Create a safe name based on a messy input string.
-    ///
-    /// The safe name will be a valid filename on Unix and Windows and
-    /// not contain any path separators.  The input can contain path
-    /// segments separated by either Unix or Windows path separators,
-    /// the rightmost non-empty segment will be used as name,
-    /// sanitised for special characters.
-    ///
-    /// The resulting name is returned as a tuple, the first part
-    /// being the stem or basename and the second being an extension,
-    /// including the dot.  E.g. "foo.txt" is returned as `("foo",
-    /// ".txt")` while "bar" is returned as `("bar", "")`.
-    ///
-    /// The extension part will always be lowercased.
-    fn sanitise_name(name: &str) -> (String, String) {
-        let mut name = name.to_string();
-        for part in name.rsplit('/') {
-            if !part.is_empty() {
-                name = part.to_string();
-                break;
-            }
-        }
-        for part in name.rsplit('\\') {
-            if !part.is_empty() {
-                name = part.to_string();
-                break;
-            }
-        }
-        let opts = sanitize_filename::Options {
-            truncate: true,
-            windows: true,
-            replacement: "",
-        };
-
-        let clean = sanitize_filename::sanitize_with_options(name, opts);
-        let mut iter = clean.splitn(2, '.');
-        let mut stem = iter.next().unwrap_or_default().to_string();
-        let mut ext = iter.next().unwrap_or_default().to_string();
-        stem.truncate(64);
-        ext.truncate(32);
-        match ext.len() {
-            0 => (stem, "".to_string()),
-            _ => (stem, format!(".{}", ext).to_lowercase()),
-        }
-    }
-
-    /// Checks whether a name is a valid blob name.
-    ///
-    /// This is slightly less strict than stanitise_name, presumably
-    /// someone already created a file with such a name so we just
-    /// ensure it's not actually a path in disguise is actually utf-8.
-    fn is_acceptible_blob_name(name: impl AsRef<OsStr>) -> bool {
-        let uname = match name.as_ref().to_str() {
-            Some(name) => name,
-            None => return false,
-        };
-        if uname.find('/').is_some() {
-            return false;
-        }
-        if uname.find('\\').is_some() {
-            return false;
-        }
-        if uname.find('\0').is_some() {
-            return false;
-        }
-        true
-    }
-}
-
-impl<'a> fmt::Display for BlobObject<'a> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "$BLOBDIR/{}", self.name)
-    }
-}
-
-/// Errors for the [BlobObject].
-#[derive(Fail, Debug)]
-pub enum BlobError {
-    CreateFailure {
-        blobdir: PathBuf,
-        blobname: String,
-        #[cause]
-        cause: std::io::Error,
-        backtrace: failure::Backtrace,
-    },
-    WriteFailure {
-        blobdir: PathBuf,
-        blobname: String,
-        #[cause]
-        cause: std::io::Error,
-        backtrace: failure::Backtrace,
-    },
-    CopyFailure {
-        blobdir: PathBuf,
-        blobname: String,
-        src: PathBuf,
-        #[cause]
-        cause: std::io::Error,
-        backtrace: failure::Backtrace,
-    },
-    WrongBlobdir {
-        blobdir: PathBuf,
-        src: PathBuf,
-        backtrace: failure::Backtrace,
-    },
-    WrongName {
-        blobname: PathBuf,
-        backtrace: failure::Backtrace,
-    },
-}
-
-// Implementing Display is done by hand because the failure
-// #[fail(display = "...")] syntax does not allow using
-// `blobdir.display()`.
-impl fmt::Display for BlobError {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        // Match on the data rather than kind, they are equivalent for
-        // identifying purposes but contain the actual data we need.
-        match &self {
-            BlobError::CreateFailure {
-                blobdir, blobname, ..
-            } => write!(
-                f,
-                "Failed to create blob {} in {}",
-                blobname,
-                blobdir.display()
-            ),
-            BlobError::WriteFailure {
-                blobdir, blobname, ..
-            } => write!(
-                f,
-                "Failed to write data to blob {} in {}",
-                blobname,
-                blobdir.display()
-            ),
-            BlobError::CopyFailure {
-                blobdir,
-                blobname,
-                src,
-                ..
-            } => write!(
-                f,
-                "Failed to copy data from {} to blob {} in {}",
-                src.display(),
-                blobname,
-                blobdir.display(),
-            ),
-            BlobError::WrongBlobdir { blobdir, src, .. } => write!(
-                f,
-                "File path {} is not in blobdir {}",
-                src.display(),
-                blobdir.display(),
-            ),
-            BlobError::WrongName { blobname, .. } => {
-                write!(f, "Blob has a bad name: {}", blobname.display(),)
-            }
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    use crate::test_utils::*;
-
-    #[test]
-    fn test_create() {
-        let t = dummy_context();
-        let blob = BlobObject::create(&t.ctx, "foo", b"hello").unwrap();
-        let fname = t.ctx.get_blobdir().join("foo");
-        let data = fs::read(fname).unwrap();
-        assert_eq!(data, b"hello");
-        assert_eq!(blob.as_name(), "$BLOBDIR/foo");
-        assert_eq!(blob.to_abs_path(), t.ctx.get_blobdir().join("foo"));
-    }
-
-    #[test]
-    fn test_lowercase_ext() {
-        let t = dummy_context();
-        let blob = BlobObject::create(&t.ctx, "foo.TXT", b"hello").unwrap();
-        assert_eq!(blob.as_name(), "$BLOBDIR/foo.txt");
-    }
-
-    #[test]
-    fn test_as_file_name() {
-        let t = dummy_context();
-        let blob = BlobObject::create(&t.ctx, "foo.txt", b"hello").unwrap();
-        assert_eq!(blob.as_file_name(), "foo.txt");
-    }
-
-    #[test]
-    fn test_as_rel_path() {
-        let t = dummy_context();
-        let blob = BlobObject::create(&t.ctx, "foo.txt", b"hello").unwrap();
-        assert_eq!(blob.as_rel_path(), Path::new("foo.txt"));
-    }
-
-    #[test]
-    fn test_suffix() {
-        let t = dummy_context();
-        let blob = BlobObject::create(&t.ctx, "foo.txt", b"hello").unwrap();
-        assert_eq!(blob.suffix(), Some("txt"));
-        let blob = BlobObject::create(&t.ctx, "bar", b"world").unwrap();
-        assert_eq!(blob.suffix(), None);
-    }
-
-    #[test]
-    fn test_create_dup() {
-        let t = dummy_context();
-        BlobObject::create(&t.ctx, "foo.txt", b"hello").unwrap();
-        let foo_path = t.ctx.get_blobdir().join("foo.txt");
-        assert!(foo_path.exists());
-        BlobObject::create(&t.ctx, "foo.txt", b"world").unwrap();
-        for dirent in fs::read_dir(t.ctx.get_blobdir()).unwrap() {
-            let fname = dirent.unwrap().file_name();
-            if fname == foo_path.file_name().unwrap() {
-                assert_eq!(fs::read(&foo_path).unwrap(), b"hello");
-            } else {
-                let name = fname.to_str().unwrap();
-                assert!(name.starts_with("foo"));
-                assert!(name.ends_with(".txt"));
-            }
-        }
-    }
-
-    #[test]
-    fn test_double_ext_preserved() {
-        let t = dummy_context();
-        BlobObject::create(&t.ctx, "foo.tar.gz", b"hello").unwrap();
-        let foo_path = t.ctx.get_blobdir().join("foo.tar.gz");
-        assert!(foo_path.exists());
-        BlobObject::create(&t.ctx, "foo.tar.gz", b"world").unwrap();
-        for dirent in fs::read_dir(t.ctx.get_blobdir()).unwrap() {
-            let fname = dirent.unwrap().file_name();
-            if fname == foo_path.file_name().unwrap() {
-                assert_eq!(fs::read(&foo_path).unwrap(), b"hello");
-            } else {
-                let name = fname.to_str().unwrap();
-                println!("{}", name);
-                assert!(name.starts_with("foo"));
-                assert!(name.ends_with(".tar.gz"));
-            }
-        }
-    }
-
-    #[test]
-    fn test_create_long_names() {
-        let t = dummy_context();
-        let s = "1".repeat(150);
-        let blob = BlobObject::create(&t.ctx, &s, b"data").unwrap();
-        let blobname = blob.as_name().split('/').last().unwrap();
-        assert!(blobname.len() < 128);
-    }
-
-    #[test]
-    fn test_create_and_copy() {
-        let t = dummy_context();
-        let src = t.dir.path().join("src");
-        fs::write(&src, b"boo").unwrap();
-        let blob = BlobObject::create_and_copy(&t.ctx, &src).unwrap();
-        assert_eq!(blob.as_name(), "$BLOBDIR/src");
-        let data = fs::read(blob.to_abs_path()).unwrap();
-        assert_eq!(data, b"boo");
-
-        let whoops = t.dir.path().join("whoops");
-        assert!(BlobObject::create_and_copy(&t.ctx, &whoops).is_err());
-        let whoops = t.ctx.get_blobdir().join("whoops");
-        assert!(!whoops.exists());
-    }
-
-    #[test]
-    fn test_create_from_path() {
-        let t = dummy_context();
-
-        let src_ext = t.dir.path().join("external");
-        fs::write(&src_ext, b"boo").unwrap();
-        let blob = BlobObject::create_from_path(&t.ctx, &src_ext).unwrap();
-        assert_eq!(blob.as_name(), "$BLOBDIR/external");
-        let data = fs::read(blob.to_abs_path()).unwrap();
-        assert_eq!(data, b"boo");
-
-        let src_int = t.ctx.get_blobdir().join("internal");
-        fs::write(&src_int, b"boo").unwrap();
-        let blob = BlobObject::create_from_path(&t.ctx, &src_int).unwrap();
-        assert_eq!(blob.as_name(), "$BLOBDIR/internal");
-        let data = fs::read(blob.to_abs_path()).unwrap();
-        assert_eq!(data, b"boo");
-    }
-    #[test]
-    fn test_create_from_name_long() {
-        let t = dummy_context();
-        let src_ext = t.dir.path().join("autocrypt-setup-message-4137848473.html");
-        fs::write(&src_ext, b"boo").unwrap();
-        let blob = BlobObject::create_from_path(&t.ctx, &src_ext).unwrap();
-        assert_eq!(
-            blob.as_name(),
-            "$BLOBDIR/autocrypt-setup-message-4137848473.html"
-        );
-    }
-
-    #[test]
-    fn test_is_blob_name() {
-        assert!(BlobObject::is_acceptible_blob_name("foo"));
-        assert!(BlobObject::is_acceptible_blob_name("foo.txt"));
-        assert!(BlobObject::is_acceptible_blob_name("f".repeat(128)));
-        assert!(!BlobObject::is_acceptible_blob_name("foo/bar"));
-        assert!(!BlobObject::is_acceptible_blob_name("foo\\bar"));
-        assert!(!BlobObject::is_acceptible_blob_name("foo\x00bar"));
-    }
-}

src/chatlist.rs

@@ -1,12 +1,10 @@
-//! # Chat list module
-
 use crate::chat::*;
 use crate::constants::*;
 use crate::contact::*;
 use crate::context::*;
 use crate::error::Result;
 use crate::lot::Lot;
-use crate::message::{Message, MessageState, MsgId};
+use crate::message::Message;
 use crate::stock::StockMessage;
 
 /// An object representing a single chatlist in memory.
@@ -36,7 +34,7 @@ use crate::stock::StockMessage;
 #[derive(Debug)]
 pub struct Chatlist {
     /// Stores pairs of `chat_id, message_id`
-    ids: Vec<(u32, MsgId)>,
+    ids: Vec<(u32, u32)>,
 }
 
 impl Chatlist {
@@ -60,7 +58,7 @@ impl Chatlist {
     ///   or "Not now".
     ///   The UI can also offer a "Close" button that calls dc_marknoticed_contact() then.
     /// - DC_CHAT_ID_ARCHIVED_LINK (6) - this special chat is present if the user has
-    ///   archived *any* chat using dc_archive_chat(). The UI should show a link as
+    ///   archived _any_ chat using dc_archive_chat(). The UI should show a link as
     ///   "Show archived chats", if the user clicks this item, the UI should show a
     ///   list of all archived chats that can be created by this function hen using
     ///   the DC_GCL_ARCHIVED_ONLY flag.
@@ -71,7 +69,7 @@ impl Chatlist {
     /// The `listflags` is a combination of flags:
     /// - if the flag DC_GCL_ARCHIVED_ONLY is set, only archived chats are returned.
     ///   if DC_GCL_ARCHIVED_ONLY is not set, only unarchived chats are returned and
-    ///   the pseudo-chat DC_CHAT_ID_ARCHIVED_LINK is added if there are *any* archived
+    ///   the pseudo-chat DC_CHAT_ID_ARCHIVED_LINK is added if there are _any_ archived
     ///   chats
     /// - if the flag DC_GCL_NO_SPECIALS is set, deaddrop and archive link are not added
     ///   to the list (may be used eg. for selecting chats on forwarding, the flag is
@@ -88,12 +86,25 @@ impl Chatlist {
         query: Option<&str>,
         query_contact_id: Option<u32>,
     ) -> Result<Self> {
-        let mut add_archived_link_item = false;
+        let mut add_archived_link_item = 0;
+
+        // select with left join and minimum:
+        // - the inner select must use `hidden` and _not_ `m.hidden`
+        //   which would refer the outer select and take a lot of time
+        // - `GROUP BY` is needed several messages may have the same timestamp
+        // - the list starts with the newest chats
+        // nb: the query currently shows messages from blocked contacts in groups.
+        // however, for normal-groups, this is okay as the message is also returned by dc_get_chat_msgs()
+        // (otherwise it would be hard to follow conversations, wa and tg do the same)
+        // for the deaddrop, however, they should really be hidden, however, _currently_ the deaddrop is not
+        // shown at all permanent in the chatlist.
 
         let process_row = |row: &rusqlite::Row| {
-            let chat_id: u32 = row.get(0)?;
-            let msg_id: MsgId = row.get(1).unwrap_or_default();
-            Ok((chat_id, msg_id))
+            let chat_id: i32 = row.get(0)?;
+            // TODO: verify that it is okay for this to be Null
+            let msg_id: i32 = row.get(1).unwrap_or_default();
+
+            Ok((chat_id as u32, msg_id as u32))
         };
 
         let process_rows = |rows: rusqlite::MappedRows<_>| {
@@ -101,60 +112,37 @@ impl Chatlist {
                 .map_err(Into::into)
         };
 
-        // select with left join and minimum:
-        //
-        // - the inner select must use `hidden` and _not_ `m.hidden`
-        //   which would refer the outer select and take a lot of time
-        // - `GROUP BY` is needed several messages may have the same
-        //   timestamp
-        // - the list starts with the newest chats
-        //
-        // nb: the query currently shows messages from blocked
-        // contacts in groups.  however, for normal-groups, this is
-        // okay as the message is also returned by dc_get_chat_msgs()
-        // (otherwise it would be hard to follow conversations, wa and
-        // tg do the same) for the deaddrop, however, they should
-        // really be hidden, however, _currently_ the deaddrop is not
+        // nb: the query currently shows messages from blocked contacts in groups.
+        // however, for normal-groups, this is okay as the message is also returned by dc_get_chat_msgs()
+        // (otherwise it would be hard to follow conversations, wa and tg do the same)
+        // for the deaddrop, however, they should really be hidden, however, _currently_ the deaddrop is not
         // shown at all permanent in the chatlist.
+
         let mut ids = if let Some(query_contact_id) = query_contact_id {
             // show chats shared with a given contact
             context.sql.query_map(
-                "SELECT c.id, m.id
-                 FROM chats c
-                 LEFT JOIN msgs m
-                        ON c.id=m.chat_id
-                       AND m.timestamp=(
-                               SELECT MAX(timestamp)
-                                 FROM msgs
-                                WHERE chat_id=c.id
-                                  AND (hidden=0 OR state=?))
-                 WHERE c.id>9
-                   AND c.blocked=0
-                   AND c.id IN(SELECT chat_id FROM chats_contacts WHERE contact_id=?)
-                 GROUP BY c.id
-                 ORDER BY IFNULL(m.timestamp,c.created_timestamp) DESC, m.id DESC;",
-                params![MessageState::OutDraft, query_contact_id as i32],
-                process_row,
-                process_rows,
-            )?
+            "SELECT c.id, m.id FROM chats c  LEFT JOIN msgs m         \
+             ON c.id=m.chat_id        \
+             AND m.timestamp=( SELECT MAX(timestamp)   \
+             FROM msgs  WHERE chat_id=c.id    \
+             AND (hidden=0 OR (hidden=1 AND state=19))) WHERE c.id>9   \
+             AND c.blocked=0 AND c.id IN(SELECT chat_id FROM chats_contacts WHERE contact_id=?)  \
+             GROUP BY c.id  ORDER BY IFNULL(m.timestamp,0) DESC, m.id DESC;",
+            params![query_contact_id as i32],
+            process_row,
+            process_rows,
+        )?
         } else if 0 != listflags & DC_GCL_ARCHIVED_ONLY {
             // show archived chats
             context.sql.query_map(
-                "SELECT c.id, m.id
-                 FROM chats c
-                 LEFT JOIN msgs m
-                        ON c.id=m.chat_id
-                       AND m.timestamp=(
-                               SELECT MAX(timestamp)
-                                 FROM msgs
-                                WHERE chat_id=c.id
-                                  AND (hidden=0 OR state=?))
-                 WHERE c.id>9
-                   AND c.blocked=0
-                   AND c.archived=1
-                 GROUP BY c.id
-                 ORDER BY IFNULL(m.timestamp,c.created_timestamp) DESC, m.id DESC;",
-                params![MessageState::OutDraft],
+                "SELECT c.id, m.id FROM chats c  LEFT JOIN msgs m         \
+                 ON c.id=m.chat_id        \
+                 AND m.timestamp=( SELECT MAX(timestamp)   \
+                 FROM msgs  WHERE chat_id=c.id    \
+                 AND (hidden=0 OR (hidden=1 AND state=19))) WHERE c.id>9   \
+                 AND c.blocked=0 AND c.archived=1  GROUP BY c.id  \
+                 ORDER BY IFNULL(m.timestamp,0) DESC, m.id DESC;",
+                params![],
                 process_row,
                 process_rows,
             )?
@@ -164,59 +152,48 @@ impl Chatlist {
 
             let str_like_cmd = format!("%{}%", query);
             context.sql.query_map(
-                "SELECT c.id, m.id
-                 FROM chats c
-                 LEFT JOIN msgs m
-                        ON c.id=m.chat_id
-                       AND m.timestamp=(
-                               SELECT MAX(timestamp)
-                                 FROM msgs
-                                WHERE chat_id=c.id
-                                  AND (hidden=0 OR state=?))
-                 WHERE c.id>9
-                   AND c.blocked=0
-                   AND c.name LIKE ?
-                 GROUP BY c.id
-                 ORDER BY IFNULL(m.timestamp,c.created_timestamp) DESC, m.id DESC;",
-                params![MessageState::OutDraft, str_like_cmd],
+                "SELECT c.id, m.id FROM chats c  LEFT JOIN msgs m         \
+                 ON c.id=m.chat_id        \
+                 AND m.timestamp=( SELECT MAX(timestamp)   \
+                 FROM msgs  WHERE chat_id=c.id    \
+                 AND (hidden=0 OR (hidden=1 AND state=19))) WHERE c.id>9   \
+                 AND c.blocked=0 AND c.name LIKE ?  \
+                 GROUP BY c.id  ORDER BY IFNULL(m.timestamp,0) DESC, m.id DESC;",
+                params![str_like_cmd],
                 process_row,
                 process_rows,
             )?
         } else {
             //  show normal chatlist
             let mut ids = context.sql.query_map(
-                "SELECT c.id, m.id
-                 FROM chats c
-                 LEFT JOIN msgs m
-                        ON c.id=m.chat_id
-                       AND m.timestamp=(
-                               SELECT MAX(timestamp)
-                                 FROM msgs
-                                WHERE chat_id=c.id
-                                  AND (hidden=0 OR state=?))
-                 WHERE c.id>9
-                   AND c.blocked=0
-                   AND c.archived=0
-                 GROUP BY c.id
-                 ORDER BY IFNULL(m.timestamp,c.created_timestamp) DESC, m.id DESC;",
-                params![MessageState::OutDraft],
+                "SELECT c.id, m.id FROM chats c  \
+                 LEFT JOIN msgs m         \
+                 ON c.id=m.chat_id        \
+                 AND m.timestamp=( SELECT MAX(timestamp)   \
+                 FROM msgs  WHERE chat_id=c.id    \
+                 AND (hidden=0 OR (hidden=1 AND state=19))) WHERE c.id>9   \
+                 AND c.blocked=0 AND c.archived=0  \
+                 GROUP BY c.id  \
+                 ORDER BY IFNULL(m.timestamp,0) DESC, m.id DESC;",
+                params![],
                 process_row,
                 process_rows,
             )?;
             if 0 == listflags & DC_GCL_NO_SPECIALS {
-                if let Some(last_deaddrop_fresh_msg_id) = get_last_deaddrop_fresh_msg(context) {
+                let last_deaddrop_fresh_msg_id = get_last_deaddrop_fresh_msg(context);
+                if last_deaddrop_fresh_msg_id > 0 {
                     ids.insert(0, (DC_CHAT_ID_DEADDROP, last_deaddrop_fresh_msg_id));
                 }
-                add_archived_link_item = true;
+                add_archived_link_item = 1;
             }
             ids
         };
 
-        if add_archived_link_item && dc_get_archived_cnt(context) > 0 {
+        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, MsgId::new(0)));
+                ids.push((DC_CHAT_ID_ALLDONE_HINT, 0));
             }
-            ids.push((DC_CHAT_ID_ARCHIVED_LINK, MsgId::new(0)));
+            ids.push((DC_CHAT_ID_ARCHIVED_LINK, 0));
         }
 
         Ok(Chatlist { ids })
@@ -227,7 +204,6 @@ impl Chatlist {
         self.ids.len()
     }
 
-    /// Returns true if chatlist is empty.
     pub fn is_empty(&self) -> bool {
         self.ids.is_empty()
     }
@@ -245,9 +221,12 @@ impl Chatlist {
     /// Get a single message ID of a chatlist.
     ///
     /// To get the message object from the message ID, use dc_get_msg().
-    pub fn get_msg_id(&self, index: usize) -> Result<MsgId> {
-        ensure!(index < self.ids.len(), "Chatlist index out of range");
-        Ok(self.ids[index].1)
+    pub fn get_msg_id(&self, index: usize) -> u32 {
+        if index >= self.ids.len() {
+            return 0;
+        }
+
+        self.ids[index].1
     }
 
     /// Get a summary for a chatlist index.
@@ -289,14 +268,18 @@ impl Chatlist {
         let lastmsg_id = self.ids[index].1;
         let mut lastcontact = None;
 
-        let lastmsg = if let Ok(lastmsg) = Message::load_from_db(context, lastmsg_id) {
-            if lastmsg.from_id != DC_CONTACT_ID_SELF
-                && (chat.typ == Chattype::Group || chat.typ == Chattype::VerifiedGroup)
-            {
-                lastcontact = Contact::load_from_db(context, lastmsg.from_id).ok();
-            }
+        let lastmsg = if 0 != lastmsg_id {
+            if let Ok(lastmsg) = Message::load_from_db(context, lastmsg_id) {
+                if lastmsg.from_id != 1
+                    && (chat.typ == Chattype::Group || chat.typ == Chattype::VerifiedGroup)
+                {
+                    lastcontact = Contact::load_from_db(context, lastmsg.from_id).ok();
+                }
 
-            Some(lastmsg)
+                Some(lastmsg)
+            } else {
+                None
+            }
         } else {
             None
         };
@@ -314,7 +297,6 @@ impl Chatlist {
     }
 }
 
-/// Get the number of archived chats
 pub fn dc_get_archived_cnt(context: &Context) -> u32 {
     context
         .sql
@@ -326,62 +308,19 @@ pub fn dc_get_archived_cnt(context: &Context) -> u32 {
         .unwrap_or_default()
 }
 
-fn get_last_deaddrop_fresh_msg(context: &Context) -> Option<MsgId> {
-    // We have an index over the state-column, this should be
-    // sufficient as there are typically only few fresh messages.
-    context.sql.query_get_value(
-        context,
-        concat!(
-            "SELECT m.id",
-            " FROM msgs m",
-            " LEFT JOIN chats c",
-            "        ON c.id=m.chat_id",
-            " WHERE m.state=10",
-            "   AND m.hidden=0",
-            "   AND c.blocked=2",
-            " ORDER BY m.timestamp DESC, m.id DESC;"
-        ),
-        params![],
-    )
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    use crate::chat;
-    use crate::test_utils::*;
-
-    #[test]
-    fn test_try_load() {
-        let t = dummy_context();
-        let chat_id1 = create_group_chat(&t.ctx, VerifiedStatus::Unverified, "a chat").unwrap();
-        let chat_id2 = create_group_chat(&t.ctx, VerifiedStatus::Unverified, "b chat").unwrap();
-        let chat_id3 = create_group_chat(&t.ctx, VerifiedStatus::Unverified, "c chat").unwrap();
-
-        // check that the chatlist starts with the most recent message
-        let chats = Chatlist::try_load(&t.ctx, 0, None, None).unwrap();
-        assert_eq!(chats.len(), 3);
-        assert_eq!(chats.get_chat_id(0), chat_id3);
-        assert_eq!(chats.get_chat_id(1), chat_id2);
-        assert_eq!(chats.get_chat_id(2), chat_id1);
-
-        // drafts are sorted to the top
-        let mut msg = Message::new(Viewtype::Text);
-        msg.set_text(Some("hello".to_string()));
-        set_draft(&t.ctx, chat_id2, Some(&mut msg));
-        let chats = Chatlist::try_load(&t.ctx, 0, None, None).unwrap();
-        assert_eq!(chats.get_chat_id(0), chat_id2);
-
-        // check chatlist query and archive functionality
-        let chats = Chatlist::try_load(&t.ctx, 0, Some("b"), None).unwrap();
-        assert_eq!(chats.len(), 1);
-
-        let chats = Chatlist::try_load(&t.ctx, DC_GCL_ARCHIVED_ONLY, None, None).unwrap();
-        assert_eq!(chats.len(), 0);
-
-        chat::archive(&t.ctx, chat_id1, true).ok();
-        let chats = Chatlist::try_load(&t.ctx, DC_GCL_ARCHIVED_ONLY, None, None).unwrap();
-        assert_eq!(chats.len(), 1);
-    }
+fn get_last_deaddrop_fresh_msg(context: &Context) -> u32 {
+    // We have an index over the state-column, this should be sufficient as there are typically
+    // only few fresh messages.
+    context
+        .sql
+        .query_get_value(
+            context,
+            "SELECT m.id  FROM msgs m  LEFT JOIN chats c ON c.id=m.chat_id  \
+             WHERE m.state=10   \
+             AND m.hidden=0    \
+             AND c.blocked=2 \
+             ORDER BY m.timestamp DESC, m.id DESC;",
+            params![],
+        )
+        .unwrap_or_default()
 }

src/config.rs

@@ -1,12 +1,10 @@
-//! # Key-value configuration management
-
 use strum::{EnumProperty, IntoEnumIterator};
 use strum_macros::{AsRefStr, Display, EnumIter, EnumProperty, EnumString};
 
-use crate::blob::BlobObject;
 use crate::constants::DC_VERSION_STR;
 use crate::context::Context;
 use crate::dc_tools::*;
+use crate::error::Error;
 use crate::job::*;
 use crate::stock::StockMessage;
 
@@ -28,38 +26,27 @@ pub enum Config {
     SendPort,
     SmtpCertificateChecks,
     ServerFlags,
-
     #[strum(props(default = "INBOX"))]
     ImapFolder,
-
     Displayname,
     Selfstatus,
     Selfavatar,
-
-    #[strum(props(default = "0"))]
+    #[strum(props(default = "1"))]
     BccSelf,
-
     #[strum(props(default = "1"))]
     E2eeEnabled,
-
     #[strum(props(default = "1"))]
     MdnsEnabled,
-
     #[strum(props(default = "1"))]
     InboxWatch,
-
     #[strum(props(default = "1"))]
     SentboxWatch,
-
     #[strum(props(default = "1"))]
     MvboxWatch,
-
     #[strum(props(default = "1"))]
     MvboxMove,
-
-    #[strum(props(default = "0"))] // also change ShowEmails.default() on changes
+    #[strum(props(default = "0"))]
     ShowEmails,
-
     SaveMimeHeaders,
     ConfiguredAddr,
     ConfiguredMailServer,
@@ -77,13 +64,11 @@ pub enum Config {
     ConfiguredSendSecurity,
     ConfiguredE2EEEnabled,
     Configured,
-
+    // Deprecated
     #[strum(serialize = "sys.version")]
     SysVersion,
-
     #[strum(serialize = "sys.msgsize_max_recommended")]
     SysMsgsizeMaxRecommended,
-
     #[strum(serialize = "sys.config_keys")]
     SysConfigKeys,
 }
@@ -125,15 +110,16 @@ impl Context {
 
     /// Set the given config key.
     /// If `None` is passed as a value the value is cleared and set to the default if there is one.
-    pub fn set_config(&self, key: Config, value: Option<&str>) -> crate::sql::Result<()> {
+    pub fn set_config(&self, key: Config, value: Option<&str>) -> Result<(), Error> {
         match key {
             Config::Selfavatar if value.is_some() => {
-                let blob = BlobObject::create_from_path(&self, value.unwrap())?;
-                self.sql.set_raw_config(self, key, Some(blob.as_name()))
+                let rel_path = std::fs::canonicalize(value.unwrap())?;
+                self.sql
+                    .set_raw_config(self, key, Some(&rel_path.to_string_lossy()))
             }
             Config::InboxWatch => {
                 let ret = self.sql.set_raw_config(self, key, value);
-                interrupt_inbox_idle(self, true);
+                interrupt_imap_idle(self);
                 ret
             }
             Config::SentboxWatch => {
@@ -179,8 +165,6 @@ mod tests {
     use std::str::FromStr;
     use std::string::ToString;
 
-    use crate::test_utils::*;
-
     #[test]
     fn test_to_string() {
         assert_eq!(Config::MailServer.to_string(), "mail_server");
@@ -197,32 +181,4 @@ mod tests {
     fn test_default_prop() {
         assert_eq!(Config::ImapFolder.get_str("default"), Some("INBOX"));
     }
-
-    #[test]
-    fn test_selfavatar() -> failure::Fallible<()> {
-        let t = dummy_context();
-        let avatar_src = t.dir.path().join("avatar.jpg");
-        std::fs::write(&avatar_src, b"avatar")?;
-        let avatar_blob = t.ctx.get_blobdir().join("avatar.jpg");
-        assert!(!avatar_blob.exists());
-        t.ctx
-            .set_config(Config::Selfavatar, Some(&avatar_src.to_str().unwrap()))?;
-        assert!(avatar_blob.exists());
-        assert_eq!(std::fs::read(&avatar_blob)?, b"avatar");
-        let avatar_cfg = t.ctx.get_config(Config::Selfavatar);
-        assert_eq!(avatar_cfg, avatar_blob.to_str().map(|s| s.to_string()));
-        Ok(())
-    }
-
-    #[test]
-    fn test_selfavatar_in_blobdir() -> failure::Fallible<()> {
-        let t = dummy_context();
-        let avatar_src = t.ctx.get_blobdir().join("avatar.jpg");
-        std::fs::write(&avatar_src, b"avatar")?;
-        t.ctx
-            .set_config(Config::Selfavatar, Some(&avatar_src.to_str().unwrap()))?;
-        let avatar_cfg = t.ctx.get_config(Config::Selfavatar);
-        assert_eq!(avatar_cfg, avatar_src.to_str().map(|s| s.to_string()));
-        Ok(())
-    }
 }

src/configure/auto_mozilla.rs

@@ -1,45 +1,16 @@
-//! # Thunderbird's Autoconfiguration implementation
-//!
-//! Documentation: https://developer.mozilla.org/en-US/docs/Mozilla/Thunderbird/Autoconfiguration */
-use failure::Fail;
-
 use quick_xml;
 use quick_xml::events::{BytesEnd, BytesStart, BytesText};
 
 use crate::constants::*;
 use crate::context::Context;
+use crate::error::Error;
 use crate::login_param::LoginParam;
 
-use super::read_url::read_url;
-
-#[derive(Debug, Fail)]
-pub enum Error {
-    #[fail(display = "Invalid email address: {:?}", _0)]
-    InvalidEmailAddress(String),
-
-    #[fail(display = "XML error at position {}", position)]
-    InvalidXml {
-        position: usize,
-        #[cause]
-        error: quick_xml::Error,
-    },
-
-    #[fail(display = "Bad or incomplete autoconfig")]
-    IncompleteAutoconfig(LoginParam),
-
-    #[fail(display = "Failed to get URL {}", _0)]
-    ReadUrlError(#[cause] super::read_url::Error),
-}
-
-pub type Result<T> = std::result::Result<T, Error>;
-
-impl From<super::read_url::Error> for Error {
-    fn from(err: super::read_url::Error) -> Error {
-        Error::ReadUrlError(err)
-    }
-}
-
-#[derive(Debug)]
+use super::read_autoconf_file;
+/* ******************************************************************************
+ * Thunderbird's Autoconfigure
+ ******************************************************************************/
+/* documentation: https://developer.mozilla.org/en-US/docs/Mozilla/Thunderbird/Autoconfiguration */
 struct MozAutoconfigure<'a> {
     pub in_emailaddr: &'a str,
     pub in_emaildomain: &'a str,
@@ -51,14 +22,13 @@ struct MozAutoconfigure<'a> {
     pub tag_config: MozConfigTag,
 }
 
-#[derive(Debug, PartialEq)]
+#[derive(PartialEq)]
 enum MozServer {
     Undefined,
     Imap,
     Smtp,
 }
 
-#[derive(Debug)]
 enum MozConfigTag {
     Undefined,
     Hostname,
@@ -67,14 +37,15 @@ enum MozConfigTag {
     Username,
 }
 
-fn parse_xml(in_emailaddr: &str, xml_raw: &str) -> Result<LoginParam> {
+pub fn moz_parse_xml(in_emailaddr: &str, xml_raw: &str) -> Result<LoginParam, Error> {
     let mut reader = quick_xml::Reader::from_str(xml_raw);
     reader.trim_text(true);
 
     // Split address into local part and domain part.
-    let p = in_emailaddr
-        .find('@')
-        .ok_or_else(|| Error::InvalidEmailAddress(in_emailaddr.to_string()))?;
+    let p = match in_emailaddr.find('@') {
+        Some(i) => i,
+        None => bail!("Email address {} does not contain @", in_emailaddr),
+    };
     let (in_emaillocalpart, in_emaildomain) = in_emailaddr.split_at(p);
     let in_emaildomain = &in_emaildomain[1..];
 
@@ -91,22 +62,22 @@ fn parse_xml(in_emailaddr: &str, xml_raw: &str) -> Result<LoginParam> {
 
     let mut buf = Vec::new();
     loop {
-        let event = reader
-            .read_event(&mut buf)
-            .map_err(|error| Error::InvalidXml {
-                position: reader.buffer_position(),
-                error,
-            })?;
-
-        match event {
-            quick_xml::events::Event::Start(ref e) => {
+        match reader.read_event(&mut buf) {
+            Ok(quick_xml::events::Event::Start(ref e)) => {
                 moz_autoconfigure_starttag_cb(e, &mut moz_ac, &reader)
             }
-            quick_xml::events::Event::End(ref e) => moz_autoconfigure_endtag_cb(e, &mut moz_ac),
-            quick_xml::events::Event::Text(ref e) => {
+            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)
             }
-            quick_xml::events::Event::Eof => break,
+            Err(e) => {
+                bail!(
+                    "Configure xml: Error at position {}: {:?}",
+                    reader.buffer_position(),
+                    e
+                );
+            }
+            Ok(quick_xml::events::Event::Eof) => break,
             _ => (),
         }
         buf.clear();
@@ -117,27 +88,27 @@ fn parse_xml(in_emailaddr: &str, xml_raw: &str) -> Result<LoginParam> {
         || moz_ac.out.send_server.is_empty()
         || moz_ac.out.send_port == 0
     {
-        Err(Error::IncompleteAutoconfig(moz_ac.out))
-    } else {
-        Ok(moz_ac.out)
+        let r = moz_ac.out.to_string();
+        bail!("Bad or incomplete autoconfig: {}", r,);
     }
+
+    Ok(moz_ac.out)
 }
 
 pub fn moz_autoconfigure(
     context: &Context,
     url: &str,
     param_in: &LoginParam,
-) -> Result<LoginParam> {
-    let xml_raw = read_url(context, url)?;
+) -> Option<LoginParam> {
+    let xml_raw = read_autoconf_file(context, url)?;
 
-    let res = parse_xml(&param_in.addr, &xml_raw);
-    if let Err(err) = &res {
-        warn!(
-            context,
-            "Failed to parse Thunderbird autoconfiguration XML: {}", err
-        );
+    match moz_parse_xml(&param_in.addr, &xml_raw) {
+        Err(err) => {
+            warn!(context, "{}", err);
+            None
+        }
+        Ok(lp) => Some(lp),
     }
-    res
 }
 
 fn moz_autoconfigure_text_cb<B: std::io::BufRead>(
@@ -342,7 +313,7 @@ mod tests {
     </loginPageInfo>
   </webMail>
 </clientConfig>";
-        let res = parse_xml("example@outlook.com", xml_raw).expect("XML parsing failed");
+        let res = moz_parse_xml("example@outlook.com", xml_raw).expect("XML parsing failed");
         assert_eq!(res.mail_server, "outlook.office365.com");
         assert_eq!(res.mail_port, 993);
         assert_eq!(res.send_server, "smtp.office365.com");

src/configure/auto_outlook.rs

@@ -1,43 +1,14 @@
-//! Outlook's Autodiscover
-
-use failure::Fail;
-
 use quick_xml;
 use quick_xml::events::BytesEnd;
 
 use crate::constants::*;
 use crate::context::Context;
+use crate::error::Error;
 use crate::login_param::LoginParam;
 
-use super::read_url::read_url;
-
-#[derive(Debug, Fail)]
-pub enum Error {
-    #[fail(display = "XML error at position {}", position)]
-    InvalidXml {
-        position: usize,
-        #[cause]
-        error: quick_xml::Error,
-    },
-
-    #[fail(display = "Bad or incomplete autoconfig")]
-    IncompleteAutoconfig(LoginParam),
-
-    #[fail(display = "Failed to get URL {}", _0)]
-    ReadUrlError(#[cause] super::read_url::Error),
-
-    #[fail(display = "Number of redirection is exceeded")]
-    RedirectionError,
-}
-
-pub type Result<T> = std::result::Result<T, Error>;
-
-impl From<super::read_url::Error> for Error {
-    fn from(err: super::read_url::Error) -> Error {
-        Error::ReadUrlError(err)
-    }
-}
+use super::read_autoconf_file;
 
+/// Outlook's Autodiscover
 struct OutlookAutodiscover {
     pub out: LoginParam,
     pub out_imap_set: bool,
@@ -54,7 +25,7 @@ enum ParsingResult {
     RedirectUrl(String),
 }
 
-fn parse_xml(xml_raw: &str) -> Result<ParsingResult> {
+fn outlk_parse_xml(xml_raw: &str) -> Result<ParsingResult, Error> {
     let mut outlk_ad = OutlookAutodiscover {
         out: LoginParam::new(),
         out_imap_set: false,
@@ -74,15 +45,8 @@ fn parse_xml(xml_raw: &str) -> Result<ParsingResult> {
     let mut current_tag: Option<String> = None;
 
     loop {
-        let event = reader
-            .read_event(&mut buf)
-            .map_err(|error| Error::InvalidXml {
-                position: reader.buffer_position(),
-                error,
-            })?;
-
-        match event {
-            quick_xml::events::Event::Start(ref e) => {
+        match reader.read_event(&mut buf) {
+            Ok(quick_xml::events::Event::Start(ref e)) => {
                 let tag = String::from_utf8_lossy(e.name()).trim().to_lowercase();
 
                 if tag == "protocol" {
@@ -97,11 +61,11 @@ fn parse_xml(xml_raw: &str) -> Result<ParsingResult> {
                     current_tag = Some(tag);
                 }
             }
-            quick_xml::events::Event::End(ref e) => {
+            Ok(quick_xml::events::Event::End(ref e)) => {
                 outlk_autodiscover_endtag_cb(e, &mut outlk_ad);
                 current_tag = None;
             }
-            quick_xml::events::Event::Text(ref e) => {
+            Ok(quick_xml::events::Event::Text(ref e)) => {
                 let val = e.unescape_and_decode(&reader).unwrap_or_default();
 
                 if let Some(ref tag) = current_tag {
@@ -117,14 +81,21 @@ fn parse_xml(xml_raw: &str) -> Result<ParsingResult> {
                     };
                 }
             }
-            quick_xml::events::Event::Eof => break,
+            Err(e) => {
+                bail!(
+                    "Configure xml: Error at position {}: {:?}",
+                    reader.buffer_position(),
+                    e
+                );
+            }
+            Ok(quick_xml::events::Event::Eof) => break,
             _ => (),
         }
         buf.clear();
     }
 
     // XML redirect via redirecturl
-    let res = if outlk_ad.config_redirecturl.is_none()
+    if outlk_ad.config_redirecturl.is_none()
         || outlk_ad.config_redirecturl.as_ref().unwrap().is_empty()
     {
         if outlk_ad.out.mail_server.is_empty()
@@ -132,34 +103,41 @@ fn parse_xml(xml_raw: &str) -> Result<ParsingResult> {
             || outlk_ad.out.send_server.is_empty()
             || outlk_ad.out.send_port == 0
         {
-            return Err(Error::IncompleteAutoconfig(outlk_ad.out));
+            let r = outlk_ad.out.to_string();
+            bail!("Bad or incomplete autoconfig: {}", r,);
         }
-        ParsingResult::LoginParam(outlk_ad.out)
+        Ok(ParsingResult::LoginParam(outlk_ad.out))
     } else {
-        ParsingResult::RedirectUrl(outlk_ad.config_redirecturl.unwrap())
-    };
-    Ok(res)
+        Ok(ParsingResult::RedirectUrl(
+            outlk_ad.config_redirecturl.unwrap(),
+        ))
+    }
 }
 
 pub fn outlk_autodiscover(
     context: &Context,
     url: &str,
     _param_in: &LoginParam,
-) -> Result<LoginParam> {
+) -> Option<LoginParam> {
     let mut url = url.to_string();
-    /* Follow up to 10 xml-redirects (http-redirects are followed in read_url() */
+    /* Follow up to 10 xml-redirects (http-redirects are followed in read_autoconf_file() */
     for _i in 0..10 {
-        let xml_raw = read_url(context, &url)?;
-        let res = parse_xml(&xml_raw);
-        if let Err(err) = &res {
-            warn!(context, "{}", err);
-        }
-        match res? {
-            ParsingResult::RedirectUrl(redirect_url) => url = redirect_url,
-            ParsingResult::LoginParam(login_param) => return Ok(login_param),
+        if let Some(xml_raw) = read_autoconf_file(context, &url) {
+            match outlk_parse_xml(&xml_raw) {
+                Err(err) => {
+                    warn!(context, "{}", err);
+                    return None;
+                }
+                Ok(res) => match res {
+                    ParsingResult::RedirectUrl(redirect_url) => url = redirect_url,
+                    ParsingResult::LoginParam(login_param) => return Some(login_param),
+                },
+            }
+        } else {
+            return None;
         }
     }
-    Err(Error::RedirectionError)
+    None
 }
 
 fn outlk_autodiscover_endtag_cb(event: &BytesEnd, outlk_ad: &mut OutlookAutodiscover) {
@@ -201,7 +179,7 @@ mod tests {
 
     #[test]
     fn test_parse_redirect() {
-        let res = parse_xml("
+        let res = outlk_parse_xml("
 <?xml version=\"1.0\" encoding=\"utf-8\"?>
   <Autodiscover xmlns=\"http://schemas.microsoft.com/exchange/autodiscover/responseschema/2006\">
     <Response xmlns=\"http://schemas.microsoft.com/exchange/autodiscover/outlook/responseschema/2006a\">
@@ -228,7 +206,7 @@ mod tests {
 
     #[test]
     fn test_parse_loginparam() {
-        let res = parse_xml(
+        let res = outlk_parse_xml(
             "\
 <?xml version=\"1.0\" encoding=\"utf-8\"?>
 <Autodiscover xmlns=\"http://schemas.microsoft.com/exchange/autodiscover/responseschema/2006\">

src/configure/mod.rs

@@ -1,9 +1,3 @@
-//! Email accounts autoconfiguration process module
-
-mod auto_mozilla;
-mod auto_outlook;
-mod read_url;
-
 use percent_encoding::{utf8_percent_encode, NON_ALPHANUMERIC};
 
 use crate::config::Config;
@@ -11,13 +5,16 @@ 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;
 
-use auto_mozilla::moz_autoconfigure;
+mod auto_outlook;
 use auto_outlook::outlk_autodiscover;
+mod auto_mozilla;
+use auto_mozilla::moz_autoconfigure;
 
 macro_rules! progress {
     ($context:tt, $progress:expr) => {
@@ -47,8 +44,9 @@ pub fn dc_is_configured(context: &Context) -> bool {
 /*******************************************************************************
  * 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 fn JobConfigureImap(context: &Context) {
+pub fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context) {
     if !context.sql.is_open() {
         error!(context, "Cannot configure, database not opened.",);
         progress!(context, 0);
@@ -64,12 +62,7 @@ pub fn JobConfigureImap(context: &Context) {
 
     let mut param_autoconfig: Option<LoginParam> = None;
 
-    context
-        .inbox_thread
-        .read()
-        .unwrap()
-        .imap
-        .disconnect(context);
+    context.inbox.read().unwrap().disconnect(context);
     context
         .sentbox_thread
         .read()
@@ -97,7 +90,7 @@ pub fn JobConfigureImap(context: &Context) {
     const STEP_3_INDEX: u8 = 13;
     let mut step_counter: u8 = 0;
     while !context.shall_stop_ongoing() {
-        step_counter += 1;
+        step_counter = step_counter + 1;
 
         let success = match step_counter {
             // Read login parameters from the database
@@ -168,7 +161,7 @@ pub fn JobConfigureImap(context: &Context) {
                         "https://autoconfig.{}/mail/config-v1.1.xml?emailaddress={}",
                         param_domain, param_addr_urlencoded
                     );
-                    param_autoconfig = moz_autoconfigure(context, &url, &param).ok();
+                    param_autoconfig = moz_autoconfigure(context, &url, &param);
                 }
                 true
             }
@@ -180,7 +173,7 @@ pub fn JobConfigureImap(context: &Context) {
                         "https://{}/.well-known/autoconfig/mail/config-v1.1.xml?emailaddress={}",
                         param_domain, param_addr_urlencoded
                     );
-                    param_autoconfig = moz_autoconfigure(context, &url, &param).ok();
+                    param_autoconfig = moz_autoconfigure(context, &url, &param);
                 }
                 true
             }
@@ -193,7 +186,7 @@ pub fn JobConfigureImap(context: &Context) {
                         "https://{}{}/autodiscover/autodiscover.xml",
                         "", param_domain
                     );
-                    param_autoconfig = outlk_autodiscover(context, &url, &param).ok();
+                    param_autoconfig = outlk_autodiscover(context, &url, &param);
                 }
                 true
             }
@@ -204,7 +197,7 @@ pub fn JobConfigureImap(context: &Context) {
                         "https://{}{}/autodiscover/autodiscover.xml",
                         "autodiscover.", param_domain
                     );
-                    param_autoconfig = outlk_autodiscover(context, &url, &param).ok();
+                    param_autoconfig = outlk_autodiscover(context, &url, &param);
                 }
                 true
             }
@@ -216,7 +209,7 @@ pub fn JobConfigureImap(context: &Context) {
                         "http://autoconfig.{}/mail/config-v1.1.xml?emailaddress={}",
                         param_domain, param_addr_urlencoded
                     );
-                    param_autoconfig = moz_autoconfigure(context, &url, &param).ok();
+                    param_autoconfig = moz_autoconfigure(context, &url, &param);
                 }
                 true
             }
@@ -228,7 +221,7 @@ pub fn JobConfigureImap(context: &Context) {
                         "http://{}/.well-known/autoconfig/mail/config-v1.1.xml",
                         param_domain
                     );
-                    param_autoconfig = moz_autoconfigure(context, &url, &param).ok();
+                    param_autoconfig = moz_autoconfigure(context, &url, &param);
                 }
                 true
             }
@@ -238,7 +231,7 @@ pub fn JobConfigureImap(context: &Context) {
                 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).ok();
+                    param_autoconfig = moz_autoconfigure(context, &url, &param);
                 }
                 true
             }
@@ -355,21 +348,19 @@ pub fn JobConfigureImap(context: &Context) {
             }
             16 => {
                 progress!(context, 900);
-                let create_mvbox = context.get_config_bool(Config::MvboxWatch)
-                    || context.get_config_bool(Config::MvboxMove);
-                let imap = &context.inbox_thread.read().unwrap().imap;
-                if let Err(err) = imap.ensure_configured_folders(context, create_mvbox) {
-                    warn!(context, "configuring folders failed: {:?}", err);
-                    false
+                let flags: libc::c_int = if context.get_config_bool(Config::MvboxWatch)
+                    || context.get_config_bool(Config::MvboxMove)
+                {
+                    DC_CREATE_MVBOX as i32
                 } else {
-                    let res = imap.select_with_uidvalidity(context, "INBOX");
-                    if let Err(err) = res {
-                        error!(context, "could not read INBOX status: {:?}", err);
-                        false
-                    } else {
-                        true
-                    }
-                }
+                    0
+                };
+                context
+                    .inbox
+                    .read()
+                    .unwrap()
+                    .configure_folders(context, flags);
+                true
             }
             17 => {
                 progress!(context, 910);
@@ -391,10 +382,11 @@ pub fn JobConfigureImap(context: &Context) {
                 // (~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, "key generation completed");
+                info!(context, "Configure completed.");
                 progress!(context, 940);
                 break; // We are done here
             }
+
             _ => {
                 error!(context, "Internal error: step counter out of bound",);
                 break;
@@ -406,26 +398,29 @@ pub fn JobConfigureImap(context: &Context) {
         }
     }
     if imap_connected_here {
-        context
-            .inbox_thread
-            .read()
-            .unwrap()
-            .imap
-            .disconnect(context);
+        context.inbox.read().unwrap().disconnect(context);
     }
     if smtp_connected_here {
         context.smtp.clone().lock().unwrap().disconnect();
     }
 
-    // remember the entered parameters on success
-    // and restore to last-entered on failure.
-    // this way, the parameters visible to the ui are always in-sync with the current configuration.
-    if success {
-        LoginParam::from_database(context, "").save_to_database(context, "configured_raw_");
+    /*
+    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 {
-        LoginParam::from_database(context, "configured_raw_").save_to_database(context, "");
+        assert!(imap_connected_here && smtp_connected_here);
+        info!(
+            context,
+            0, "Keeping IMAP/SMTP connections open after successful configuration"
+        );
     }
-
+    */
     context.free_ongoing();
     progress!(context, if success { 1000 } else { 0 });
 }
@@ -489,13 +484,7 @@ fn try_imap_one_param(context: &Context, param: &LoginParam) -> Option<bool> {
         param.mail_user, param.mail_server, param.mail_port, param.server_flags
     );
     info!(context, "Trying: {}", inf);
-    if context
-        .inbox_thread
-        .read()
-        .unwrap()
-        .imap
-        .connect(context, &param)
-    {
+    if context.inbox.read().unwrap().connect(context, &param) {
         info!(context, "success: {}", inf);
         return Some(true);
     }
@@ -542,24 +531,62 @@ fn try_smtp_one_param(context: &Context, param: &LoginParam) -> Option<bool> {
         param.send_user, param.send_server, param.send_port, param.server_flags
     );
     info!(context, "Trying: {}", inf);
-    match context
+    if context
         .smtp
         .clone()
         .lock()
         .unwrap()
         .connect(context, &param)
     {
-        Ok(()) => {
-            info!(context, "success: {}", inf);
-            Some(true)
+        info!(context, "success: {}", inf);
+        return Some(true);
+    }
+    if context.shall_stop_ongoing() {
+        return Some(false);
+    }
+    info!(context, "could not connect: {}", inf);
+    None
+}
+
+/*******************************************************************************
+ * 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_raw_config_bool(context, "configured") {
+        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;
         }
-        Err(err) => {
-            if context.shall_stop_ongoing() {
-                Some(false)
-            } else {
-                warn!(context, "could not connect: {}", err);
-                None
-            }
+    }
+
+    ret_connected
+}
+
+/*******************************************************************************
+ * Configure a Context
+ ******************************************************************************/
+
+pub fn read_autoconf_file(context: &Context, url: &str) -> Option<String> {
+    info!(context, "Testing {} ...", url);
+
+    match reqwest::Client::new()
+        .get(url)
+        .send()
+        .and_then(|mut res| res.text())
+    {
+        Ok(res) => Some(res),
+        Err(_err) => {
+            info!(context, "Can\'t read file.",);
+
+            None
         }
     }
 }
@@ -568,7 +595,7 @@ fn try_smtp_one_param(context: &Context, param: &LoginParam) -> Option<bool> {
 mod tests {
 
     use crate::config::*;
-    use crate::configure::JobConfigureImap;
+    use crate::configure::dc_job_do_DC_JOB_CONFIGURE_IMAP;
     use crate::test_utils::*;
 
     #[test]
@@ -578,6 +605,6 @@ mod tests {
             .set_config(Config::Addr, Some("probably@unexistant.addr"))
             .unwrap();
         t.ctx.set_config(Config::MailPw, Some("123456")).unwrap();
-        JobConfigureImap(&t.ctx);
+        dc_job_do_DC_JOB_CONFIGURE_IMAP(&t.ctx);
     }
 }

src/configure/read_url.rs

@@ -1,27 +0,0 @@
-use crate::context::Context;
-use failure::Fail;
-
-#[derive(Debug, Fail)]
-pub enum Error {
-    #[fail(display = "URL request error")]
-    GetError(#[cause] reqwest::Error),
-}
-
-pub type Result<T> = std::result::Result<T, Error>;
-
-pub fn read_url(context: &Context, url: &str) -> Result<String> {
-    info!(context, "Requesting URL {}", url);
-
-    match reqwest::Client::new()
-        .get(url)
-        .send()
-        .and_then(|mut res| res.text())
-    {
-        Ok(res) => Ok(res),
-        Err(err) => {
-            info!(context, "Can\'t read URL {}", url);
-
-            Err(Error::GetError(err))
-        }
-    }
-}

src/constants.rs

@@ -1,4 +1,4 @@
-//! # Constants
+//! Constants
 #![allow(non_camel_case_types, dead_code)]
 
 use deltachat_derive::*;
@@ -8,6 +8,21 @@ 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;
 const DC_INBOX_WATCH_DEFAULT: i32 = 1;
@@ -29,20 +44,6 @@ impl Default for Blocked {
     }
 }
 
-#[derive(Debug, Display, Clone, Copy, PartialEq, Eq, FromPrimitive, ToPrimitive, FromSql, ToSql)]
-#[repr(u8)]
-pub enum ShowEmails {
-    Off = 0,
-    AcceptedContacts = 1,
-    All = 2,
-}
-
-impl Default for ShowEmails {
-    fn default() -> Self {
-        ShowEmails::Off // also change Config.ShowEmails props(default) on changes
-    }
-}
-
 pub const DC_IMAP_SEEN: u32 = 0x1;
 
 pub const DC_HANDSHAKE_CONTINUE_NORMAL_PROCESSING: i32 = 0x01;
@@ -53,7 +54,7 @@ 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: u32 = 0x01;
+const DC_GCM_ADDDAYMARKER: usize = 0x01;
 
 pub const DC_GCL_VERIFIED_ONLY: usize = 0x01;
 pub const DC_GCL_ADD_SELF: usize = 0x02;
@@ -105,7 +106,7 @@ impl Default for Chattype {
 }
 
 pub const DC_MSG_ID_MARKER1: u32 = 1;
-pub const DC_MSG_ID_DAYMARKER: u32 = 9;
+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()
@@ -115,14 +116,10 @@ const DC_MAX_GET_INFO_LEN: usize = 100000;
 
 pub const DC_CONTACT_ID_UNDEFINED: u32 = 0;
 pub const DC_CONTACT_ID_SELF: u32 = 1;
-pub const DC_CONTACT_ID_INFO: u32 = 2;
-pub const DC_CONTACT_ID_DEVICE: u32 = 5;
+pub const DC_CONTACT_ID_DEVICE: u32 = 2;
 pub const DC_CONTACT_ID_LAST_SPECIAL: u32 = 9;
 
-// Flags for empty server job
-
-pub const DC_EMPTY_MVBOX: u32 = 0x01;
-pub const DC_EMPTY_INBOX: u32 = 0x02;
+pub const DC_CREATE_MVBOX: usize = 1;
 
 // Flags for configuring IMAP and SMTP servers.
 // These flags are optional
@@ -254,6 +251,11 @@ 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")
+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 set stock translation strings
 

src/contact.rs

@@ -14,7 +14,7 @@ use crate::error::Result;
 use crate::events::Event;
 use crate::key::*;
 use crate::login_param::LoginParam;
-use crate::message::{MessageState, MsgId};
+use crate::message::MessageState;
 use crate::peerstate::*;
 use crate::sql;
 use crate::stock::StockMessage;
@@ -23,17 +23,15 @@ use crate::stock::StockMessage;
 const DC_ORIGIN_MIN_CONTACT_LIST: i32 = 0x100;
 
 /// An object representing a single contact in memory.
-///
 /// The contact object is not updated.
 /// If you want an update, you have to recreate the object.
 ///
 /// The library makes sure
 /// only to use names _authorized_ by the contact in `To:` or `Cc:`.
-/// *Given-names* as "Daddy" or "Honey" are not used there.
+/// _Given-names _as "Daddy" or "Honey" are not used there.
 /// For this purpose, internally, two names are tracked -
-/// authorized name and given name.
+/// authorized-name and given-name.
 /// By default, these names are equal, but functions working with contact names
-/// only affect the given name.
 #[derive(Debug)]
 pub struct Contact {
     /// The contact ID.
@@ -49,8 +47,8 @@ pub struct Contact {
     /// May be empty, initially set to `authname`.
     name: String,
     /// Name authorized by the contact himself. Only this name may be spread to others,
-    /// e.g. in To:-lists. May be empty. It is recommended to use `Contact::get_authname`,
-    /// to access this field.
+    /// e.g. in To:-lists. May be empty. It is recommended to use `Contact::get_name`,
+    /// `Contact::get_display_name` or `Contact::get_name_n_addr` to access this field.
     authname: String,
     /// E-Mail-Address of the contact. It is recommended to use `Contact::get_addr`` to access this field.
     addr: String,
@@ -108,6 +106,11 @@ impl Default for Origin {
 }
 
 impl Origin {
+    /// Contacts that start a new "normal" chat, defaults to off.
+    pub fn is_start_new_chat(self) -> bool {
+        self as i32 >= 0x7FFFFFFF
+    }
+
     /// Contacts that are verified and known not to be spam.
     pub fn is_verified(self) -> bool {
         self as i32 >= 0x100
@@ -138,7 +141,7 @@ pub enum VerifiedStatus {
 }
 
 impl Contact {
-    pub fn load_from_db(context: &Context, contact_id: u32) -> crate::sql::Result<Self> {
+    pub fn load_from_db(context: &Context, contact_id: u32) -> Result<Self> {
         if contact_id == DC_CONTACT_ID_SELF {
             let contact = Contact {
                 id: contact_id,
@@ -150,16 +153,7 @@ impl Contact {
                 blocked: false,
                 origin: Origin::Unknown,
             };
-            return Ok(contact);
-        } else if contact_id == DC_CONTACT_ID_DEVICE {
-            let contact = Contact {
-                id: contact_id,
-                name: context.stock_str(StockMessage::DeviceMessages).into(),
-                authname: "".into(),
-                addr: "device@localhost".into(),
-                blocked: false,
-                origin: Origin::Unknown,
-            };
+
             return Ok(contact);
         }
 
@@ -205,7 +199,7 @@ impl Contact {
     /// Add a single contact as a result of an _explicit_ user action.
     ///
     /// We assume, the contact name, if any, is entered by the user and is used "as is" therefore,
-    /// normalize() is *not* called for the name. If the contact is blocked, it is unblocked.
+    /// normalize() is _not_ called for the name. If the contact is blocked, it is unblocked.
     ///
     /// To add a number of contacts, see `dc_add_address_book()` which is much faster for adding
     /// a bunch of addresses.
@@ -235,7 +229,7 @@ impl Contact {
     }
 
     /// Mark all messages sent by the given contact
-    /// as *noticed*.  See also dc_marknoticed_chat() and dc_markseen_msgs()
+    /// as _noticed_.  See also dc_marknoticed_chat() and dc_markseen_msgs()
     ///
     /// Calling this function usually results in the event `#DC_EVENT_MSGS_CHANGED`.
     pub fn mark_noticed(context: &Context, id: u32) {
@@ -249,7 +243,7 @@ impl Contact {
         {
             context.call_cb(Event::MsgsChanged {
                 chat_id: 0,
-                msg_id: MsgId::new(0),
+                msg_id: 0,
             });
         }
     }
@@ -269,8 +263,8 @@ impl Contact {
             .get_config(Config::ConfiguredAddr)
             .unwrap_or_default();
 
-        if addr_cmp(addr_normalized, addr_self) {
-            return DC_CONTACT_ID_SELF;
+        if addr_normalized == addr_self {
+            return 1;
         }
 
         context.sql.query_get_value(
@@ -306,8 +300,8 @@ impl Contact {
             .get_config(Config::ConfiguredAddr)
             .unwrap_or_default();
 
-        if addr_cmp(addr, addr_self) {
-            return Ok((DC_CONTACT_ID_SELF, sth_modified));
+        if addr == addr_self {
+            return Ok((1, sth_modified));
         }
 
         if !may_be_valid_addr(&addr) {
@@ -425,7 +419,7 @@ impl Contact {
     /// the event `DC_EVENT_CONTACTS_CHANGED` is sent.
     ///
     /// 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.
+    /// however, for adding a bunch of addresses, this function is _much_ faster.
     ///
     /// The `addr_book` is a multiline string in the format `Name one\nAddress one\nName two\nAddress two`.
     ///
@@ -582,12 +576,7 @@ impl Contact {
 
             let mut self_key = Key::from_self_public(context, &loginparam.addr, &context.sql);
 
-            if peerstate.is_some()
-                && peerstate
-                    .as_ref()
-                    .and_then(|p| p.peek_key(PeerstateVerifiedStatus::Unverified))
-                    .is_some()
-            {
+            if peerstate.is_some() && peerstate.as_ref().and_then(|p| p.peek_key(0)).is_some() {
                 let peerstate = peerstate.as_ref().unwrap();
                 let p =
                     context.stock_str(if peerstate.prefer_encrypt == EncryptPreference::Mutual {
@@ -607,25 +596,25 @@ impl Contact {
                     .map(|k| k.formatted_fingerprint())
                     .unwrap_or_default();
                 let fingerprint_other_verified = peerstate
-                    .peek_key(PeerstateVerifiedStatus::BidirectVerified)
+                    .peek_key(2)
                     .map(|k| k.formatted_fingerprint())
                     .unwrap_or_default();
                 let fingerprint_other_unverified = peerstate
-                    .peek_key(PeerstateVerifiedStatus::Unverified)
+                    .peek_key(0)
                     .map(|k| k.formatted_fingerprint())
                     .unwrap_or_default();
-                if loginparam.addr < peerstate.addr {
+                if peerstate.addr.is_some() && &loginparam.addr < peerstate.addr.as_ref().unwrap() {
                     cat_fingerprint(&mut ret, &loginparam.addr, &fingerprint_self, "");
                     cat_fingerprint(
                         &mut ret,
-                        peerstate.addr.clone(),
+                        peerstate.addr.as_ref().unwrap(),
                         &fingerprint_other_verified,
                         &fingerprint_other_unverified,
                     );
                 } else {
                     cat_fingerprint(
                         &mut ret,
-                        peerstate.addr.clone(),
+                        peerstate.addr.as_ref().unwrap(),
                         &fingerprint_other_verified,
                         &fingerprint_other_unverified,
                     );
@@ -688,7 +677,7 @@ impl Contact {
                 }
                 Err(err) => {
                     error!(context, "delete_contact {} failed ({})", contact_id, err);
-                    return Err(err.into());
+                    return Err(err);
                 }
             }
         }
@@ -706,7 +695,7 @@ impl Contact {
     /// like "Me" in the selected language and the email address
     /// defined by dc_set_config().
     pub fn get_by_id(context: &Context, contact_id: u32) -> Result<Contact> {
-        Ok(Contact::load_from_db(context, contact_id)?)
+        Contact::load_from_db(context, contact_id)
     }
 
     /// Get the ID of the contact.
@@ -719,7 +708,6 @@ impl Contact {
         &self.addr
     }
 
-    /// Get name authorized by the contact.
     pub fn get_authname(&self) -> &str {
         &self.authname
     }
@@ -878,7 +866,7 @@ impl Contact {
     }
 
     pub fn real_exists_by_id(context: &Context, contact_id: u32) -> bool {
-        if !context.sql.is_open() || contact_id <= DC_CONTACT_ID_LAST_SPECIAL {
+        if !context.sql.is_open() || contact_id <= 9 {
             return false;
         }
 
@@ -902,8 +890,7 @@ impl Contact {
     }
 }
 
-/// Extracts first name from full name.
-fn get_first_name(full_name: &str) -> &str {
+fn get_first_name<'a>(full_name: &'a str) -> &'a str {
     full_name.splitn(2, ' ').next().unwrap_or_default()
 }
 
@@ -913,7 +900,6 @@ pub fn may_be_valid_addr(addr: &str) -> bool {
     res.is_ok()
 }
 
-/// Returns address with whitespace trimmed and `mailto:` prefix removed.
 pub fn addr_normalize(addr: &str) -> &str {
     let norm = addr.trim();
 
@@ -925,26 +911,26 @@ pub fn addr_normalize(addr: &str) -> &str {
 }
 
 fn set_block_contact(context: &Context, contact_id: u32, new_blocking: bool) {
-    if contact_id <= DC_CONTACT_ID_LAST_SPECIAL {
+    if contact_id <= 9 {
         return;
     }
 
     if let Ok(contact) = Contact::load_from_db(context, contact_id) {
-        if contact.blocked != new_blocking
-            && sql::execute(
+        if contact.blocked != new_blocking {
+            if sql::execute(
                 context,
                 &context.sql,
                 "UPDATE contacts SET blocked=? WHERE id=?;",
                 params![new_blocking as i32, contact_id as i32],
             )
             .is_ok()
-        {
-            // also (un)block all chats with _only_ this contact - we do not delete them to allow a
-            // non-destructive blocking->unblocking.
-            // (Maybe, beside normal chats (type=100) we should also block group chats with only this user.
-            // However, I'm not sure about this point; it may be confusing if the user wants to add other people;
-            // this would result in recreating the same group...)
-            if sql::execute(
+            {
+                // also (un)block all chats with _only_ this contact - we do not delete them to allow a
+                // non-destructive blocking->unblocking.
+                // (Maybe, beside normal chats (type=100) we should also block group chats with only this user.
+                // However, I'm not sure about this point; it may be confusing if the user wants to add other people;
+                // this would result in recreating the same group...)
+                if sql::execute(
                     context,
                     &context.sql,
                     "UPDATE chats SET blocked=? WHERE type=? AND id IN (SELECT chat_id FROM chats_contacts WHERE contact_id=?);",
@@ -953,6 +939,7 @@ fn set_block_contact(context: &Context, contact_id: u32, new_blocking: bool) {
                     Contact::mark_noticed(context, contact_id);
                     context.call_cb(Event::ContactsChanged(None));
                 }
+            }
         }
     }
 }
@@ -1022,16 +1009,17 @@ fn cat_fingerprint(
 }
 
 pub fn addr_cmp(addr1: impl AsRef<str>, addr2: impl AsRef<str>) -> bool {
-    let norm1 = addr_normalize(addr1.as_ref()).to_lowercase();
-    let norm2 = addr_normalize(addr2.as_ref()).to_lowercase();
+    let norm1 = addr_normalize(addr1.as_ref());
+    let norm2 = addr_normalize(addr2.as_ref());
 
     norm1 == norm2
 }
 
 pub fn addr_equals_self(context: &Context, addr: impl AsRef<str>) -> bool {
     if !addr.as_ref().is_empty() {
+        let normalized_addr = addr_normalize(addr.as_ref());
         if let Some(self_addr) = context.get_config(Config::ConfiguredAddr) {
-            return addr_cmp(addr, self_addr);
+            return normalized_addr == self_addr;
         }
     }
     false
@@ -1056,8 +1044,6 @@ fn split_address_book(book: &str) -> Vec<(&str, &str)> {
 mod tests {
     use super::*;
 
-    use crate::test_utils::*;
-
     #[test]
     fn test_may_be_valid_addr() {
         assert_eq!(may_be_valid_addr(""), false);
@@ -1083,10 +1069,6 @@ mod tests {
     fn test_normalize_addr() {
         assert_eq!(addr_normalize("mailto:john@doe.com"), "john@doe.com");
         assert_eq!(addr_normalize("  hello@world.com   "), "hello@world.com");
-
-        // normalisation preserves case to allow user-defined spelling.
-        // however, case is ignored on addr_cmp()
-        assert_ne!(addr_normalize("John@Doe.com"), "john@doe.com");
     }
 
     #[test]
@@ -1103,116 +1085,4 @@ mod tests {
             vec![("Name one", "Address one"), ("Name two", "Address two")]
         )
     }
-
-    #[test]
-    fn test_get_contacts() {
-        let context = dummy_context();
-        let contacts = Contact::get_all(&context.ctx, 0, Some("some2")).unwrap();
-        assert_eq!(contacts.len(), 0);
-
-        let id = Contact::create(&context.ctx, "bob", "bob@mail.de").unwrap();
-        assert_ne!(id, 0);
-
-        let contacts = Contact::get_all(&context.ctx, 0, Some("bob")).unwrap();
-        assert_eq!(contacts.len(), 1);
-
-        let contacts = Contact::get_all(&context.ctx, 0, Some("alice")).unwrap();
-        assert_eq!(contacts.len(), 0);
-    }
-
-    #[test]
-    fn test_add_or_lookup() {
-        // add some contacts, this also tests add_address_book()
-        let t = dummy_context();
-        let book = concat!(
-            "  Name one  \n one@eins.org \n",
-            "Name two\ntwo@deux.net\n",
-            "\nthree@drei.sam\n",
-            "Name two\ntwo@deux.net\n" // should not be added again
-        );
-        assert_eq!(Contact::add_address_book(&t.ctx, book).unwrap(), 3);
-
-        // check first added contact, this does not modify because of lower origin
-        let (contact_id, sth_modified) =
-            Contact::add_or_lookup(&t.ctx, "bla foo", "one@eins.org", Origin::IncomingUnknownTo)
-                .unwrap();
-        assert!(contact_id > DC_CONTACT_ID_LAST_SPECIAL);
-        assert_eq!(sth_modified, Modifier::None);
-        let contact = Contact::load_from_db(&t.ctx, contact_id).unwrap();
-        assert_eq!(contact.get_id(), contact_id);
-        assert_eq!(contact.get_name(), "Name one");
-        assert_eq!(contact.get_display_name(), "Name one");
-        assert_eq!(contact.get_addr(), "one@eins.org");
-        assert_eq!(contact.get_name_n_addr(), "Name one (one@eins.org)");
-
-        // modify first added contact
-        let (contact_id_test, sth_modified) = Contact::add_or_lookup(
-            &t.ctx,
-            "Real one",
-            " one@eins.org  ",
-            Origin::ManuallyCreated,
-        )
-        .unwrap();
-        assert_eq!(contact_id, contact_id_test);
-        assert_eq!(sth_modified, Modifier::Modified);
-        let contact = Contact::load_from_db(&t.ctx, contact_id).unwrap();
-        assert_eq!(contact.get_name(), "Real one");
-        assert_eq!(contact.get_addr(), "one@eins.org");
-        assert!(!contact.is_blocked());
-
-        // check third added contact (contact without name)
-        let (contact_id, sth_modified) =
-            Contact::add_or_lookup(&t.ctx, "", "three@drei.sam", Origin::IncomingUnknownTo)
-                .unwrap();
-        assert!(contact_id > DC_CONTACT_ID_LAST_SPECIAL);
-        assert_eq!(sth_modified, Modifier::None);
-        let contact = Contact::load_from_db(&t.ctx, contact_id).unwrap();
-        assert_eq!(contact.get_name(), "");
-        assert_eq!(contact.get_display_name(), "three@drei.sam");
-        assert_eq!(contact.get_addr(), "three@drei.sam");
-        assert_eq!(contact.get_name_n_addr(), "three@drei.sam");
-
-        // add name to third contact from incoming message (this becomes authorized name)
-        let (contact_id_test, sth_modified) = Contact::add_or_lookup(
-            &t.ctx,
-            "m. serious",
-            "three@drei.sam",
-            Origin::IncomingUnknownFrom,
-        )
-        .unwrap();
-        assert_eq!(contact_id, contact_id_test);
-        assert_eq!(sth_modified, Modifier::Modified);
-        let contact = Contact::load_from_db(&t.ctx, contact_id).unwrap();
-        assert_eq!(contact.get_name_n_addr(), "m. serious (three@drei.sam)");
-        assert!(!contact.is_blocked());
-
-        // manually edit name of third contact (does not changed authorized name)
-        let (contact_id_test, sth_modified) = Contact::add_or_lookup(
-            &t.ctx,
-            "schnucki",
-            "three@drei.sam",
-            Origin::ManuallyCreated,
-        )
-        .unwrap();
-        assert_eq!(contact_id, contact_id_test);
-        assert_eq!(sth_modified, Modifier::Modified);
-        let contact = Contact::load_from_db(&t.ctx, contact_id).unwrap();
-        assert_eq!(contact.get_authname(), "m. serious");
-        assert_eq!(contact.get_name_n_addr(), "schnucki (three@drei.sam)");
-        assert!(!contact.is_blocked());
-
-        // check SELF
-        let contact = Contact::load_from_db(&t.ctx, DC_CONTACT_ID_SELF).unwrap();
-        assert_eq!(DC_CONTACT_ID_SELF, 1);
-        assert_eq!(contact.get_name(), t.ctx.stock_str(StockMessage::SelfMsg));
-        assert_eq!(contact.get_addr(), ""); // we're not configured
-        assert!(!contact.is_blocked());
-    }
-
-    #[test]
-    fn test_addr_cmp() {
-        assert!(addr_cmp("AA@AA.ORG", "aa@aa.ORG"));
-        assert!(addr_cmp(" aa@aa.ORG ", "AA@AA.ORG"));
-        assert!(addr_cmp(" mailto:AA@AA.ORG", "Aa@Aa.orG"));
-    }
 }

src/context.rs

@@ -1,7 +1,7 @@
-//! Contacts module
-
 use std::collections::HashMap;
 use std::ffi::OsString;
+use std::fs;
+use std::io::Write;
 use std::path::{Path, PathBuf};
 use std::sync::{Arc, Condvar, Mutex, RwLock};
 
@@ -11,6 +11,7 @@ use crate::chat::*;
 use crate::config::Config;
 use crate::constants::*;
 use crate::contact::*;
+use crate::dc_tools::{dc_copy_file, dc_derive_safe_stem_ext};
 use crate::error::*;
 use crate::events::Event;
 use crate::imap::*;
@@ -19,10 +20,11 @@ use crate::job_thread::JobThread;
 use crate::key::*;
 use crate::login_param::LoginParam;
 use crate::lot::Lot;
-use crate::message::{self, Message, MsgId};
+use crate::message::{self, Message};
 use crate::param::Params;
-use crate::smtp::Smtp;
+use crate::smtp::*;
 use crate::sql::Sql;
+use rand::{thread_rng, Rng};
 
 /// Callback function type for [Context]
 ///
@@ -41,14 +43,12 @@ pub type ContextCallback = dyn Fn(&Context, Event) -> uintptr_t + Send + Sync;
 
 #[derive(DebugStub)]
 pub struct Context {
-    /// Database file path
     dbfile: PathBuf,
-    /// Blob directory path
     blobdir: PathBuf,
     pub sql: Sql,
+    pub inbox: Arc<RwLock<Imap>>,
     pub perform_inbox_jobs_needed: Arc<RwLock<bool>>,
     pub probe_imap_network: Arc<RwLock<bool>>,
-    pub inbox_thread: Arc<RwLock<JobThread>>,
     pub sentbox_thread: Arc<RwLock<JobThread>>,
     pub mvbox_thread: Arc<RwLock<JobThread>>,
     pub smtp: Arc<Mutex<Smtp>>,
@@ -59,7 +59,7 @@ pub struct Context {
     pub os_name: Option<String>,
     pub cmdline_sel_chat_id: Arc<RwLock<u32>>,
     pub bob: Arc<RwLock<BobStatus>>,
-    pub last_smeared_timestamp: RwLock<i64>,
+    pub last_smeared_timestamp: Arc<RwLock<i64>>,
     pub running_state: Arc<RwLock<RunningState>>,
     /// Mutex to avoid generating the key for the user more than once.
     pub generating_key_mutex: Mutex<()>,
@@ -88,7 +88,7 @@ pub fn get_info() -> HashMap<&'static str, String> {
     );
     res.insert(
         "arch",
-        (std::mem::size_of::<*mut libc::c_void>())
+        (::std::mem::size_of::<*mut libc::c_void>())
             .wrapping_mul(8)
             .to_string(),
     );
@@ -97,7 +97,6 @@ pub fn get_info() -> HashMap<&'static str, String> {
 }
 
 impl Context {
-    /// Creates new context.
     pub fn new(cb: Box<ContextCallback>, os_name: String, dbfile: PathBuf) -> Result<Context> {
         let mut blob_fname = OsString::new();
         blob_fname.push(dbfile.file_name().unwrap_or_default());
@@ -123,6 +122,7 @@ impl Context {
         let ctx = Context {
             blobdir,
             dbfile,
+            inbox: Arc::new(RwLock::new(Imap::new())),
             cb,
             os_name: Some(os_name),
             running_state: Arc::new(RwLock::new(Default::default())),
@@ -131,13 +131,8 @@ impl Context {
             smtp_state: Arc::new((Mutex::new(Default::default()), Condvar::new())),
             oauth2_critical: Arc::new(Mutex::new(())),
             bob: Arc::new(RwLock::new(Default::default())),
-            last_smeared_timestamp: RwLock::new(0),
+            last_smeared_timestamp: Arc::new(RwLock::new(0)),
             cmdline_sel_chat_id: Arc::new(RwLock::new(0)),
-            inbox_thread: Arc::new(RwLock::new(JobThread::new(
-                "INBOX",
-                "configured_inbox_folder",
-                Imap::new(),
-            ))),
             sentbox_thread: Arc::new(RwLock::new(JobThread::new(
                 "SENTBOX",
                 "configured_sentbox_folder",
@@ -162,16 +157,67 @@ impl Context {
         Ok(ctx)
     }
 
-    /// Returns database file path.
     pub fn get_dbfile(&self) -> &Path {
         self.dbfile.as_path()
     }
 
-    /// Returns blob directory path.
     pub fn get_blobdir(&self) -> &Path {
         self.blobdir.as_path()
     }
 
+    pub fn copy_to_blobdir(&self, orig_filename: impl AsRef<str>) -> Result<String> {
+        // return a $BLOBDIR/<filename> with the content of orig_filename
+        // copied into it. The <filename> will be safely derived from
+        // orig_filename, and will not clash with existing filenames.
+        let dest = self.new_blob_file(&orig_filename, b"")?;
+        if dc_copy_file(
+            &self,
+            PathBuf::from(orig_filename.as_ref()),
+            PathBuf::from(&dest),
+        ) {
+            Ok(dest)
+        } else {
+            bail!("could not copy {} to {}", orig_filename.as_ref(), dest);
+        }
+    }
+
+    pub fn new_blob_file(&self, orig_filename: impl AsRef<str>, data: &[u8]) -> Result<String> {
+        // return a $BLOBDIR/<FILENAME> string which corresponds to the
+        // respective file in the blobdir, and which contains the data.
+        // FILENAME is computed by looking and possibly mangling the
+        // basename of orig_filename. The resulting filenames are meant
+        // to be human-readable.
+        let (stem, ext) = dc_derive_safe_stem_ext(orig_filename.as_ref());
+
+        // ext starts with "." or is empty string, so we can always resconstruct
+
+        for i in 0..3 {
+            let candidate_basename = match i {
+                // first a try to just use the (possibly mangled) original basename
+                0 => format!("{}{}", stem, ext),
+
+                // otherwise extend stem with random numbers
+                _ => {
+                    let mut rng = thread_rng();
+                    let random_id: u32 = rng.gen();
+                    format!("{}-{}{}", stem, random_id, ext)
+                }
+            };
+            let path = self.get_blobdir().join(&candidate_basename);
+            if let Ok(mut file) = fs::OpenOptions::new()
+                .create_new(true)
+                .write(true)
+                .open(&path)
+            {
+                file.write_all(data)?;
+                let db_entry = format!("$BLOBDIR/{}", candidate_basename);
+                self.call_cb(Event::NewBlobFile(db_entry.clone()));
+                return Ok(db_entry);
+            }
+        }
+        bail!("out of luck to create new blob file");
+    }
+
     pub fn call_cb(&self, event: Event) -> uintptr_t {
         (*self.cb)(self, event)
     }
@@ -324,30 +370,24 @@ impl Context {
         res
     }
 
-    pub fn get_fresh_msgs(&self) -> Vec<MsgId> {
+    pub fn get_fresh_msgs(&self) -> Vec<u32> {
         let show_deaddrop = 0;
+
         self.sql
             .query_map(
-                concat!(
-                    "SELECT m.id",
-                    " FROM msgs m",
-                    " LEFT JOIN contacts ct",
-                    "        ON m.from_id=ct.id",
-                    " LEFT JOIN chats c",
-                    "        ON m.chat_id=c.id",
-                    " WHERE m.state=?",
-                    "   AND m.hidden=0",
-                    "   AND m.chat_id>?",
-                    "   AND ct.blocked=0",
-                    "   AND (c.blocked=0 OR c.blocked=?)",
-                    " ORDER BY m.timestamp DESC,m.id DESC;"
-                ),
+                "SELECT m.id FROM msgs m LEFT JOIN contacts ct \
+                 ON m.from_id=ct.id LEFT JOIN chats c ON m.chat_id=c.id WHERE m.state=?   \
+                 AND m.hidden=0   \
+                 AND m.chat_id>?   \
+                 AND ct.blocked=0   \
+                 AND (c.blocked=0 OR c.blocked=?) ORDER BY m.timestamp DESC,m.id DESC;",
                 &[10, 9, if 0 != show_deaddrop { 2 } else { 0 }],
-                |row| row.get::<_, MsgId>(0),
+                |row| row.get(0),
                 |rows| {
                     let mut ret = Vec::new();
                     for row in rows {
-                        ret.push(row?);
+                        let id: u32 = row?;
+                        ret.push(id);
                     }
                     Ok(ret)
                 },
@@ -356,7 +396,7 @@ impl Context {
     }
 
     #[allow(non_snake_case)]
-    pub fn search_msgs(&self, chat_id: u32, query: impl AsRef<str>) -> Vec<MsgId> {
+    pub fn search_msgs(&self, chat_id: u32, query: impl AsRef<str>) -> Vec<u32> {
         let real_query = query.as_ref().trim();
         if real_query.is_empty() {
             return Vec::new();
@@ -365,43 +405,25 @@ impl Context {
         let strLikeBeg = format!("{}%", real_query);
 
         let query = if 0 != chat_id {
-            concat!(
-                "SELECT m.id AS id, m.timestamp AS timestamp",
-                " FROM msgs m",
-                " LEFT JOIN contacts ct",
-                "        ON m.from_id=ct.id",
-                " WHERE m.chat_id=?",
-                "   AND m.hidden=0",
-                "   AND ct.blocked=0",
-                "   AND (txt LIKE ? OR ct.name LIKE ?)",
-                " ORDER BY m.timestamp,m.id;"
-            )
+            "SELECT m.id, m.timestamp FROM msgs m LEFT JOIN contacts ct ON m.from_id=ct.id WHERE m.chat_id=?  \
+         AND m.hidden=0  \
+         AND ct.blocked=0 AND (txt LIKE ? OR ct.name LIKE ?) ORDER BY m.timestamp,m.id;"
         } else {
-            concat!(
-                "SELECT m.id AS id, m.timestamp AS timestamp",
-                " FROM msgs m",
-                " LEFT JOIN contacts ct",
-                "        ON m.from_id=ct.id",
-                " LEFT JOIN chats c",
-                "        ON m.chat_id=c.id",
-                " WHERE m.chat_id>9",
-                "   AND m.hidden=0",
-                "   AND (c.blocked=0 OR c.blocked=?)",
-                "   AND ct.blocked=0",
-                "   AND (m.txt LIKE ? OR ct.name LIKE ?)",
-                " ORDER BY m.timestamp DESC,m.id DESC;"
-            )
+            "SELECT m.id, m.timestamp FROM msgs m LEFT JOIN contacts ct ON m.from_id=ct.id \
+         LEFT JOIN chats c ON m.chat_id=c.id WHERE m.chat_id>9 AND m.hidden=0  \
+         AND (c.blocked=0 OR c.blocked=?) \
+         AND ct.blocked=0 AND (m.txt LIKE ? OR ct.name LIKE ?) ORDER BY m.timestamp DESC,m.id DESC;"
         };
 
         self.sql
             .query_map(
                 query,
                 params![chat_id as i32, &strLikeInText, &strLikeBeg],
-                |row| row.get::<_, MsgId>("id"),
+                |row| row.get::<_, i32>(0),
                 |rows| {
                     let mut ret = Vec::new();
                     for id in rows {
-                        ret.push(id?);
+                        ret.push(id? as u32);
                     }
                     Ok(ret)
                 },
@@ -432,14 +454,15 @@ impl Context {
         }
     }
 
-    pub fn do_heuristics_moves(&self, folder: &str, msg_id: MsgId) {
+    pub fn do_heuristics_moves(&self, folder: &str, msg_id: u32) {
         if !self.get_config_bool(Config::MvboxMove) {
             return;
         }
 
-        if self.is_mvbox(folder) {
+        if !self.is_inbox(folder) && !self.is_sentbox(folder) {
             return;
         }
+
         if let Ok(msg) = Message::load_from_db(self, msg_id) {
             if msg.is_setupmessage() {
                 // do not move setup messages;
@@ -447,15 +470,20 @@ impl Context {
                 return;
             }
 
+            if self.is_mvbox(folder) {
+                message::update_msg_move_state(self, &msg.rfc724_mid, MoveState::Stay);
+            }
+
             // 1 = dc message, 2 = reply to dc message
             if 0 != msg.is_dc_message {
                 job_add(
                     self,
                     Action::MoveMsg,
-                    msg.id.to_u32() as i32,
+                    msg.id as libc::c_int,
                     Params::new(),
                     0,
                 );
+                message::update_msg_move_state(self, &msg.rfc724_mid, MoveState::Moving);
             }
         }
     }
@@ -463,8 +491,8 @@ impl Context {
 
 impl Drop for Context {
     fn drop(&mut self) {
-        info!(self, "disconnecting inbox-thread",);
-        self.inbox_thread.read().unwrap().imap.disconnect(self);
+        info!(self, "disconnecting INBOX-watch",);
+        self.inbox.read().unwrap().disconnect(self);
         info!(self, "disconnecting sentbox-thread",);
         self.sentbox_thread.read().unwrap().imap.disconnect(self);
         info!(self, "disconnecting mvbox-thread",);
@@ -491,25 +519,12 @@ pub struct BobStatus {
     pub qr_scan: Option<Lot>,
 }
 
-#[derive(Debug, PartialEq)]
-pub enum PerformJobsNeeded {
-    Not,
-    AtOnce,
-    AvoidDos,
-}
-
-impl Default for PerformJobsNeeded {
-    fn default() -> Self {
-        Self::Not
-    }
-}
-
 #[derive(Default, Debug)]
 pub struct SmtpState {
     pub idle: bool,
     pub suspended: bool,
     pub doing_jobs: bool,
-    pub perform_jobs_needed: PerformJobsNeeded,
+    pub perform_jobs_needed: i32,
     pub probe_network: bool,
 }
 
@@ -521,6 +536,7 @@ pub fn get_version_str() -> &'static str {
 mod tests {
     use super::*;
 
+    use crate::dc_tools::*;
     use crate::test_utils::*;
 
     #[test]
@@ -558,6 +574,51 @@ mod tests {
         assert!(res.is_err());
     }
 
+    #[test]
+    fn test_new_blob_file() {
+        let t = dummy_context();
+        let context = t.ctx;
+        let x = &context.new_blob_file("hello", b"data").unwrap();
+        assert!(dc_file_exist(&context, x));
+        assert!(x.starts_with("$BLOBDIR"));
+        assert!(dc_read_file(&context, x).unwrap() == b"data");
+
+        let y = &context.new_blob_file("hello", b"data").unwrap();
+        assert!(dc_file_exist(&context, y));
+        assert!(y.starts_with("$BLOBDIR/hello-"));
+
+        let x = &context.new_blob_file("xyz/hello.png", b"data").unwrap();
+        assert!(dc_file_exist(&context, x));
+        assert_eq!(x, "$BLOBDIR/hello.png");
+
+        let y = &context.new_blob_file("hello\\world.png", b"data").unwrap();
+        assert!(dc_file_exist(&context, y));
+        assert_eq!(y, "$BLOBDIR/world.png");
+    }
+
+    #[test]
+    fn test_new_blob_file_long_names() {
+        let t = dummy_context();
+        let context = t.ctx;
+        let s = "12312312039182039182039812039810293810293810293810293801293801293123123";
+        let x = &context.new_blob_file(s, b"data").unwrap();
+        println!("blobfilename '{}'", x);
+        println!("xxxxfilename '{}'", s);
+        assert!(x.len() < s.len());
+        assert!(dc_file_exist(&context, x));
+        assert!(x.starts_with("$BLOBDIR"));
+    }
+
+    #[test]
+    fn test_new_blob_file_unicode() {
+        let t = dummy_context();
+        let context = t.ctx;
+        let s = "helloäworld.qwe";
+        let x = &context.new_blob_file(s, b"data").unwrap();
+        assert_eq!(x, "$BLOBDIR/hello-world.qwe");
+        assert_eq!(dc_read_file(&context, x).unwrap(), b"data");
+    }
+
     #[test]
     fn test_sqlite_parent_not_exists() {
         let tmp = tempfile::tempdir().unwrap();

src/dc_dehtml.rs

@@ -1,7 +1,3 @@
-//! De-HTML
-//!
-//! A module to remove HTML tags from the email text
-
 use lazy_static::lazy_static;
 use quick_xml;
 use quick_xml::events::{BytesEnd, BytesStart, BytesText};
@@ -23,18 +19,22 @@ enum AddText {
     YesPreserveLineEnds,
 }
 
-// dehtml() returns way too many newlines; however, an optimisation on this issue is not needed as
-// the newlines are typically removed in further processing by the caller
-pub fn dehtml(buf: &str) -> String {
-    let buf = buf.trim();
+// 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 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(buf.len()),
+        strbuilder: String::with_capacity(buf_terminated.len()),
         add_text: AddText::YesRemoveLineEnds,
         last_href: None,
     };
 
-    let mut reader = quick_xml::Reader::from_str(buf);
+    let mut reader = quick_xml::Reader::from_str(buf_terminated);
 
     let mut buf = Vec::new();
 
@@ -171,7 +171,7 @@ mod tests {
     use super::*;
 
     #[test]
-    fn test_dehtml() {
+    fn test_dc_dehtml() {
         let cases = vec![
             (
                 "<a href='https://example.com'> Foo </a>",
@@ -186,7 +186,7 @@ mod tests {
             ("", ""),
         ];
         for (input, output) in cases {
-            assert_eq!(dehtml(input), output);
+            assert_eq!(dc_dehtml(input), output);
         }
     }
 }

src/dc_simplify.rs

@@ -1,4 +1,4 @@
-use crate::dehtml::*;
+use crate::dc_dehtml::*;
 
 #[derive(Copy, Clone)]
 pub struct Simplify {
@@ -34,7 +34,7 @@ impl Simplify {
     /// The data returned from simplify() must be free()'d when no longer used.
     pub fn simplify(&mut self, input: &str, is_html: bool, is_msgrmsg: bool) -> String {
         let mut out = if is_html {
-            dehtml(input)
+            dc_dehtml(input)
         } else {
             input.to_string()
         };
@@ -49,7 +49,7 @@ impl Simplify {
     /**
      * Simplify Plain Text
      */
-    #[allow(non_snake_case, clippy::mut_range_bound)]
+    #[allow(non_snake_case)]
     fn simplify_plain_text(&mut self, buf_terminated: &str, is_msgrmsg: bool) -> String {
         /* This function ...
         ... removes all text after the line `-- ` (footer mark)

src/dc_strencode.rs

@@ -0,0 +1,251 @@
+use itertools::Itertools;
+use std::borrow::Cow;
+use std::ffi::CString;
+use std::ptr;
+
+use charset::Charset;
+use libc::free;
+use mmime::mailmime::decode::mailmime_encoded_phrase_parse;
+use mmime::other::*;
+use percent_encoding::{percent_decode, utf8_percent_encode, AsciiSet, CONTROLS};
+
+use crate::dc_tools::*;
+
+/**
+ * Encode non-ascii-strings as `=?UTF-8?Q?Bj=c3=b6rn_Petersen?=`.
+ * Belongs to RFC 2047: https://tools.ietf.org/html/rfc2047
+ *
+ * We do not fold at position 72; this would result in empty words as `=?utf-8?Q??=` which are correct,
+ * but cannot be displayed by some mail programs (eg. Android Stock Mail).
+ * however, this is not needed, as long as _one_ word is not longer than 72 characters.
+ * _if_ it is, the display may get weird.  This affects the subject only.
+ * the best solution wor all this would be if libetpan encodes the line as only libetpan knowns when a header line is full.
+ *
+ * @param to_encode Null-terminated UTF-8-string to encode.
+ * @return Returns the encoded string which must be free()'d when no longed needed.
+ *     On errors, NULL is returned.
+ */
+pub fn dc_encode_header_words(input: impl AsRef<str>) -> String {
+    let mut result = String::default();
+    for (_, group) in &input.as_ref().chars().group_by(|c| c.is_whitespace()) {
+        let word: String = group.collect();
+        result.push_str(&quote_word(&word.as_bytes()));
+    }
+
+    result
+}
+
+fn must_encode(byte: u8) -> bool {
+    static SPECIALS: &[u8] = b",:!\"#$@[\\]^`{|}~=?_";
+
+    SPECIALS.into_iter().any(|b| *b == byte)
+}
+
+fn quote_word(word: &[u8]) -> String {
+    let mut result = String::default();
+    let mut encoded = false;
+
+    for byte in word {
+        let byte = *byte;
+        if byte >= 128 || must_encode(byte) {
+            result.push_str(&format!("={:2X}", byte));
+            encoded = true;
+        } else if byte == b' ' {
+            result.push('_');
+            encoded = true;
+        } else {
+            result.push(byte as _);
+        }
+    }
+
+    if encoded {
+        result = format!("=?utf-8?Q?{}?=", &result);
+    }
+    result
+}
+
+/* ******************************************************************************
+ * Encode/decode header words, RFC 2047
+ ******************************************************************************/
+
+pub(crate) fn dc_decode_header_words(input: &str) -> String {
+    static FROM_ENCODING: &[u8] = b"iso-8859-1\x00";
+    static TO_ENCODING: &[u8] = b"utf-8\x00";
+    let mut out = ptr::null_mut();
+    let mut cur_token = 0;
+    let input_c = CString::yolo(input);
+    unsafe {
+        let r = mailmime_encoded_phrase_parse(
+            FROM_ENCODING.as_ptr().cast(),
+            input_c.as_ptr(),
+            input.len(),
+            &mut cur_token,
+            TO_ENCODING.as_ptr().cast(),
+            &mut out,
+        );
+        if r as u32 != MAILIMF_NO_ERROR || out.is_null() {
+            input.to_string()
+        } else {
+            let res = to_string_lossy(out);
+            free(out.cast());
+            res
+        }
+    }
+}
+
+pub fn dc_needs_ext_header(to_check: impl AsRef<str>) -> bool {
+    let to_check = to_check.as_ref();
+
+    if to_check.is_empty() {
+        return false;
+    }
+
+    to_check.chars().any(|c| {
+        !(c.is_ascii_alphanumeric()
+            || c == '-'
+            || c == '_'
+            || c == '_'
+            || c == '.'
+            || c == '~'
+            || c == '%')
+    })
+}
+
+const EXT_ASCII_ST: &AsciiSet = &CONTROLS
+    .add(b' ')
+    .add(b'-')
+    .add(b'_')
+    .add(b'.')
+    .add(b'~')
+    .add(b'%');
+
+/// Encode an UTF-8 string to the extended header format.
+pub fn dc_encode_ext_header(to_encode: impl AsRef<str>) -> String {
+    let encoded = utf8_percent_encode(to_encode.as_ref(), &EXT_ASCII_ST);
+    format!("utf-8''{}", encoded)
+}
+
+/// Decode an extended-header-format strings to UTF-8.
+pub fn dc_decode_ext_header(to_decode: &[u8]) -> Cow<str> {
+    if let Some(index) = bytes!(b'\'').find(to_decode) {
+        let (charset, rest) = to_decode.split_at(index);
+        if !charset.is_empty() {
+            // skip language
+            if let Some(index2) = bytes!(b'\'').find(&rest[1..]) {
+                let decoded = percent_decode(&rest[index2 + 2..]);
+
+                if charset != b"utf-8" && charset != b"UTF-8" {
+                    if let Some(encoding) = Charset::for_label(charset) {
+                        let bytes = decoded.collect::<Vec<u8>>();
+                        let (res, _, _) = encoding.decode(&bytes);
+                        return Cow::Owned(res.into_owned());
+                    } else {
+                        return decoded.decode_utf8_lossy();
+                    }
+                } else {
+                    return decoded.decode_utf8_lossy();
+                }
+            }
+        }
+    }
+
+    String::from_utf8_lossy(to_decode)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_dc_decode_header_words() {
+        assert_eq!(
+            dc_decode_header_words("=?utf-8?B?dGVzdMOkw7bDvC50eHQ=?="),
+            std::string::String::from_utf8(b"test\xc3\xa4\xc3\xb6\xc3\xbc.txt".to_vec()).unwrap(),
+        );
+
+        assert_eq!(dc_decode_header_words("just ascii test"), "just ascii test");
+
+        assert_eq!(dc_encode_header_words("abcdef"), "abcdef");
+
+        let r = dc_encode_header_words(
+            std::string::String::from_utf8(b"test\xc3\xa4\xc3\xb6\xc3\xbc.txt".to_vec()).unwrap(),
+        );
+        assert!(r.starts_with("=?utf-8"));
+
+        assert_eq!(
+            dc_decode_header_words(&r),
+            std::string::String::from_utf8(b"test\xc3\xa4\xc3\xb6\xc3\xbc.txt".to_vec()).unwrap(),
+        );
+
+        assert_eq!(
+                dc_decode_header_words("=?ISO-8859-1?Q?attachment=3B=0D=0A_filename=3D?= =?ISO-8859-1?Q?=22test=E4=F6=FC=2Etxt=22=3B=0D=0A_size=3D39?="),
+                std::string::String::from_utf8(b"attachment;\r\n filename=\"test\xc3\xa4\xc3\xb6\xc3\xbc.txt\";\r\n size=39".to_vec()).unwrap(),
+            );
+    }
+
+    #[test]
+    fn test_dc_encode_ext_header() {
+        let buf1 = dc_encode_ext_header("Björn Petersen");
+        assert_eq!(&buf1, "utf-8\'\'Bj%C3%B6rn%20Petersen");
+        let buf2 = dc_decode_ext_header(buf1.as_bytes());
+        assert_eq!(&buf2, "Björn Petersen",);
+
+        let buf1 = dc_decode_ext_header(b"iso-8859-1\'en\'%A3%20rates");
+        assert_eq!(buf1, "£ rates",);
+
+        let buf1 = dc_decode_ext_header(b"wrong\'format");
+        assert_eq!(buf1, "wrong\'format",);
+
+        let buf1 = dc_decode_ext_header(b"\'\'");
+        assert_eq!(buf1, "\'\'");
+
+        let buf1 = dc_decode_ext_header(b"x\'\'");
+        assert_eq!(buf1, "");
+
+        let buf1 = dc_decode_ext_header(b"\'");
+        assert_eq!(buf1, "\'");
+
+        let buf1 = dc_decode_ext_header(b"");
+        assert_eq!(buf1, "");
+
+        // regressions
+        assert_eq!(
+            dc_decode_ext_header(dc_encode_ext_header("%0A").as_bytes()),
+            "%0A"
+        );
+    }
+
+    #[test]
+    fn test_dc_needs_ext_header() {
+        assert_eq!(dc_needs_ext_header("Björn"), true);
+        assert_eq!(dc_needs_ext_header("Bjoern"), false);
+        assert_eq!(dc_needs_ext_header(""), false);
+        assert_eq!(dc_needs_ext_header(" "), true);
+        assert_eq!(dc_needs_ext_header("a b"), true);
+    }
+
+    use proptest::prelude::*;
+
+    proptest! {
+        #[test]
+        fn test_ext_header_roundtrip(buf: String) {
+            let encoded = dc_encode_ext_header(&buf);
+            let decoded = dc_decode_ext_header(encoded.as_bytes());
+            assert_eq!(buf, decoded);
+        }
+
+        #[test]
+        fn test_ext_header_decode_anything(buf: Vec<u8>) {
+            // make sure this never panics
+            let _decoded = dc_decode_ext_header(&buf);
+        }
+
+        #[test]
+        fn test_dc_header_roundtrip(input: String) {
+            let encoded = dc_encode_header_words(&input);
+            let decoded = dc_decode_header_words(&encoded);
+
+            assert_eq!(input, decoded);
+        }
+    }
+}

src/e2ee.rs

@@ -1,20 +1,41 @@
 //! End-to-end encryption support.
 
 use std::collections::HashSet;
+use std::ptr;
+use std::str::FromStr;
 
-use mailparse::MailHeaderMap;
+use libc::strlen;
+use mmime::clist::*;
+use mmime::mailimf::types::*;
+use mmime::mailimf::types_helper::*;
+use mmime::mailimf::*;
+use mmime::mailmime::content::*;
+use mmime::mailmime::types::*;
+use mmime::mailmime::types_helper::*;
+use mmime::mailmime::write_mem::*;
+use mmime::mailmime::*;
+use mmime::mailprivacy_prepare_mime;
+use mmime::mmapstring::*;
+use mmime::{mailmime_substitute, MAILIMF_NO_ERROR, MAIL_NO_ERROR};
 use num_traits::FromPrimitive;
 
 use crate::aheader::*;
 use crate::config::Config;
 use crate::context::Context;
+use crate::dc_tools::*;
 use crate::error::*;
 use crate::key::*;
 use crate::keyring::*;
+use crate::mimefactory::MimeFactory;
 use crate::peerstate::*;
 use crate::pgp;
 use crate::securejoin::handle_degrade_event;
 use crate::wrapmime;
+use crate::wrapmime::*;
+
+// standard mime-version header aka b"Version: 1\r\n\x00"
+static mut VERSION_CONTENT: [libc::c_char; 13] =
+    [86, 101, 114, 115, 105, 111, 110, 58, 32, 49, 13, 10, 0];
 
 #[derive(Debug)]
 pub struct EncryptHelper {
@@ -50,27 +71,39 @@ impl EncryptHelper {
         Aheader::new(addr, pk, self.prefer_encrypt)
     }
 
-    /// Determines if we can and should encrypt.
-    pub fn should_encrypt(
-        &self,
-        context: &Context,
+    pub fn try_encrypt(
+        &mut self,
+        factory: &mut MimeFactory,
         e2ee_guaranteed: bool,
-        peerstates: &[(Option<Peerstate>, &str)],
+        min_verified: libc::c_int,
+        do_gossip: bool,
+        mut in_out_message: *mut Mailmime,
+        imffields_unprotected: *mut mailimf_fields,
     ) -> Result<bool> {
+        // libEtPan's pgp_encrypt_mime() takes the parent as the new root.
+        // We just expect the root as being given to this function.
+        ensure!(
+            !in_out_message.is_null() && unsafe { (*in_out_message).mm_parent.is_null() },
+            "corrupted inputs"
+        );
+
         if !(self.prefer_encrypt == EncryptPreference::Mutual || e2ee_guaranteed) {
             return Ok(false);
         }
 
-        for (peerstate, addr) in peerstates {
-            match peerstate {
-                Some(peerstate) => {
-                    if peerstate.prefer_encrypt != EncryptPreference::Mutual && !e2ee_guaranteed {
-                        info!(context, "peerstate for {:?} is no-encrypt", addr);
-                        return Ok(false);
-                    }
-                }
+        let context = &factory.context;
+        let mut keyring = Keyring::default();
+        let mut gossip_headers: Vec<String> = Vec::with_capacity(factory.recipients_addr.len());
+
+        // determine if we can and should encrypt
+        for recipient_addr in factory.recipients_addr.iter() {
+            if recipient_addr == &self.addr {
+                continue;
+            }
+            let peerstate = match Peerstate::from_addr(context, &context.sql, recipient_addr) {
+                Some(peerstate) => peerstate,
                 None => {
-                    let msg = format!("peerstate for {:?} missing, cannot encrypt", addr);
+                    let msg = format!("peerstate for {} missing, cannot encrypt", recipient_addr);
                     if e2ee_guaranteed {
                         return Err(format_err!("{}", msg));
                     } else {
@@ -78,59 +111,169 @@ impl EncryptHelper {
                         return Ok(false);
                     }
                 }
+            };
+
+            if peerstate.prefer_encrypt != EncryptPreference::Mutual && !e2ee_guaranteed {
+                info!(context, "peerstate for {} is no-encrypt", recipient_addr);
+                return Ok(false);
+            }
+
+            if let Some(key) = peerstate.peek_key(min_verified as usize) {
+                keyring.add_owned(key.clone());
+                if do_gossip {
+                    if let Some(header) = peerstate.render_gossip_header(min_verified as usize) {
+                        gossip_headers.push(header.to_string());
+                    }
+                }
+            } else {
+                bail!(
+                    "proper enc-key for {} missing, cannot encrypt",
+                    recipient_addr
+                );
             }
         }
 
-        Ok(true)
-    }
+        let sign_key = {
+            keyring.add_ref(&self.public_key);
+            let key = Key::from_self_private(context, self.addr.clone(), &context.sql);
+            ensure!(key.is_some(), "no own private key found");
 
-    /// Tries to encrypt the passed in `mail`.
-    pub fn encrypt(
-        &mut self,
-        context: &Context,
-        min_verified: PeerstateVerifiedStatus,
-        mail_to_encrypt: lettre_email::PartBuilder,
-        peerstates: &[(Option<Peerstate>, &str)],
-    ) -> Result<String> {
-        let mut keyring = Keyring::default();
+            key
+        };
 
-        for (peerstate, addr) in peerstates
-            .iter()
-            .filter_map(|(state, addr)| state.as_ref().map(|s| (s, addr)))
-        {
-            let key = peerstate.peek_key(min_verified).ok_or_else(|| {
-                format_err!("proper enc-key for {} missing, cannot encrypt", addr)
-            })?;
-            keyring.add_ref(key);
+        // encrypt message
+        unsafe {
+            mailprivacy_prepare_mime(in_out_message);
+            let mut part_to_encrypt = (*in_out_message).mm_data.mm_message.mm_msg_mime;
+            (*part_to_encrypt).mm_parent = ptr::null_mut();
+            let imffields_encrypted = mailimf_fields_new_empty();
+
+            // mailmime_new_message_data() calls mailmime_fields_new_with_version()
+            // which would add the unwanted MIME-Version:-header
+            let message_to_encrypt = mailmime_new_simple(
+                MAILMIME_MESSAGE as libc::c_int,
+                mailmime_fields_new_empty(),
+                mailmime_get_content_message(),
+                imffields_encrypted,
+                part_to_encrypt,
+            );
+
+            for header in &gossip_headers {
+                wrapmime::new_custom_field(imffields_encrypted, "Autocrypt-Gossip", &header)
+            }
+
+            // memoryhole headers: move some headers into encrypted part
+            // XXX note we can't use clist's into_iter() because the loop body also removes items
+            let mut cur = (*(*imffields_unprotected).fld_list).first;
+            while !cur.is_null() {
+                let field = (*cur).data as *mut mailimf_field;
+                let mut move_to_encrypted = false;
+
+                if !field.is_null() {
+                    if (*field).fld_type == MAILIMF_FIELD_SUBJECT as libc::c_int {
+                        move_to_encrypted = true;
+                    } else if (*field).fld_type == MAILIMF_FIELD_OPTIONAL_FIELD as libc::c_int {
+                        let opt_field = (*field).fld_data.fld_optional_field;
+                        if !opt_field.is_null() && !(*opt_field).fld_name.is_null() {
+                            let fld_name = to_string_lossy((*opt_field).fld_name);
+                            if fld_name.starts_with("Secure-Join")
+                                || (fld_name.starts_with("Chat-") && fld_name != "Chat-Version")
+                            {
+                                move_to_encrypted = true;
+                            }
+                        }
+                    }
+                }
+
+                if move_to_encrypted {
+                    mailimf_fields_add(imffields_encrypted, field);
+                    cur = clist_delete((*imffields_unprotected).fld_list, cur);
+                } else {
+                    cur = (*cur).next;
+                }
+            }
+
+            let subject = mailimf_subject_new("...".strdup());
+            mailimf_fields_add(imffields_unprotected, mailimf_field_new_subject(subject));
+
+            wrapmime::append_ct_param(
+                (*part_to_encrypt).mm_content_type,
+                "protected-headers",
+                "v1",
+            )?;
+            let plain = mmap_string_new(b"\x00" as *const u8 as *const libc::c_char);
+            let mut col = 0;
+            mailmime_write_mem(plain, &mut col, message_to_encrypt);
+            mailmime_free(message_to_encrypt);
+
+            ensure!(
+                !(*plain).str_0.is_null() && (*plain).len > 0,
+                "could not write/allocate"
+            );
+
+            let ctext = pgp::pk_encrypt(
+                std::slice::from_raw_parts((*plain).str_0 as *const u8, (*plain).len),
+                &keyring,
+                sign_key.as_ref(),
+            );
+            mmap_string_free(plain);
+
+            let ctext_v = ctext?;
+
+            // create MIME-structure that will contain the encrypted text
+            let mut encrypted_part = new_data_part(
+                ptr::null_mut(),
+                0 as libc::size_t,
+                "multipart/encrypted",
+                MAILMIME_MECHANISM_BASE64,
+            )?;
+            let content = (*encrypted_part).mm_content_type;
+            wrapmime::append_ct_param(content, "protocol", "application/pgp-encrypted")?;
+
+            let version_mime = new_data_part(
+                VERSION_CONTENT.as_mut_ptr() as *mut libc::c_void,
+                strlen(VERSION_CONTENT.as_mut_ptr()),
+                "application/pgp-encrypted",
+                MAILMIME_MECHANISM_7BIT,
+            )?;
+            mailmime_smart_add_part(encrypted_part, version_mime);
+
+            // we assume that ctext_v is not dropped until the end
+            // of this if-scope
+            let ctext_part = new_data_part(
+                ctext_v.as_ptr() as *mut libc::c_void,
+                ctext_v.len(),
+                "application/octet-stream",
+                MAILMIME_MECHANISM_7BIT,
+            )?;
+
+            mailmime_smart_add_part(encrypted_part, ctext_part);
+            (*in_out_message).mm_data.mm_message.mm_msg_mime = encrypted_part;
+            (*encrypted_part).mm_parent = in_out_message;
+            let gossiped = !&gossip_headers.is_empty();
+            factory.finalize_mime_message(in_out_message, true, gossiped)?;
+
+            Ok(true)
         }
-
-        keyring.add_ref(&self.public_key);
-        let sign_key = Key::from_self_private(context, self.addr.clone(), &context.sql)
-            .ok_or_else(|| format_err!("missing own private key"))?;
-
-        let raw_message = mail_to_encrypt.build().as_string().into_bytes();
-
-        let ctext = pgp::pk_encrypt(&raw_message, &keyring, Some(&sign_key))?;
-
-        Ok(ctext)
     }
 }
 
 pub fn try_decrypt(
     context: &Context,
-    mail: &mailparse::ParsedMail<'_>,
-    message_time: i64,
-) -> Result<(Option<Vec<u8>>, HashSet<String>)> {
-    let from = mail
-        .headers
-        .get_first_value("From")?
-        .and_then(|from_addr| mailparse::addrparse(&from_addr).ok())
-        .and_then(|from| from.extract_single_info())
-        .map(|from| from.addr)
-        .unwrap_or_default();
+    in_out_message: *mut Mailmime,
+) -> Result<(bool, HashSet<String>, HashSet<String>)> {
+    // just a pointer into mailmime structure, must not be freed
+    let imffields = mailmime_find_mailimf_fields(in_out_message);
+    ensure!(
+        !in_out_message.is_null() && !imffields.is_null(),
+        "corrupt invalid mime inputs"
+    );
+
+    let from = wrapmime::get_field_from(imffields)?;
+    let message_time = wrapmime::get_field_date(imffields)?;
 
     let mut peerstate = None;
-    let autocryptheader = Aheader::from_headers(context, &from, &mail.headers);
+    let autocryptheader = Aheader::from_imffields(&from, imffields);
 
     if message_time > 0 {
         peerstate = Peerstate::from_addr(context, &context.sql, &from);
@@ -139,7 +282,9 @@ pub fn try_decrypt(
             if let Some(ref header) = autocryptheader {
                 peerstate.apply_header(&header, message_time);
                 peerstate.save_to_db(&context.sql, false)?;
-            } else if message_time > peerstate.last_seen_autocrypt && !contains_report(mail) {
+            } else if message_time > peerstate.last_seen_autocrypt
+                && !contains_report(in_out_message)
+            {
                 peerstate.degrade_encryption(message_time);
                 peerstate.save_to_db(&context.sql, false)?;
             }
@@ -149,12 +294,13 @@ pub fn try_decrypt(
             peerstate = Some(p);
         }
     }
-
     /* possibly perform decryption */
     let mut private_keyring = Keyring::default();
     let mut public_keyring_for_validate = Keyring::default();
-    let mut out_mail = None;
+    let mut encrypted = false;
     let mut signatures = HashSet::default();
+    let mut gossipped_addr = HashSet::default();
+
     let self_addr = context.get_config(Config::ConfiguredAddr);
 
     if let Some(self_addr) = self_addr {
@@ -174,16 +320,60 @@ pub fn try_decrypt(
                 }
             }
 
-            out_mail = decrypt_if_autocrypt_message(
+            let mut gossip_headers = ptr::null_mut();
+            encrypted = decrypt_if_autocrypt_message(
                 context,
-                mail,
+                in_out_message,
                 &private_keyring,
                 &public_keyring_for_validate,
                 &mut signatures,
+                &mut gossip_headers,
             )?;
+            if !gossip_headers.is_null() {
+                gossipped_addr =
+                    update_gossip_peerstates(context, message_time, imffields, gossip_headers)?;
+                unsafe { mailimf_fields_free(gossip_headers) };
+            }
         }
     }
-    Ok((out_mail, signatures))
+    Ok((encrypted, signatures, gossipped_addr))
+}
+
+fn new_data_part(
+    data: *mut libc::c_void,
+    data_bytes: libc::size_t,
+    content_type: &str,
+    default_encoding: u32,
+) -> Result<*mut Mailmime> {
+    let content = new_content_type(&content_type)?;
+    let mut encoding = ptr::null_mut();
+    if wrapmime::content_type_needs_encoding(content) {
+        encoding = unsafe { mailmime_mechanism_new(default_encoding as i32, ptr::null_mut()) };
+        ensure!(!encoding.is_null(), "failed to create encoding");
+    }
+    let mime_fields = {
+        unsafe {
+            mailmime_fields_new_with_data(
+                encoding,
+                ptr::null_mut(),
+                ptr::null_mut(),
+                ptr::null_mut(),
+                ptr::null_mut(),
+            )
+        }
+    };
+    ensure!(!mime_fields.is_null(), "internal mime error");
+
+    let mime = unsafe { mailmime_new_empty(content, mime_fields) };
+    ensure!(!mime.is_null(), "internal mime error");
+
+    if unsafe { (*mime).mm_type } == MAILMIME_SINGLE as libc::c_int {
+        if !data.is_null() && data_bytes > 0 {
+            unsafe { mailmime_set_body_text(mime, data as *mut libc::c_char, data_bytes) };
+        }
+    }
+
+    Ok(mime)
 }
 
 /// Load public key from database or generate a new one.
@@ -210,7 +400,7 @@ fn load_or_generate_self_public_key(context: &Context, self_addr: impl AsRef<str
     );
     match pgp::create_keypair(&self_addr) {
         Some((public_key, private_key)) => {
-            if dc_key_save_self_keypair(
+            match dc_key_save_self_keypair(
                 context,
                 &public_key,
                 &private_key,
@@ -218,78 +408,219 @@ fn load_or_generate_self_public_key(context: &Context, self_addr: impl AsRef<str
                 true,
                 &context.sql,
             ) {
-                info!(
-                    context,
-                    "Keypair generated in {:.3}s.",
-                    start.elapsed().as_secs()
-                );
-                Ok(public_key)
-            } else {
-                Err(format_err!("Failed to save keypair"))
+                true => {
+                    info!(
+                        context,
+                        "Keypair generated in {:.3}s.",
+                        start.elapsed().as_secs()
+                    );
+                    Ok(public_key)
+                }
+                false => Err(format_err!("Failed to save keypair")),
             }
         }
         None => Err(format_err!("Failed to generate keypair")),
     }
 }
 
-fn decrypt_if_autocrypt_message<'a>(
+fn update_gossip_peerstates(
     context: &Context,
-    mail: &mailparse::ParsedMail<'a>,
+    message_time: i64,
+    imffields: *mut mailimf_fields,
+    gossip_headers: *const mailimf_fields,
+) -> Result<HashSet<String>> {
+    // XXX split the parsing from the modification part
+    let mut recipients: Option<HashSet<String>> = None;
+    let mut gossipped_addr: HashSet<String> = Default::default();
+
+    for cur_data in unsafe { (*(*gossip_headers).fld_list).into_iter() } {
+        let field = cur_data as *mut mailimf_field;
+        if field.is_null() {
+            continue;
+        }
+
+        let field = unsafe { *field };
+
+        if field.fld_type == MAILIMF_FIELD_OPTIONAL_FIELD as libc::c_int {
+            let optional_field = unsafe { field.fld_data.fld_optional_field };
+            if optional_field.is_null() {
+                continue;
+            }
+
+            let optional_field = unsafe { *optional_field };
+            if !optional_field.fld_name.is_null()
+                && as_str(optional_field.fld_name) == "Autocrypt-Gossip"
+            {
+                let value = to_string_lossy(optional_field.fld_value);
+                let gossip_header = Aheader::from_str(&value);
+
+                if let Ok(ref header) = gossip_header {
+                    if recipients.is_none() {
+                        recipients = Some(mailimf_get_recipients(imffields));
+                    }
+                    if recipients.as_ref().unwrap().contains(&header.addr) {
+                        let mut peerstate =
+                            Peerstate::from_addr(context, &context.sql, &header.addr);
+                        if let Some(ref mut peerstate) = peerstate {
+                            peerstate.apply_gossip(header, message_time);
+                            peerstate.save_to_db(&context.sql, false)?;
+                        } else {
+                            let p = Peerstate::from_gossip(context, header, message_time);
+                            p.save_to_db(&context.sql, true)?;
+                            peerstate = Some(p);
+                        }
+                        if let Some(peerstate) = peerstate {
+                            if peerstate.degrade_event.is_some() {
+                                handle_degrade_event(context, &peerstate)?;
+                            }
+                        }
+
+                        gossipped_addr.insert(header.addr.clone());
+                    } else {
+                        info!(
+                            context,
+                            "Ignoring gossipped \"{}\" as the address is not in To/Cc list.",
+                            &header.addr,
+                        );
+                    }
+                }
+            }
+        }
+    }
+
+    Ok(gossipped_addr)
+}
+
+fn decrypt_if_autocrypt_message(
+    context: &Context,
+    mime_undetermined: *mut Mailmime,
     private_keyring: &Keyring,
     public_keyring_for_validate: &Keyring,
     ret_valid_signatures: &mut HashSet<String>,
-) -> Result<Option<Vec<u8>>> {
-    //  The returned bool is true if we detected an Autocrypt-encrypted
-    // message and successfully decrypted it. Decryption then modifies the
-    // passed in mime structure in place. The returned bool is false
-    // if it was not an Autocrypt message.
-    //
-    // Errors are returned for failures related to decryption of AC-messages.
+    ret_gossip_headers: *mut *mut mailimf_fields,
+) -> Result<(bool)> {
+    /* The returned bool is true if we detected an Autocrypt-encrypted
+    message and successfully decrypted it. Decryption then modifies the
+    passed in mime structure in place. The returned bool is false
+    if it was not an Autocrypt message.
 
-    let encrypted_data_part = match wrapmime::get_autocrypt_mime(mail) {
-        Err(err) => {
+    Errors are returned for failures related to decryption of AC-messages.
+    */
+    ensure!(!mime_undetermined.is_null(), "Invalid mime reference");
+
+    let (mime, encrypted_data_part) = match wrapmime::get_autocrypt_mime(mime_undetermined) {
+        Err(_) => {
             // not a proper autocrypt message, abort and ignore
-            info!(context, "Not an autocrypt message: {:?}", err);
-            return Ok(None);
+            return Ok(false);
         }
         Ok(res) => res,
     };
 
-    decrypt_part(
+    let decrypted_mime = decrypt_part(
         context,
         encrypted_data_part,
         private_keyring,
         public_keyring_for_validate,
         ret_valid_signatures,
-    )
+    )?;
+    // decrypted_mime is a dangling pointer which we now put into mailmime's Ownership
+    unsafe {
+        mailmime_substitute(mime, decrypted_mime);
+        mailmime_free(mime);
+    }
+
+    // finally, let's also return gossip headers
+    // XXX better return parsed headers so that upstream
+    // does not need to dive into mmime-stuff again.
+    unsafe {
+        if (*ret_gossip_headers).is_null() && !ret_valid_signatures.is_empty() {
+            let mut dummy: libc::size_t = 0;
+            let mut test: *mut mailimf_fields = ptr::null_mut();
+            if mailimf_envelope_and_optional_fields_parse(
+                (*decrypted_mime).mm_mime_start,
+                (*decrypted_mime).mm_length,
+                &mut dummy,
+                &mut test,
+            ) == MAILIMF_NO_ERROR as libc::c_int
+                && !test.is_null()
+            {
+                *ret_gossip_headers = test;
+            }
+        }
+    }
+
+    Ok(true)
 }
 
-/// Returns Ok(None) if nothing encrypted was found.
 fn decrypt_part(
     _context: &Context,
-    mail: &mailparse::ParsedMail<'_>,
+    mime: *mut Mailmime,
     private_keyring: &Keyring,
     public_keyring_for_validate: &Keyring,
     ret_valid_signatures: &mut HashSet<String>,
-) -> Result<Option<Vec<u8>>> {
-    let data = mail.get_body_raw()?;
+) -> Result<*mut Mailmime> {
+    let mime_data: *mut mailmime_data;
+    let mut mime_transfer_encoding = MAILMIME_MECHANISM_BINARY as libc::c_int;
+
+    unsafe {
+        mime_data = (*mime).mm_data.mm_single;
+    }
+    if !wrapmime::has_decryptable_data(mime_data) {
+        return Ok(ptr::null_mut());
+    }
+
+    if let Some(enc) = wrapmime::get_mime_transfer_encoding(mime) {
+        mime_transfer_encoding = enc;
+    }
+
+    let data: Vec<u8> = wrapmime::decode_dt_data(mime_data, mime_transfer_encoding)?;
+
+    let mut ret_decrypted_mime = ptr::null_mut();
 
     if has_decrypted_pgp_armor(&data) {
         // we should only have one decryption happening
         ensure!(ret_valid_signatures.is_empty(), "corrupt signatures");
 
-        let plain = pgp::pk_decrypt(
+        let plain = match pgp::pk_decrypt(
             &data,
             &private_keyring,
             &public_keyring_for_validate,
             Some(ret_valid_signatures),
-        )?;
+        ) {
+            Ok(plain) => {
+                ensure!(!ret_valid_signatures.is_empty(), "no valid signatures");
+                plain
+            }
+            Err(err) => bail!("could not decrypt: {}", err),
+        };
+        let plain_bytes = plain.len();
+        let plain_buf = plain.as_ptr() as *const libc::c_char;
 
-        ensure!(!ret_valid_signatures.is_empty(), "no valid signatures");
-        return Ok(Some(plain));
+        let mut index = 0;
+        let mut decrypted_mime = ptr::null_mut();
+        if unsafe {
+            mailmime_parse(
+                plain_buf as *const _,
+                plain_bytes,
+                &mut index,
+                &mut decrypted_mime,
+            )
+        } != MAIL_NO_ERROR as libc::c_int
+            || decrypted_mime.is_null()
+        {
+            if !decrypted_mime.is_null() {
+                unsafe { mailmime_free(decrypted_mime) };
+            }
+        } else {
+            // decrypted_mime points into `plain`.
+            // FIXME(@dignifiedquire): this still leaks memory I believe, as mailmime_free
+            // does not free the underlying buffer. But for now we have to live with it
+            std::mem::forget(plain);
+            ret_decrypted_mime = decrypted_mime;
+        }
     }
 
-    Ok(None)
+    Ok(ret_decrypted_mime)
 }
 
 fn has_decrypted_pgp_armor(input: &[u8]) -> bool {
@@ -313,8 +644,36 @@ fn has_decrypted_pgp_armor(input: &[u8]) -> bool {
 /// However, Delta Chat itself has no problem with encrypted multipart/report
 /// parts and MUAs should be encouraged to encrpyt multipart/reports as well so
 /// that we could use the normal Autocrypt processing.
-fn contains_report(mail: &mailparse::ParsedMail<'_>) -> bool {
-    mail.ctype.mimetype == "multipart/report"
+fn contains_report(mime: *mut Mailmime) -> bool {
+    assert!(!mime.is_null());
+    let mime = unsafe { *mime };
+
+    if mime.mm_type == MAILMIME_MULTIPLE as libc::c_int {
+        let tp_type = unsafe { (*(*mime.mm_content_type).ct_type).tp_type };
+        let ct_type =
+            unsafe { (*(*(*mime.mm_content_type).ct_type).tp_data.tp_composite_type).ct_type };
+
+        if tp_type == MAILMIME_TYPE_COMPOSITE_TYPE as libc::c_int
+            && ct_type == MAILMIME_COMPOSITE_TYPE_MULTIPART as libc::c_int
+            && as_str(unsafe { (*mime.mm_content_type).ct_subtype }) == "report"
+        {
+            return true;
+        }
+
+        for cur_data in unsafe { (*(*mime.mm_mime_fields).fld_list).into_iter() } {
+            if contains_report(cur_data as *mut Mailmime) {
+                return true;
+            }
+        }
+    } else if mime.mm_type == MAILMIME_MESSAGE as libc::c_int {
+        let m = unsafe { mime.mm_data.mm_message.mm_msg_mime };
+
+        if contains_report(m) {
+            return true;
+        }
+    }
+
+    false
 }
 
 /// Ensures a private key exists for the configured user.
@@ -340,6 +699,7 @@ pub fn ensure_secret_key_exists(context: &Context) -> Result<String> {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use libc::free;
 
     use crate::test_utils::*;
 
@@ -362,7 +722,7 @@ mod tests {
 
     #[test]
     fn test_mailmime_parse() {
-        let plain = b"Chat-Disposition-Notification-To: hello@world.de
+        let plain = b"Chat-Disposition-Notification-To: holger@deltachat.de
 Chat-Group-ID: CovhGgau8M-
 Chat-Group-Name: Delta Chat Dev
 Subject: =?utf-8?Q?Chat=3A?= Delta Chat =?utf-8?Q?Dev=3A?= sidenote for
@@ -370,18 +730,35 @@ Subject: =?utf-8?Q?Chat=3A?= Delta Chat =?utf-8?Q?Dev=3A?= sidenote for
 Content-Type: text/plain; charset=\"utf-8\"; protected-headers=\"v1\"
 Content-Transfer-Encoding: quoted-printable
 
-sidenote for all: things are trick atm recomm=
-end not to try to run with desktop or ios unless you are ready to hunt bugs
+sidenote for all: rust core master is broken currently ... so dont recomm=
+end to try to run with desktop or ios unless you are ready to hunt bugs
 
 -- =20
 Sent with my Delta Chat Messenger: https://delta.chat";
-        let mail = mailparse::parse_mail(plain).expect("failed to parse valid message");
+        let plain_bytes = plain.len();
+        let plain_buf = plain.as_ptr() as *const libc::c_char;
 
-        assert_eq!(mail.headers.len(), 6);
-        assert!(
-            mail.get_body().unwrap().starts_with(
-                "sidenote for all: things are trick atm recommend not to try to run with desktop or ios unless you are ready to hunt bugs")
-        );
+        let mut index = 0;
+        let mut decrypted_mime = std::ptr::null_mut();
+
+        let res = unsafe {
+            mailmime_parse(
+                plain_buf as *const _,
+                plain_bytes,
+                &mut index,
+                &mut decrypted_mime,
+            )
+        };
+        unsafe {
+            let msg1 = (*decrypted_mime).mm_data.mm_message.mm_msg_mime;
+            let data = mailmime_transfer_decode(msg1).unwrap();
+            println!("{:?}", String::from_utf8_lossy(&data));
+        }
+
+        assert_eq!(res, 0);
+        assert!(!decrypted_mime.is_null());
+
+        unsafe { free(decrypted_mime as *mut _) };
     }
 
     mod load_or_generate_self_public_key {

src/error.rs

@@ -1,14 +1,19 @@
-//! # Error handling
-
 use failure::Fail;
-use lettre_email::mime;
 
 #[derive(Debug, Fail)]
 pub enum Error {
+    #[fail(display = "Sqlite Error: {:?}", _0)]
+    Sql(rusqlite::Error),
+    #[fail(display = "Sqlite Connection Pool Error: {:?}", _0)]
+    ConnectionPool(r2d2::Error),
     #[fail(display = "{:?}", _0)]
     Failure(failure::Error),
-    #[fail(display = "SQL error: {:?}", _0)]
-    SqlError(#[cause] crate::sql::Error),
+    #[fail(display = "Sqlite: Connection closed")]
+    SqlNoConnection,
+    #[fail(display = "Sqlite: Already open")]
+    SqlAlreadyOpen,
+    #[fail(display = "Sqlite: Failed to open")]
+    SqlFailedToOpen,
     #[fail(display = "{:?}", _0)]
     Io(std::io::Error),
     #[fail(display = "{:?}", _0)]
@@ -17,31 +22,21 @@ pub enum Error {
     Image(image_meta::ImageError),
     #[fail(display = "{:?}", _0)]
     Utf8(std::str::Utf8Error),
+    #[fail(display = "{:?}", _0)]
+    CStringError(crate::dc_tools::CStringError),
     #[fail(display = "PGP: {:?}", _0)]
     Pgp(pgp::errors::Error),
     #[fail(display = "Base64Decode: {:?}", _0)]
     Base64Decode(base64::DecodeError),
     #[fail(display = "{:?}", _0)]
     FromUtf8(std::string::FromUtf8Error),
-    #[fail(display = "{}", _0)]
-    BlobError(#[cause] crate::blob::BlobError),
-    #[fail(display = "Invalid Message ID.")]
-    InvalidMsgId,
-    #[fail(display = "Watch folder not found {:?}", _0)]
-    WatchFolderNotFound(String),
-    #[fail(display = "Inalid Email: {:?}", _0)]
-    MailParseError(#[cause] mailparse::MailParseError),
-    #[fail(display = "Building invalid Email: {:?}", _0)]
-    LettreError(#[cause] lettre_email::error::Error),
-    #[fail(display = "FromStr error: {:?}", _0)]
-    FromStr(#[cause] mime::FromStrError),
 }
 
 pub type Result<T> = std::result::Result<T, Error>;
 
-impl From<crate::sql::Error> for Error {
-    fn from(err: crate::sql::Error) -> Error {
-        Error::SqlError(err)
+impl From<rusqlite::Error> for Error {
+    fn from(err: rusqlite::Error) -> Error {
+        Error::Sql(err)
     }
 }
 
@@ -57,6 +52,12 @@ impl From<failure::Error> for Error {
     }
 }
 
+impl From<r2d2::Error> for Error {
+    fn from(err: r2d2::Error) -> Error {
+        Error::ConnectionPool(err)
+    }
+}
+
 impl From<std::io::Error> for Error {
     fn from(err: std::io::Error) -> Error {
         Error::Io(err)
@@ -75,6 +76,12 @@ impl From<image_meta::ImageError> for Error {
     }
 }
 
+impl From<crate::dc_tools::CStringError> for Error {
+    fn from(err: crate::dc_tools::CStringError) -> Error {
+        Error::CStringError(err)
+    }
+}
+
 impl From<pgp::errors::Error> for Error {
     fn from(err: pgp::errors::Error) -> Error {
         Error::Pgp(err)
@@ -87,36 +94,6 @@ impl From<std::string::FromUtf8Error> for Error {
     }
 }
 
-impl From<crate::blob::BlobError> for Error {
-    fn from(err: crate::blob::BlobError) -> Error {
-        Error::BlobError(err)
-    }
-}
-
-impl From<crate::message::InvalidMsgId> for Error {
-    fn from(_err: crate::message::InvalidMsgId) -> Error {
-        Error::InvalidMsgId
-    }
-}
-
-impl From<mailparse::MailParseError> for Error {
-    fn from(err: mailparse::MailParseError) -> Error {
-        Error::MailParseError(err)
-    }
-}
-
-impl From<lettre_email::error::Error> for Error {
-    fn from(err: lettre_email::error::Error) -> Error {
-        Error::LettreError(err)
-    }
-}
-
-impl From<mime::FromStrError> for Error {
-    fn from(err: mime::FromStrError) -> Error {
-        Error::FromStr(err)
-    }
-}
-
 #[macro_export]
 macro_rules! bail {
     ($e:expr) => {

src/events.rs

@@ -1,11 +1,7 @@
-//! # Events specification
-
 use std::path::PathBuf;
 
 use strum::EnumProperty;
 
-use crate::message::MsgId;
-
 impl Event {
     /// Returns the corresponding Event id.
     pub fn as_id(&self) -> i32 {
@@ -56,12 +52,6 @@ pub enum Event {
     #[strum(props(id = "105"))]
     ImapMessageMoved(String),
 
-    /// Emitted when an IMAP folder was emptied
-    ///
-    /// @return 0
-    #[strum(props(id = "106"))]
-    ImapFolderEmptied(String),
-
     /// Emitted when an new file in the $BLOBDIR was created
     ///
     /// @return 0
@@ -92,7 +82,7 @@ pub enum Event {
     /// However, for ongoing processes (eg. 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
+    /// failed (returned false). It should be sufficient to report only the _last_ error
     /// in a messasge box then.
     ///
     /// @return
@@ -135,7 +125,7 @@ pub enum Event {
     ///
     /// @return 0
     #[strum(props(id = "2000"))]
-    MsgsChanged { chat_id: u32, msg_id: MsgId },
+    MsgsChanged { chat_id: u32, msg_id: u32 },
 
     /// There is a fresh message. Typically, the user will show an notification
     /// when receiving this message.
@@ -144,28 +134,28 @@ pub enum Event {
     ///
     /// @return 0
     #[strum(props(id = "2005"))]
-    IncomingMsg { chat_id: u32, msg_id: MsgId },
+    IncomingMsg { chat_id: u32, msg_id: u32 },
 
     /// A single message is sent successfully. State changed from  DC_STATE_OUT_PENDING to
     /// DC_STATE_OUT_DELIVERED, see dc_msg_get_state().
     ///
     /// @return 0
     #[strum(props(id = "2010"))]
-    MsgDelivered { chat_id: u32, msg_id: MsgId },
+    MsgDelivered { chat_id: u32, msg_id: u32 },
 
     /// 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().
     ///
     /// @return 0
     #[strum(props(id = "2012"))]
-    MsgFailed { chat_id: u32, msg_id: MsgId },
+    MsgFailed { chat_id: u32, msg_id: u32 },
 
     /// 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().
     ///
     /// @return 0
     #[strum(props(id = "2015"))]
-    MsgRead { chat_id: u32, msg_id: MsgId },
+    MsgRead { chat_id: u32, msg_id: u32 },
 
     /// 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.
@@ -245,11 +235,4 @@ pub enum Event {
     /// @return 0
     #[strum(props(id = "2061"))]
     SecurejoinJoinerProgress { contact_id: u32, progress: usize },
-
-    /// This event is sent out to the inviter when a joiner successfully joined a group.
-    /// @param data1 (int) chat_id
-    /// @param data2 (int) contact_id
-    /// @return 0
-    #[strum(props(id = "2062"))]
-    SecurejoinMemberAdded { chat_id: u32, contact_id: u32 },
 }

src/imap/select_folder.rs

@@ -1,111 +0,0 @@
-use super::Imap;
-
-use crate::context::Context;
-
-type Result<T> = std::result::Result<T, Error>;
-
-#[derive(Debug, Fail)]
-pub enum Error {
-    #[fail(display = "IMAP Could not obtain imap-session object.")]
-    NoSession,
-
-    #[fail(display = "IMAP Connection Lost or no connection established")]
-    ConnectionLost,
-
-    #[fail(display = "IMAP Folder name invalid: {:?}", _0)]
-    BadFolderName(String),
-
-    #[fail(display = "IMAP close/expunge failed: {}", _0)]
-    CloseExpungeFailed(#[cause] async_imap::error::Error),
-
-    #[fail(display = "IMAP other error: {:?}", _0)]
-    Other(String),
-}
-
-impl Imap {
-    /// select a folder, possibly update uid_validity and, if needed,
-    /// expunge the folder to remove delete-marked messages.
-    pub(super) async fn select_folder<S: AsRef<str>>(
-        &self,
-        context: &Context,
-        folder: Option<S>,
-    ) -> Result<()> {
-        if self.session.lock().await.is_none() {
-            let mut cfg = self.config.write().await;
-            cfg.selected_folder = None;
-            cfg.selected_folder_needs_expunge = false;
-            return Err(Error::NoSession);
-        }
-
-        // if there is a new folder and the new folder is equal to the selected one, there's nothing to do.
-        // if there is _no_ new folder, we continue as we might want to expunge below.
-        if let Some(ref folder) = folder {
-            if let Some(ref selected_folder) = self.config.read().await.selected_folder {
-                if folder.as_ref() == selected_folder {
-                    return Ok(());
-                }
-            }
-        }
-
-        // deselect existing folder, if needed (it's also done implicitly by SELECT, however, without EXPUNGE then)
-        let needs_expunge = { self.config.read().await.selected_folder_needs_expunge };
-        if needs_expunge {
-            if let Some(ref folder) = self.config.read().await.selected_folder {
-                info!(context, "Expunge messages in \"{}\".", folder);
-
-                // A CLOSE-SELECT is considerably faster than an EXPUNGE-SELECT, see
-                // https://tools.ietf.org/html/rfc3501#section-6.4.2
-                if let Some(ref mut session) = &mut *self.session.lock().await {
-                    match session.close().await {
-                        Ok(_) => {
-                            info!(context, "close/expunge succeeded");
-                        }
-                        Err(err) => {
-                            return Err(Error::CloseExpungeFailed(err));
-                        }
-                    }
-                } else {
-                    return Err(Error::NoSession);
-                }
-            }
-            self.config.write().await.selected_folder_needs_expunge = false;
-        }
-
-        // select new folder
-        if let Some(ref folder) = folder {
-            if let Some(ref mut session) = &mut *self.session.lock().await {
-                let res = session.select(folder).await;
-
-                // https://tools.ietf.org/html/rfc3501#section-6.3.1
-                // says that if the server reports select failure we are in
-                // authenticated (not-select) state.
-
-                match res {
-                    Ok(mailbox) => {
-                        let mut config = self.config.write().await;
-                        config.selected_folder = Some(folder.as_ref().to_string());
-                        config.selected_mailbox = Some(mailbox);
-                        Ok(())
-                    }
-                    Err(async_imap::error::Error::ConnectionLost) => {
-                        self.trigger_reconnect();
-                        self.config.write().await.selected_folder = None;
-                        Err(Error::ConnectionLost)
-                    }
-                    Err(async_imap::error::Error::Validate(_)) => {
-                        Err(Error::BadFolderName(folder.as_ref().to_string()))
-                    }
-                    Err(err) => {
-                        self.config.write().await.selected_folder = None;
-                        self.trigger_reconnect();
-                        Err(Error::Other(err.to_string()))
-                    }
-                }
-            } else {
-                Err(Error::NoSession)
-            }
-        } else {
-            Ok(())
-        }
-    }
-}

src/imap_client.rs

@@ -1,293 +0,0 @@
-use async_imap::{
-    error::{Error as ImapError, Result as ImapResult},
-    extensions::idle::Handle as ImapIdleHandle,
-    types::{Capabilities, Fetch, Mailbox, Name},
-    Client as ImapClient, Session as ImapSession,
-};
-use async_std::net::{self, TcpStream};
-use async_std::prelude::*;
-use async_std::sync::Arc;
-use async_tls::client::TlsStream;
-
-use crate::login_param::{dc_build_tls_config, CertificateChecks};
-
-#[derive(Debug)]
-pub(crate) enum Client {
-    Secure(ImapClient<TlsStream<TcpStream>>),
-    Insecure(ImapClient<TcpStream>),
-}
-
-#[derive(Debug)]
-pub(crate) enum Session {
-    Secure(ImapSession<TlsStream<TcpStream>>),
-    Insecure(ImapSession<TcpStream>),
-}
-
-#[derive(Debug)]
-pub(crate) enum IdleHandle {
-    Secure(ImapIdleHandle<TlsStream<TcpStream>>),
-    Insecure(ImapIdleHandle<TcpStream>),
-}
-
-impl Client {
-    pub async fn connect_secure<A: net::ToSocketAddrs, S: AsRef<str>>(
-        addr: A,
-        domain: S,
-        certificate_checks: CertificateChecks,
-    ) -> ImapResult<Self> {
-        let stream = TcpStream::connect(addr).await?;
-        let tls_config = dc_build_tls_config(certificate_checks);
-        let tls_connector: async_tls::TlsConnector = Arc::new(tls_config).into();
-        let tls_stream = tls_connector.connect(domain.as_ref(), stream)?.await?;
-        let mut client = ImapClient::new(tls_stream);
-        if std::env::var(crate::DCC_IMAP_DEBUG).is_ok() {
-            client.debug = true;
-        }
-
-        let _greeting = client
-            .read_response()
-            .await
-            .expect("failed to read greeting");
-
-        Ok(Client::Secure(client))
-    }
-
-    pub async fn connect_insecure<A: net::ToSocketAddrs>(addr: A) -> ImapResult<Self> {
-        let stream = TcpStream::connect(addr).await?;
-
-        let mut client = ImapClient::new(stream);
-        if std::env::var(crate::DCC_IMAP_DEBUG).is_ok() {
-            client.debug = true;
-        }
-        let _greeting = client
-            .read_response()
-            .await
-            .expect("failed to read greeting");
-
-        Ok(Client::Insecure(client))
-    }
-
-    pub async fn secure<S: AsRef<str>>(
-        self,
-        domain: S,
-        certificate_checks: CertificateChecks,
-    ) -> ImapResult<Client> {
-        match self {
-            Client::Insecure(client) => {
-                let tls_config = dc_build_tls_config(certificate_checks);
-                let tls: async_tls::TlsConnector = Arc::new(tls_config).into();
-
-                let client_sec = client.secure(domain, &tls).await?;
-
-                Ok(Client::Secure(client_sec))
-            }
-            // Nothing to do
-            Client::Secure(_) => Ok(self),
-        }
-    }
-
-    pub async fn authenticate<A: async_imap::Authenticator, S: AsRef<str>>(
-        self,
-        auth_type: S,
-        authenticator: &A,
-    ) -> Result<Session, (ImapError, Client)> {
-        match self {
-            Client::Secure(i) => match i.authenticate(auth_type, authenticator).await {
-                Ok(session) => Ok(Session::Secure(session)),
-                Err((err, c)) => Err((err, Client::Secure(c))),
-            },
-            Client::Insecure(i) => match i.authenticate(auth_type, authenticator).await {
-                Ok(session) => Ok(Session::Insecure(session)),
-                Err((err, c)) => Err((err, Client::Insecure(c))),
-            },
-        }
-    }
-
-    pub async fn login<U: AsRef<str>, P: AsRef<str>>(
-        self,
-        username: U,
-        password: P,
-    ) -> Result<Session, (ImapError, Client)> {
-        match self {
-            Client::Secure(i) => match i.login(username, password).await {
-                Ok(session) => Ok(Session::Secure(session)),
-                Err((err, c)) => Err((err, Client::Secure(c))),
-            },
-            Client::Insecure(i) => match i.login(username, password).await {
-                Ok(session) => Ok(Session::Insecure(session)),
-                Err((err, c)) => Err((err, Client::Insecure(c))),
-            },
-        }
-    }
-}
-
-impl Session {
-    pub async fn capabilities(&mut self) -> ImapResult<Capabilities> {
-        let res = match self {
-            Session::Secure(i) => i.capabilities().await?,
-            Session::Insecure(i) => i.capabilities().await?,
-        };
-
-        Ok(res)
-    }
-
-    pub async fn list(
-        &mut self,
-        reference_name: Option<&str>,
-        mailbox_pattern: Option<&str>,
-    ) -> ImapResult<Vec<Name>> {
-        let res = match self {
-            Session::Secure(i) => {
-                i.list(reference_name, mailbox_pattern)
-                    .await?
-                    .collect::<ImapResult<_>>()
-                    .await?
-            }
-            Session::Insecure(i) => {
-                i.list(reference_name, mailbox_pattern)
-                    .await?
-                    .collect::<ImapResult<_>>()
-                    .await?
-            }
-        };
-        Ok(res)
-    }
-
-    pub async fn create<S: AsRef<str>>(&mut self, mailbox_name: S) -> ImapResult<()> {
-        match self {
-            Session::Secure(i) => i.create(mailbox_name).await?,
-            Session::Insecure(i) => i.create(mailbox_name).await?,
-        }
-        Ok(())
-    }
-
-    pub async fn subscribe<S: AsRef<str>>(&mut self, mailbox: S) -> ImapResult<()> {
-        match self {
-            Session::Secure(i) => i.subscribe(mailbox).await?,
-            Session::Insecure(i) => i.subscribe(mailbox).await?,
-        }
-        Ok(())
-    }
-
-    pub async fn close(&mut self) -> ImapResult<()> {
-        match self {
-            Session::Secure(i) => i.close().await?,
-            Session::Insecure(i) => i.close().await?,
-        }
-        Ok(())
-    }
-
-    pub async fn select<S: AsRef<str>>(&mut self, mailbox_name: S) -> ImapResult<Mailbox> {
-        let mbox = match self {
-            Session::Secure(i) => i.select(mailbox_name).await?,
-            Session::Insecure(i) => i.select(mailbox_name).await?,
-        };
-
-        Ok(mbox)
-    }
-
-    pub async fn fetch<S1, S2>(&mut self, sequence_set: S1, query: S2) -> ImapResult<Vec<Fetch>>
-    where
-        S1: AsRef<str>,
-        S2: AsRef<str>,
-    {
-        let res = match self {
-            Session::Secure(i) => {
-                i.fetch(sequence_set, query)
-                    .await?
-                    .collect::<ImapResult<_>>()
-                    .await?
-            }
-            Session::Insecure(i) => {
-                i.fetch(sequence_set, query)
-                    .await?
-                    .collect::<ImapResult<_>>()
-                    .await?
-            }
-        };
-        Ok(res)
-    }
-
-    pub async fn uid_fetch<S1, S2>(&mut self, uid_set: S1, query: S2) -> ImapResult<Vec<Fetch>>
-    where
-        S1: AsRef<str>,
-        S2: AsRef<str>,
-    {
-        let res = match self {
-            Session::Secure(i) => {
-                i.uid_fetch(uid_set, query)
-                    .await?
-                    .collect::<ImapResult<_>>()
-                    .await?
-            }
-            Session::Insecure(i) => {
-                i.uid_fetch(uid_set, query)
-                    .await?
-                    .collect::<ImapResult<_>>()
-                    .await?
-            }
-        };
-
-        Ok(res)
-    }
-
-    pub fn idle(self) -> IdleHandle {
-        match self {
-            Session::Secure(i) => {
-                let h = i.idle();
-                IdleHandle::Secure(h)
-            }
-            Session::Insecure(i) => {
-                let h = i.idle();
-                IdleHandle::Insecure(h)
-            }
-        }
-    }
-
-    pub async fn uid_store<S1, S2>(&mut self, uid_set: S1, query: S2) -> ImapResult<Vec<Fetch>>
-    where
-        S1: AsRef<str>,
-        S2: AsRef<str>,
-    {
-        let res = match self {
-            Session::Secure(i) => {
-                i.uid_store(uid_set, query)
-                    .await?
-                    .collect::<ImapResult<_>>()
-                    .await?
-            }
-            Session::Insecure(i) => {
-                i.uid_store(uid_set, query)
-                    .await?
-                    .collect::<ImapResult<_>>()
-                    .await?
-            }
-        };
-        Ok(res)
-    }
-
-    pub async fn uid_mv<S1: AsRef<str>, S2: AsRef<str>>(
-        &mut self,
-        uid_set: S1,
-        mailbox_name: S2,
-    ) -> ImapResult<()> {
-        match self {
-            Session::Secure(i) => i.uid_mv(uid_set, mailbox_name).await?,
-            Session::Insecure(i) => i.uid_mv(uid_set, mailbox_name).await?,
-        }
-        Ok(())
-    }
-
-    pub async fn uid_copy<S1: AsRef<str>, S2: AsRef<str>>(
-        &mut self,
-        uid_set: S1,
-        mailbox_name: S2,
-    ) -> ImapResult<()> {
-        match self {
-            Session::Secure(i) => i.uid_copy(uid_set, mailbox_name).await?,
-            Session::Insecure(i) => i.uid_copy(uid_set, mailbox_name).await?,
-        }
-
-        Ok(())
-    }
-}

src/imex.rs

@@ -1,12 +1,9 @@
-//! # Import/export module
-
 use core::cmp::{max, min};
-use std::path::Path;
+use std::path::{Path, PathBuf};
 
 use num_traits::FromPrimitive;
 use rand::{thread_rng, Rng};
 
-use crate::blob::BlobObject;
 use crate::chat;
 use crate::config::Config;
 use crate::configure::*;
@@ -18,8 +15,7 @@ use crate::error::*;
 use crate::events::Event;
 use crate::job::*;
 use crate::key::*;
-use crate::message::{Message, MsgId};
-use crate::mimeparser::SystemMessage;
+use crate::message::Message;
 use crate::param::*;
 use crate::pgp;
 use crate::sql::{self, Sql};
@@ -51,9 +47,9 @@ pub enum ImexMode {
 
 /// Import/export things.
 /// For this purpose, the function creates a job that is executed in the IMAP-thread then;
-/// this requires to call dc_perform_inbox_jobs() regularly.
+/// this requires to call dc_perform_imap_jobs() regularly.
 ///
-/// What to do is defined by the *what* parameter.
+/// What to do is defined by the _what_ parameter.
 ///
 /// While dc_imex() returns immediately, the started job may take a while,
 /// you can stop it using dc_stop_ongoing_process(). During execution of the job,
@@ -77,36 +73,37 @@ pub fn imex(context: &Context, what: ImexMode, param1: Option<impl AsRef<Path>>)
     job_add(context, Action::ImexImap, 0, param, 0);
 }
 
-/// Returns the filename of the backup found (otherwise an error)
+/// Returns the filename of the backup if found, nullptr otherwise.
 pub fn has_backup(context: &Context, dir_name: impl AsRef<Path>) -> Result<String> {
     let dir_name = dir_name.as_ref();
     let dir_iter = std::fs::read_dir(dir_name)?;
     let mut newest_backup_time = 0;
     let mut newest_backup_path: Option<std::path::PathBuf> = None;
     for dirent in dir_iter {
-        if let Ok(dirent) = dirent {
-            let path = dirent.path();
-            let name = dirent.file_name();
-            let name = name.to_string_lossy();
-            if name.starts_with("delta-chat") && name.ends_with(".bak") {
-                let sql = Sql::new();
-                if sql.open(context, &path, true) {
-                    let curr_backup_time = sql
-                        .get_raw_config_int(context, "backup_time")
-                        .unwrap_or_default();
-                    if curr_backup_time > newest_backup_time {
-                        newest_backup_path = Some(path);
-                        newest_backup_time = curr_backup_time;
+        match dirent {
+            Ok(dirent) => {
+                let path = dirent.path();
+                let name = dirent.file_name();
+                let name = name.to_string_lossy();
+                if name.starts_with("delta-chat") && name.ends_with(".bak") {
+                    let sql = Sql::new();
+                    if sql.open(context, &path, true) {
+                        let curr_backup_time =
+                            sql.get_raw_config_int(context, "backup_time")
+                                .unwrap_or_default() as u64;
+                        if curr_backup_time > newest_backup_time {
+                            newest_backup_path = Some(path);
+                            newest_backup_time = curr_backup_time;
+                        }
                     }
-                    info!(context, "backup_time of {} is {}", name, curr_backup_time);
-                    sql.close(&context);
                 }
             }
+            Err(_) => (),
         }
     }
     match newest_backup_path {
         Some(path) => Ok(path.to_string_lossy().into_owned()),
-        None => bail!("no backup found in {}", dir_name.display()),
+        None => bail!("no backup found"),
     }
 }
 
@@ -125,20 +122,19 @@ fn do_initiate_key_transfer(context: &Context) -> Result<String> {
     let setup_file_content = render_setup_file(context, &setup_code)?;
     /* encrypting may also take a while ... */
     ensure!(!context.shall_stop_ongoing(), "canceled");
-    let setup_file_blob = BlobObject::create(
-        context,
+    let setup_file_name = context.new_blob_file(
         "autocrypt-setup-message.html",
         setup_file_content.as_bytes(),
     )?;
 
-    let chat_id = chat::create_by_contact_id(context, DC_CONTACT_ID_SELF)?;
+    let chat_id = chat::create_by_contact_id(context, 1)?;
     msg = Message::default();
     msg.type_0 = Viewtype::File;
-    msg.param.set(Param::File, setup_file_blob.as_name());
+    msg.param.set(Param::File, setup_file_name);
 
     msg.param
         .set(Param::MimeType, "application/autocrypt-setup");
-    msg.param.set_cmd(SystemMessage::AutocryptSetupMessage);
+    msg.param.set_int(Param::Cmd, 6);
     msg.param
         .set_int(Param::ForcePlaintext, DC_FP_NO_AUTOCRYPT_HEADER);
 
@@ -154,11 +150,6 @@ fn do_initiate_key_transfer(context: &Context) -> Result<String> {
             }
         }
     }
-    // no maybe_add_bcc_self_device_msg() here.
-    // the ui shows the dialog with the setup code on this device,
-    // it would be too much noise to have two things popping up at the same time.
-    // maybe_add_bcc_self_device_msg() is called on the other device
-    // once the transfer is completed.
     Ok(setup_code)
 }
 
@@ -172,7 +163,7 @@ pub fn render_setup_file(context: &Context, passphrase: &str) -> Result<String>
     );
     let self_addr = e2ee::ensure_secret_key_exists(context)?;
     let private_key = Key::from_self_private(context, self_addr, &context.sql)
-        .ok_or_else(|| format_err!("Failed to get private key."))?;
+        .ok_or(format_err!("Failed to get private key."))?;
     let ac_headers = match context.get_config_bool(Config::E2eeEnabled) {
         false => None,
         true => Some(("Autocrypt-Prefer-Encrypt", "mutual")),
@@ -219,7 +210,7 @@ pub fn create_setup_code(_context: &Context) -> String {
     for i in 0..9 {
         loop {
             random_val = rng.gen();
-            if random_val as usize <= 60000 {
+            if !(random_val as usize > 60000) {
                 break;
             }
         }
@@ -234,25 +225,14 @@ pub fn create_setup_code(_context: &Context) -> String {
     ret
 }
 
-fn maybe_add_bcc_self_device_msg(context: &Context) -> Result<()> {
-    if !context.sql.get_raw_config_bool(context, "bcc_self") {
-        let mut msg = Message::new(Viewtype::Text);
-        // TODO: define this as a stockstring once the wording is settled.
-        msg.text = Some(
-            "It seems you are using multiple devices with Delta Chat. Great!\n\n\
-             If you also want to synchronize outgoing messages accross all devices, \
-             go to the settings and enable \"Send copy to self\"."
-                .to_string(),
-        );
-        chat::add_device_msg(context, Some("bcc-self-hint"), Some(&mut msg))?;
+pub fn continue_key_transfer(context: &Context, msg_id: u32, setup_code: &str) -> Result<()> {
+    ensure!(msg_id > DC_MSG_ID_LAST_SPECIAL, "wrong id");
+
+    let msg = Message::load_from_db(context, msg_id);
+    if msg.is_err() {
+        bail!("Message is no Autocrypt Setup Message.");
     }
-    Ok(())
-}
-
-pub fn continue_key_transfer(context: &Context, msg_id: MsgId, setup_code: &str) -> Result<()> {
-    ensure!(!msg_id.is_special(), "wrong id");
-
-    let msg = Message::load_from_db(context, msg_id)?;
+    let msg = msg.unwrap_or_default();
     ensure!(
         msg.is_setupmessage(),
         "Message is no Autocrypt Setup Message."
@@ -263,7 +243,6 @@ pub fn continue_key_transfer(context: &Context, msg_id: MsgId, setup_code: &str)
         let sc = normalize_setup_code(setup_code);
         let armored_key = decrypt_setup_file(context, &sc, file)?;
         set_self_key(context, &armored_key, true, true)?;
-        maybe_add_bcc_self_device_msg(context)?;
 
         Ok(())
     } else {
@@ -364,7 +343,7 @@ pub fn normalize_setup_code(s: &str) -> String {
 }
 
 #[allow(non_snake_case)]
-pub fn JobImexImap(context: &Context, job: &Job) -> Result<()> {
+pub fn job_do_DC_JOB_IMEX_IMAP(context: &Context, job: &Job) -> Result<()> {
     ensure!(context.alloc_ongoing(), "could not allocate ongoing");
     let what: Option<ImexMode> = job.param.get_int(Param::Cmd).and_then(ImexMode::from_i32);
     let param = job.param.get(Param::Arg).unwrap_or_default();
@@ -423,7 +402,7 @@ fn import_backup(context: &Context, backup_to_import: impl AsRef<Path>) -> Resul
     context.sql.close(&context);
     dc_delete_file(context, context.get_dbfile());
     ensure!(
-        !context.get_dbfile().exists(),
+        !dc_file_exist(context, context.get_dbfile()),
         "Cannot delete old database."
     );
 
@@ -459,9 +438,7 @@ fn import_backup(context: &Context, backup_to_import: impl AsRef<Path>) -> Resul
         |files| {
             for (processed_files_cnt, file) in files.enumerate() {
                 let (file_name, file_blob) = file?;
-                if context.shall_stop_ongoing() {
-                    return Ok(false);
-                }
+                ensure!(!context.shall_stop_ongoing(), "received stop signal");
                 let mut permille = processed_files_cnt * 1000 / total_files_cnt;
                 if permille < 10 {
                     permille = 10
@@ -475,25 +452,25 @@ fn import_backup(context: &Context, backup_to_import: impl AsRef<Path>) -> Resul
                 }
 
                 let path_filename = context.get_blobdir().join(file_name);
-                dc_write_file(context, &path_filename, &file_blob)?;
+                if dc_write_file(context, &path_filename, &file_blob) {
+                    continue;
+                }
+                bail!(
+                    "Storage full? Cannot write file {} with {} bytes.",
+                    path_filename.display(),
+                    file_blob.len(),
+                );
             }
-            Ok(true)
+            Ok(())
         },
     );
 
-    match res {
-        Ok(all_files_extracted) => {
-            if all_files_extracted {
-                // only delete backup_blobs if all files were successfully extracted
-                sql::execute(context, &context.sql, "DROP TABLE backup_blobs;", params![])?;
-                sql::try_execute(context, &context.sql, "VACUUM;").ok();
-                Ok(())
-            } else {
-                bail!("received stop signal");
-            }
-        }
-        Err(err) => Err(err.into()),
-    }
+    res.and_then(|_| {
+        // only delete backup_blobs if all files were successfully extracted
+        sql::execute(context, &context.sql, "DROP TABLE backup_blobs;", params![])?;
+        sql::try_execute(context, &context.sql, "VACUUM;").ok();
+        Ok(())
+    })
 }
 
 /*******************************************************************************
@@ -507,56 +484,51 @@ fn export_backup(context: &Context, dir: impl AsRef<Path>) -> Result<()> {
     // let dest_path_filename = dc_get_next_backup_file(context, dir, res);
     let now = time();
     let dest_path_filename = dc_get_next_backup_path(dir, now)?;
-    let dest_path_string = dest_path_filename.to_string_lossy().to_string();
 
     sql::housekeeping(context);
 
     sql::try_execute(context, &context.sql, "VACUUM;").ok();
-
-    // we close the database during the copy of the dbfile
     context.sql.close(context);
     info!(
         context,
-        "Backup '{}' to '{}'.",
+        "Backup \"{}\" to \"{}\".",
         context.get_dbfile().display(),
         dest_path_filename.display(),
     );
     let copied = dc_copy_file(context, context.get_dbfile(), &dest_path_filename);
     context.sql.open(&context, &context.get_dbfile(), false);
-
     if !copied {
+        let s = dest_path_filename.to_string_lossy().to_string();
         bail!(
-            "could not copy file from '{}' to '{}'",
-            context.get_dbfile().display(),
-            dest_path_string
+            "could not copy file from {:?} to {:?}",
+            context.get_dbfile(),
+            s
         );
     }
-    let dest_sql = Sql::new();
-    ensure!(
-        dest_sql.open(context, &dest_path_filename, false),
-        "could not open exported database {}",
-        dest_path_string
-    );
-    let res = match add_files_to_export(context, &dest_sql) {
+    match add_files_to_export(context, &dest_path_filename) {
         Err(err) => {
             dc_delete_file(context, &dest_path_filename);
             error!(context, "backup failed: {}", err);
             Err(err)
         }
         Ok(()) => {
-            dest_sql.set_raw_config_int(context, "backup_time", now as i32)?;
-            context.call_cb(Event::ImexFileWritten(dest_path_filename));
+            context
+                .sql
+                .set_raw_config_int(context, "backup_time", now as i32)?;
+            context.call_cb(Event::ImexFileWritten(dest_path_filename.clone()));
             Ok(())
         }
-    };
-    dest_sql.close(context);
-
-    Ok(res?)
+    }
 }
 
-fn add_files_to_export(context: &Context, sql: &Sql) -> Result<()> {
+fn add_files_to_export(context: &Context, dest_path_filename: &PathBuf) -> Result<()> {
     // add all files as blobs to the database copy (this does not require
     // the source to be locked, neigher the destination as it is used only here)
+    let sql = Sql::new();
+    ensure!(
+        sql.open(context, &dest_path_filename, false),
+        "could not open db"
+    );
     if !sql.table_exists("backup_blobs") {
         sql::execute(
             context,
@@ -574,15 +546,16 @@ fn add_files_to_export(context: &Context, sql: &Sql) -> Result<()> {
     info!(context, "EXPORT: total_files_cnt={}", total_files_cnt);
     // scan directory, pass 2: copy files
     let dir_handle = std::fs::read_dir(&dir)?;
-    let exported_all_files = sql.prepare(
+    sql.prepare(
         "INSERT INTO backup_blobs (file_name, file_content) VALUES (?, ?);",
         |mut stmt, _| {
             let mut processed_files_cnt = 0;
             for entry in dir_handle {
                 let entry = entry?;
-                if context.shall_stop_ongoing() {
-                    return Ok(false);
-                }
+                ensure!(
+                    !context.shall_stop_ongoing(),
+                    "canceled during export-files"
+                );
                 processed_files_cnt += 1;
                 let permille = max(min(processed_files_cnt * 1000 / total_files_cnt, 990), 10);
                 context.call_cb(Event::ImexProgress(permille));
@@ -602,10 +575,9 @@ fn add_files_to_export(context: &Context, sql: &Sql) -> Result<()> {
                     stmt.execute(params![name, buf])?;
                 }
             }
-            Ok(true)
+            Ok(())
         },
     )?;
-    ensure!(exported_all_files, "canceled during export-files");
     Ok(())
 }
 
@@ -685,14 +657,14 @@ fn export_self_keys(context: &Context, dir: impl AsRef<Path>) -> Result<()> {
                 let (id, public_key, private_key, is_default) = key_pair?;
                 let id = Some(id).filter(|_| is_default != 0);
                 if let Some(key) = public_key {
-                    if export_key_to_asc_file(context, &dir, id, &key).is_err() {
+                    if !export_key_to_asc_file(context, &dir, id, &key) {
                         export_errors += 1;
                     }
                 } else {
                     export_errors += 1;
                 }
                 if let Some(key) = private_key {
-                    if export_key_to_asc_file(context, &dir, id, &key).is_err() {
+                    if !export_key_to_asc_file(context, &dir, id, &key) {
                         export_errors += 1;
                     }
                 } else {
@@ -716,7 +688,8 @@ fn export_key_to_asc_file(
     dir: impl AsRef<Path>,
     id: Option<i64>,
     key: &Key,
-) -> std::io::Result<()> {
+) -> bool {
+    let mut success = false;
     let file_name = {
         let kind = if key.is_public() { "public" } else { "private" };
         let id = id.map_or("default".into(), |i| i.to_string());
@@ -726,13 +699,14 @@ fn export_key_to_asc_file(
     info!(context, "Exporting key {}", file_name.display());
     dc_delete_file(context, &file_name);
 
-    let res = key.write_asc_to_file(&file_name, context);
-    if res.is_err() {
+    if !key.write_asc_to_file(&file_name, context) {
         error!(context, "Cannot write key to {}", file_name.display());
     } else {
         context.call_cb(Event::ImexFileWritten(file_name));
+        success = true;
     }
-    res
+
+    success
 }
 
 #[cfg(test)]
@@ -796,7 +770,7 @@ mod tests {
         let base64 = include_str!("../test-data/key/public.asc");
         let key = Key::from_base64(base64, KeyType::Public).unwrap();
         let blobdir = "$BLOBDIR";
-        assert!(export_key_to_asc_file(&context.ctx, blobdir, None, &key).is_ok());
+        assert!(export_key_to_asc_file(&context.ctx, blobdir, None, &key));
         let blobdir = context.ctx.get_blobdir().to_str().unwrap();
         let filename = format!("{}/public-key-default.asc", blobdir);
         let bytes = std::fs::read(&filename).unwrap();