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:
@@ -36,13 +36,20 @@ jobs:
     executor: default
     steps:
       - checkout
+      - run:
+          name: Update submodules
+          command: git submodule update --init --recursive
+      - run:
+          name: Calculate dependencies
+          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
       - run: rustup component add --toolchain $(cat rust-toolchain) clippy-preview
+      - run: cargo update
       - run: cargo fetch
       - run: rustc +stable --version
       - run: rustc +$(cat rust-toolchain) --version
@@ -53,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"
@@ -84,6 +91,7 @@ jobs:
             curl https://sh.rustup.rs -sSf | sh -s -- -y
       - run: rustup install $(cat rust-toolchain)
       - run: rustup default $(cat rust-toolchain)
+      - run: cargo update
       - run: cargo fetch
       - run:
           name: Test
@@ -113,20 +121,33 @@ 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
 
-  remote_python_packaging:
-    machine: true
+  build_test_docs_wheel:
+    docker:
+      - image: deltachat/coredeps
+        environment:
+            TESTS: 1
+            DOCS: 1
+    working_directory: /mnt/crate
     steps:
-      - checkout
-      # the following commands on success produces
-      # workspace/{wheelhouse,py-docs} as artefact directories
-      - run: bash ci_scripts/remote_python_packaging.sh 
+      - *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:
@@ -134,25 +155,12 @@ jobs:
             - py-docs
             - wheelhouse
 
-  remote_tests_rust:
-    machine: true
-    steps:
-      - checkout
-      - run: ci_scripts/remote_tests_rust.sh
-    
-  remote_tests_python:
-    machine: true
-    steps:
-      - checkout
-      - run: ci_scripts/remote_tests_python.sh
-
   upload_docs_wheels:
     machine: true
     steps:
       - checkout
       - attach_workspace:
           at: workspace
-      - run: pyenv versions
       - run: pyenv global 3.5.2
       - run: ls -laR workspace
       - run: ci_scripts/ci_upload.sh workspace/py-docs workspace/wheelhouse workspace/c-docs
@@ -164,7 +172,7 @@ jobs:
       - *restore-cache
       - run:
           name: Run cargo clippy
-          command: cargo clippy 
+          command: cargo clippy --all
 
 
 workflows:
@@ -172,49 +180,27 @@ workflows:
 
   test:
     jobs:
-      # - cargo_fetch
-
-      - remote_tests_rust:
-          filters:
-            tags:
-              only: /.*/
-
-      - remote_tests_python:
-          filters:
-            tags:
-              only: /.*/
-
-      - remote_python_packaging:
-          requires: 
-             - remote_tests_python
-             - remote_tests_rust 
-          filters:
-            tags:
-              only: /.*/
+      - cargo_fetch
+      - build_doxygen
 
+      - build_test_docs_wheel:
+          requires:
+            - cargo_fetch
       - upload_docs_wheels:
           requires:
-             - remote_python_packaging
-             - build_doxygen
-          filters:
-            tags:
-              only: /.*/
-      # - rustfmt:
-      #     requires:
-      #       - cargo_fetch
-      # - clippy:
-      #     requires:
-      #      - cargo_fetch
-
-      - build_doxygen:
-          filters:
-            tags:
-              only: /.*/
+            - build_test_docs_wheel
+            - build_doxygen 
+      - rustfmt:
+          requires:
+            - cargo_fetch
+      - clippy:
+          requires:
+           - cargo_fetch
 
       # 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:

.github/workflows/code-quality.yml

@@ -1,48 +0,0 @@
-on: push
-name: Code Quality
-jobs:
-
-  check:
-    name: Check
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: nightly-2019-11-06
-          override: true
-      - uses: actions-rs/cargo@v1
-        with:
-          command: check
-          args: --workspace --examples --tests --all-features
-
-  fmt:
-    name: Rustfmt
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: nightly-2019-11-06
-          override: true
-      - run: rustup component add rustfmt
-      - uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all -- --check
-
-  run_clippy:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-      - uses: actions-rs/toolchain@v1
-        with:
-            toolchain: nightly-2019-11-06
-            components: clippy
-            override: true
-      - uses: actions-rs/clippy-check@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          args: --all-features

.gitignore

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

CHANGELOG.md

@@ -1,378 +1,6 @@
-# Changelog 
+# API changes
 
-## 1.25.0
-
-- save traffic by downloading only messages that are really displayed #1236
-
-- change generated key type to Ed25519, these keys are much shorter
-  than RSA keys, which results in saving traffic and speed improvements #1287
-
-- improve key handling #1237 #1240 #1242 #1247
-
-- mute handling, apis are dc_set_chat_mute_duration()
-  dc_chat_is_muted() and dc_chat_get_remaining_mute_duration() #1143
-
-- pinning chats, new apis are dc_set_chat_visibility() and
-  dc_chat_get_visibility() #1248
-
-- add dc_provider_new_from_email() api that queries the new, integrated
-  provider-database #1207
-
-- account creation by scanning a qr code
-  in the DCACCOUNT scheme (https://mailadm.readthedocs.io),
-  new api is dc_set_config_from_qr() #1249
-
-- if possible, dc_join_securejoin(), returns the new chat-id immediately
-  and does the handshake in background #1225
-
-- update imap and smtp dependencies #1115
-
-- check for MOVE capability before using MOVE command #1263
-
-- allow inline attachments from RFC 2183 #1280
-
-- fix updating names from incoming mails #1298
-
-- fix error messages shown on import #1234
-
-- directly attempt to re-connect if the smtp connection is maybe stale #1296
-
-- improve adding group members #1291
-
-- improve rust-api #1261
-
-- cleanup #1302 #1283 #1282 #1276 #1270-#1274 #1267 #1258-#1260
-  #1257 #1239 #1231 #1224
-
-- update spec #1286 #1291
-
-
-## 1.0.0-beta.24
-
-- fix oauth2/gmail bug introduced in beta23 (not used in releases) #1219
-
-- fix panic when receiving eg. cyrillic filenames #1216
-
-- delete all consumed secure-join handshake messagess #1209 #1212
-
-- rust-level cleanups #1218 #1217 #1210 #1205
-
-- python-level cleanups #1204 #1202 #1201
-
-
-## 1.0.0-beta.23
-
-- #1197 fix imap-deletion of messages 
-
-- #1171 Combine multiple MDNs into a single mail, reducing traffic 
-
-- #1155 fix to not send out gossip always, reducing traffic
-
-- #1160 fix reply-to-encrypted determination 
-
-- #1182 Add "Auto-Submitted: auto-replied" header to MDNs
-
-- #1194 produce python wheels again, fix c/py.delta.chat
-  master-deployment 
-
-- rust-level housekeeping and improvements #1161 #1186 #1185 #1190 #1194 #1199 #1191 #1190 #1184 and more
-
-- #1063 clarify licensing 
-
-- #1147 use mailparse 0.10.2 
-
-
-## 1.0.0-beta.22
-
-- #1095 normalize email lineends to CRLF
-
-- #1095 enable link-time-optimization, saves eg. on android 11 mb
-
-- #1099 fix import regarding devicechats
-
-- #1092 improve logging
-
-- #1096 #1097 #1094 #1090 #1091 internal cleanups
-
-## 1.0.0-beta.21
-
-- #1078 #1082 ensure RFC compliance by producing 78 column lines for
-  encoded attachments. 
-
-- #1080 don't recreate and thus break group membership if an unknown 
-  sender (or mailer-daemon) sends a message referencing the group chat 
-
-- #1081 #1079 some internal cleanups 
-
-- update imap-proto dependency, to fix yandex/oauth 
-
-## 1.0.0-beta.20
-
-- #1074 fix OAUTH2/gmail
-- #1072 fix group members not appearing in contact list
-- #1071 never block interrupt_idle (thus hopefully also not on maybe_network())
-- #1069 reduce smtp-timeout to 30 seconds
-- #1066 #1065 avoid unwrap in dehtml, make literals more readable
-
-## 1.0.0-beta.19
-
-- #1058 timeout smtp-send if it doesn't complete in 15 minutes 
-
-- #1059 trim down logging
-
-## 1.0.0-beta.18
-
-- #1056 avoid panicking when we couldn't read imap-server's greeting
-  message 
-
-- #1055 avoid panicking when we don't have a selected folder
-
-- #1052 #1049 #1051 improve logging to add thread-id/name and
-  file/lineno to each info/warn message.
-
-- #1050 allow python bindings to initialize Account with "os_name".
-
-
-## 1.0.0-beta.17
-
-- #1044 implement avatar recoding to 192x192 in core to keep file sizes small. 
-
-- #1024 fix #1021 SQL/injection malformed Chat-Group-Name breakage
-
-- #1036 fix smtp crash by pulling in a fixed async-smtp 
-
-- #1039 fix read-receipts appearing as normal messages when you change
-  MDN settings 
-
-- #1040 do not panic on SystemTimeDifference
-
-- #1043 avoid potential crashes in malformed From/Chat-Disposition... headers  
-
-- #1045 #1041 #1038 #1035 #1034 #1029 #1025 various cleanups and doc
-  improvments 
-
-## 1.0.0-beta.16
-
-- alleviate login problems with providers which only
-  support RSA1024 keys by switching back from Rustls 
-  to native-tls, by using the new async-email/async-native-tls 
-  crate from @dignifiedquire. thanks @link2xt. 
-
-- introduce per-contact profile images to send out 
-  own profile image heuristically, and fix sending
-  out of profile images in "in-prepare" groups. 
-  this also extends the Chat-spec that is maintained
-  in core to specify Chat-Group-Image and Chat-Group-Avatar
-  headers. thanks @r10s and @hpk42.
-
-- fix merging of protected headers from the encrypted
-  to the unencrypted parts, now not happening recursively
-  anymore.  thanks @hpk and @r10s
-
-- fix/optimize autocrypt gossip headers to only get 
-  sent when there are more than 2 people in a chat. 
-  thanks @link2xt
-
-- fix displayname to use the authenticated name 
-  when available (displayname as coming from contacts 
-  themselves). thanks @simon-laux
-
-- introduce preliminary support for offline autoconfig 
-  for nauta provider. thanks @hpk42 @r10s
-
-## 1.0.0-beta.15
-
-- fix #994 attachment appeared doubled in chats (and where actually
-  downloaded after smtp-send). @hpk42
-
-## 1.0.0-beta.14
-
-- fix packaging issue with our rust-email fork, now we are tracking
-  master again there. hpk42
-
-## 1.0.0-beta.13
-
-- fix #976 -- unicode-issues in display-name of email addresses. @hpk42
-
-- fix #985 group add/remove member bugs resulting in broken groups.  @hpk42
-
-- fix hanging IMAP connections -- we now detect with a 15second timeout
-  if we cannot terminate the IDLE IMAP protocol. @hpk42 @link2xt
-
-- fix incoming multipart/mixed containing html, to show up as
-  attachments again.  Fixes usage for simplebot which sends html
-  files for users to interact with the bot. @adbenitez @hpk42 
-
-- refinements to internal autocrypt-handling code, do not send
-  prefer-encrypt=nopreference as it is the default if no attribute
-  is present.  @linkxt 
-
-- simplify, modularize and rustify several parts 
-  of dc-core (general WIP). @link2xt @flub @hpk42 @r10s
-
-- use async-email/async-smtp to handle SMTP connections, might
-  fix connection/reconnection issues. @link2xt 
-
-- more tests and refinements for dealing with blobstorage @flub @hpk42 
-
-- use a dedicated build-server for CI testing of core PRs
-
-
-## 1.0.0-beta.12
-
-- fix python bindings to use core for copying attachments to blobdir
-  and fix core to actually do it. @hpk42
-
-## 1.0.0-beta.11
-
-- trigger reconnect more often on imap error states.  Should fix an 
-  issue observed when trying to empty a folder.  @hpk42
-
-- un-split qr tests: we fixed qr-securejoin protocol flakyness 
-  last weeks. @hpk42
-
-## 1.0.0-beta.10
-
-- 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
-
-- add experimental new dc_chat_get_info_json FFI/API so that desktop devs
-  can play with using it. @jikstra
-
-- fix encoding of subjects and attachment-filenames @hpk42
-  @dignifiedquire . 
-
-## 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,32 +1,27 @@
 [package]
 name = "deltachat"
-version = "1.25.0"
+version = "1.0.0-beta.1"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2018"
-license = "MPL-2.0"
-
-[profile.release]
-lto = true
+license = "MPL"
 
 [dependencies]
 deltachat_derive = { path = "./deltachat_derive" }
+mmime = { version = "0.1.2", path = "./mmime" }
 
 libc = "0.2.51"
-pgp = { version = "0.4.0", 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.7.0"
-smallvec = "1.0.0"
-reqwest = { version = "0.10.0", features = ["blocking", "json"] }
-num-derive = "0.3.0"
+rand = "0.6.5"
+smallvec = "0.6.9"
+reqwest = "0.9.15"
+num-derive = "0.2.5"
 num-traits = "0.2.6"
-async-smtp = "0.2"
-email = { git = "https://github.com/deltachat/rust-email", branch = "master" }
-lettre_email = { git = "https://github.com/deltachat/lettre", branch = "master" }
-async-imap = "0.2"
-async-native-tls = "0.3.1"
-async-std = { version = "1.4", 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"] }
@@ -34,11 +29,12 @@ serde_json = "1.0"
 chrono = "0.4.6"
 failure = "0.1.5"
 failure_derive = "0.1.5"
-indexmap = "1.3.0"
+# TODO: make optional
+rustyline = "4.1.0"
 lazy_static = "1.4.0"
 regex = "1.1.6"
-rusqlite = { version = "0.21", features = ["bundled"] }
-r2d2_sqlite = "0.13.0"
+rusqlite = { version = "0.20", features = ["bundled"] }
+r2d2_sqlite = "0.12.0"
 r2d2 = "0.8.5"
 strum = "0.16.0"
 strum_macros = "0.16.0"
@@ -47,19 +43,11 @@ backtrace = "0.3.33"
 byteorder = "1.3.1"
 itertools = "0.8.0"
 image-meta = "0.1.0"
-quick-xml = "0.17.1"
+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"] }
-mailparse = "0.10.2"
-encoded-words = { git = "https://github.com/async-email/encoded-words", branch="master" }
-native-tls = "0.2.3"
-image = { version = "0.22.4", default-features=false, features = ["gif_codec", "jpeg", "ico", "png_codec", "pnm", "webp", "bmp"] }
-pretty_env_logger = "0.3.1"
-
-rustyline = { version = "4.1.0", optional = true }
 
 [dev-dependencies]
 tempfile = "3.0"
@@ -71,6 +59,7 @@ proptest = "0.9.4"
 members = [
   "deltachat-ffi",
   "deltachat_derive",
+  "mmime",
 ]
 
 [[example]]
@@ -80,11 +69,10 @@ path = "examples/simple.rs"
 [[example]]
 name = "repl"
 path = "examples/repl/main.rs"
-required-features = ["rustyline"]
 
 
 [features]
 default = ["nightly", "ringbuf"]
-vendored = ["async-native-tls/vendored", "reqwest/native-tls-vendored", "async-smtp/native-tls-vendored"]
+vendored = ["native-tls/vendored", "reqwest/default-tls-vendored"]
 nightly = ["pgp/nightly"]
 ringbuf = ["pgp/ringbuf"]

LICENSE

@@ -2,6 +2,9 @@ The files in this directory and under its subdirectories
 are (c) 2019 by Bjoern Petersen and contributors and released under the
 Mozilla Public License Version 2.0, see below for a copy.
 
+NOTE that the files in the "libs" directory are copyrighted by third parties
+and come with their own respective licenses.
+
 Mozilla Public License Version 2.0
 ==================================
 

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
@@ -114,22 +107,3 @@ $ cargo test -- --ignored
 [circle]: https://circleci.com/gh/deltachat/deltachat-core-rust/
 [appveyor-shield]: https://ci.appveyor.com/api/projects/status/lqpegel3ld4ipxj8/branch/master?style=flat-square
 [appveyor]: https://ci.appveyor.com/project/dignifiedquire/deltachat-core-rust/branch/master
-
-## Language bindings and frontend projects
-
-Language bindings are available for:
-
-- [C](https://c.delta.chat)
-- [Node.js](https://www.npmjs.com/package/deltachat-node)
-- [Python](https://py.delta.chat)
-- [Go](https://github.com/hugot/go-deltachat/)
-- **Java** and **Swift** (contained in the Android/iOS repos)
-
-The following "frontend" projects make use of the Rust-library
-or its language bindings:
-
-- [Android](https://github.com/deltachat/deltachat-android)
-- [iOS](https://github.com/deltachat/deltachat-ios)
-- [Desktop](https://github.com/deltachat/deltachat-desktop)
-- [Pidgin](https://code.ur.gs/lupine/purple-plugin-delta/)
-- several **Bots**

appveyor.yml

@@ -8,6 +8,7 @@ install:
   - set PATH=%PATH%;%USERPROFILE%\.cargo\bin
   - rustc -vV
   - cargo -vV
+  - cargo update
 
 build: false
 

assets/icon-device.svg

@@ -1,83 +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:export-ydpi="409.60001"
-   inkscape:export-xdpi="409.60001"
-   inkscape:export-filename="/Users/bpetersen/projects/deltachat-core-rust/assets/icon-device.png"
-   version="1.0"
-   width="60"
-   height="60"
-   viewBox="0 0 45 45"
-   preserveAspectRatio="xMidYMid meet"
-   id="svg4344"
-   sodipodi:docname="icon-device.svg"
-   inkscape:version="1.0beta1 (32d4812, 2019-09-19)">
-  <defs
-     id="defs4348" />
-  <sodipodi:namedview
-     inkscape:snap-global="false"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     inkscape:document-rotation="0"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1600"
-     inkscape:window-height="1035"
-     id="namedview4346"
-     showgrid="false"
-     units="px"
-     inkscape:zoom="3.959798"
-     inkscape:cx="28.322498"
-     inkscape:cy="24.898474"
-     inkscape:window-x="45"
-     inkscape:window-y="23"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg4344" />
-  <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>
-  <rect
-     y="-4.4408921e-16"
-     x="0"
-     height="45"
-     width="45"
-     id="rect860"
-     style="opacity:1;fill:#76868b;fill-opacity:1;stroke-width:0.819271" />
-  <g
-     fill="#000000"
-     stroke="none"
-     style="fill:#ffffff;fill-opacity:1"
-     transform="matrix(0.00255113,0,0,-0.00255113,5.586152,38.200477)"
-     id="g4342">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       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"
-       id="path4338"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       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"
-       id="path4340"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>

assets/icon-saved-messages.svg

@@ -1,71 +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:export-ydpi="409.60001"
-   inkscape:export-xdpi="409.60001"
-   inkscape:export-filename="/home/kerle/test-icon.png"
-   version="1.0"
-   width="60"
-   height="60"
-   viewBox="0 0 45 45"
-   preserveAspectRatio="xMidYMid meet"
-   id="svg4344"
-   sodipodi:docname="icon-saved-messages.svg"
-   inkscape:version="1.0beta1 (32d4812, 2019-09-19)">
-  <defs
-     id="defs4348" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     inkscape:document-rotation="0"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1395"
-     inkscape:window-height="855"
-     id="namedview4346"
-     showgrid="false"
-     units="px"
-     inkscape:zoom="4"
-     inkscape:cx="29.308676"
-     inkscape:cy="49.03624"
-     inkscape:window-x="89"
-     inkscape:window-y="108"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg4344"
-     inkscape:lockguides="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>
-  <rect
-     y="0"
-     x="0"
-     height="45"
-     width="45"
-     id="rect1420"
-     style="fill:#87aade;fill-opacity:1;stroke:none;stroke-width:0.968078" />
-  <path
-     id="rect846"
-     style="fill:#ffffff;stroke-width:0.58409804"
-     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"
-     inkscape:connector-curvature="0" />
-</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

@@ -17,15 +17,13 @@ export BRANCH=${CIRCLE_BRANCH:?specify branch for uploading purposes}
 # python docs to py.delta.chat
 ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null delta@py.delta.chat mkdir -p build/${BRANCH}
 rsync -avz \
-  --delete \
   -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 \
-  --delete \
   -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" \
   "$DOXYDOCDIR/html/" \
   delta@c.delta.chat:build-c/${BRANCH}
@@ -37,7 +35,6 @@ echo -----------------------
 # Bundle external shared libraries into the wheels
 pushd $WHEELHOUSEDIR
 
-pip3 install -U pip
 pip3 install devpi-client
 devpi use https://m.devpi.net
 devpi login dc --password $DEVPI_LOGIN
@@ -49,9 +46,6 @@ devpi use dc/$N_BRANCH || {
     devpi use dc/$N_BRANCH
 }
 devpi index $N_BRANCH bases=/root/pypi
-devpi upload deltachat*
+devpi upload deltachat*.whl
 
 popd
-
-# remove devpi non-master dc indices if thy are too old
-python ci_scripts/cleanup_devpi_indices.py

ci_scripts/cleanup_devpi_indices.py

@@ -1,69 +0,0 @@
-"""
-Remove old "dc" indices except for master which always stays.
-
-"""
-from requests import Session
-import datetime
-import sys
-import subprocess
-
-MAXDAYS=7
-
-session = Session()
-session.headers["Accept"] = "application/json"
-
-
-def get_indexes(baseurl, username):
-    response = session.get(baseurl + username)
-    assert response.status_code == 200
-    result = response.json()["result"]
-    return result["indexes"]
-
-
-def get_projectnames(baseurl, username, indexname):
-    response = session.get(baseurl + username + "/" + indexname)
-    assert response.status_code == 200
-    result = response.json()["result"]
-    return result["projects"]
-
-
-def get_release_dates(baseurl, username, indexname, projectname):
-    response = session.get(baseurl + username + "/" + indexname + "/" + projectname)
-    assert response.status_code == 200
-    result = response.json()["result"]
-    dates = set()
-    for value in result.values():
-        if "+links" not in value:
-            continue
-        for link in value["+links"]:
-            for log in link["log"]:
-                dates.add(tuple(log["when"]))
-    return dates
-
-
-def run():
-    baseurl = "https://m.devpi.net/"
-    username = "dc"
-    for indexname in get_indexes(baseurl, username):
-        projectnames = get_projectnames(baseurl, username, indexname)
-        if indexname == "master" or not indexname:
-            continue
-        assert projectnames == ["deltachat"]
-        for projectname in projectnames:
-            dates = get_release_dates(baseurl, username, indexname, projectname)
-            if not dates:
-                print(
-                    "%s has no releases" % (baseurl + username + "/" + indexname),
-                    file=sys.stderr)
-                date = datetime.datetime.now()
-            else:
-                date = datetime.datetime(*max(dates))
-            if (datetime.datetime.now() - date) > datetime.timedelta(days=MAXDAYS):
-                assert username and indexname
-                url = baseurl + username + "/" + indexname
-                subprocess.check_call(["devpi", "index", "-y", "--delete", url])
-
-
-
-if __name__ == '__main__':
-    run()

ci_scripts/docker-coredeps/Dockerfile

@@ -5,17 +5,21 @@ 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
 
-# Install a recent Perl, needed to install the openssl crate 
-ADD deps/build_perl.sh /builder/build_perl.sh
-RUN rm /usr/bin/perl
-RUN mkdir tmp1 && cd tmp1 && bash /builder/build_perl.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
+# 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
+
+# Install OpenSSL
+ADD deps/build_openssl.sh /builder/build_openssl.sh
+RUN mkdir tmp1 && cd tmp1 && bash /builder/build_openssl.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,11 +1,11 @@
 #!/bin/bash
 
-set -e -x
+set -e -x 
 
-# Install Rust
-curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2019-11-06 -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-11-06-x86_64-unknown-linux-gnu/share/
+rm -rf /root/.rustup/toolchains/nightly-2019-07-10-x86_64-unknown-linux-gnu/share/

ci_scripts/docker-coredeps/deps/run_all.sh

@@ -0,0 +1,49 @@
+#!/bin/bash
+#
+# Build the Delta Chat C/Rust library
+#
+set -e -x
+
+# perform clean build of core and install 
+export TOXWORKDIR=.docker-tox
+
+# build core library
+
+cargo build --release -p deltachat_ffi
+
+# configure access to a base python and 
+# to several python interpreters needed by tox below
+export PATH=$PATH:/opt/python/cp35-cp35m/bin
+export PYTHONDONTWRITEBYTECODE=1
+pushd /bin
+ln -s /opt/python/cp27-cp27m/bin/python2.7
+ln -s /opt/python/cp36-cp36m/bin/python3.6
+ln -s /opt/python/cp37-cp37m/bin/python3.7
+popd
+
+#
+# run python tests
+#
+
+if [ -n "$TESTS" ]; then 
+
+    echo ----------------
+    echo run python tests
+    echo ----------------
+
+    pushd python 
+    # first run all tests ...
+    rm -rf tests/__pycache__
+    rm -rf src/deltachat/__pycache__
+    export PYTHONDONTWRITEBYTECODE=1
+    tox --workdir "$TOXWORKDIR" -e py27,py35,py36,py37
+    popd
+fi
+
+
+if [ -n "$DOCS" ]; then 
+    echo -----------------------
+    echo generating python docs
+    echo -----------------------
+    (cd python && tox --workdir "$TOXWORKDIR" -e doc) 
+fi

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_python_packaging.sh

@@ -1,51 +0,0 @@
-#!/bin/bash 
-
-export BRANCH=${CIRCLE_BRANCH:?branch to build}
-export REPONAME=${CIRCLE_PROJECT_REPONAME:?repository name}
-export SSHTARGET=${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
-
-# we have to create a remote file for the remote-docker run 
-# so we can do a simple ssh command with a TTY
-# so that when our job dies, all container-runs are aborted.
-# sidenote: the circle-ci machinery will kill ongoing jobs
-# if there are new commits and we want to ensure that 
-# everything is terminated/cleaned up and we have no orphaned
-# useless still-running docker-containers consuming resources. 
-
-ssh $SSHTARGET bash -c "cat >$BUILDDIR/exec_docker_run" <<_HERE
-    set +x -e
-    cd $BUILDDIR
-    export DCC_PY_LIVECONFIG=$DCC_PY_LIVECONFIG
-
-    set -x
-
-    # run everything else inside docker 
-    docker run -e DCC_PY_LIVECONFIG \
-       --rm -it -v \$(pwd):/mnt -w /mnt \
-       deltachat/coredeps ci_scripts/run_all.sh
-
-_HERE
-
-echo "--- Running $CIRCLE_JOB remotely"
-
-ssh -t $SSHTARGET bash "$BUILDDIR/exec_docker_run"
-mkdir -p workspace 
-rsync -avz "$SSHTARGET:$BUILDDIR/python/.docker-tox/wheelhouse/*manylinux1*" workspace/wheelhouse/
-rsync -avz "$SSHTARGET:$BUILDDIR/python/.docker-tox/dist/*" workspace/wheelhouse/
-rsync -avz "$SSHTARGET:$BUILDDIR/python/doc/_build/" workspace/py-docs

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=${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=${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-doxygen.sh

@@ -3,4 +3,5 @@
 set -ex
 
 cd deltachat-ffi 
-PROJECT_NUMBER=$(git log -1 --format "%h (%cd)") doxygen 
+doxygen 
+

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=debug
-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

ci_scripts/run_all.sh

@@ -1,48 +0,0 @@
-#!/bin/bash
-#
-# Build the Delta Chat Core Rust library, Python wheels and docs 
-
-set -e -x
-
-# Perform clean build of core and install.
-export TOXWORKDIR=.docker-tox
-
-# compile core lib
-
-export PATH=/root/.cargo/bin:$PATH
-cargo build --release -p deltachat_ffi
-# cargo test --all --all-features
-
-# Statically link against libdeltachat.a.
-export DCC_RS_DEV=$(pwd)
-
-# Configure access to a base python and to several python interpreters
-# needed by tox below.
-export PATH=$PATH:/opt/python/cp35-cp35m/bin
-export PYTHONDONTWRITEBYTECODE=1
-pushd /bin
-ln -s /opt/python/cp27-cp27m/bin/python2.7
-ln -s /opt/python/cp36-cp36m/bin/python3.6
-ln -s /opt/python/cp37-cp37m/bin/python3.7
-ln -s /opt/python/cp38-cp38/bin/python3.8
-popd
-
-pushd python
-# prepare a clean tox run
-rm -rf tests/__pycache__
-rm -rf src/deltachat/__pycache__
-mkdir -p $TOXWORKDIR
-
-# disable live-account testing to speed up test runs and wheel building
-# XXX we may switch on some live-tests on for better ensurances 
-# Note that the independent remote_tests_python step does all kinds of
-# live-testing already. 
-unset DCC_PY_LIVECONFIG 
-tox --workdir "$TOXWORKDIR" -e py35,py36,py37,py38,auditwheels
-popd
-
-
-echo -----------------------
-echo generating python docs
-echo -----------------------
-(cd python && tox --workdir "$TOXWORKDIR" -e doc)

deltachat-ffi/Cargo.toml

@@ -1,11 +1,11 @@
 [package]
 name = "deltachat_ffi"
-version = "1.25.0"
+version = "1.0.0-beta.1"
 description = "Deltachat FFI"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2018"
 readme = "README.md"
-license = "MPL-2.0"
+license = "MIT OR Apache-2.0"
 
 keywords = ["deltachat", "chat", "openpgp", "email", "encryption"]
 categories = ["cryptography", "std", "email"]
@@ -16,11 +16,10 @@ crate-type = ["cdylib", "staticlib"]
 
 [dependencies]
 deltachat = { path = "../", default-features = false }
+deltachat-provider-database = "0.2.1"
 libc = "0.2"
 human-panic = "1.0.1"
 num-traits = "0.2.6"
-failure = "0.1.6"
-serde_json = "1.0"
 
 [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.
@@ -364,12 +362,6 @@ char*           dc_get_blobdir               (const dc_context_t* context);
  *                    also show all mails of confirmed contacts,
  *                    DC_SHOW_EMAILS_ALL (2)=
  *                    also show mails of unconfirmed contacts in the deaddrop.
- * - `key_gen_type` = DC_KEY_GEN_DEFAULT (0)=
- *                    generate recommended key type (default),
- *                    DC_KEY_GEN_RSA2048 (1)=
- *                    generate RSA 2048 keypair
- *                    DC_KEY_GEN_ED25519 (2)=
- *                    generate Ed25519 keypair
  * - `save_mime_headers` = 1=save mime headers
  *                    and make dc_get_mime_headers() work for subsequent calls,
  *                    0=do not save mime headers (default)
@@ -409,37 +401,20 @@ int             dc_set_config                (dc_context_t* context, const char*
  */
 char*           dc_get_config                (dc_context_t* context, const char* key);
 
-
 /**
- * Set stock string translation.
+ * Set stock string translation. 
  *
- * The function will emit warnings if it returns an error state.
+ * The function will emit warnings if it returns an error state. 
  *
  * @memberof dc_context_t
  * @param context The context object
  * @param stock_id   the integer id of the stock message (DC_STR_*)
- * @param stock_msg  the message to be used
+ * @param stock_msg  the message to be used 
  * @return int (==0 on error, 1 on success)
  */
 int             dc_set_stock_translation(dc_context_t* context, uint32_t stock_id, const char* stock_msg);
 
 
-/**
- * Set configuration values from a QR code containing an account.
- * Before this function is called, dc_check_qr() should confirm the type of the
- * QR code is DC_QR_ACCOUNT.
- *
- * Internally, the function will call dc_set_config()
- * at least with the keys `addr` and `mail_pw`.
- *
- * @memberof dc_context_t
- * @param context The context object
- * @param qr scanned QR code
- * @return int (==0 on error, 1 on success)
- */
-int             dc_set_config_from_qr   (dc_context_t* context, const char* qr);
-
-
 /**
  * Get information about the context.
  *
@@ -524,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().
@@ -875,27 +856,6 @@ void            dc_interrupt_smtp_idle       (dc_context_t* context);
 void            dc_maybe_network             (dc_context_t* context);
 
 
-/**
- * Save a keypair as the default keys for the user.
- *
- * This API is only for testing purposes and should not be used as part of a
- * normal application, use the import-export APIs instead.
- *
- * This saves a public/private keypair as the default keypair in the context.
- * It allows avoiding having to generate a secret key for unittests which need
- * one.
- *
- * @memberof dc_context_t
- * @param context The context as created by dc_context_new().
- * @param addr The email address of the user.  This must match the
- *    configured_addr setting of the context as well as the UID of the key.
- * @param public_data The public key as base64.
- * @param secret_data The secret key as base64.
- * @return 1 on success, 0 on failure.
- */
-int             dc_preconfigure_keypair        (dc_context_t* context, const char *addr, const char *public_data, const char *secret_data);
-
-
 // handle chatlists
 
 #define         DC_GCL_ARCHIVED_ONLY         0x01
@@ -924,7 +884,7 @@ int             dc_preconfigure_keypair        (dc_context_t* context, const cha
  *   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_set_chat_visibility(). 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.
@@ -1038,20 +998,11 @@ uint32_t        dc_get_chat_id_by_contact_id (dc_context_t* context, uint32_t co
  *
  * Example:
  * ~~~
- * char* blobdir = dc_get_blobdir(context);
- * char* file_to_send = mprintf("%s/%s", blobdir, "send.mp4")
- *
  * dc_msg_t* msg = dc_msg_new(context, DC_MSG_VIDEO);
- * dc_msg_set_file(msg, file_to_send, NULL);
+ * dc_msg_set_file(msg, "/file/to/send.mp4", NULL);
  * dc_prepare_msg(context, chat_id, msg);
- *
- * // ... create the file ...
- *
+ * // ... after /file/to/send.mp4 is ready:
  * dc_send_msg(context, chat_id, msg);
- *
- * dc_msg_unref(msg);
- * free(file_to_send);
- * dc_str_unref(file_to_send);
  * ~~~
  *
  * @memberof dc_context_t
@@ -1077,11 +1028,8 @@ uint32_t        dc_prepare_msg               (dc_context_t* context, uint32_t ch
  * Example:
  * ~~~
  * dc_msg_t* msg = dc_msg_new(context, DC_MSG_IMAGE);
- *
  * dc_msg_set_file(msg, "/file/to/send.jpg", NULL);
  * dc_send_msg(context, chat_id, msg);
- *
- * dc_msg_unref(msg);
  * ~~~
  *
  * @memberof dc_context_t
@@ -1148,87 +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);
- * }
- *
- * dc_msg_unref(changelog_msg);
- * dc_msg_unref(welome_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.
@@ -1344,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.
@@ -1378,18 +1245,25 @@ uint32_t        dc_get_next_media            (dc_context_t* context, uint32_t ms
 
 
 /**
- * Set chat visibility to pinned, archived or normal.
+ * Archive or unarchive a chat.
  *
- * Calling this function usually results in the event #DC_EVENT_MSGS_CHANGED
- * See @ref DC_CHAT_VISIBILITY for detailed information about the visibilities.
+ * Archived chats are not included in the default chatlist returned
+ * by dc_get_chatlist().  Instead, if there are _any_ archived chats,
+ * the pseudo-chat with the chat_id DC_CHAT_ID_ARCHIVED_LINK will be added the the
+ * end of the chatlist.
+ *
+ * - To get a list of archived chats, use dc_get_chatlist() with the flag DC_GCL_ARCHIVED_ONLY.
+ * - To find out the archived state of a given chat, use dc_chat_get_archived()
+ * - Messages in archived chats are marked as being noticed, so they do not count as "fresh"
+ * - Calling this function usually results in the event #DC_EVENT_MSGS_CHANGED
  *
  * @memberof dc_context_t
  * @param context The context object as returned from dc_context_new().
- * @param chat_id The ID of the chat to change the visibility for.
- * @param visibility one of @ref DC_CHAT_VISIBILITY
+ * @param chat_id The ID of the chat to archive or unarchive.
+ * @param archive 1=archive chat, 0=unarchive chat, all other values are reserved for future use
  * @return None.
  */
-void            dc_set_chat_visibility       (dc_context_t* context, uint32_t chat_id, int visibility);
+void            dc_archive_chat              (dc_context_t* context, uint32_t chat_id, int archive);
 
 
 /**
@@ -1593,22 +1467,6 @@ int             dc_set_chat_name             (dc_context_t* context, uint32_t ch
 int             dc_set_chat_profile_image    (dc_context_t* context, uint32_t chat_id, const char* image);
 
 
-
-/**
- * Set mute duration of a chat.
- *
- * This value can be checked by the ui upon receiving a new message to decide whether it should trigger an notification.
- *
- * Sends out #DC_EVENT_CHAT_MODIFIED.
- *
- * @memberof dc_context_t
- * @param chat_id The chat ID to set the mute duration.
- * @param duration The duration (0 for no mute, -1 for forever mute, everything else is is the relative mute duration from now in seconds)
- * @param context The context as created by dc_context_new().
- * @return 1=success, 0=error
- */
-int             dc_set_chat_mute_duration             (dc_context_t* context, uint32_t chat_id, int64_t duration);
-
 // handle messages
 
 /**
@@ -1655,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.
@@ -1809,7 +1657,7 @@ uint32_t        dc_create_contact            (dc_context_t* context, const char*
  * Trying to add email-addresses that are already in the contact list,
  * results in updating the name unless the name was changed manually by the user.
  * If any email-address or any name is really updated,
- * the event #DC_EVENT_CONTACTS_CHANGED is sent.
+ * the event DC_EVENT_CONTACTS_CHANGED is sent.
  *
  * To add a single contact entered by the user, you should prefer dc_create_contact(),
  * however, for adding a bunch of addresses, this function is _much_ faster.
@@ -2015,7 +1863,7 @@ void            dc_imex                      (dc_context_t* context, int what, c
  *         }
  *         while (!configure_succeeded())
  *     }
- *     dc_str_unref(file);
+ *     free(file);
  * }
  * ~~~
  *
@@ -2127,7 +1975,6 @@ void            dc_stop_ongoing_process      (dc_context_t* context);
 #define         DC_QR_FPR_OK                 210 // id=contact
 #define         DC_QR_FPR_MISMATCH           220 // id=contact
 #define         DC_QR_FPR_WITHOUT_ADDR       230 // test1=formatted fingerprint
-#define         DC_QR_ACCOUNT                250 // text1=domain
 #define         DC_QR_ADDR                   320 // id=contact
 #define         DC_QR_TEXT                   330 // text1=text
 #define         DC_QR_URL                    332 // text1=URL
@@ -2145,12 +1992,12 @@ void            dc_stop_ongoing_process      (dc_context_t* context);
  * - DC_QR_FPR_OK with dc_lot_t::id=Contact ID
  * - DC_QR_FPR_MISMATCH with dc_lot_t::id=Contact ID
  * - DC_QR_FPR_WITHOUT_ADDR with dc_lot_t::test1=Formatted fingerprint
- * - DC_QR_ACCOUNT allows creation of an account, dc_lot_t::text1=domain
  * - DC_QR_ADDR with dc_lot_t::id=Contact ID
  * - DC_QR_TEXT with dc_lot_t::text1=Text
  * - DC_QR_URL with dc_lot_t::text1=URL
  * - DC_QR_ERROR with dc_lot_t::text1=Error string
  *
+ *
  * @memberof dc_context_t
  * @param context The context object.
  * @param qr The text of the scanned QR code.
@@ -2161,22 +2008,20 @@ dc_lot_t*       dc_check_qr                  (dc_context_t* context, const char*
 
 
 /**
- * Get QR code text that will offer an Setup-Contact or Verified-Group invitation.
+ * Get QR code text that will offer an secure-join verification.
  * The QR code is compatible to the OPENPGP4FPR format
  * so that a basic fingerprint comparison also works eg. with OpenKeychain.
  *
  * The scanning device will pass the scanned content to dc_check_qr() then;
- * if dc_check_qr() returns DC_QR_ASK_VERIFYCONTACT or DC_QR_ASK_VERIFYGROUP
+ * if this function returns DC_QR_ASK_VERIFYCONTACT or DC_QR_ASK_VERIFYGROUP
  * an out-of-band-verification can be joined using dc_join_securejoin()
  *
  * @memberof dc_context_t
  * @param context The context object.
  * @param chat_id If set to a group-chat-id,
- *     the Verified-Group-Invite protocol is offered in the QR code;
+ *     the group-join-protocol is offered in the QR code;
  *     works for verified groups as well as for normal groups.
- *     If set to 0, the Setup-Contact protocol is offered in the QR code.
- *     See https://countermitm.readthedocs.io/en/latest/new.html
- *     for details about both protocols.
+ *     If set to 0, the setup-Verified-contact-protocol is offered in the QR code.
  * @return Text that should go to the QR code,
  *     On errors, an empty QR code is returned, NULL is never returned.
  *     The returned string must be released using dc_str_unref() after usage.
@@ -2185,29 +2030,13 @@ char*           dc_get_securejoin_qr         (dc_context_t* context, uint32_t ch
 
 
 /**
- * Continue a Setup-Contact or Verified-Group-Invite protocol
- * started on another device with dc_get_securejoin_qr().
+ * Join an out-of-band-verification initiated on another device with dc_get_securejoin_qr().
  * This function is typically called when dc_check_qr() returns
  * lot.state=DC_QR_ASK_VERIFYCONTACT or lot.state=DC_QR_ASK_VERIFYGROUP.
  *
- * Depending on the given QR code,
- * this function may takes some time and sends and receives several messages.
- * Therefore, you should call it always in a separate thread;
- * if you want to abort it, you should call dc_stop_ongoing_process().
- *
- * - If the given QR code starts the Setup-Contact protocol,
- *   the function typically returns immediately
- *   and the handshake runs in background.
- *   Subsequent calls of dc_join_securejoin() will abort unfinished tasks.
- *   The returned chat is the one-to-one opportunistic chat.
- *   When the protocol has finished, an info-message is added to that chat.
- * - If the given QR code starts the Verified-Group-Invite protocol,
- *   the function waits until the protocol has finished.
- *   This is because the verified group is not opportunistic
- *   and can be created only when the contacts have verified each other.
- *
- * See https://countermitm.readthedocs.io/en/latest/new.html
- * for details about both protocols.
+ * This function takes some time and sends and receives several messages.
+ * You should call it in a separate thread; if you want to abort it, you should
+ * call dc_stop_ongoing_process().
  *
  * @memberof dc_context_t
  * @param context The context object
@@ -2215,9 +2044,6 @@ char*           dc_get_securejoin_qr         (dc_context_t* context, uint32_t ch
  *     to dc_check_qr().
  * @return Chat-id of the joined chat, the UI may redirect to the this chat.
  *     If the out-of-band verification failed or was aborted, 0 is returned.
- *     A returned chat-id does not guarantee that the chat or the belonging contact is verified.
- *     If needed, this be checked with dc_chat_is_verified() and dc_contact_is_verified(),
- *     however, in practise, the UI will just listen to #DC_EVENT_CONTACTS_CHANGED unconditionally.
  */
 uint32_t        dc_join_securejoin           (dc_context_t* context, const char* qr);
 
@@ -2692,25 +2518,6 @@ dc_lot_t*        dc_chatlist_get_summary     (const dc_chatlist_t* chatlist, siz
 dc_context_t*    dc_chatlist_get_context     (dc_chatlist_t* chatlist);
 
 
-/**
- * Get info summary for a chat, in json format.
- *
- * The returned json string has the following key/values:
- *
- * id: chat id
- * name: chat/group name
- * color: color of this chat
- * last-message-from: who sent the last message
- * last-message-text: message (truncated)
- * last-message-state: DC_STATE* constant
- * last-message-date:
- * avatar-path: path-to-blobfile
- * is_verified: yes/no
-
- * @return a utf8-encoded json string containing all requested info. Must be freed using dc_str_unref().  NULL is never returned.
- */
-char*            dc_chat_get_info_json       (dc_context_t* context, size_t chat_id);
-
 /**
  * @class dc_chat_t
  *
@@ -2793,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.
@@ -2800,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.
  */
@@ -2845,14 +2654,21 @@ uint32_t        dc_chat_get_color            (const dc_chat_t* chat);
 
 
 /**
- * Get visibility of chat.
- * See @ref DC_CHAT_VISIBILITY for detailed information about the visibilities.
+ * Get archived state.
+ *
+ * - 0 = normal chat, not archived, not sticky.
+ * - 1 = chat archived
+ * - 2 = chat sticky (reserved for future use, if you do not support this value, just treat the chat as a normal one)
+ *
+ * To archive or unarchive chats, use dc_archive_chat().
+ * If chats are archived, this should be shown in the UI by a little icon or text,
+ * eg. the search will also return archived chats.
  *
  * @memberof dc_chat_t
  * @param chat The chat object.
- * @return One of @ref DC_CHAT_VISIBILITY
+ * @return Archived state.
  */
-int             dc_chat_get_visibility       (const dc_chat_t* chat);
+int             dc_chat_get_archived         (const dc_chat_t* chat);
 
 
 /**
@@ -2889,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
@@ -2945,26 +2730,6 @@ int             dc_chat_is_verified          (const dc_chat_t* chat);
 int             dc_chat_is_sending_locations (const dc_chat_t* chat);
 
 
-/**
- * Check whether the chat is currently muted
- *
- * @memberof dc_chat_t
- * @param chat The chat object.
- * @return 1=muted, 0=not muted
- */
-int             dc_chat_is_muted (const dc_chat_t* chat);
-
-
-/**
- * Get the exact state of the mute of a chat
- *
- * @memberof dc_chat_t
- * @param chat The chat object.
- * @return 0=not muted, -1=forever muted, (x>0)=remaining seconds until the mute is lifted
- */
-int64_t          dc_chat_get_remaining_mute_duration (const dc_chat_t* chat);
-
-
 /**
  * @class dc_msg_t
  *
@@ -3077,15 +2842,15 @@ int             dc_msg_get_viewtype           (const dc_msg_t* msg);
  * Get the state of a message.
  *
  * Incoming message states:
- * - DC_STATE_IN_FRESH (10) - Incoming _fresh_ message. Fresh messages are neither noticed nor seen and are typically shown in notifications. Use dc_get_fresh_msgs() to get all fresh messages.
- * - DC_STATE_IN_NOTICED (13) - Incoming _noticed_ message. E.g. chat opened but message not yet read - noticed messages are not counted as unread but did not marked as read nor resulted in MDNs. Use dc_marknoticed_chat() or dc_marknoticed_contact() to mark messages as being noticed.
- * - DC_STATE_IN_SEEN (16) - Incoming message, really _seen_ by the user. Marked as read on IMAP and MDN may be sent. Use dc_markseen_msgs() to mark messages as being seen.
+ * - DC_STATE_IN_FRESH (10) - Incoming _fresh_ message. Fresh messages are not noticed nor seen and are typically shown in notifications. Use dc_get_fresh_msgs() to get all fresh messages.
+ * - DC_STATE_IN_NOTICED (13) - Incoming _noticed_ message. Eg. chat opened but message not yet read - noticed messages are not counted as unread but did not marked as read nor resulted in MDNs. Use dc_marknoticed_chat() or dc_marknoticed_contact() to mark messages as being noticed.
+ * - DC_STATE_IN_SEEN (16) - Incoming message, really _seen_ by the user. Marked as read on IMAP and MDN may be send. Use dc_markseen_msgs() to mark messages as being seen.
  *
  * Outgoing message states:
  * - DC_STATE_OUT_PREPARING (18) - For files which need time to be prepared before they can be sent,
  *   the message enters this state before DC_STATE_OUT_PENDING.
  * - DC_STATE_OUT_DRAFT (19) - Message saved as draft using dc_set_draft()
- * - DC_STATE_OUT_PENDING (20) - The user has pressed the "send" button but the
+ * - DC_STATE_OUT_PENDING (20) - The user has send the "send" button but the
  *   message is not yet sent and is pending in some way. Maybe we're offline (no checkmark).
  * - DC_STATE_OUT_FAILED (24) - _Unrecoverable_ error (_recoverable_ errors result in pending messages), you'll receive the event #DC_EVENT_MSG_FAILED.
  * - DC_STATE_OUT_DELIVERED (26) - Outgoing message successfully delivered to server (one checkmark). Note, that already delivered messages may get into the state DC_STATE_OUT_FAILED if we get such a hint from the server.
@@ -3595,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
 
 
@@ -3733,15 +3497,11 @@ int             dc_contact_is_blocked        (const dc_contact_t* contact);
 
 
 /**
- * Check if a contact was verified. E.g. by a secure-join QR code scan
- * and if the key has not changed since this verification.
+ * Same as dc_contact_is_verified() but allows speeding up things
+ * by adding the peerstate belonging to the contact.
+ * If you do not have the peerstate available, it is loaded automatically.
  *
- * The UI may draw a checkbox or something like that beside verified contacts.
- *
- * @memberof dc_contact_t
- * @param contact The contact object.
- * @return 0: contact is not verified.
- *    2: SELF and contact have verified their fingerprints in both directions; in the UI typically checkmarks are shown.
+ * @private @memberof dc_context_t
  */
 int             dc_contact_is_verified       (dc_contact_t* contact);
 
@@ -3753,19 +3513,30 @@ int             dc_contact_is_verified       (dc_contact_t* contact);
  */
 
 
+/**
+ * Create a provider struct for the given domain.
+ *
+ * @memberof dc_provider_t
+ * @param domain The domain to get provider info for.
+ * @return a dc_provider_t struct which can be used with the dc_provider_get_*
+ *     accessor functions.  If no provider info is found, NULL will be
+ *     returned.
+ */
+dc_provider_t*  dc_provider_new_from_domain           (const char* domain);
+
+
 /**
  * Create a provider struct for the given email address.
  *
  * The provider is extracted from the email address and it's information is returned.
  *
  * @memberof dc_provider_t
- * @param context The context object as created by dc_context_new().
  * @param email The user's email address to extract the provider info form.
  * @return a dc_provider_t struct which can be used with the dc_provider_get_*
  *     accessor functions.  If no provider info is found, NULL will be
  *     returned.
  */
-dc_provider_t*  dc_provider_new_from_email            (const dc_context_t* context, const char* email);
+dc_provider_t*  dc_provider_new_from_email            (const char* email);
 
 
 /**
@@ -3775,35 +3546,53 @@ dc_provider_t*  dc_provider_new_from_email            (const dc_context_t* conte
  *
  * @memberof dc_provider_t
  * @param provider The dc_provider_t struct.
- * @return String with a fully-qualified URL,
- *     if there is no such URL, an empty string is returned, NULL is never returned.
- *     The returned value must be released using dc_str_unref().
+ * @return A string which must be released using dc_str_unref().
  */
 char*           dc_provider_get_overview_page         (const dc_provider_t* provider);
 
 
 /**
- * Get hints to be shown to the user on the login screen.
- * Depending on the @ref DC_PROVIDER_STATUS returned by dc_provider_get_status(),
- * the ui may want to highlight the hint.
+ * The provider's name.
  *
- * Moreover, the ui should display a "More information" link
- * that forwards to the url returned by dc_provider_get_overview_page().
+ * The name of the provider, e.g. "POSTEO".
  *
  * @memberof dc_provider_t
  * @param provider The dc_provider_t struct.
- * @return A string with the hint to show to the user, may contain multiple lines,
- *     if there is no such hint, an empty string is returned, NULL is never returned.
- *     The returned value must be released using dc_str_unref().
+ * @return A string which must be released using dc_str_unref().
  */
-char*           dc_provider_get_before_login_hint     (const dc_provider_t* provider);
+char*           dc_provider_get_name                  (const dc_provider_t* provider);
+
+
+/**
+ * The markdown content of the providers page.
+ *
+ * This contains the preparation steps or additional information if the status
+ * is @ref DC_PROVIDER_STATUS_BROKEN.
+ *
+ * @memberof dc_provider_t
+ * @param provider The dc_provider_t struct.
+ * @return A string which must be released using dc_str_unref().
+ */
+char*           dc_provider_get_markdown              (const dc_provider_t* provider);
+
+
+/**
+ * Date of when the state was last checked/updated.
+ *
+ * This is returned as a string.
+ *
+ * @memberof dc_provider_t
+ * @param provider The dc_provider_t struct.
+ * @return A string which must be released using dc_str_unref().
+ */
+char*           dc_provider_get_status_date           (const dc_provider_t* provider);
 
 
 /**
  * Whether DC works with this provider.
  *
- * Can be one of #DC_PROVIDER_STATUS_OK,
- * #DC_PROVIDER_STATUS_PREPARATION or #DC_PROVIDER_STATUS_BROKEN.
+ * Can be one of @ref DC_PROVIDER_STATUS_OK, @ref
+ * DC_PROVIDER_STATUS_PREPARATION and @ref DC_PROVIDER_STATUS_BROKEN.
  *
  * @memberof dc_provider_t
  * @param provider The dc_provider_t struct.
@@ -3818,7 +3607,7 @@ int             dc_provider_get_status                (const dc_provider_t* prov
  * @memberof dc_provider_t
  * @param provider The dc_provider_t struct.
  */
-void            dc_provider_unref                     (dc_provider_t* provider);
+void            dc_provider_unref                     (const dc_provider_t* provider);
 
 
 /**
@@ -4090,62 +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 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
-
-/**
- * @}
- */
 
 
 /**
@@ -4160,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().
@@ -4226,30 +3960,20 @@ 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.
+ * Emitted when a new blob file was successfully written 
  *
  * @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
- *
- * @param data1 0
- * @param data2 (const char*) path name
+ * @param data2 (const char*) path name 
  *     Must not be unref'd or modified and is valid only until the callback returns.
  * @return 0
  */
 #define DC_EVENT_NEW_BLOB_FILE 150
 
 /**
- * Emitted when a blob file was successfully deleted
+ * Emitted when a blob file was successfully deleted 
  *
  * @param data1 0
- * @param data2 (const char*) path name
+ * @param data2 (const char*) path name 
  *     Must not be unref'd or modified and is valid only until the callback returns.
  * @return 0
  */
@@ -4406,7 +4130,7 @@ int64_t          dc_lot_get_timestamp     (const dc_lot_t* lot);
 
 
 /**
- * Contact(s) created, renamed, verified, blocked or deleted.
+ * Contact(s) created, renamed, blocked or deleted.
  *
  * @param data1 (int) If not 0, this is the contact_id of an added contact that should be selected.
  * @param data2 0
@@ -4497,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
-
-
 /**
  * @}
  */
@@ -4524,8 +4238,6 @@ int64_t          dc_lot_get_timestamp     (const dc_lot_t* lot);
 #define DC_EVENT_RETURNS_STRING(e)   ((e)==DC_EVENT_GET_STRING) // not used anymore
 char*           dc_get_version_str           (void); // deprecated
 void            dc_array_add_id              (dc_array_t*, uint32_t); // deprecated
-#define dc_archive_chat(a,b,c)  dc_set_chat_visibility((a), (b), (c)? 1 : 0) // not used anymore
-#define dc_chat_get_archived(a) (dc_chat_get_visibility((a))==1? 1 : 0)      // not used anymore
 
 
 /*
@@ -4535,13 +4247,6 @@ void            dc_array_add_id              (dc_array_t*, uint32_t); // depreca
 #define DC_SHOW_EMAILS_ACCEPTED_CONTACTS 1
 #define DC_SHOW_EMAILS_ALL               2
 
-/*
- * Values for dc_get|set_config("key_gen_type")
- */
-#define DC_KEY_GEN_DEFAULT 0
-#define DC_KEY_GEN_RSA2048 1
-#define DC_KEY_GEN_ED25519 2
-
 
 /**
  * @defgroup DC_PROVIDER_STATUS DC_PROVIDER_STATUS
@@ -4553,43 +4258,23 @@ void            dc_array_add_id              (dc_array_t*, uint32_t); // depreca
  */
 
 /**
- * Prover works out-of-the-box.
- * This provider status is returned for provider where the login
- * works by just entering the name or the email-address.
+ * Provider status returned by dc_provider_get_status().
  *
- * - There is no need for the user to do any special things
- *   (enable IMAP or so) in the provider's webinterface or at other places.
- * - There is no need for the user to enter advanced settings;
- *   server, port etc. are known by the core.
- *
- * The status is returned by dc_provider_get_status().
+ * Works right out of the box without any preperation steps needed
  */
 #define         DC_PROVIDER_STATUS_OK           1
 
 /**
- * Provider works, but there are preparations needed.
+ * Provider status returned by dc_provider_get_status().
  *
- * - The user has to do some special things as "Enable IMAP in the Webinterface",
- *   what exactly, is described in the string returnd by dc_provider_get_before_login_hints()
- *   and, typically more detailed, in the page linked by dc_provider_get_overview_page().
- * - There is no need for the user to enter advanced settings;
- *   server, port etc. should be known by the core.
- *
- * The status is returned by dc_provider_get_status().
+ * Works, but preparation steps are needed
  */
 #define         DC_PROVIDER_STATUS_PREPARATION  2
 
 /**
- * Provider is not working.
- * This provider status is returned for providers
- * that are known to not work with Delta Chat.
- * The ui should block logging in with this provider.
+ * Provider status returned by dc_provider_get_status().
  *
- * More information about that is typically provided
- * in the string returned by dc_provider_get_before_login_hints()
- * and in the page linked by dc_provider_get_overview_page().
- *
- * The status is returned by dc_provider_get_status().
+ * Doesn't work (too unstable to use falls also in this category)
  */
 #define         DC_PROVIDER_STATUS_BROKEN       3
 
@@ -4598,48 +4283,6 @@ void            dc_array_add_id              (dc_array_t*, uint32_t); // depreca
  */
 
 
-/**
- * @defgroup DC_CHAT_VISIBILITY DC_CHAT_VISIBILITY
- *
- * These constants describe the visibility of a chat.
- * The chat visibiliry can be get using dc_chat_get_visibility()
- * and set using dc_set_chat_visibility().
- *
- * @addtogroup DC_CHAT_VISIBILITY
- * @{
- */
-
-/**
- * Chats with normal visibility are not archived and are shown below all pinned chats.
- * Archived chats, that receive new messages automatically become normal chats.
- */
-#define         DC_CHAT_VISIBILITY_NORMAL      0
-
-/**
- * Archived chats are not included in the default chatlist returned by dc_get_chatlist().
- * Instead, if there are _any_ archived chats, the pseudo-chat
- * with the chat_id DC_CHAT_ID_ARCHIVED_LINK will be added the the end of the chatlist.
- *
- * The UI typically shows a little icon or chats beside archived chats in the chatlist,
- * this is needed as eg. the search will also return archived chats.
- *
- * If archived chats receive new messages, they become normal chats again.
- *
- * To get a list of archived chats, use dc_get_chatlist() with the flag DC_GCL_ARCHIVED_ONLY.
- */
-#define         DC_CHAT_VISIBILITY_ARCHIVED    1
-
-/**
- * Pinned chats are included in the default chatlist. moreover,
- * they are always the first items, whether they have fresh messages or not.
- */
-#define         DC_CHAT_VISIBILITY_PINNED      2
-
-/**
- * @}
- */
-
-
 /*
  * TODO: Strings need some doumentation about used placeholders.
  *
@@ -4695,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/providers.rs

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

deltachat-ffi/src/string.rs

@@ -1,395 +0,0 @@
-use failure::Fail;
-use std::ffi::{CStr, CString};
-use std::ptr;
-
-/// 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 turn strings into C strings.
-///
-/// 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())
-    }
-}
-
-/// Convenience methods to turn optional strings into C strings.
-///
-/// This is the same as the [StrExt] trait but a different trait name
-/// to work around the type system not allowing to implement [StrExt]
-/// for `Option<impl StrExt>` When we already have an [StrExt] impl
-/// for `AsRef<&str>`.
-///
-/// When the [Option] is [Option::Some] this behaves just like
-/// [StrExt::strdup], when it is [Option::None] a null pointer is
-/// returned.
-pub trait OptStrExt {
-    /// Allocate a new raw C `*char` version of this string, or NULL.
-    ///
-    /// See [StrExt::strdup] for details.
-    unsafe fn strdup(&self) -> *mut libc::c_char;
-}
-
-impl<T: AsRef<str>> OptStrExt for Option<T> {
-    unsafe fn strdup(&self) -> *mut libc::c_char {
-        match self {
-            Some(s) => {
-                let tmp = CString::yolo(s.as_ref());
-                dc_strdup(tmp.as_ptr())
-            }
-            None => ptr::null_mut(),
-        }
-    }
-}
-
-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);
-        }
-    }
-
-    #[test]
-    fn test_strdup_opt_string() {
-        unsafe {
-            let s = Some("hello");
-            let c = s.strdup();
-            let cmp = strcmp(c, b"hello\x00" as *const u8 as *const libc::c_char);
-            free(c as *mut libc::c_void);
-            assert_eq!(cmp, 0);
-
-            let s: Option<&str> = None;
-            let c = s.strdup();
-            assert_eq!(c, ptr::null_mut());
-        }
-    }
-}

deltachat_derive/Cargo.toml

@@ -1,13 +1,12 @@
 [package]
 name = "deltachat_derive"
-version = "2.0.0"
-authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
+version = "0.1.0"
+authors = ["Dmitry Bogatov <KAction@debian.org>"]
 edition = "2018"
-license = "MPL-2.0"
 
 [lib]
 proc-macro = true
 
 [dependencies]
-syn = "1.0.13"
-quote = "1.0.2"
+syn = "0.14.4"
+quote = "0.6.3"

examples/repl/cmdline.rs

@@ -1,8 +1,9 @@
 use std::path::Path;
 use std::str::FromStr;
 
-use deltachat::chat::{self, Chat, ChatId, ChatVisibility};
+use deltachat::chat::{self, Chat};
 use deltachat::chatlist::*;
+use deltachat::config;
 use deltachat::constants::*;
 use deltachat::contact::*;
 use deltachat::context::*;
@@ -13,21 +14,21 @@ 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 deltachat::{config, provider};
+use libc::free;
 
-/// Reset database tables.
+/// 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.
-fn dc_reset_tables(context: &Context, bits: i32) -> i32 {
-    println!("Resetting tables ({})...", bits);
+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();
-        println!("(1) Jobs reset.");
+        info!(context, "(1) Jobs reset.");
     }
     if 0 != bits & 2 {
         sql::execute(
@@ -37,11 +38,11 @@ fn dc_reset_tables(context: &Context, bits: i32) -> i32 {
             params![],
         )
         .unwrap();
-        println!("(2) Peerstates reset.");
+        info!(context, "(2) Peerstates reset.");
     }
     if 0 != bits & 4 {
         sql::execute(context, &context.sql, "DELETE FROM keypairs;", params![]).unwrap();
-        println!("(4) Private keypairs reset.");
+        info!(context, "(4) Private keypairs reset.");
     }
     if 0 != bits & 8 {
         sql::execute(
@@ -80,12 +81,12 @@ fn dc_reset_tables(context: &Context, bits: i32) -> i32 {
         )
         .unwrap();
         sql::execute(context, &context.sql, "DELETE FROM leftgrps;", params![]).unwrap();
-        println!("(8) Rest but server config reset.");
+        info!(context, "(8) Rest but server config reset.");
     }
 
     context.call_cb(Event::MsgsChanged {
-        chat_id: ChatId::new(0),
-        msg_id: MsgId::new(0),
+        chat_id: 0,
+        msg_id: 0,
     });
 
     1
@@ -94,9 +95,7 @@ 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)?;
 
-    if let Err(err) = dc_receive_imf(context, &data, "import", 0, false) {
-        println!("dc_receive_imf errored: {:?}", err);
-    }
+    unsafe { dc_receive_imf(context, &data, "import", 0, 0) };
     Ok(())
 }
 
@@ -108,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))
@@ -134,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 */
@@ -155,7 +155,7 @@ fn poke_spec(context: &Context, spec: Option<&str>) -> libc::c_int {
                 let name = name_f.to_string_lossy();
                 if name.ends_with(".eml") {
                     let path_plus_name = format!("{}/{}", &real_spec, name);
-                    println!("Import: {}", path_plus_name);
+                    info!(context, "Import: {}", path_plus_name);
                     if dc_poke_eml_file(context, path_plus_name).is_ok() {
                         read_cnt += 1
                     }
@@ -163,17 +163,20 @@ fn poke_spec(context: &Context, spec: Option<&str>) -> libc::c_int {
             }
         }
     }
-    println!("Import: {} items read from \"{}\".", read_cnt, &real_spec);
+    info!(
+        context,
+        "Import: {} items read from \"{}\".", read_cnt, &real_spec
+    );
     if read_cnt > 0 {
         context.call_cb(Event::MsgsChanged {
-            chat_id: ChatId::new(0),
-            msg_id: MsgId::new(0),
+            chat_id: 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();
@@ -187,10 +190,11 @@ fn log_msg(context: &Context, prefix: impl AsRef<str>, msg: &Message) {
     };
     let temp2 = dc_timestamp_to_str(msg.get_timestamp());
     let msgtext = msg.get_text();
-    println!(
-        "{}{}{}{}: {} (Contact#{}): {} {}{}{}{}{} [{}]",
+    info!(
+        context,
+        "{}#{}{}{}: {} (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,
@@ -217,35 +221,38 @@ 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() {
-            println!(
+        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 {
-                println!(
+                info!(
+                    context,
                     "--------------------------------------------------------------------------------",
                 );
                 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 {
-        println!(
+        info!(
+            context,
             "--------------------------------------------------------------------------------"
         );
     }
     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);
@@ -288,7 +295,7 @@ fn log_contactlist(context: &Context, contacts: &Vec<u32>) {
                 );
             }
 
-            println!("Contact#{}: {}{}", contact_id, line, line2);
+            info!(context, "Contact#{}: {}{}", contact_id, line, line2);
         }
     }
 }
@@ -297,9 +304,9 @@ 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.is_unset() {
+    let mut sel_chat = if chat_id > 0 {
         Chat::load_from_db(context, chat_id).ok()
     } else {
         None
@@ -308,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();
@@ -341,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\
@@ -367,12 +378,9 @@ 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\
-                 pin <chat-id>\n\
-                 unpin <chat-id>\n\
                  delchat <chat-id>\n\
                  ===========================Message commands==\n\
                  listmsgs <query>\n\
@@ -394,10 +402,8 @@ pub fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::Error> {
                  getqr [<chat-id>]\n\
                  getbadqr\n\
                  checkqr <qr-content>\n\
-                 providerinfo <addr>\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\
                  ============================================="
@@ -412,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" => {
@@ -430,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)?;
@@ -460,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");
@@ -486,9 +492,6 @@ pub fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::Error> {
         "info" => {
             println!("{:#?}", context.get_info());
         }
-        "interrupt" => {
-            interrupt_inbox_idle(context);
-        }
         "maybenetwork" => {
             maybe_network(context);
         }
@@ -506,26 +509,26 @@ pub fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::Error> {
 
             let cnt = chatlist.len();
             if cnt > 0 {
-                println!(
+                info!(
+                    context,
                     "================================================================================"
                 );
 
                 for i in (0..cnt).rev() {
                     let chat = Chat::load_from_db(context, chatlist.get_chat_id(i))?;
-                    println!(
-                        "{}#{}: {} [{} fresh] {}",
+                    let temp_subtitle = chat.get_subtitle(context);
+                    let temp_name = chat.get_name();
+                    info!(
+                        context,
+                        "{}#{}: {} [{}] [{} fresh]",
                         chat_prefix(&chat),
                         chat.get_id(),
-                        chat.get_name(),
-                        chat.get_id().get_fresh_msg_cnt(context),
-                        match chat.visibility {
-                            ChatVisibility::Normal => "",
-                            ChatVisibility::Archived => "📦",
-                            ChatVisibility::Pinned => "📌",
-                        },
+                        temp_name,
+                        temp_subtitle,
+                        chat::get_fresh_msg_cnt(context, chat.get_id()),
                     );
                     let lot = chatlist.get_summary(context, i, Some(&chat));
-                    let statestr = if chat.visibility == ChatVisibility::Archived {
+                    let statestr = if chat.is_archived() {
                         " [Archived]"
                     } else {
                         match lot.get_state() {
@@ -539,7 +542,8 @@ pub fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::Error> {
                     let timestr = dc_timestamp_to_str(lot.get_timestamp());
                     let text1 = lot.get_text1();
                     let text2 = lot.get_text2();
-                    println!(
+                    info!(
+                        context,
                         "{}{}{}{} [{}]{}",
                         text1.unwrap_or(""),
                         if text1.is_some() { ": " } else { "" },
@@ -552,13 +556,14 @@ pub fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::Error> {
                             ""
                         },
                     );
-                    println!(
+                    info!(
+                        context,
                         "================================================================================"
                     );
                 }
             }
-            if location::is_sending_locations_to_chat(context, ChatId::new(0)) {
-                println!("Location streaming enabled.");
+            if location::is_sending_locations_to_chat(context, 0) {
+                info!(context, "Location streaming enabled.");
             }
             println!("{} chats", cnt);
         }
@@ -567,8 +572,8 @@ pub fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::Error> {
                 bail!("Argument [chat-id] is missing.");
             }
             if !arg1.is_empty() {
-                let chat_id = ChatId::new(arg1.parse()?);
-                println!("Selecting chat {}", chat_id);
+                let chat_id = arg1.parse()?;
+                println!("Selecting chat #{}", chat_id);
                 sel_chat = Some(Chat::load_from_db(context, chat_id)?);
                 *context.cmdline_sel_chat_id.write().unwrap() = chat_id;
             }
@@ -576,41 +581,31 @@ 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())
-            };
-            println!(
-                "{}#{}: {} [{}]{}{}",
+            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) = sel_chat.get_id().get_draft(context)? {
+            if let Some(draft) = chat::get_draft(context, sel_chat.get_id())? {
                 log_msg(context, "Draft", &draft);
             }
 
-            println!("{} messages.", sel_chat.get_id().get_msg_cnt(context));
+            println!(
+                "{} messages.",
+                chat::get_msg_cnt(context, sel_chat.get_id())
+            );
             chat::marknoticed_chat(context, sel_chat.get_id())?;
         }
         "createchat" => {
@@ -622,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)?;
 
@@ -686,7 +681,7 @@ pub fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::Error> {
             ensure!(sel_chat.is_some(), "No chat selected.");
 
             let contacts = chat::get_chat_contacts(context, sel_chat.as_ref().unwrap().get_id());
-            println!("Memberlist:");
+            info!(context, "Memberlist:");
 
             log_contactlist(context, &contacts);
             println!(
@@ -712,8 +707,9 @@ pub fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::Error> {
             let default_marker = "-".to_string();
             for location in &locations {
                 let marker = location.marker.as_ref().unwrap_or(&default_marker);
-                println!(
-                    "Loc#{}: {}: lat={} lng={} acc={} Chat#{} Contact#{} {} {}",
+                info!(
+                    context,
+                    "Loc#{}: {}: lat={} lng={} acc={} Chat#{} Contact#{} Msg#{} {}",
                     location.location_id,
                     dc_timestamp_to_str(location.timestamp),
                     location.latitude,
@@ -726,7 +722,7 @@ pub fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::Error> {
                 );
             }
             if locations.is_empty() {
-                println!("No locations.");
+                info!(context, "No locations.");
             }
         }
         "sendlocations" => {
@@ -792,7 +788,7 @@ pub fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::Error> {
             let chat = if let Some(ref sel_chat) = sel_chat {
                 sel_chat.get_id()
             } else {
-                ChatId::new(0)
+                0 as libc::c_uint
             };
 
             let msglist = context.search_msgs(chat, arg1);
@@ -806,29 +802,17 @@ pub fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::Error> {
             if !arg1.is_empty() {
                 let mut draft = Message::new(Viewtype::Text);
                 draft.set_text(Some(arg1.to_string()));
-                sel_chat
-                    .as_ref()
-                    .unwrap()
-                    .get_id()
-                    .set_draft(context, Some(&mut draft));
+                chat::set_draft(
+                    context,
+                    sel_chat.as_ref().unwrap().get_id(),
+                    Some(&mut draft),
+                );
                 println!("Draft saved.");
             } else {
-                sel_chat.as_ref().unwrap().get_id().set_draft(context, None);
+                chat::set_draft(context, sel_chat.as_ref().unwrap().get_id(), None);
                 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.");
 
@@ -842,34 +826,30 @@ 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");
         }
-        "archive" | "unarchive" | "pin" | "unpin" => {
+        "archive" | "unarchive" => {
             ensure!(!arg1.is_empty(), "Argument <chat-id> missing.");
-            let chat_id = ChatId::new(arg1.parse()?);
-            chat_id.set_visibility(
+            let chat_id = arg1.parse()?;
+            chat::archive(
                 context,
-                match arg0 {
-                    "archive" => ChatVisibility::Archived,
-                    "unarchive" | "unpin" => ChatVisibility::Normal,
-                    "pin" => ChatVisibility::Pinned,
-                    _ => panic!("Unexpected command (This should never happen)"),
-                },
+                chat_id,
+                if arg0 == "archive" { true } else { false },
             )?;
         }
         "delchat" => {
             ensure!(!arg1.is_empty(), "Argument <chat-id> missing.");
-            let chat_id = ChatId::new(arg1.parse()?);
-            chat_id.delete(context)?;
+            let chat_id = arg1.parse()?;
+            chat::delete(context, chat_id)?;
         }
         "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);
         }
@@ -881,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 chat_id = ChatId::new(arg2.parse()?);
-            msg_ids[0] = MsgId::new(arg1.parse()?);
+            let mut msg_ids = [0; 1];
+            let chat_id = arg2.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" => {
@@ -938,14 +918,7 @@ pub fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::Error> {
             let contact = Contact::get_by_id(context, contact_id)?;
             let name_n_addr = contact.get_name_n_addr();
 
-            let mut res = format!(
-                "Contact info for: {}:\nIcon: {}\n",
-                name_n_addr,
-                match contact.get_profile_image(context) {
-                    Some(image) => image.to_str().unwrap().to_string(),
-                    None => "NoIcon".to_string(),
-                }
-            );
+            let mut res = format!("Contact info for: {}:\n\n", name_n_addr);
 
             res += &Contact::get_encrinfo(context, contact_id)?;
 
@@ -982,31 +955,6 @@ pub fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::Error> {
                 res.get_text2()
             );
         }
-        "setqr" => {
-            ensure!(!arg1.is_empty(), "Argument <qr-content> missing.");
-            match set_config_from_qr(context, arg1) {
-                Ok(()) => println!("Config set from QR code, you can now call 'configure'"),
-                Err(err) => println!("Cannot set config from QR code: {:?}", err),
-            }
-        }
-        "providerinfo" => {
-            ensure!(!arg1.is_empty(), "Argument <addr> missing.");
-            match provider::get_provider_info(arg1) {
-                Some(info) => {
-                    println!("Information for provider belonging to {}:", arg1);
-                    println!("status: {}", info.status as u32);
-                    println!("before_login_hint: {}", info.before_login_hint);
-                    println!("after_login_hint: {}", info.after_login_hint);
-                    println!("overview_page: {}", info.overview_page);
-                    for server in info.server.iter() {
-                        println!("server: {}:{}", server.hostname, server.port,);
-                    }
-                }
-                None => {
-                    println!("No information for provider belonging to {} found.", arg1);
-                }
-            }
-        }
         // TODO: implement this again, unclear how to match this through though, without writing a parser.
         // "event" => {
         //     ensure!(!arg1.is_empty(), "Argument <id> missing.");
@@ -1028,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

@@ -20,8 +20,8 @@ use std::process::Command;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::{Arc, Mutex, RwLock};
 
-use deltachat::chat::ChatId;
 use deltachat::config;
+use deltachat::configure::*;
 use deltachat::context::*;
 use deltachat::job::*;
 use deltachat::oauth2::*;
@@ -41,7 +41,7 @@ use self::cmdline::*;
 
 // Event Handler
 
-fn receive_event(_context: &Context, event: Event) {
+fn receive_event(_context: &Context, event: Event) -> libc::uintptr_t {
     match event {
         Event::Info(msg) => {
             /* do not show the event as this would fill the screen */
@@ -111,6 +111,8 @@ fn receive_event(_context: &Context, event: Event) {
             print!("\x1b[33m{{Received {:?}}}\n\x1b[0m", event);
         }
     }
+
+    0
 }
 
 // Threads for waiting for messages and for jobs
@@ -148,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);
             });
         });
     });
@@ -200,7 +202,7 @@ fn stop_threads(context: &Context) {
         println!("Stopping threads");
         IS_RUNNING.store(false, Ordering::Relaxed);
 
-        interrupt_inbox_idle(context);
+        interrupt_imap_idle(context);
         interrupt_mvbox_idle(context);
         interrupt_sentbox_idle(context);
         interrupt_smtp_idle(context);
@@ -233,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",
@@ -248,7 +250,7 @@ const IMEX_COMMANDS: [&str; 12] = [
     "stop",
 ];
 
-const DB_COMMANDS: [&str; 11] = [
+const DB_COMMANDS: [&'static str; 11] = [
     "info",
     "open",
     "close",
@@ -262,7 +264,7 @@ const DB_COMMANDS: [&str; 11] = [
     "housekeeping",
 ];
 
-const CHAT_COMMANDS: [&str; 26] = [
+const CHAT_COMMANDS: [&'static str; 24] = [
     "listchats",
     "listarchived",
     "chat",
@@ -286,11 +288,9 @@ const CHAT_COMMANDS: [&str; 26] = [
     "listmedia",
     "archive",
     "unarchive",
-    "pin",
-    "unpin",
     "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,14 +455,14 @@ 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" => {
             start_threads(ctx.clone());
-            ctx.read().unwrap().configure();
+            configure(&ctx.read().unwrap());
         }
         "oauth2" => {
             if let Some(addr) = ctx.read().unwrap().get_config(config::Config::Addr) {
@@ -486,10 +486,9 @@ fn handle_cmd(line: &str, ctx: Arc<RwLock<Context>>) -> Result<ExitResult, failu
         }
         "getqr" | "getbadqr" => {
             start_threads(ctx.clone());
-            if let Some(mut qr) = dc_get_securejoin_qr(
-                &ctx.read().unwrap(),
-                ChatId::new(arg1.parse().unwrap_or_default()),
-            ) {
+            if let Some(mut qr) =
+                dc_get_securejoin_qr(&ctx.read().unwrap(), arg1.parse().unwrap_or_default())
+            {
                 if !qr.is_empty() {
                     if arg0 == "getbadqr" && qr.len() > 40 {
                         qr.replace_range(12..22, "0000000000")

examples/simple.rs

@@ -7,26 +7,29 @@ use tempfile::tempdir;
 use deltachat::chat;
 use deltachat::chatlist::*;
 use deltachat::config;
+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;
 
-fn cb(_ctx: &Context, event: Event) {
+fn cb(_ctx: &Context, event: Event) -> usize {
     print!("[{:?}]", event);
 
     match event {
         Event::ConfigureProgress(progress) => {
-            println!("  progress: {}", progress);
+            print!("  progress: {}\n", progress);
+            0
         }
         Event::Info(msg) | Event::Warning(msg) | Event::Error(msg) | Event::ErrorNetwork(msg) => {
-            println!("  {}", msg);
+            print!("  {}\n", msg);
+            0
         }
         _ => {
-            println!();
+            print!("\n");
+            0
         }
     }
 }
@@ -47,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);
                 }
             }
         }
@@ -76,7 +79,7 @@ fn main() {
     ctx.set_config(config::Config::Addr, Some("d@testrun.org"))
         .unwrap();
     ctx.set_config(config::Config::MailPw, Some(&pw)).unwrap();
-    ctx.configure();
+    configure(&ctx);
 
     thread::sleep(duration);
 
@@ -97,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);
+    *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/CHANGELOG

@@ -1,17 +1,6 @@
-0.800.0
--------
-
-- use latest core 1.25.0 
-
-- refine tests and some internal changes to core bindings
-
-0.700.0
+0.600.1
 ---------
 
-- lots of new Python APIs
-
-- use rust core-beta23 
-
 - introduce automatic versioning via setuptools_scm, 
   based on py-X.Y.Z tags 
 

python/README.rst

@@ -3,98 +3,41 @@ deltachat python bindings
 =========================
 
 This package provides bindings to the deltachat-core_ Rust -library
-which implements IMAP/SMTP/MIME/PGP e-mail standards and offers
-a low-level Chat/Contact/Message API to user interfaces and bots.
+which provides imap/smtp/crypto handling as well as chat/group/messages
+handling to Android, Desktop and IO user interfaces.
 
+Installing pre-built packages (linux-only)
+==========================================
 
-Installing bindings from source (Updated: 20-Jan-2020)
-=========================================================
-
-Install Rust and Cargo first.  Deltachat needs a specific nightly
-version, the easiest is probably to first install Rust stable from
-rustup and then use this to install the correct nightly version.
-
-Bootstrap Rust and Cargo by using rustup::
-
-   curl https://sh.rustup.rs -sSf | sh
-
-Then GIT clone the deltachat-core-rust repo and get the actual
-rust- and cargo-toolchain needed by deltachat::
-
-   git clone https://github.com/deltachat/deltachat-core-rust
-   cd deltachat-core-rust
-   rustup show
-
-To install the Delta Chat Python bindings make sure you have Python3 installed.
-E.g. on Debian-based systems `apt install python3 python3-pip
-python3-venv` should give you a usable python installation.
-
-Ensure you are in the deltachat-core-rust/python directory, create the
-virtual environment and activate it in your shell::
-
-   cd python
-   python3 -m venv venv  # or: virtualenv venv
-   source venv/bin/activate
-
-You should now be able to build the python bindings using the supplied script::
-
-   ./install_python_bindings.py
-
-The installation might take a while, depending on your machine.
-The bindings will be installed in release mode but with debug symbols.
-The release mode is currently necessary because some tests generate RSA keys
-which is prohibitively slow in non-release mode.
-
-After successful binding installation you can install a few more
-Python packages before running the tests::
-
-    python -m pip install pytest pytest-timeout pytest-rerunfailures requests
-    pytest -v tests
-
-
-running "live" tests with temporary accounts
----------------------------------------------
-
-If you want to run "liveconfig" functional tests you can set
-``DCC_NEW_TMP_EMAIL`` to:
-
-- a particular https-url that you can ask for from the delta
-  chat devs. This is implemented on the server side via
-  the [mailadm](https://github.com/deltachat/mailadm) command line tool.
-
-- or the path of a file that contains two lines, each describing
-  via "addr=... mail_pw=..." a test account login that will
-  be used for the live tests.
-
-With ``DCC_NEW_TMP_EMAIL`` set pytest invocations will use real
-e-mail accounts and run through all functional "liveconfig" tests.
-
-
-Installing pre-built packages (Linux-only)
-========================================================
-
-If you have a Linux system you may try to install the ``deltachat`` binary "wheel" packages
+If you have a linux system you may install the ``deltachat`` binary "wheel" package
 without any "build-from-source" steps.
 
-We suggest to `Install virtualenv <https://virtualenv.pypa.io/en/stable/installation/>`_,
-then create a fresh Python virtual environment and activate it in your shell::
+1. `Install virtualenv <https://virtualenv.pypa.io/en/stable/installation/>`_,
+   then create a fresh python environment and activate it in your shell::
 
         virtualenv venv  # or: python -m venv
         source venv/bin/activate
 
-Afterwards, invoking ``python`` or ``pip install`` only
-modifies files in your ``venv`` directory and leaves
-your system installation alone.
+   Afterwards, invoking ``python`` or ``pip install`` will only
+   modify files in your ``venv`` directory and leave your system installation
+   alone.
+
+2. Install the wheel for linux::
+
+        pip install deltachat
+
+    Verify it worked by typing::
+
+        python -c "import deltachat"
+
+
+Installing a wheel from a PR/branch
+---------------------------------------
 
 For Linux, we automatically build wheels for all github PR branches
-and push them to a python package index. To install the latest
-github ``master`` branch::
+and push them to a python package index. To install the latest github ``master`` branch::
 
-    pip install --pre -i https://m.devpi.net/dc/master deltachat
-
-To verify it worked::
-
-    python -c "import deltachat"
+    pip install -i https://m.devpi.net/dc/master deltachat
 
 .. note::
 
@@ -103,6 +46,65 @@ To verify it worked::
     `in contact with us <https://delta.chat/en/contribute>`_.
 
 
+Installing bindings from source
+===============================
+
+If you can't use "binary" method above then you need to compile
+to core deltachat library::
+
+    git clone https://github.com/deltachat/deltachat-core-rust
+    cd deltachat-core-rust
+    cd python
+
+If you don't have one active, create and activate a python "virtualenv":
+
+    python virtualenv venv  # or python -m venv
+    source venv/bin/activate
+
+Afterwards ``which python`` tells you that it comes out of the "venv"
+directory that contains all python install artifacts. Let's first
+install test tools::
+
+    pip install pytest pytest-timeout pytest-rerunfailures requests
+
+then cargo-build and install the deltachat bindings::
+
+    python install_python_bindings.py
+
+The bindings will be installed in release mode but with debug symbols.
+The release mode is necessary because some tests generate RSA keys
+which is prohibitively slow in debug mode.
+
+After successful binding installation you can finally run the tests::
+
+    pytest -v tests
+
+.. note::
+
+    Some tests are sometimes failing/hanging because of
+    https://github.com/deltachat/deltachat-core-rust/issues/331
+    and
+    https://github.com/deltachat/deltachat-core-rust/issues/326
+
+
+running "live" tests (experimental)
+-----------------------------------
+
+If you want to run "liveconfig" functional tests you can set
+``DCC_PY_LIVECONFIG`` to:
+
+- a particular https-url that you can ask for from the delta
+  chat devs.
+
+- or the path of a file that contains two lines, each describing
+  via "addr=... mail_pw=..." a test account login that will
+  be used for the live tests.
+
+With ``DCC_PY_LIVECONFIG`` set pytest invocations will use real
+e-mail accounts and run through all functional "liveconfig" tests.
+
+
+
 Code examples
 =============
 
@@ -113,11 +115,15 @@ You may look at `examples <https://py.delta.chat/examples.html>`_.
 .. _`deltachat-core`: https://github.com/deltachat/deltachat-core-rust
 
 
-Building manylinux1 based wheels
-================================
+Building manylinux1 wheels
+==========================
+
+.. note::
+
+   This section may not fully work.
 
 Building portable manylinux1 wheels which come with libdeltachat.so
-can be done with docker-tooling.
+and all it's dependencies is easy using the provided docker tooling.
 
 using docker pull / premade images
 ------------------------------------
@@ -130,9 +136,9 @@ organization::
 
 This docker image can be used to run tests and build Python wheels for all interpreters::
 
-    $ docker run -e DCC_NEW_TMP_EMAIL \
-       --rm -it -v \$(pwd):/mnt -w /mnt \
-       deltachat/coredeps ci_scripts/run_all.sh
+    $ bash ci_scripts/ci_run.sh
+
+This command runs tests and build-wheel scripts in a docker container.
 
 
 Optionally build your own docker image

python/doc/_static/custom.css

@@ -15,7 +15,3 @@ div.globaltoc {
 img.logo {
     height: 120px;
 }
-
-div.footer {
-    display: none;
-}

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/doc/conf.py

@@ -55,7 +55,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'deltachat'
-copyright = u'2020, holger krekel and contributors'
+copyright = u'2018, holger krekel and contributors'
 
 
 # The language for content autogenerated by Sphinx. Refer to documentation

python/doc/index.rst

@@ -1,14 +1,15 @@
 deltachat python bindings
 =========================
 
-The ``deltachat`` Python package provides two layers of bindings for the
-core Rust-library of the https://delta.chat messaging ecosystem:
+The ``deltachat`` Python package provides two bindings for the core Rust-library
+of the https://delta.chat messaging ecosystem:
 
 - :doc:`api` is a high level interface to deltachat-core which aims
   to be memory safe and thoroughly tested through continous tox/pytest runs.
 
-- :doc:`lapi` is a lowlevel CFFI-binding to the `Rust Core
-  <https://github.com/deltachat/deltachat-core-rust>`_.
+- :doc:`capi` is a lowlevel CFFI-binding to the previous
+  `deltachat-core C-API <https://c.delta.chat>`_ (so far the Rust library
+  replicates exactly the same C-level API).
 
 
 
@@ -27,6 +28,7 @@ getting started
    links
    changelog
    api
+   capi
    lapi
 
 ..

python/install_python_bindings.py

@@ -9,20 +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 = "debug"
+    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
 
-    cmd = ["cargo", "build", "-p", "deltachat_ffi"]
-    if target == 'release':
-        cmd.append("--release")
-    subprocess.check_call(cmd)
+    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/setup.py

@@ -13,12 +13,11 @@ def main():
             "root": "..",
             "relative_to": __file__,
             'tag_regex': r'^(?P<prefix>py-)?(?P<version>[^\+]+)(?P<suffix>.*)?$',
-            'git_describe_command': "git describe --dirty --tags --long --match py-*.*",
         },
         description='Python bindings for the Delta Chat Core library using CFFI against the Rust-implemented libdeltachat',
         long_description=long_description,
         author='holger krekel, Floris Bruynooghe, Bjoern Petersen and contributors',
-        install_requires=['cffi>=1.0.0', 'pluggy'],
+        install_requires=['cffi>=1.0.0', 'six'],
         packages=setuptools.find_packages('src'),
         package_dir={'': 'src'},
         cffi_modules=['src/deltachat/_build.py:ffibuilder'],

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

@@ -3,61 +3,53 @@
 from __future__ import print_function
 import atexit
 import threading
-import os
+import re
 import time
 from array import array
-from queue import Queue
+try:
+    from queue import Queue, Empty
+except ImportError:
+    from Queue import Queue, Empty
 
 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 .eventlogger import EventLogger
-from .hookspec import get_plugin_manager, hookimpl
+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, os_name=None, debug=True):
+    def __init__(self, db_path, logid=None, eventlogging=True, debug=True):
         """ initialize account object.
 
         :param db_path: a path to the account database. The database
                         will be created if it doesn't exist.
         :param logid: an optional logging prefix that should be used with
                       the default internal logging.
-        :param os_name: this will be put to the X-Mailer header in outgoing messages
+        :param eventlogging: if False no eventlogging and no context callback will be configured
         :param debug: turn on debug logging for events.
         """
         self._dc_context = ffi.gc(
-            lib.dc_context_new(lib.py_dc_callback, ffi.NULL, as_dc_charpointer(os_name)),
+            lib.dc_context_new(lib.py_dc_callback, ffi.NULL, ffi.NULL),
             _destroy_dc_context,
         )
-        self._evlogger = EventLogger(self, logid, debug)
-        self._threads = IOThreads(self._dc_context, self._evlogger._log_event)
+        if eventlogging:
+            self._evlogger = EventLogger(self._dc_context, logid, debug)
+            deltachat.set_context_callback(self._dc_context, self._process_event)
+            self._threads = IOThreads(self._dc_context, self._evlogger._log_event)
+        else:
+            self._threads = IOThreads(self._dc_context)
 
-        # register event call back and initialize plugin system
-        def _ll_event(ctx, evt_name, data1, data2):
-            assert ctx == self._dc_context
-            self.pluggy.hook.process_low_level_event(
-                account=self, event_name=evt_name, data1=data1, data2=data2
-            )
-
-        self.pluggy = get_plugin_manager()
-        self.pluggy.register(self._evlogger)
-        deltachat.set_context_callback(self._dc_context, _ll_event)
-
-        # open database
         if hasattr(db_path, "encode"):
             db_path = db_path.encode("utf8")
         if not lib.dc_open(self._dc_context, db_path, ffi.NULL):
             raise ValueError("Could not dc_open: {}".format(db_path))
         self._configkeys = self.get_config("sys.config_keys").split()
+        self._imex_events = Queue()
         atexit.register(self.shutdown)
 
     # def __del__(self):
@@ -100,12 +92,9 @@ class Account(object):
         """
         self._check_config_key(name)
         name = name.encode("utf8")
+        value = value.encode("utf8")
         if name == b"addr" and self.is_configured():
             raise ValueError("can not change 'addr' after account is configured.")
-        if value is not None:
-            value = value.encode("utf8")
-        else:
-            value = ffi.NULL
         lib.dc_set_config(self._dc_context, name, value)
 
     def get_config(self, name):
@@ -122,18 +111,6 @@ class Account(object):
         assert res != ffi.NULL, "config value not found for: {!r}".format(name)
         return from_dc_charpointer(res)
 
-    def _preconfigure_keypair(self, addr, public, secret):
-        """See dc_preconfigure_keypair() in deltachat.h.
-
-        In other words, you don't need this.
-        """
-        res = lib.dc_preconfigure_keypair(self._dc_context,
-                                          as_dc_charpointer(addr),
-                                          as_dc_charpointer(public),
-                                          as_dc_charpointer(secret))
-        if res == 0:
-            raise Exception("Failed to set key")
-
     def configure(self, **kwargs):
         """ set config values and configure this account.
 
@@ -153,41 +130,15 @@ class Account(object):
         """
         return lib.dc_is_configured(self._dc_context)
 
-    def set_avatar(self, img_path):
-        """Set self avatar.
-
-        :raises ValueError: if profile image could not be set
-        :returns: None
-        """
-        if img_path is None:
-            self.set_config("selfavatar", None)
-        else:
-            assert os.path.exists(img_path), img_path
-            self.set_config("selfavatar", img_path)
-
     def check_is_configured(self):
         """ Raise ValueError if this account is not configured. """
         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_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_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_blobdir(self):
         """ return the directory for files.
@@ -198,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)
@@ -212,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)
@@ -238,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)
@@ -256,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:
@@ -273,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:
@@ -291,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)
@@ -300,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),
@@ -318,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.
 
@@ -352,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]
@@ -381,12 +317,27 @@ class Account(object):
             raise RuntimeError("found more than one new file")
         return export_files[0]
 
+    def _imex_events_clear(self):
+        try:
+            while True:
+                self._imex_events.get_nowait()
+        except Empty:
+            pass
+
     def _export(self, path, imex_cmd):
-        with ImexTracker(self) as imex_tracker:
-            lib.dc_imex(self._dc_context, imex_cmd, as_dc_charpointer(path), ffi.NULL)
-            if not self._threads.is_started():
-                lib.dc_perform_imap_jobs(self._dc_context)
-            return imex_tracker.wait_finish()
+        self._imex_events_clear()
+        lib.dc_imex(self._dc_context, imex_cmd, as_dc_charpointer(path), ffi.NULL)
+        if not self._threads.is_started():
+            lib.dc_perform_imap_jobs(self._dc_context)
+        files_written = []
+        while True:
+            ev = self._imex_events.get()
+            if isinstance(ev, str):
+                files_written.append(ev)
+            elif isinstance(ev, bool):
+                if not ev:
+                    raise ValueError("export failed, exp-files: {}".format(files_written))
+                return files_written
 
     def import_self_keys(self, path):
         """ Import private keys found in the `path` directory.
@@ -404,11 +355,12 @@ class Account(object):
         self._import(path, imex_cmd=12)
 
     def _import(self, path, imex_cmd):
-        with ImexTracker(self) as imex_tracker:
-            lib.dc_imex(self._dc_context, imex_cmd, as_dc_charpointer(path), ffi.NULL)
-            if not self._threads.is_started():
-                lib.dc_perform_imap_jobs(self._dc_context)
-            imex_tracker.wait_finish()
+        self._imex_events_clear()
+        lib.dc_imex(self._dc_context, imex_cmd, as_dc_charpointer(path), ffi.NULL)
+        if not self._threads.is_started():
+            lib.dc_perform_imap_jobs(self._dc_context)
+        if not self._imex_events.get():
+            raise ValueError("import from path '{}' failed".format(path))
 
     def initiate_key_transfer(self):
         """return setup code after a Autocrypt setup message
@@ -448,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)
         """
@@ -462,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)
@@ -497,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. """
@@ -511,56 +462,24 @@ class Account(object):
             deltachat.clear_context_callback(self._dc_context)
             del self._dc_context
             atexit.unregister(self.shutdown)
-        self.pluggy.unregister(self._evlogger)
 
-    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.
+    def _process_event(self, ctx, evt_name, data1, data2):
+        assert ctx == self._dc_context
+        if hasattr(self, "_evlogger"):
+            self._evlogger(evt_name, data1, data2)
+            method = getattr(self, "on_" + evt_name.lower(), None)
+            if method is not None:
+                method(data1, data2)
+        return 0
 
-        :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")
+    def on_dc_event_imex_progress(self, data1, data2):
+        if data1 == 1000:
+            self._imex_events.put(True)
+        elif data1 == 0:
+            self._imex_events.put(False)
 
-
-class ImexTracker:
-    def __init__(self, account):
-        self._imex_events = Queue()
-        self.account = account
-
-    def __enter__(self):
-        self.account.pluggy.register(self)
-        return self
-
-    def __exit__(self, *args):
-        self.account.pluggy.unregister(self)
-
-    @hookimpl
-    def process_low_level_event(self, account, event_name, data1, data2):
-        # there could be multiple accounts instantiated
-        if self.account is not account:
-            return
-        if event_name == "DC_EVENT_IMEX_PROGRESS":
-            self._imex_events.put(data1)
-        elif event_name == "DC_EVENT_IMEX_FILE_WRITTEN":
-            self._imex_events.put(data1)
-
-    def wait_finish(self, progress_timeout=60):
-        """ Return list of written files, raise ValueError if ExportFailed. """
-        files_written = []
-        while True:
-            ev = self._imex_events.get(timeout=progress_timeout)
-            if isinstance(ev, str):
-                files_written.append(ev)
-            elif ev == 0:
-                raise ValueError("export failed, exp-files: {}".format(files_written))
-            elif ev == 1000:
-                return files_written
+    def on_dc_event_imex_file_written(self, data1, data2):
+        self._imex_events.put(data1)
 
 
 class IOThreads:
@@ -591,11 +510,6 @@ class IOThreads:
 
     def stop(self, wait=False):
         self._thread_quitflag = True
-
-        # Workaround for a race condition. Make sure that thread is
-        # not in between checking for quitflag and entering idle.
-        time.sleep(0.5)
-
         lib.dc_interrupt_imap_idle(self._dc_context)
         lib.dc_interrupt_smtp_idle(self._dc_context)
         lib.dc_interrupt_mvbox_idle(self._dc_context)
@@ -608,41 +522,108 @@ 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):
         self._log_event("py-bindings-info", 0, "MVBOX THREAD START")
         while not self._thread_quitflag:
             lib.dc_perform_mvbox_jobs(self._dc_context)
-            if not self._thread_quitflag:
-                lib.dc_perform_mvbox_fetch(self._dc_context)
-            if not self._thread_quitflag:
-                lib.dc_perform_mvbox_idle(self._dc_context)
+            lib.dc_perform_mvbox_fetch(self._dc_context)
+            lib.dc_perform_mvbox_idle(self._dc_context)
         self._log_event("py-bindings-info", 0, "MVBOX THREAD FINISHED")
 
     def sentbox_thread_run(self):
         self._log_event("py-bindings-info", 0, "SENTBOX THREAD START")
         while not self._thread_quitflag:
             lib.dc_perform_sentbox_jobs(self._dc_context)
-            if not self._thread_quitflag:
-                lib.dc_perform_sentbox_fetch(self._dc_context)
-            if not self._thread_quitflag:
-                lib.dc_perform_sentbox_idle(self._dc_context)
+            lib.dc_perform_sentbox_fetch(self._dc_context)
+            lib.dc_perform_sentbox_idle(self._dc_context)
         self._log_event("py-bindings-info", 0, "SENTBOX THREAD FINISHED")
 
     def smtp_thread_run(self):
         self._log_event("py-bindings-info", 0, "SMTP THREAD START")
         while not self._thread_quitflag:
             lib.dc_perform_smtp_jobs(self._dc_context)
-            if not self._thread_quitflag:
-                lib.dc_perform_smtp_idle(self._dc_context)
+            lib.dc_perform_smtp_idle(self._dc_context)
         self._log_event("py-bindings-info", 0, "SMTP THREAD FINISHED")
 
 
+class EventLogger:
+    _loglock = threading.RLock()
+
+    def __init__(self, dc_context, logid=None, debug=True):
+        self._dc_context = dc_context
+        self._event_queue = Queue()
+        self._debug = debug
+        if logid is None:
+            logid = str(self._dc_context).strip(">").split()[-1]
+        self.logid = logid
+        self._timeout = None
+        self.init_time = time.time()
+
+    def __call__(self, evt_name, data1, data2):
+        self._log_event(evt_name, data1, data2)
+        self._event_queue.put((evt_name, data1, data2))
+
+    def set_timeout(self, timeout):
+        self._timeout = timeout
+
+    def consume_events(self, check_error=True):
+        while not self._event_queue.empty():
+            self.get()
+
+    def get(self, timeout=None, check_error=True):
+        timeout = timeout or self._timeout
+        ev = self._event_queue.get(timeout=timeout)
+        if check_error and ev[0] == "DC_EVENT_ERROR":
+            raise ValueError("{}({!r},{!r})".format(*ev))
+        return ev
+
+    def ensure_event_not_queued(self, event_name_regex):
+        __tracebackhide__ = True
+        rex = re.compile("(?:{}).*".format(event_name_regex))
+        while 1:
+            try:
+                ev = self._event_queue.get(False)
+            except Empty:
+                break
+            else:
+                assert not rex.match(ev[0]), "event found {}".format(ev)
+
+    def get_matching(self, event_name_regex, check_error=True, timeout=None):
+        self._log("-- waiting for event with regex: {} --".format(event_name_regex))
+        rex = re.compile("(?:{}).*".format(event_name_regex))
+        while 1:
+            ev = self.get(timeout=timeout, check_error=check_error)
+            if rex.match(ev[0]):
+                return ev
+
+    def get_info_matching(self, regex):
+        rex = re.compile("(?:{}).*".format(regex))
+        while 1:
+            ev = self.get_matching("DC_EVENT_INFO")
+            if rex.match(ev[2]):
+                return ev
+
+    def _log_event(self, evt_name, data1, data2):
+        # don't show events that are anyway empty impls now
+        if evt_name == "DC_EVENT_GET_STRING":
+            return
+        if self._debug:
+            evpart = "{}({!r},{!r})".format(evt_name, data1, data2)
+            self._log(evpart)
+
+    def _log(self, msg):
+        t = threading.currentThread()
+        tname = getattr(t, "name", t)
+        if tname == "MainThread":
+            tname = "MAIN"
+        with self._loglock:
+            print("{:2.2f} [{}-{}] {}".format(time.time() - self.init_time, tname, self.logid, msg))
+
+
 def _destroy_dc_context(dc_context, dc_context_unref=lib.dc_context_unref):
     # destructor for dc_context
     dc_context_unref(dc_context)

python/src/deltachat/chatting.py

@@ -1,16 +1,58 @@
-""" Chat and Location related API. """
+""" chatting related objects: Contact, Chat, Message. """
 
 import mimetypes
-import calendar
-import json
-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.
 
@@ -58,13 +100,6 @@ class Chat(object):
         """
         return self.id == const.DC_CHAT_ID_DEADDROP
 
-    def is_muted(self):
-        """ return true if this chat is muted.
-
-        :returns: True if chat is muted, False otherwise.
-        """
-        return lib.dc_chat_is_muted(self._dc_chat)
-
     def is_promoted(self):
         """ return True if this chat is promoted, i.e.
         the member contacts are aware of their membership,
@@ -91,43 +126,12 @@ class Chat(object):
     def set_name(self, name):
         """ set name of this chat.
 
-        :param name: as a unicode string.
+        :param: name as a unicode string.
         :returns: None
         """
         name = as_dc_charpointer(name)
         return lib.dc_set_chat_name(self._dc_context, self.id, name)
 
-    def mute(self, duration=None):
-        """ mutes the chat
-
-        :param duration: Number of seconds to mute the chat for. None to mute until unmuted again.
-        :returns: None
-        """
-        if duration is None:
-            mute_duration = -1
-        else:
-            mute_duration = duration
-        ret = lib.dc_set_chat_mute_duration(self._dc_context, self.id, mute_duration)
-        if not bool(ret):
-            raise ValueError("Call to dc_set_chat_mute_duration failed")
-
-    def unmute(self):
-        """ unmutes the chat
-
-        :returns: None
-        """
-        ret = lib.dc_set_chat_mute_duration(self._dc_context, self.id, 0)
-        if not bool(ret):
-            raise ValueError("Failed to unmute chat")
-
-    def get_mute_duration(self):
-        """ Returns the number of seconds until the mute of this chat is lifted.
-
-        :param duration:
-        :returns: Returns the number of seconds the chat is still muted for. (0 for not muted, -1 forever muted)
-        """
-        return bool(lib.dc_chat_get_remaining_mute_duration(self.id))
-
     def get_type(self):
         """ return type of this chat.
 
@@ -147,30 +151,6 @@ class Chat(object):
 
     # ------  chat messaging API ------------------------------
 
-    def send_msg(self, msg):
-        """send a message by using a ready Message object.
-
-        :param msg: a :class:`deltachat.message.Message` instance
-           previously returned by
-           e.g. :meth:`deltachat.message.Message.new_empty` or
-           :meth:`prepare_file`.
-        :raises ValueError: if message can not be sent.
-
-        :returns: a :class:`deltachat.message.Message` instance as
-           sent out.  This is the same object as was passed in, which
-           has been modified with the new state of the core.
-        """
-        if msg.is_out_preparing():
-            assert msg.id != 0
-            # get a fresh copy of dc_msg, the core needs it
-            msg = Message.from_db(self.account, msg.id)
-        sent_id = lib.dc_send_msg(self._dc_context, self.id, msg._dc_msg)
-        if sent_id == 0:
-            raise ValueError("message could not be sent")
-        # modify message in place to avoid bad state for the caller
-        msg._dc_msg = Message.from_db(self.account, sent_id)._dc_msg
-        return msg
-
     def send_text(self, text):
         """ send a text message and return the resulting Message instance.
 
@@ -192,12 +172,9 @@ class Chat(object):
         :raises ValueError: if message can not be send/chat does not exist.
         :returns: the resulting :class:`deltachat.message.Message` instance
         """
-        msg = Message.new_empty(self.account, view_type="file")
-        msg.set_file(path, mime_type)
-        sent_id = lib.dc_send_msg(self._dc_context, self.id, msg._dc_msg)
-        if sent_id == 0:
-            raise ValueError("message could not be sent")
-        return Message.from_db(self.account, sent_id)
+        msg = self.prepare_message_file(path=path, mime_type=mime_type)
+        self.send_prepared(msg)
+        return msg
 
     def send_image(self, path):
         """ send an image message and return the resulting Message instance.
@@ -207,12 +184,9 @@ class Chat(object):
         :returns: the resulting :class:`deltachat.message.Message` instance
         """
         mime_type = mimetypes.guess_type(path)[0]
-        msg = Message.new_empty(self.account, view_type="image")
-        msg.set_file(path, mime_type)
-        sent_id = lib.dc_send_msg(self._dc_context, self.id, msg._dc_msg)
-        if sent_id == 0:
-            raise ValueError("message could not be sent")
-        return Message.from_db(self.account, sent_id)
+        msg = self.prepare_message_file(path=path, mime_type=mime_type, view_type="image")
+        self.send_prepared(msg)
+        return msg
 
     def prepare_message(self, msg):
         """ create a new prepared message.
@@ -311,12 +285,6 @@ class Chat(object):
         """
         return lib.dc_marknoticed_chat(self._dc_context, self.id)
 
-    def get_summary(self):
-        """ return dictionary with summary information. """
-        dc_res = lib.dc_chat_get_info_json(self._dc_context, self.id)
-        s = from_dc_charpointer(dc_res)
-        return json.loads(s)
-
     # ------  group management API ------------------------------
 
     def add_contact(self, contact):
@@ -344,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
@@ -398,80 +365,3 @@ class Chat(object):
         if dc_res == ffi.NULL:
             return None
         return from_dc_charpointer(dc_res)
-
-    def get_color(self):
-        """return the color of the chat.
-        :returns: color as 0x00rrggbb
-        """
-        return lib.dc_chat_get_color(self._dc_chat)
-
-    def get_subtitle(self):
-        """return the subtitle of the chat
-        :returns: the subtitle
-        """
-        return from_dc_charpointer(lib.dc_chat_get_subtitle(self._dc_chat))
-
-    # ------  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 is_archived(self):
-        """return True if this chat is archived.
-        :returns: True if archived.
-        """
-        return lib.dc_chat_get_visibility(self._dc_chat) == const.DC_CHAT_VISIBILITY_ARCHIVED
-
-    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

@@ -18,7 +18,6 @@ DC_QR_ASK_VERIFYGROUP = 202
 DC_QR_FPR_OK = 210
 DC_QR_FPR_MISMATCH = 220
 DC_QR_FPR_WITHOUT_ADDR = 230
-DC_QR_ACCOUNT = 250
 DC_QR_ADDR = 320
 DC_QR_TEXT = 330
 DC_QR_URL = 332
@@ -48,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
@@ -67,18 +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_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,20 +90,13 @@ 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
 DC_STR_SELFNOTINGRP = 21
-DC_KEY_GEN_DEFAULT = 0
-DC_KEY_GEN_RSA2048 = 1
-DC_KEY_GEN_ED25519 = 2
 DC_PROVIDER_STATUS_OK = 1
 DC_PROVIDER_STATUS_PREPARATION = 2
 DC_PROVIDER_STATUS_BROKEN = 3
-DC_CHAT_VISIBILITY_NORMAL = 0
-DC_CHAT_VISIBILITY_ARCHIVED = 1
-DC_CHAT_VISIBILITY_PINNED = 2
 DC_STR_NOMESSAGES = 1
 DC_STR_SELF = 2
 DC_STR_DRAFT = 3
@@ -157,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|DC_KEY_GEN)_\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,59 +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)
-
-    def get_profile_image(self):
-        """Get contact profile image.
-
-        :returns: path to profile image, None if no profile image exists.
-        """
-        dc_res = lib.dc_contact_get_profile_image(self._dc_contact)
-        if dc_res == ffi.NULL:
-            return None
-        return from_dc_charpointer(dc_res)

python/src/deltachat/eventlogger.py

@@ -1,81 +0,0 @@
-import threading
-import re
-import time
-from queue import Queue, Empty
-from .hookspec import hookimpl
-
-
-class EventLogger:
-    _loglock = threading.RLock()
-
-    def __init__(self, account, logid=None, debug=True):
-        self.account = account
-        self._event_queue = Queue()
-        self._debug = debug
-        if logid is None:
-            logid = str(self.account._dc_context).strip(">").split()[-1]
-        self.logid = logid
-        self._timeout = None
-        self.init_time = time.time()
-
-    @hookimpl
-    def process_low_level_event(self, account, event_name, data1, data2):
-        if self.account == account:
-            self._log_event(event_name, data1, data2)
-            self._event_queue.put((event_name, data1, data2))
-
-    def set_timeout(self, timeout):
-        self._timeout = timeout
-
-    def consume_events(self, check_error=True):
-        while not self._event_queue.empty():
-            self.get(check_error=check_error)
-
-    def get(self, timeout=None, check_error=True):
-        timeout = timeout or self._timeout
-        ev = self._event_queue.get(timeout=timeout)
-        if check_error and ev[0] == "DC_EVENT_ERROR":
-            raise ValueError("{}({!r},{!r})".format(*ev))
-        return ev
-
-    def ensure_event_not_queued(self, event_name_regex):
-        __tracebackhide__ = True
-        rex = re.compile("(?:{}).*".format(event_name_regex))
-        while 1:
-            try:
-                ev = self._event_queue.get(False)
-            except Empty:
-                break
-            else:
-                assert not rex.match(ev[0]), "event found {}".format(ev)
-
-    def get_matching(self, event_name_regex, check_error=True, timeout=None):
-        self._log("-- waiting for event with regex: {} --".format(event_name_regex))
-        rex = re.compile("(?:{}).*".format(event_name_regex))
-        while 1:
-            ev = self.get(timeout=timeout, check_error=check_error)
-            if rex.match(ev[0]):
-                return ev
-
-    def get_info_matching(self, regex):
-        rex = re.compile("(?:{}).*".format(regex))
-        while 1:
-            ev = self.get_matching("DC_EVENT_INFO")
-            if rex.match(ev[2]):
-                return ev
-
-    def _log_event(self, evt_name, data1, data2):
-        # don't show events that are anyway empty impls now
-        if evt_name == "DC_EVENT_GET_STRING":
-            return
-        if self._debug:
-            evpart = "{}({!r},{!r})".format(evt_name, data1, data2)
-            self._log(evpart)
-
-    def _log(self, msg):
-        t = threading.currentThread()
-        tname = getattr(t, "name", t)
-        if tname == "MainThread":
-            tname = "MAIN"
-        with self._loglock:
-            print("{:2.2f} [{}-{}] {}".format(time.time() - self.init_time, tname, self.logid, msg))

python/src/deltachat/hookspec.py

@@ -1,25 +0,0 @@
-""" Hooks for python bindings """
-
-import pluggy
-
-name = "deltachat"
-
-hookspec = pluggy.HookspecMarker(name)
-hookimpl = pluggy.HookimplMarker(name)
-_plugin_manager = None
-
-
-def get_plugin_manager():
-    global _plugin_manager
-    if _plugin_manager is None:
-        _plugin_manager = pluggy.PluginManager(name)
-        _plugin_manager.add_hookspecs(DeltaChatHookSpecs)
-    return _plugin_manager
-
-
-class DeltaChatHookSpecs:
-    """ Plugin Hook specifications for Python bindings to Delta Chat CFFI. """
-
-    @hookspec
-    def process_low_level_event(self, account, event_name, data1, data2):
-        """ process a CFFI low level events for a given account. """

python/src/deltachat/message.py

@@ -1,6 +1,7 @@
-""" The Message object. """
+""" chatting related objects: Contact, Chat, Message. """
 
 import os
+import shutil
 from . import props
 from .cutil import from_dc_charpointer, as_dc_charpointer
 from .capi import lib, ffi
@@ -12,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
@@ -57,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
@@ -69,6 +72,19 @@ class Message(object):
         mtype = ffi.NULL if mime_type is None else as_dc_charpointer(mime_type)
         if not os.path.exists(path):
             raise ValueError("path does not exist: {!r}".format(path))
+        blobdir = self.account.get_blobdir()
+        if not path.startswith(blobdir):
+            for i in range(50):
+                ext = "" if i == 0 else "-" + str(i)
+                dest = os.path.join(blobdir, os.path.basename(path) + ext)
+                if os.path.exists(dest):
+                    continue
+                shutil.copyfile(path, dest)
+                break
+            else:
+                raise ValueError("could not create blobdir-path for {}".format(path))
+            path = dest
+        assert path.startswith(blobdir), path
         lib.dc_msg_set_file(self._dc_msg, as_dc_charpointer(path), mtype)
 
     @props.with_doc
@@ -146,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)
 
@@ -174,7 +190,7 @@ class Message(object):
     @property
     def _msgstate(self):
         if self.id == 0:
-            dc_msg = self._dc_msg
+            dc_msg = self.message._dc_msg
         else:
             # load message from db to get a fresh/current state
             dc_msg = ffi.gc(

python/src/deltachat/provider.py

@@ -11,18 +11,27 @@ class ProviderNotFoundError(Exception):
 class Provider(object):
     """Provider information.
 
-    :param domain: The email to get the provider info for.
+    :param domain: The domain to get the provider info for, this is
+    normally the part following the `@` of the domain.
     """
 
-    def __init__(self, account, addr):
+    def __init__(self, domain):
         provider = ffi.gc(
-            lib.dc_provider_new_from_email(account._dc_context, as_dc_charpointer(addr)),
+            lib.dc_provider_new_from_domain(as_dc_charpointer(domain)),
             lib.dc_provider_unref,
         )
         if provider == ffi.NULL:
             raise ProviderNotFoundError("Provider not found")
         self._provider = provider
 
+    @classmethod
+    def from_email(cls, email):
+        """Create provider info from an email address.
+
+        :param email: Email address to get provider info for.
+        """
+        return cls(email.split('@')[-1])
+
     @property
     def overview_page(self):
         """URL to the overview page of the provider on providers.delta.chat."""
@@ -30,10 +39,21 @@ class Provider(object):
             lib.dc_provider_get_overview_page(self._provider))
 
     @property
-    def get_before_login_hints(self):
-        """Should be shown to the user on login."""
+    def name(self):
+        """The name of the provider."""
+        return from_dc_charpointer(lib.dc_provider_get_name(self._provider))
+
+    @property
+    def markdown(self):
+        """Content of the information page, formatted as markdown."""
         return from_dc_charpointer(
-            lib.dc_provider_get_before_login_hints(self._provider))
+            lib.dc_provider_get_markdown(self._provider))
+
+    @property
+    def status_date(self):
+        """The date the provider info was last updated, as a string."""
+        return from_dc_charpointer(
+            lib.dc_provider_get_status_date(self._provider))
 
     @property
     def status(self):

python/tests/conftest.py

@@ -1,14 +1,10 @@
 from __future__ import print_function
 import os
-import sys
-import py
 import pytest
 import requests
 import time
 from deltachat import Account
-from deltachat import const
 from deltachat.capi import lib
-from _pytest.monkeypatch import MonkeyPatch
 import tempfile
 
 
@@ -18,41 +14,25 @@ def pytest_addoption(parser):
         help="a file with >=2 lines where each line "
              "contains NAME=VALUE config settings for one account"
     )
-    parser.addoption(
-        "--ignored", action="store_true",
-        help="Also run tests marked with the ignored marker",
-    )
 
 
 def pytest_configure(config):
-    config.addinivalue_line(
-        "markers", "ignored: Mark test as bing slow, skipped unless --ignored is used."
-    )
     cfg = config.getoption('--liveconfig')
     if not cfg:
-        cfg = os.getenv('DCC_NEW_TMP_EMAIL')
+        cfg = os.getenv('DCC_PY_LIVECONFIG')
         if cfg:
             config.option.liveconfig = cfg
 
 
-def pytest_runtest_setup(item):
-    if (list(item.iter_markers(name="ignored"))
-            and not item.config.getoption("ignored")):
-        pytest.skip("Ignored tests not requested, use --ignored")
-
-
 def pytest_report_header(config, startdir):
     summary = []
 
     t = tempfile.mktemp()
-    m = MonkeyPatch()
     try:
-        m.setattr(sys.stdout, "write", lambda x: len(x))
-        ac = Account(t)
+        ac = Account(t, eventlogging=False)
         info = ac.get_info()
         ac.shutdown()
     finally:
-        m.undo()
         os.remove(t)
     summary.extend(['Deltachat core={} sqlite={}'.format(
          info['deltachat_core_version'],
@@ -102,22 +82,18 @@ class SessionLiveConfigFromFile:
 
 
 class SessionLiveConfigFromURL:
-    def __init__(self, url):
+    def __init__(self, url, create_token):
         self.configlist = []
-        self.url = url
-
-    def get(self, index):
-        try:
-            return self.configlist[index]
-        except IndexError:
-            assert index == len(self.configlist), index
-            res = requests.post(self.url)
+        for i in range(2):
+            res = requests.post(url, json={"token_create_user": int(create_token)})
             if res.status_code != 200:
                 pytest.skip("creating newtmpuser failed {!r}".format(res))
             d = res.json()
             config = dict(addr=d["email"], mail_pw=d["password"])
             self.configlist.append(config)
-            return config
+
+    def get(self, index):
+        return self.configlist[index]
 
     def exists(self):
         return bool(self.configlist)
@@ -128,24 +104,14 @@ def session_liveconfig(request):
     liveconfig_opt = request.config.option.liveconfig
     if liveconfig_opt:
         if liveconfig_opt.startswith("http"):
-            return SessionLiveConfigFromURL(liveconfig_opt)
+            url, create_token = liveconfig_opt.split("#", 1)
+            return SessionLiveConfigFromURL(url, create_token)
         else:
             return SessionLiveConfigFromFile(liveconfig_opt)
 
 
-@pytest.fixture(scope='session')
-def datadir():
-    """The py.path.local object of the test-data/ directory."""
-    for path in reversed(py.path.local(__file__).parts()):
-        datadir = path.join('test-data')
-        if datadir.isdir():
-            return datadir
-    else:
-        pytest.skip('test-data directory not found')
-
-
 @pytest.fixture
-def acfactory(pytestconfig, tmpdir, request, session_liveconfig, datadir):
+def acfactory(pytestconfig, tmpdir, request, session_liveconfig):
 
     class AccountMaker:
         def __init__(self):
@@ -153,8 +119,6 @@ def acfactory(pytestconfig, tmpdir, request, session_liveconfig, datadir):
             self.offline_count = 0
             self._finalizers = []
             self.init_time = time.time()
-            self._generated_keys = ["alice", "bob", "charlie",
-                                    "dom", "elena", "fiona"]
 
         def finalize(self):
             while self._finalizers:
@@ -174,65 +138,47 @@ def acfactory(pytestconfig, tmpdir, request, session_liveconfig, datadir):
             ac._evlogger.set_timeout(2)
             return ac
 
-        def _preconfigure_key(self, account, addr):
-            # Only set a key if we haven't used it yet for another account.
-            if self._generated_keys:
-                keyname = self._generated_keys.pop(0)
-                fname_pub = "key/{name}-public.asc".format(name=keyname)
-                fname_sec = "key/{name}-secret.asc".format(name=keyname)
-                account._preconfigure_keypair(addr,
-                                              datadir.join(fname_pub).read(),
-                                              datadir.join(fname_sec).read())
-
         def get_configured_offline_account(self):
             ac = self.get_unconfigured_account()
 
             # do a pseudo-configured account
             addr = "addr{}@offline.org".format(self.offline_count)
             ac.set_config("addr", addr)
-            self._preconfigure_key(ac, addr)
             lib.dc_set_config(ac._dc_context, b"configured_addr", addr.encode("ascii"))
             ac.set_config("mail_pw", "123")
             lib.dc_set_config(ac._dc_context, b"configured_mail_pw", b"123")
             lib.dc_set_config(ac._dc_context, b"configured", b"1")
             return ac
 
-        def get_online_config(self, pre_generated_key=True):
+        def peek_online_config(self):
             if not session_liveconfig:
-                pytest.skip("specify DCC_NEW_TMP_EMAIL or --liveconfig")
+                pytest.skip("specify DCC_PY_LIVECONFIG or --liveconfig")
+            return session_liveconfig.get(self.live_count)
+
+        def get_online_config(self):
+            if not session_liveconfig:
+                pytest.skip("specify DCC_PY_LIVECONFIG or --liveconfig")
             configdict = session_liveconfig.get(self.live_count)
             self.live_count += 1
             if "e2ee_enabled" not in configdict:
                 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))
-            if pre_generated_key:
-                self._preconfigure_key(ac, configdict['addr'])
             ac._evlogger.init_time = self.init_time
             ac._evlogger.set_timeout(30)
             return ac, dict(configdict)
 
-        def get_online_configuring_account(self, mvbox=False, sentbox=False,
-                                           pre_generated_key=True, config={}):
-            ac, configdict = self.get_online_config(
-                pre_generated_key=pre_generated_key)
-            configdict.update(config)
+        def get_online_configuring_account(self, mvbox=False, sentbox=False):
+            ac, configdict = self.get_online_config()
             ac.configure(**configdict)
             ac.start_threads(mvbox=mvbox, sentbox=sentbox)
             return ac
 
-        def get_one_online_account(self, pre_generated_key=True):
-            ac1 = self.get_online_configuring_account(
-                pre_generated_key=pre_generated_key)
-            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()
@@ -242,12 +188,10 @@ def acfactory(pytestconfig, tmpdir, request, session_liveconfig, datadir):
             wait_configuration_progress(ac2, 1000)
             return ac1, ac2
 
-        def clone_online_account(self, account, pre_generated_key=True):
+        def clone_online_account(self, account):
             self.live_count += 1
             tmpdb = tmpdir.join("livedb%d" % self.live_count)
             ac = self.make_account(tmpdb.strpath, logid="ac{}".format(self.live_count))
-            if pre_generated_key:
-                self._preconfigure_key(ac, account.get_config("addr"))
             ac._evlogger.init_time = self.init_time
             ac._evlogger.set_timeout(30)
             ac.configure(addr=account.get_config("addr"), mail_pw=account.get_config("mail_pw"))

python/tests/test_account.py

@@ -2,12 +2,10 @@ 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
-from conftest import (wait_configuration_progress,
-                      wait_securejoin_inviter_progress)
+from conftest import wait_configuration_progress, wait_successful_IMAP_SMTP_connection, wait_securejoin_inviter_progress
 
 
 class TestOfflineAccountBasic:
@@ -17,26 +15,12 @@ class TestOfflineAccountBasic:
         with pytest.raises(ValueError):
             Account(p.strpath)
 
-    def test_os_name(self, tmpdir):
-        p = tmpdir.join("hello.db")
-        # we can't easily test if os_name is used in X-Mailer
-        # outgoing messages without a full Online test
-        # but we at least check Account accepts the arg
-        ac1 = Account(p.strpath, os_name="solarpunk")
-        ac1.get_info()
-
-    def test_preconfigure_keypair(self, acfactory, datadir):
-        ac = acfactory.get_unconfigured_account()
-        ac._preconfigure_keypair("alice@example.com",
-                                 datadir.join("key/alice-public.asc").read(),
-                                 datadir.join("key/alice-secret.asc").read())
-
     def test_getinfo(self, acfactory):
         ac1 = acfactory.get_unconfigured_account()
         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()
@@ -58,13 +42,18 @@ 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()
         with pytest.raises(ValueError):
             ac1.get_self_contact()
 
+    def test_get_info(self, acfactory):
+        ac1 = acfactory.get_configured_offline_account()
+        out = ac1.get_infostring()
+        assert "number_of_chats=0" in out
+
     def test_selfcontact_configured(self, acfactory):
         ac1 = acfactory.get_configured_offline_account()
         me = ac1.get_self_contact()
@@ -132,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)
@@ -165,18 +148,6 @@ class TestOfflineChat:
         chat.set_name("title2")
         assert chat.get_name() == "title2"
 
-        d = chat.get_summary()
-        print(d)
-        assert d["id"] == chat.id
-        assert d["type"] == chat.get_type()
-        assert d["name"] == chat.get_name()
-        assert d["archived"] == chat.is_archived()
-        # assert d["param"] == chat.param
-        assert d["color"] == chat.get_color()
-        assert d["profile_image"] == "" if chat.get_profile_image() is None else chat.get_profile_image()
-        assert d["subtitle"] == chat.get_subtitle()
-        assert d["draft"] == "" if chat.get_draft() is None else chat.get_draft()
-
     def test_group_chat_creation_with_translation(self, ac1):
         ac1.set_stock_translation(const.DC_STR_NEWGROUPDRAFT, "xyz %1$s")
         ac1._evlogger.consume_events()
@@ -214,18 +185,6 @@ class TestOfflineChat:
         chat.remove_profile_image()
         assert chat.get_profile_image() is None
 
-    def test_mute(self, ac1):
-        chat = ac1.create_group_chat(name="title1")
-        assert not chat.is_muted()
-        chat.mute()
-        assert chat.is_muted()
-        chat.unmute()
-        assert not chat.is_muted()
-        chat.mute(50)
-        assert chat.is_muted()
-        with pytest.raises(ValueError):
-            chat.mute(-51)
-
     def test_delete_and_send_fails(self, ac1, chat1):
         chat1.delete()
         ac1._evlogger.get_matching("DC_EVENT_MSGS_CHANGED")
@@ -404,23 +363,6 @@ class TestOfflineChat:
         assert not res.is_ask_verifygroup()
         assert res.contact_id == 10
 
-    def test_group_chat_many_members_add_remove(self, ac1, lp):
-        lp.sec("ac1: creating group chat with 10 other members")
-        chat = ac1.create_group_chat(name="title1")
-        contacts = []
-        for i in range(10):
-            contact = ac1.create_contact("some{}@example.org".format(i))
-            contacts.append(contact)
-            chat.add_contact(contact)
-
-        num_contacts = len(chat.get_contacts())
-        assert num_contacts == 11
-
-        lp.sec("ac1: removing two contacts and checking things are right")
-        chat.remove_contact(contacts[9])
-        chat.remove_contact(contacts[3])
-        assert len(chat.get_contacts()) == 9
-
 
 class TestOnlineAccount:
     def get_chat(self, ac1, ac2, both_created=False):
@@ -431,45 +373,6 @@ class TestOnlineAccount:
             ac2.create_chat_by_contact(ac2.create_contact(email=ac1.get_config("addr")))
         return chat
 
-    @pytest.mark.ignored
-    def test_configure_generate_key(self, acfactory, lp):
-        # A slow test which will generate new keys.
-        ac1 = acfactory.get_online_configuring_account(
-            pre_generated_key=False,
-            config={"key_gen_type": str(const.DC_KEY_GEN_RSA2048)}
-        )
-        ac2 = acfactory.get_online_configuring_account(
-            pre_generated_key=False,
-            config={"key_gen_type": str(const.DC_KEY_GEN_ED25519)}
-        )
-        wait_configuration_progress(ac1, 1000)
-        wait_configuration_progress(ac2, 1000)
-        chat = self.get_chat(ac1, ac2, both_created=True)
-
-        lp.sec("ac1: send unencrypted message to ac2")
-        chat.send_text("message1")
-        lp.sec("ac2: waiting for message from ac1")
-        ev = ac2._evlogger.get_matching("DC_EVENT_INCOMING_MSG")
-        msg_in = ac2.get_message_by_id(ev[2])
-        assert msg_in.text == "message1"
-        assert not msg_in.is_encrypted()
-
-        lp.sec("ac2: send encrypted message to ac1")
-        msg_in.chat.send_text("message2")
-        lp.sec("ac1: waiting for message from ac2")
-        ev = ac1._evlogger.get_matching("DC_EVENT_INCOMING_MSG")
-        msg2_in = ac1.get_message_by_id(ev[2])
-        assert msg2_in.text == "message2"
-        assert msg2_in.is_encrypted()
-
-        lp.sec("ac1: send encrypted message to ac2")
-        msg2_in.chat.send_text("message3")
-        lp.sec("ac2: waiting for message from ac1")
-        ev = ac2._evlogger.get_matching("DC_EVENT_INCOMING_MSG")
-        msg3_in = ac1.get_message_by_id(ev[2])
-        assert msg3_in.text == "message3"
-        assert msg3_in.is_encrypted()
-
     def test_configure_canceled(self, acfactory):
         ac1 = acfactory.get_online_configuring_account()
         wait_configuration_progress(ac1, 200)
@@ -488,129 +391,44 @@ class TestOnlineAccount:
 
     def test_one_account_send_bcc_setting(self, acfactory, lp):
         ac1 = acfactory.get_online_configuring_account()
-        ac2 = acfactory.get_online_configuring_account()
-
-        # Clone the first account: we will test if sent messages
-        # are copied to it via BCC.
-        ac1_clone = acfactory.clone_online_account(ac1)
-
+        ac2_config = acfactory.peek_online_config()
+        c2 = ac1.create_contact(email=ac2_config["addr"])
+        chat = ac1.create_chat_by_contact(c2)
+        assert chat.id > const.DC_CHAT_ID_LAST_SPECIAL
+        wait_successful_IMAP_SMTP_connection(ac1)
         wait_configuration_progress(ac1, 1000)
-        wait_configuration_progress(ac2, 1000)
-        wait_configuration_progress(ac1_clone, 1000)
-
-        chat = self.get_chat(ac1, ac2)
-
-        self_addr = ac1.get_config("addr")
-        other_addr = ac2.get_config("addr")
-
-        lp.sec("send out message without bcc to ourselves")
-        ac1.set_config("bcc_self", "0")
-        msg_out = chat.send_text("message1")
-        assert not msg_out.is_forwarded()
-
-        # wait for send out (no BCC)
-        ev = ac1._evlogger.get_matching("DC_EVENT_SMTP_MESSAGE_SENT")
-        assert ac1.get_config("bcc_self") == "0"
-
-        # make sure we are not sending message to ourselves
-        assert self_addr not in ev[2]
-        assert other_addr in ev[2]
-        ev = ac1._evlogger.get_matching("DC_EVENT_DELETED_BLOB_FILE")
-
-        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")
+        assert ev[2] == msg_out.id
         # wait for send out (BCC)
-        ev = ac1._evlogger.get_matching("DC_EVENT_SMTP_MESSAGE_SENT")
         assert ac1.get_config("bcc_self") == "1"
-
-        # now make sure we are sending message to ourselves too
+        self_addr = ac1.get_config("addr")
+        ev = ac1._evlogger.get_matching("DC_EVENT_SMTP_MESSAGE_SENT")
         assert self_addr in ev[2]
-        assert other_addr in ev[2]
         ev = ac1._evlogger.get_matching("DC_EVENT_DELETED_BLOB_FILE")
 
-        # Second client receives only second message, but not the first
-        ev = ac1_clone._evlogger.get_matching("DC_EVENT_MSGS_CHANGED")
-        assert ac1_clone.get_message_by_id(ev[2]).text == msg_out.text
+        ac1._evlogger.consume_events()
+        lp.sec("send out message without bcc")
+        ac1.set_config("bcc_self", "0")
+        msg_out = chat.send_text("message3")
+        assert not msg_out.is_forwarded()
+        ev = ac1._evlogger.get_matching("DC_EVENT_MSGS_CHANGED")
+        assert ev[2] == msg_out.id
+        ev = ac1._evlogger.get_matching("DC_EVENT_SMTP_MESSAGE_SENT")
+        assert self_addr not in ev[2]
+        ev = ac1._evlogger.get_matching("DC_EVENT_DELETED_BLOB_FILE")
 
-    def test_send_file_twice_unicode_filename_mangling(self, tmpdir, acfactory, lp):
-        ac1, ac2 = acfactory.get_two_online_accounts()
-        chat = self.get_chat(ac1, ac2)
-
-        basename = "somedäüta.html.zip"
-        p = os.path.join(tmpdir.strpath, basename)
-        with open(p, "w") as f:
-            f.write("some data")
-
-        def send_and_receive_message():
-            lp.sec("ac1: prepare and send attachment + text to ac2")
-            msg1 = Message.new_empty(ac1, "file")
-            msg1.set_text("withfile")
-            msg1.set_file(p)
-            chat.send_msg(msg1)
-
-            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
-            return ac2.get_message_by_id(ev[2])
-
-        msg = send_and_receive_message()
-        assert msg.text == "withfile"
-        assert open(msg.filename).read() == "some data"
-        assert msg.filename.endswith(basename)
-
-        msg2 = send_and_receive_message()
-        assert msg2.text == "withfile"
-        assert open(msg2.filename).read() == "some data"
-        assert msg2.filename.endswith("html.zip")
-        assert msg.filename != msg2.filename
-
-    def test_send_file_html_attachment(self, tmpdir, acfactory, lp):
-        ac1, ac2 = acfactory.get_two_online_accounts()
-        chat = self.get_chat(ac1, ac2)
-
-        basename = "test.html"
-        content = "<html><body>text</body>data"
-
-        p = os.path.join(tmpdir.strpath, basename)
-        with open(p, "w") as f:
-            # write wrong html to see if core tries to parse it
-            # (it shouldn't as it's a file attachment)
-            f.write(content)
-
-        lp.sec("ac1: prepare and send attachment + text to ac2")
-        chat.send_file(p, mime_type="text/html")
-
-        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[2])
-
-        assert open(msg.filename).read() == content
-        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()
@@ -623,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]
@@ -694,24 +493,9 @@ 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()
 
-        # make DC's life harder wrt to encodings
-        ac1.set_config("displayname", "ä name")
-
         lp.sec("ac1: create chat with ac2")
         chat = self.get_chat(ac1, ac2)
 
@@ -729,9 +513,8 @@ class TestOnlineAccount:
         msg_in = ac2.get_message_by_id(msg_out.id)
         assert msg_in.text == "message1"
         assert not msg_in.is_forwarded()
-        assert msg_in.get_sender_contact().display_name == ac1.get_config("displayname")
 
-        lp.sec("check the message arrived in contact-requests/deaddrop")
+        lp.sec("check the message arrived in contact-requets/deaddrop")
         chat2 = msg_in.chat
         assert msg_in in chat2.get_messages()
         assert chat2.is_deaddrop()
@@ -747,26 +530,14 @@ class TestOnlineAccount:
         chat2b.mark_noticed()
         assert chat2b.count_fresh_messages() == 0
 
-        ac2._evlogger.consume_events()
-
-        lp.sec("sending a second message from ac1 to ac2")
-        msg_out2 = chat.send_text("message2")
-
-        lp.sec("wait for ac2 to receive second message")
-        ev = ac2._evlogger.get_matching("DC_EVENT_INCOMING_MSG")
-        assert ev[2] == msg_out2.id
-        msg_in2 = ac2.get_message_by_id(msg_out2.id)
-
-        lp.sec("mark messages as seen on ac2, wait for changes on ac1")
-        ac2.mark_seen_messages([msg_in, msg_in2])
+        lp.sec("mark message as seen on ac2, wait for changes on ac1")
+        ac2.mark_seen_messages([msg_in])
         lp.step("1")
-        for i in range(2):
-            ev = ac1._evlogger.get_matching("DC_EVENT_MSG_READ")
-            assert ev[1] > const.DC_CHAT_ID_LAST_SPECIAL
-            assert ev[2] > const.DC_MSG_ID_LAST_SPECIAL
+        ev = ac1._evlogger.get_matching("DC_EVENT_MSG_READ")
+        assert ev[1] > const.DC_CHAT_ID_LAST_SPECIAL
+        assert ev[2] > const.DC_MSG_ID_LAST_SPECIAL
         lp.step("2")
         assert msg_out.is_out_mdn_received()
-        assert msg_out2.is_out_mdn_received()
 
         lp.sec("check that a second call to mark_seen does not create change or smtp job")
         ac2._evlogger.consume_events()
@@ -776,41 +547,6 @@ class TestOnlineAccount:
         except queue.Empty:
             pass  # mark_seen_messages() has generated events before it returns
 
-    def test_mdn_asymetric(self, acfactory, lp):
-        ac1, ac2 = acfactory.get_two_online_accounts()
-
-        lp.sec("ac1: create chat with ac2")
-        chat = self.get_chat(ac1, ac2, both_created=True)
-
-        # make sure mdns are enabled (usually enabled by default already)
-        ac1.set_config("mdns_enabled", "1")
-        ac2.set_config("mdns_enabled", "1")
-
-        lp.sec("sending text message from ac1 to ac2")
-        msg_out = chat.send_text("message1")
-
-        assert len(chat.get_messages()) == 1
-
-        lp.sec("disable ac1 MDNs")
-        ac1.set_config("mdns_enabled", "0")
-
-        lp.sec("wait for ac2 to receive message")
-        msg = ac2.wait_next_incoming_message()
-
-        assert len(msg.chat.get_messages()) == 1
-
-        lp.sec("ac2: mark incoming message as seen")
-        ac2.mark_seen_messages([msg])
-
-        lp.sec("ac1: waiting for incoming activity")
-        # MDN should be moved even though MDNs are already disabled
-        ac1._evlogger.get_matching("DC_EVENT_IMAP_MESSAGE_MOVED")
-
-        assert len(chat.get_messages()) == 1
-
-        # MDN is received even though MDNs are already disabled
-        assert msg_out.is_out_mdn_received()
-
     def test_send_and_receive_will_encrypt_decrypt(self, acfactory, lp):
         ac1, ac2 = acfactory.get_two_online_accounts()
 
@@ -839,12 +575,6 @@ class TestOnlineAccount:
         assert msg_back.text == "message-back"
         assert msg_back.is_encrypted()
 
-        # Test that we do not gossip peer keys in 1-to-1 chat,
-        # as it makes no sense to gossip to peers their own keys.
-        # Gossip is only sent in encrypted messages,
-        # and we sent encrypted msg_back right above.
-        assert chat2b.get_summary()["gossiped_timestamp"] == 0
-
         lp.sec("create group chat with two members, one of which has no encrypt state")
         chat = ac1.create_group_chat("encryption test")
         chat.add_contact(ac1.create_contact(ac2.get_config("addr")))
@@ -853,85 +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")
-
-        # Set unprepared and unencrypted draft to test that it is not
-        # taken into account when determining whether last message is
-        # encrypted.
-        msg_draft = Message.new_empty(ac1, "text")
-        msg_draft.set_text("message2 -- should be encrypted")
-        chat.set_draft(msg_draft)
-
-        # Get the draft, prepare and send it.
-        msg_draft = chat.get_draft()
-        msg_out = chat.prepare_message(msg_draft)
-        chat.send_prepared(msg_out)
-
-        chat.set_draft(None)
-        assert chat.get_draft() is None
-
-        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()
 
@@ -972,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
@@ -1005,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
@@ -1041,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")
@@ -1085,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()
@@ -1097,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()
@@ -1120,54 +724,7 @@ class TestOnlineAccount:
         assert msg.text == "world"
         assert msg.is_encrypted()
 
-    def test_set_get_contact_avatar(self, acfactory, data, lp):
-        lp.sec("configuring ac1 and ac2")
-        ac1, ac2 = acfactory.get_two_online_accounts()
-
-        lp.sec("ac1: set own profile image")
-        p = data.get_path("d.png")
-        ac1.set_avatar(p)
-
-        lp.sec("ac1: create 1:1 chat with ac2")
-        chat = self.get_chat(ac1, ac2, both_created=True)
-
-        msg = chat.send_text("hi -- do you see my brand new avatar?")
-        assert not msg.is_encrypted()
-
-        lp.sec("ac2: wait for receiving message and avatar from ac1")
-        msg1 = ac2.wait_next_incoming_message()
-        assert not msg1.chat.is_deaddrop()
-        received_path = msg1.get_sender_contact().get_profile_image()
-        assert open(received_path, "rb").read() == open(p, "rb").read()
-
-        lp.sec("ac2: set own profile image")
-        p = data.get_path("d.png")
-        ac2.set_avatar(p)
-
-        lp.sec("ac2: send back message")
-        m = msg1.chat.send_text("yes, i received your avatar -- how do you like mine?")
-        assert m.is_encrypted()
-
-        lp.sec("ac1: wait for receiving message and avatar from ac2")
-        msg2 = ac1.wait_next_incoming_message()
-        received_path = msg2.get_sender_contact().get_profile_image()
-        assert received_path is not None, "did not get avatar through encrypted message"
-        assert open(received_path, "rb").read() == open(p, "rb").read()
-
-        ac2._evlogger.consume_events()
-        ac1._evlogger.consume_events()
-
-        # XXX not sure if the following is correct / possible. you may remove it
-        lp.sec("ac1: delete profile image from chat, and send message to ac2")
-        ac1.set_avatar(None)
-        m = msg2.chat.send_text("i don't like my avatar anymore and removed it")
-        assert m.is_encrypted()
-
-        lp.sec("ac2: wait for message along with avatar deletion of ac1")
-        msg3 = ac2.wait_next_incoming_message()
-        assert msg3.get_sender_contact().get_profile_image() is None
-
-    def test_set_get_group_image(self, acfactory, data, lp):
+    def test_set_get_profile_image(self, acfactory, data, lp):
         ac1, ac2 = acfactory.get_two_online_accounts()
 
         lp.sec("create unpromoted group chat")
@@ -1220,152 +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 TestGroupStressTests:
-    def test_group_many_members_add_leave_remove(self, acfactory, lp):
-        lp.sec("creating and configuring five accounts")
-        accounts = [acfactory.get_online_configuring_account() for i in range(5)]
-        for acc in accounts:
-            wait_configuration_progress(acc, 1000)
-        ac1 = accounts.pop()
-
-        lp.sec("ac1: setting up contacts with 4 other members")
-        contacts = []
-        for acc, name in zip(accounts, list("äöüsr")):
-            contact = ac1.create_contact(acc.get_config("addr"), name=name)
-            contacts.append(contact)
-
-            # make sure we accept the "hi" message
-            ac1.create_chat_by_contact(contact)
-
-            # make sure the other side accepts our messages
-            c1 = acc.create_contact(ac1.get_config("addr"), "ä member")
-            chat1 = acc.create_chat_by_contact(c1)
-
-            # send a message to get the contact key via autocrypt header
-            chat1.send_text("hi")
-            msg = ac1.wait_next_incoming_message()
-            assert msg.text == "hi"
-
-        # Save fifth account for later
-        ac5 = accounts.pop()
-        contact5 = contacts.pop()
-
-        lp.sec("ac1: creating group chat with 3 other members")
-        chat = ac1.create_group_chat("title1")
-        for contact in contacts:
-            chat.add_contact(contact)
-        assert not chat.is_promoted()
-
-        lp.sec("ac1: send mesage to new group chat")
-        msg = chat.send_text("hello")
-        assert chat.is_promoted()
-        assert msg.is_encrypted()
-
-        gossiped_timestamp = chat.get_summary()["gossiped_timestamp"]
-        assert gossiped_timestamp > 0
-
-        num_contacts = len(chat.get_contacts())
-        assert num_contacts == 3 + 1
-
-        lp.sec("ac2: checking that the chat arrived correctly")
-        ac2 = accounts[0]
-        msg = ac2.wait_next_incoming_message()
-        assert msg.text == "hello"
-        print("chat is", msg.chat)
-        assert len(msg.chat.get_contacts()) == 4
-
-        lp.sec("ac3: checking that 'ac4' is a known contact")
-        ac3 = accounts[1]
-        msg3 = ac3.wait_next_incoming_message()
-        assert msg3.text == "hello"
-        ac3_contacts = ac3.get_contacts()
-        assert len(ac3_contacts) == 3
-        ac4_contacts = ac3.get_contacts(query=accounts[2].get_config("addr"))
-        assert len(ac4_contacts) == 1
-
-        lp.sec("ac2: removing one contact")
-        to_remove = contacts[-1]
-        msg.chat.remove_contact(to_remove)
-
-        lp.sec("ac1: receiving system message about contact removal")
-        sysmsg = ac1.wait_next_incoming_message()
-        assert to_remove.addr in sysmsg.text
-        assert len(sysmsg.chat.get_contacts()) == 3
-
-        # Receiving message about removed contact does not reset gossip
-        assert chat.get_summary()["gossiped_timestamp"] == gossiped_timestamp
-
-        lp.sec("ac1: sending another message to the chat")
-        chat.send_text("hello2")
-        msg = ac2.wait_next_incoming_message()
-        assert msg.text == "hello2"
-        assert chat.get_summary()["gossiped_timestamp"] == gossiped_timestamp
-
-        lp.sec("ac1: adding fifth member to the chat")
-        chat.add_contact(contact5)
-        # Additng contact to chat resets gossiped_timestamp
-        assert chat.get_summary()["gossiped_timestamp"] >= gossiped_timestamp
-
-        lp.sec("ac2: receiving system message about contact addition")
-        sysmsg = ac2.wait_next_incoming_message()
-        assert contact5.addr in sysmsg.text
-        assert len(sysmsg.chat.get_contacts()) == 4
-
-        lp.sec("ac5: waiting for message about addition to the chat")
-        sysmsg = ac5.wait_next_incoming_message()
-        msg = sysmsg.chat.send_text("hello!")
-        # Message should be encrypted because keys of other members are gossiped
-        assert msg.is_encrypted()
-
 
 class TestOnlineConfigureFails:
     def test_invalid_password(self, acfactory):
@@ -1374,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):
@@ -1383,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

@@ -1,49 +1,10 @@
 from __future__ import print_function
-
-import os.path
-import shutil
-
-import pytest
 from filecmp import cmp
-
-from conftest import wait_configuration_progress, wait_msgs_changed
 from deltachat import const
+from conftest import wait_configuration_progress, wait_msgs_changed
 
 
 class TestOnlineInCreation:
-    def test_increation_not_blobdir(self, tmpdir, acfactory, lp):
-        ac1 = acfactory.get_online_configuring_account()
-        ac2 = acfactory.get_online_configuring_account()
-        wait_configuration_progress(ac1, 1000)
-        wait_configuration_progress(ac2, 1000)
-
-        c2 = ac1.create_contact(email=ac2.get_config("addr"))
-        chat = ac1.create_chat_by_contact(c2)
-
-        lp.sec("Creating in-creation file outside of blobdir")
-        assert tmpdir.strpath != ac1.get_blobdir()
-        src = tmpdir.join('file.txt').ensure(file=1)
-        with pytest.raises(Exception):
-            chat.prepare_message_file(src.strpath)
-
-    def test_no_increation_copies_to_blobdir(self, tmpdir, acfactory, lp):
-        ac1 = acfactory.get_online_configuring_account()
-        ac2 = acfactory.get_online_configuring_account()
-        wait_configuration_progress(ac1, 1000)
-        wait_configuration_progress(ac2, 1000)
-
-        c2 = ac1.create_contact(email=ac2.get_config("addr"))
-        chat = ac1.create_chat_by_contact(c2)
-
-        lp.sec("Creating file outside of blobdir")
-        assert tmpdir.strpath != ac1.get_blobdir()
-        src = tmpdir.join('file.txt')
-        src.write("hello there\n")
-        chat.send_file(src.strpath)
-
-        blob_src = os.path.join(ac1.get_blobdir(), 'file.txt')
-        assert os.path.exists(blob_src), "file.txt not copied to blobdir"
-
     def test_forward_increation(self, acfactory, data, lp):
         ac1 = acfactory.get_online_configuring_account()
         ac2 = acfactory.get_online_configuring_account()
@@ -56,10 +17,7 @@ class TestOnlineInCreation:
         wait_msgs_changed(ac1, 0, 0)  # why no chat id?
 
         lp.sec("create a message with a file in creation")
-        orig = data.get_path("d.png")
-        path = os.path.join(ac1.get_blobdir(), 'd.png')
-        with open(path, "x") as fp:
-            fp.write("preparing")
+        path = data.get_path("d.png")
         prepared_original = chat.prepare_message_file(path)
         assert prepared_original.is_out_preparing()
         wait_msgs_changed(ac1, chat.id, prepared_original.id)
@@ -80,7 +38,6 @@ class TestOnlineInCreation:
 
         lp.sec("finish creating the file and send it")
         assert prepared_original.is_out_preparing()
-        shutil.copyfile(orig, path)
         chat.send_prepared(prepared_original)
         assert prepared_original.is_out_pending() or prepared_original.is_out_delivered()
         wait_msgs_changed(ac1, chat.id, prepared_original.id)
@@ -100,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, orig, shallow=False)
+        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, orig, shallow=False)
+        assert cmp(received_copy.filename, path, False)

python/tests/test_lowlevel.py

@@ -2,6 +2,7 @@ from __future__ import print_function
 from deltachat import capi, cutil, const, set_context_callback, clear_context_callback
 from deltachat.capi import ffi
 from deltachat.capi import lib
+from deltachat.account import EventLogger
 
 
 def test_empty_context():
@@ -17,13 +18,21 @@ def test_callback_None2int():
 
 
 def test_dc_close_events(tmpdir):
-    from deltachat.account import Account
+    ctx = ffi.gc(
+        capi.lib.dc_context_new(capi.lib.py_dc_callback, ffi.NULL, ffi.NULL),
+        lib.dc_context_unref,
+    )
+    evlog = EventLogger(ctx)
+    evlog.set_timeout(5)
+    set_context_callback(
+        ctx,
+        lambda ctx, evt_name, data1, data2: evlog(evt_name, data1, data2)
+    )
     p = tmpdir.join("hello.db")
-    ac1 = Account(p.strpath)
-    ac1.shutdown()
+    lib.dc_open(ctx, p.strpath.encode("ascii"), ffi.NULL)
+    capi.lib.dc_close(ctx)
 
     def find(info_string):
-        evlog = ac1._evlogger
         while 1:
             ev = evlog.get_matching("DC_EVENT_INFO", check_error=False)
             data2 = ev[2]
@@ -32,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")
@@ -86,19 +95,19 @@ 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(
+        lib.dc_provider_get_overview_page(provider)
+    ) == "https://providers.delta.chat/example.com"
+    assert cutil.from_dc_charpointer(lib.dc_provider_get_name(provider)) == "Example"
+    assert cutil.from_dc_charpointer(lib.dc_provider_get_markdown(provider)) == "\n..."
+    assert cutil.from_dc_charpointer(lib.dc_provider_get_status_date(provider)) == "2018-09"
+    assert lib.dc_provider_get_status(provider) == const.DC_PROVIDER_STATUS_PREPARATION
 
 
 def test_provider_info_none():
-    ctx = ffi.gc(
-        lib.dc_context_new(lib.py_dc_callback, ffi.NULL, ffi.NULL),
-        lib.dc_context_unref,
-    )
-    assert lib.dc_provider_new_from_email(ctx, cutil.as_dc_charpointer("email@unexistent.no")) == ffi.NULL
+    assert lib.dc_provider_new_from_email(cutil.as_dc_charpointer("email@unexistent.no")) == ffi.NULL
 
 
 def test_get_info_closed():

python/tests/test_provider_info.py

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

python/tox.ini

@@ -1,21 +1,19 @@
 [tox]
 # make sure to update environment list in travis.yml and appveyor.yml
 envlist =
-    py37
+    py35
     lint
     auditwheels
 
 [testenv]
 commands = 
-    pytest -n6 --reruns 2 --reruns-delay 5 -v -rsXx --ignored {posargs:tests}
+    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
@@ -30,9 +28,10 @@ deps = auditwheel
 commands = 
     python tests/auditwheels.py {toxworkdir}/wheelhouse
 
+
 [testenv:lint]
 skipsdist = True
-skip_install = True
+usedevelop = True
 deps =
     flake8
     # pygments required by rst-lint
@@ -44,32 +43,22 @@ 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 -ra --strict-markers
-python_files = tests/test_*.py
+addopts = -v -rs --reruns 3 --reruns-delay 2
+python_files = tests/test_*.py 
 norecursedirs = .tox 
 xfail_strict=true
-timeout = 90
+timeout = 60 
 timeout_method = thread
 
 [flake8]

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

scripts/proxy.py

@@ -1,80 +0,0 @@
-#!/usr/bin/env python3
-# Examples:
-#
-# Original server that doesn't use SSL:
-# ./proxy.py 8080 imap.nauta.cu 143
-# ./proxy.py 8081 smtp.nauta.cu 25
-#
-# Original server that uses SSL:
-# ./proxy.py 8080 testrun.org 993 --ssl
-# ./proxy.py 8081 testrun.org 465 --ssl
-
-from datetime import datetime
-import argparse
-import selectors
-import ssl
-import socket
-import socketserver
-
-
-class Proxy(socketserver.ThreadingTCPServer):
-    allow_reuse_address = True
-
-    def __init__(self, proxy_host, proxy_port, real_host, real_port, use_ssl):
-        self.real_host = real_host
-        self.real_port = real_port
-        self.use_ssl = use_ssl
-        super().__init__((proxy_host, proxy_port), RequestHandler)
-
-
-class RequestHandler(socketserver.BaseRequestHandler):
-
-    def handle(self):
-        print('{} - {} CONNECTED.'.format(datetime.now(), self.client_address))
-
-        total = 0
-        real_server = (self.server.real_host, self.server.real_port)
-        with socket.create_connection(real_server) as sock:
-            if self.server.use_ssl:
-                context = ssl.create_default_context()
-                sock = context.wrap_socket(
-                    sock, server_hostname=real_server[0])
-
-            forward = {self.request: sock, sock: self.request}
-
-            sel = selectors.DefaultSelector()
-            sel.register(self.request, selectors.EVENT_READ,
-                         self.client_address)
-            sel.register(sock, selectors.EVENT_READ, real_server)
-
-            active = True
-            while active:
-                events = sel.select()
-                for key, mask in events:
-                    print('\n{} - {} wrote:'.format(datetime.now(), key.data))
-                    data = key.fileobj.recv(1024)
-                    received = len(data)
-                    total += received
-                    print(data)
-                    print('{} Bytes\nTotal: {} Bytes'.format(received, total))
-                    if data:
-                        forward[key.fileobj].sendall(data)
-                    else:
-                        print('\nCLOSING CONNECTION.\n\n')
-                        forward[key.fileobj].close()
-                        key.fileobj.close()
-                        active = False
-
-
-if __name__ == '__main__':
-    p = argparse.ArgumentParser(description='Simple Python Proxy')
-    p.add_argument(
-        "proxy_port", help="the port where the proxy will listen", type=int)
-    p.add_argument('host', help="the real host")
-    p.add_argument('port', help="the port of the real host", type=int)
-    p.add_argument("--ssl", help="use ssl to connect to the real host",
-                   action="store_true")
-    args = p.parse_args()
-
-    with Proxy('', args.proxy_port, args.host, args.port, args.ssl) as proxy:
-        proxy.serve_forever()

set_core_version.py

@@ -1,65 +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.25.0")
-    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.25.0
-        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", "check"])
-    subprocess.call(["git", "add", "-u"])
-    # subprocess.call(["cargo", "update", "-p", "deltachat"])
-
-    print("after commit make sure to: ")
-    print("")
-    print("   git tag {}".format(newversion))
-    print("")

spec.md

@@ -1,6 +1,6 @@
 # Chat-over-Email specification
 
-Version 0.30.0
+Version 0.19.0
 
 This document describes how emails can be used
 to implement typical messenger functions
@@ -17,9 +17,6 @@ while staying compatible to existing MUAs.
     - [Change group name](#change-group-name)
     - [Set group image](#set-group-image)
 - [Set profile image](#set-profile-image)
-- [Locations](#locations)
-    - [User locations](#user-locations)
-    - [Points of interest](#points-of-interest)
 - [Miscellaneous](#miscellaneous)
 
 
@@ -32,7 +29,8 @@ Messages SHOULD be encrypted by the
 Meta data (at least the subject and all chat-headers) SHOULD be encrypted
 by the [Memoryhole](https://github.com/autocrypt/memoryhole) standard.
 If Memoryhole is not used,
-the subject of encrypted messages SHOULD be replaced by the string `...`.
+the subject of encrypted messages SHOULD be replaced by the string
+`Chat: Encrypted message` where the part after the colon MAY be localized.
 
 
 # Outgoing messages
@@ -115,7 +113,6 @@ but MUAs typically expose the sender in the UI.
 Groups are chats with usually more than one recipient,
 each defined by an email-address.
 The sender plus the recipients are the group members.
-All group members form the member list.
 
 To allow different groups with the same members,
 groups are identified by a group-id.
@@ -138,7 +135,8 @@ The group-name MUST be written to `Chat-Group-Name` header
 to join a group chat on a second device any time).
 
 The `Subject` header of outgoing group messages
-SHOULD be set to the group-name.
+SHOULD start with the characters `Chat:`
+followed by the group-name and a colon followed by an excerpt of the message.
 
 To identify the group-id on replies from normal MUAs,
 the group-id MUST also be added to the message-id of outgoing messages.
@@ -155,8 +153,8 @@ The message-id MUST have the format `Gr.<group-id>.<unique data>`.
     Hello group - this group contains three members
 
 Messengers adding the member list in the form `Name <email-address>`
-MUST take care only to distribute the names authorized by the contacts themselves.
-Otherwise, names as _Daddy_ or _Honey_ may be distributed
+MUST take care only to spread the names authorized by the contacts themselves.
+Otherwise, names as _Daddy_ or _Honey_ may be spread
 (this issue is also true for normal MUAs, however,
 for more contact- and chat-centralized apps
 such situations happen more frequently).
@@ -179,22 +177,12 @@ to a normal single-user chat with the email-address given in `From`.
 
 ## Add and remove members
 
-Messenger clients MUST init the member list
-from the `From`/`To` headers on the first group message.
-
-When a member is added later,
-a `Chat-Group-Member-Added` action header must be sent
-with the value set to the email-address of the added member.
-When receiving a `Chat-Group-Member-Added` header, however,
-_all missing_ members  the `From`/`To` headers has to be added.
-This is to mitigate problems when receiving messages
-in different orders, esp. on creating new groups.
-
-To remove a member, a `Chat-Group-Member-Removed` header must be sent
-with the value set to the email-address of the member to remove.
-When receiving a `Chat-Group-Member-Removed` header,
-only exaxtly the given member has to be removed from the member list.
-
+Messenger clients MUST construct the member list
+from the `From`/`To` headers only on the first group message
+or if they see a `Chat-Group-Member-Added`
+or `Chat-Group-Member-Removed` action header.
+Both headers MUST have the email-address
+of the added or removed member as the value.
 Messenger clients MUST NOT construct the member list
 on other group messages
 (this is to avoid accidentally altered To-lists in normal MUAs;
@@ -260,11 +248,11 @@ and the message SHOULD appear as a message or action from the sender.
 A group MAY have a group-image.
 To change or set the group-image,
 the messenger MUST attach an image file to a message
-and MUST add the header `Chat-Group-Avatar`
+and MUST add the header `Chat-Group-Image`
 with the value set to the image name.
 
 To remove the group-image,
-the messenger MUST add the header `Chat-Group-Avatar: 0`.
+the messenger MUST add the header `Chat-Group-Image: 0`.
 
 The messenger SHOULD send an explicit mail for each group image change.
 The body of the message SHOULD contain
@@ -277,7 +265,7 @@ and the message SHOULD appear as a message or action from the sender.
     Chat-Version: 1.0
     Chat-Group-ID: 12345uvwxyZ
     Chat-Group-Name: Our Group
-    Chat-Group-Avatar: image.jpg
+    Chat-Group-Image: image.jpg
     Message-ID: Gr.12345uvwxyZ.0005@domain
     Subject: Chat: Our Group: Hello, ...
     Content-Type: multipart/mixed; boundary="==break=="
@@ -295,25 +283,25 @@ and the message SHOULD appear as a message or action from the sender.
 
 The image format SHOULD be image/jpeg or image/png.
 To save data, it is RECOMMENDED
-to add a `Chat-Group-Avatar` only on image changes.
+to add a `Chat-Group-Image` only on image changes.
 
 
 # Set profile image
 
-A user MAY have a profile-image that MAY be distributed to their contacts.
+A user MAY have a profile-image that MAY be spread to his contacts.
 To change or set the profile-image,
 the messenger MUST attach an image file to a message
-and MUST add the header `Chat-User-Avatar`
+and MUST add the header `Chat-Profile-Image`
 with the value set to the image name.
 
 To remove the profile-image,
-the messenger MUST add the header `Chat-User-Avatar: 0`.
+the messenger MUST add the header `Chat-Profile-Image: 0`.
 
-To distribute the image,
+To spread the image,
 the messenger MAY send the profile image
 together with the next mail to a given contact
 (to do this only once,
-the messenger has to keep a `user_avatar_update_state` somewhere).
+the messenger has to keep a `profile_image_update_state` somewhere).
 Alternatively, the messenger MAY send an explicit mail
 for each profile-image change to all contacts using a compatible messenger.
 The messenger SHOULD NOT send an explicit mail to normal MUAs.
@@ -321,7 +309,7 @@ The messenger SHOULD NOT send an explicit mail to normal MUAs.
     From: sender@domain
     To: rcpt@domain
     Chat-Version: 1.0
-    Chat-User-Avatar: photo.jpg
+    Chat-Profile-Image: photo.jpg
     Subject: Chat: Hello, ...
     Content-Type: multipart/mixed; boundary="==break=="
 
@@ -337,71 +325,13 @@ The messenger SHOULD NOT send an explicit mail to normal MUAs.
     --==break==--
 
 The image format SHOULD be image/jpeg or image/png.
-Note that `Chat-User-Avatar` may appear together with all other headers,
-eg. there may be a `Chat-User-Avatar` and a `Chat-Group-Avatar` header
+Note that `Chat-Profile-Image` may appear together with all other headers,
+eg. there may be a `Chat-Profile-Image` and a `Chat-Group-Image` header
 in the same message.
-To save data, it is RECOMMENDED to add a `Chat-User-Avatar` header
+To save data, it is RECOMMENDED to add a `Chat-Profile-Image` header
 only on image changes.
 
 
-# Locations
-
-Locations can be attachted to messages using
-[standard kml-files](https://www.opengeospatial.org/standards/kml/)
-with well-known names.
-
-
-## User locations
-
-To send the location of the sender,
-the app can attach a file with the name `location.kml`.
-The file can contain one or more locations.
-Apps that support location streaming will typically collect some location events
-and send them together in one file.
-As each location has an independent timestamp,
-the apps can show the location as a track.
-
-Note that the `addr` attribute inside the  `location.kml` file
-MUST match the users email-address.
-Otherwise, the file is discarded silently;
-this is to protect against getting wrong locations,
-eg. forwarded from a normal MUA.
-
-    <?xml version="1.0" encoding="UTF-8"?>
-    <kml xmlns="http://www.opengis.net/kml/2.2">
-      <Document addr="ndh@deltachat.de">
-        <Placemark>
-          <Timestamp><when>2020-01-11T20:40:19Z</when></Timestamp>
-          <Point><coordinates accuracy="1.2">1.234,5.678</coordinates></Point>
-        </Placemark>
-        <Placemark>
-          <Timestamp><when>2020-01-11T20:40:25Z</when></Timestamp>
-          <Point><coordinates accuracy="5.4">7.654,3.21</coordinates></Point>
-        </Placemark>
-      </Document>
-    </kml>
-
-
-## Points of interest
-
-To send an "Point of interest", a POI,
-use a normal message and attach a file with the name  `message.kml`.
-In contrast to user locations, this file should contain only one location
-and an address-attribute is not needed -
-as the location belongs to the message content,
-it is fine if the location is detected on forwarding etc.
-
-    <?xml version="1.0" encoding="UTF-8"?>
-    <kml xmlns="http://www.opengis.net/kml/2.2">
-      <Document>
-        <Placemark>
-          <Timestamp><when>2020-01-01T20:40:19Z</when></Timestamp>
-          <Point><coordinates accuracy="1.2">1.234,5.678</coordinates></Point>
-        </Placemark>
-      </Document>
-    </kml>
-
-
 # Miscellaneous
 
 Messengers SHOULD use the header `In-Reply-To` as usual.
@@ -438,4 +368,4 @@ as the sending time of the message as indicated by its Date header,
 or the time of first receipt if that date is in the future or unavailable.
 
 
-Copyright © 2017-2020 Delta Chat contributors.
+Copyright © 2017-2019 Delta Chat contributors.

src/aheader.rs

@@ -1,15 +1,13 @@
-//! # 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::headerdef::{HeaderDef, HeaderDefMap};
-use crate::key::{DcKey, SignedPublicKey};
+use crate::key::*;
 
 /// Possible values for encryption preference
 #[derive(PartialEq, Eq, Debug, Clone, Copy, FromPrimitive, ToPrimitive)]
@@ -42,27 +40,22 @@ 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,
-    pub public_key: SignedPublicKey,
+    pub public_key: Key,
     pub prefer_encrypt: EncryptPreference,
 }
 
 impl Aheader {
-    /// Creates new autocrypt header
-    pub fn new(
-        addr: String,
-        public_key: SignedPublicKey,
-        prefer_encrypt: EncryptPreference,
-    ) -> Self {
+    pub fn new(addr: String, public_key: Key, prefer_encrypt: EncryptPreference) -> Self {
         Aheader {
             addr,
             public_key,
@@ -70,52 +63,60 @@ impl Aheader {
         }
     }
 
-    pub fn from_headers(
-        context: &Context,
-        wanted_from: &str,
-        headers: &[mailparse::MailHeader<'_>],
-    ) -> Option<Self> {
-        if let Ok(Some(value)) = headers.get_header_value(HeaderDef::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
     }
 }
 
 impl fmt::Display for Aheader {
     fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        write!(fmt, "addr={};", self.addr)?;
-        if self.prefer_encrypt == EncryptPreference::Mutual {
-            write!(fmt, " prefer-encrypt=mutual;")?;
-        }
-
-        // adds a whitespace every 78 characters, this allows
-        // email crate to wrap the lines according to RFC 5322
+        // TODO replace 78 with enum /rtn
+        // adds a whitespace every 78 characters, this allows libEtPan to
+        // wrap the lines according to RFC 5322
         // (which may insert a linebreak before every whitespace)
-        let keydata = self.public_key.to_base64().chars().enumerate().fold(
-            String::new(),
-            |mut res, (i, c)| {
-                if i % 78 == 78 - "keydata=".len() {
-                    res.push(' ')
-                }
-                res.push(c);
-                res
-            },
-        );
-        write!(fmt, " keydata={}", keydata)
+        let keydata = self.public_key.to_base64(78);
+        write!(
+            fmt,
+            "addr={}; prefer-encrypt={}; keydata={}",
+            self.addr, self.prefer_encrypt, keydata
+        )
     }
 }
 
@@ -144,16 +145,30 @@ impl str::FromStr for Aheader {
                 return Err(());
             }
         };
-        let public_key: SignedPublicKey = attributes
-            .remove("keydata")
-            .ok_or(())
-            .and_then(|raw| SignedPublicKey::from_base64(&raw).or(Err(())))
-            .and_then(|key| key.verify().and(Ok(key)).or(Err(())))?;
 
-        let prefer_encrypt = attributes
+        let public_key = match attributes
+            .remove("keydata")
+            .and_then(|raw| Key::from_base64(&raw, KeyType::Public))
+        {
+            Some(key) => {
+                if key.verify() {
+                    key
+                } else {
+                    return Err(());
+                }
+            }
+            None => {
+                return Err(());
+            }
+        };
+
+        let prefer_encrypt = match attributes
             .remove("prefer-encrypt")
             .and_then(|raw| raw.parse().ok())
-            .unwrap_or_default();
+        {
+            Some(pref) => pref,
+            None => EncryptPreference::NoPreference,
+        };
 
         // Autocrypt-Level0: unknown attributes starting with an underscore can be safely ignored
         // Autocrypt-Level0: unknown attribute, treat the header as invalid
@@ -173,13 +188,15 @@ impl str::FromStr for Aheader {
 mod tests {
     use super::*;
 
-    const RAWKEY: &str = "xsBNBFzG3j0BCAC6iNhT8zydvCXi8LI/gFnkadMbfmSE/rTJskRRra/utGbLyDta/yTrJgWL7O3y/g4HdDW/dN2z26Y6W13IMzx9gLInn1KQZChtqWAcr/ReUucXcymwcfg1mdkBGk3TSLeLihN6CJx8Wsv8ig+kgAzte4f5rqEEAJVQ9WZHuti7UiYs6oRzqTo06CRe9owVXxzdMf0VDQtf7ZFm9dpzKKbhH7Lu8880iiotQ9/yRCkDGp9fNThsrLdZiK6OIAcIBAqi2rI89aS1dAmnRbktQieCx5izzyYkR1KvVL3gTTllHOzfKVEC2asmtWu2e4se/+O4WMIS1eGrn7GeWVb0Vwc5ABEBAAHNETxhQEBiLmV4YW1wbGUuZGU+wsCJBBABCAAzAhkBBQJcxt5FAhsDBAsJCAcGFQgJCgsCAxYCARYhBI4xxYKBgH3ANh5cufaKrc9mtiMLAAoJEPaKrc9mtiML938H/18F+3Wf9/JaAy/8hCO1v4S2PVBhxaKCokaNFtkfaMRne2l087LscCFPiFNyb4mv6Z3YeK8Xpxlp2sI0ecvdiqLUOGfnxS6tQrj+83EjtIrZ/hXOk1h121QFWH9Zg2VNHtODXjAgdLDC0NWUrclR0ZOqEDQHeo0ibTILdokVfXFN25wakPmGaYJP2y729cb1ve7RzvIvwn+Dddfxo3ao72rBfLi7l4NQ4S0KsY4cw+/6l5bRCKYCP77wZtvCwUvfVVosLdT43agtSiBI49+ayqvZ8OCvSJa61i+v81brTiEy9GBod4eAp45Ibsuemkw+gon4ZOvUXHTjwFB+h63MrozOwE0EXMbePQEIAL/vauf1zK8JgCu3V+G+SOX0iWw5xUlCPX+ERpBbWfwu3uAqn4wYXD3JDE/fVAF668xiV4eTPtlSUd5h0mn+G7uXMMOtkb+20SoEt50f8zw8TrL9t+ZsV11GKZWJpCar5AhXWsn6EEi8I2hLL5vn55ZZmHuGgN4jjmkRl3ToKCLhaXwTBjCJem7N5EH7F75wErEITa55v4Lb4Nfca7vnvtYrI1OA446xa8gHra0SINelTD09/JM/Fw4sWVPBaRZmJK/Tnu79N23No9XBUubmFPv1pNexZsQclicnTpt/BEWhiun7d6lfGB63K1aoHRTR1pcrWvBuALuuz0gqar2zlI0AEQEAAcLAdgQYAQgAIAUCXMbeRQIbDBYhBI4xxYKBgH3ANh5cufaKrc9mtiMLAAoJEPaKrc9mtiMLKSEIAIyLCRO2OyZ0IYRvRPpMn4p7E+7Pfcz/0mSkOy+1hshgJnqivXurm8zwGrwdMqeV4eslKR9H1RUdWGUQJNbtwmmjrt5DHpIhYHl5t3FpCBaGbV20Omo00Q38lBl9MtrmZkZw+ktEk6X+0xCKssMF+2MADkSOIufbR5HrDVB89VZOHCO9DeXvCUUAw2hyJiL/LHmLzJ40zYoTmb+F//f0k0j+tRdbkefyRoCmwG7YGiT+2hnCdgcezswnzah5J3ZKlrg7jOGo1LxtbvNUzxNBbC6S/aNgwm6qxo7xegRhmEl5uZ16zwyj4qz+xkjGy25Of5mWfUDoNw7OT7sjUbHOOMc=";
+    fn rawkey() -> String {
+        "xsBNBFzG3j0BCAC6iNhT8zydvCXi8LI/gFnkadMbfmSE/rTJskRRra/utGbLyDta/yTrJgWL7O3y/g4HdDW/dN2z26Y6W13IMzx9gLInn1KQZChtqWAcr/ReUucXcymwcfg1mdkBGk3TSLeLihN6CJx8Wsv8ig+kgAzte4f5rqEEAJVQ9WZHuti7UiYs6oRzqTo06CRe9owVXxzdMf0VDQtf7ZFm9dpzKKbhH7Lu8880iiotQ9/yRCkDGp9fNThsrLdZiK6OIAcIBAqi2rI89aS1dAmnRbktQieCx5izzyYkR1KvVL3gTTllHOzfKVEC2asmtWu2e4se/+O4WMIS1eGrn7GeWVb0Vwc5ABEBAAHNETxhQEBiLmV4YW1wbGUuZGU+wsCJBBABCAAzAhkBBQJcxt5FAhsDBAsJCAcGFQgJCgsCAxYCARYhBI4xxYKBgH3ANh5cufaKrc9mtiMLAAoJEPaKrc9mtiML938H/18F+3Wf9/JaAy/8hCO1v4S2PVBhxaKCokaNFtkfaMRne2l087LscCFPiFNyb4mv6Z3YeK8Xpxlp2sI0ecvdiqLUOGfnxS6tQrj+83EjtIrZ/hXOk1h121QFWH9Zg2VNHtODXjAgdLDC0NWUrclR0ZOqEDQHeo0ibTILdokVfXFN25wakPmGaYJP2y729cb1ve7RzvIvwn+Dddfxo3ao72rBfLi7l4NQ4S0KsY4cw+/6l5bRCKYCP77wZtvCwUvfVVosLdT43agtSiBI49+ayqvZ8OCvSJa61i+v81brTiEy9GBod4eAp45Ibsuemkw+gon4ZOvUXHTjwFB+h63MrozOwE0EXMbePQEIAL/vauf1zK8JgCu3V+G+SOX0iWw5xUlCPX+ERpBbWfwu3uAqn4wYXD3JDE/fVAF668xiV4eTPtlSUd5h0mn+G7uXMMOtkb+20SoEt50f8zw8TrL9t+ZsV11GKZWJpCar5AhXWsn6EEi8I2hLL5vn55ZZmHuGgN4jjmkRl3ToKCLhaXwTBjCJem7N5EH7F75wErEITa55v4Lb4Nfca7vnvtYrI1OA446xa8gHra0SINelTD09/JM/Fw4sWVPBaRZmJK/Tnu79N23No9XBUubmFPv1pNexZsQclicnTpt/BEWhiun7d6lfGB63K1aoHRTR1pcrWvBuALuuz0gqar2zlI0AEQEAAcLAdgQYAQgAIAUCXMbeRQIbDBYhBI4xxYKBgH3ANh5cufaKrc9mtiMLAAoJEPaKrc9mtiMLKSEIAIyLCRO2OyZ0IYRvRPpMn4p7E+7Pfcz/0mSkOy+1hshgJnqivXurm8zwGrwdMqeV4eslKR9H1RUdWGUQJNbtwmmjrt5DHpIhYHl5t3FpCBaGbV20Omo00Q38lBl9MtrmZkZw+ktEk6X+0xCKssMF+2MADkSOIufbR5HrDVB89VZOHCO9DeXvCUUAw2hyJiL/LHmLzJ40zYoTmb+F//f0k0j+tRdbkefyRoCmwG7YGiT+2hnCdgcezswnzah5J3ZKlrg7jOGo1LxtbvNUzxNBbC6S/aNgwm6qxo7xegRhmEl5uZ16zwyj4qz+xkjGy25Of5mWfUDoNw7OT7sjUbHOOMc=".into()
+    }
 
     #[test]
     fn test_from_str() {
         let h: Aheader = format!(
             "addr=me@mail.com; prefer-encrypt=mutual; keydata={}",
-            RAWKEY
+            rawkey()
         )
         .parse()
         .expect("failed to parse");
@@ -188,22 +205,9 @@ mod tests {
         assert_eq!(h.prefer_encrypt, EncryptPreference::Mutual);
     }
 
-    // EncryptPreference::Reset is an internal value, parser should never return it
-    #[test]
-    fn test_from_str_reset() {
-        let raw = format!(
-            "addr=reset@example.com; prefer-encrypt=reset; keydata={}",
-            RAWKEY
-        );
-        let h: Aheader = raw.parse().expect("failed to parse");
-
-        assert_eq!(h.addr, "reset@example.com");
-        assert_eq!(h.prefer_encrypt, EncryptPreference::NoPreference);
-    }
-
     #[test]
     fn test_from_str_non_critical() {
-        let raw = format!("addr=me@mail.com; _foo=one; _bar=two; keydata={}", RAWKEY);
+        let raw = format!("addr=me@mail.com; _foo=one; _bar=two; keydata={}", rawkey());
         let h: Aheader = raw.parse().expect("failed to parse");
 
         assert_eq!(h.addr, "me@mail.com");
@@ -214,57 +218,33 @@ mod tests {
     fn test_from_str_superflous_critical() {
         let raw = format!(
             "addr=me@mail.com; _foo=one; _bar=two; other=me; keydata={}",
-            RAWKEY
+            rawkey()
         );
         assert!(raw.parse::<Aheader>().is_err());
     }
 
     #[test]
     fn test_good_headers() {
-        let fixed_header = concat!(
-            "addr=a@b.example.org; prefer-encrypt=mutual; ",
-            "keydata=xsBNBFzG3j0BCAC6iNhT8zydvCXi8LI/gFnkadMbfmSE/rTJskRRra/utGbLyDta/yTrJg",
-            " WL7O3y/g4HdDW/dN2z26Y6W13IMzx9gLInn1KQZChtqWAcr/ReUucXcymwcfg1mdkBGk3TSLeLihN6",
-            " CJx8Wsv8ig+kgAzte4f5rqEEAJVQ9WZHuti7UiYs6oRzqTo06CRe9owVXxzdMf0VDQtf7ZFm9dpzKK",
-            " bhH7Lu8880iiotQ9/yRCkDGp9fNThsrLdZiK6OIAcIBAqi2rI89aS1dAmnRbktQieCx5izzyYkR1Kv",
-            " VL3gTTllHOzfKVEC2asmtWu2e4se/+O4WMIS1eGrn7GeWVb0Vwc5ABEBAAHNETxhQEBiLmV4YW1wbG",
-            " UuZGU+wsCJBBABCAAzAhkBBQJcxt5FAhsDBAsJCAcGFQgJCgsCAxYCARYhBI4xxYKBgH3ANh5cufaK",
-            " rc9mtiMLAAoJEPaKrc9mtiML938H/18F+3Wf9/JaAy/8hCO1v4S2PVBhxaKCokaNFtkfaMRne2l087",
-            " LscCFPiFNyb4mv6Z3YeK8Xpxlp2sI0ecvdiqLUOGfnxS6tQrj+83EjtIrZ/hXOk1h121QFWH9Zg2VN",
-            " HtODXjAgdLDC0NWUrclR0ZOqEDQHeo0ibTILdokVfXFN25wakPmGaYJP2y729cb1ve7RzvIvwn+Ddd",
-            " fxo3ao72rBfLi7l4NQ4S0KsY4cw+/6l5bRCKYCP77wZtvCwUvfVVosLdT43agtSiBI49+ayqvZ8OCv",
-            " SJa61i+v81brTiEy9GBod4eAp45Ibsuemkw+gon4ZOvUXHTjwFB+h63MrozOwE0EXMbePQEIAL/vau",
-            " f1zK8JgCu3V+G+SOX0iWw5xUlCPX+ERpBbWfwu3uAqn4wYXD3JDE/fVAF668xiV4eTPtlSUd5h0mn+",
-            " G7uXMMOtkb+20SoEt50f8zw8TrL9t+ZsV11GKZWJpCar5AhXWsn6EEi8I2hLL5vn55ZZmHuGgN4jjm",
-            " kRl3ToKCLhaXwTBjCJem7N5EH7F75wErEITa55v4Lb4Nfca7vnvtYrI1OA446xa8gHra0SINelTD09",
-            " /JM/Fw4sWVPBaRZmJK/Tnu79N23No9XBUubmFPv1pNexZsQclicnTpt/BEWhiun7d6lfGB63K1aoHR",
-            " TR1pcrWvBuALuuz0gqar2zlI0AEQEAAcLAdgQYAQgAIAUCXMbeRQIbDBYhBI4xxYKBgH3ANh5cufaK",
-            " rc9mtiMLAAoJEPaKrc9mtiMLKSEIAIyLCRO2OyZ0IYRvRPpMn4p7E+7Pfcz/0mSkOy+1hshgJnqivX",
-            " urm8zwGrwdMqeV4eslKR9H1RUdWGUQJNbtwmmjrt5DHpIhYHl5t3FpCBaGbV20Omo00Q38lBl9Mtrm",
-            " ZkZw+ktEk6X+0xCKssMF+2MADkSOIufbR5HrDVB89VZOHCO9DeXvCUUAw2hyJiL/LHmLzJ40zYoTmb",
-            " +F//f0k0j+tRdbkefyRoCmwG7YGiT+2hnCdgcezswnzah5J3ZKlrg7jOGo1LxtbvNUzxNBbC6S/aNg",
-            " wm6qxo7xegRhmEl5uZ16zwyj4qz+xkjGy25Of5mWfUDoNw7OT7sjUbHOOMc="
-        );
+        let fixed_header = "addr=a@b.example.org; prefer-encrypt=mutual; keydata=xsBNBFzG3j0BCAC6iNhT8zydvCXi8LI/gFnkadMbfmSE/rTJskRRra/utGbLyDta/yTrJgWL7O3y/g 4HdDW/dN2z26Y6W13IMzx9gLInn1KQZChtqWAcr/ReUucXcymwcfg1mdkBGk3TSLeLihN6CJx8Wsv8 ig+kgAzte4f5rqEEAJVQ9WZHuti7UiYs6oRzqTo06CRe9owVXxzdMf0VDQtf7ZFm9dpzKKbhH7Lu88 80iiotQ9/yRCkDGp9fNThsrLdZiK6OIAcIBAqi2rI89aS1dAmnRbktQieCx5izzyYkR1KvVL3gTTll HOzfKVEC2asmtWu2e4se/+O4WMIS1eGrn7GeWVb0Vwc5ABEBAAHNETxhQEBiLmV4YW1wbGUuZGU+ws CJBBABCAAzAhkBBQJcxt5FAhsDBAsJCAcGFQgJCgsCAxYCARYhBI4xxYKBgH3ANh5cufaKrc9mtiML AAoJEPaKrc9mtiML938H/18F+3Wf9/JaAy/8hCO1v4S2PVBhxaKCokaNFtkfaMRne2l087LscCFPiF Nyb4mv6Z3YeK8Xpxlp2sI0ecvdiqLUOGfnxS6tQrj+83EjtIrZ/hXOk1h121QFWH9Zg2VNHtODXjAg dLDC0NWUrclR0ZOqEDQHeo0ibTILdokVfXFN25wakPmGaYJP2y729cb1ve7RzvIvwn+Dddfxo3ao72 rBfLi7l4NQ4S0KsY4cw+/6l5bRCKYCP77wZtvCwUvfVVosLdT43agtSiBI49+ayqvZ8OCvSJa61i+v 81brTiEy9GBod4eAp45Ibsuemkw+gon4ZOvUXHTjwFB+h63MrozOwE0EXMbePQEIAL/vauf1zK8JgC u3V+G+SOX0iWw5xUlCPX+ERpBbWfwu3uAqn4wYXD3JDE/fVAF668xiV4eTPtlSUd5h0mn+G7uXMMOt kb+20SoEt50f8zw8TrL9t+ZsV11GKZWJpCar5AhXWsn6EEi8I2hLL5vn55ZZmHuGgN4jjmkRl3ToKC LhaXwTBjCJem7N5EH7F75wErEITa55v4Lb4Nfca7vnvtYrI1OA446xa8gHra0SINelTD09/JM/Fw4s WVPBaRZmJK/Tnu79N23No9XBUubmFPv1pNexZsQclicnTpt/BEWhiun7d6lfGB63K1aoHRTR1pcrWv BuALuuz0gqar2zlI0AEQEAAcLAdgQYAQgAIAUCXMbeRQIbDBYhBI4xxYKBgH3ANh5cufaKrc9mtiML AAoJEPaKrc9mtiMLKSEIAIyLCRO2OyZ0IYRvRPpMn4p7E+7Pfcz/0mSkOy+1hshgJnqivXurm8zwGr wdMqeV4eslKR9H1RUdWGUQJNbtwmmjrt5DHpIhYHl5t3FpCBaGbV20Omo00Q38lBl9MtrmZkZw+ktE k6X+0xCKssMF+2MADkSOIufbR5HrDVB89VZOHCO9DeXvCUUAw2hyJiL/LHmLzJ40zYoTmb+F//f0k0 j+tRdbkefyRoCmwG7YGiT+2hnCdgcezswnzah5J3ZKlrg7jOGo1LxtbvNUzxNBbC6S/aNgwm6qxo7x egRhmEl5uZ16zwyj4qz+xkjGy25Of5mWfUDoNw7OT7sjUbHOOMc=";
 
         let ah = Aheader::from_str(fixed_header).expect("failed to parse");
         assert_eq!(ah.addr, "a@b.example.org");
         assert_eq!(ah.prefer_encrypt, EncryptPreference::Mutual);
-        assert_eq!(format!("{}", ah), fixed_header);
 
         let rendered = ah.to_string();
         assert_eq!(rendered, fixed_header);
 
-        let ah = Aheader::from_str(&format!(" _foo; __FOO=BAR ;;; addr = a@b.example.org ;\r\n   prefer-encrypt = mutual ; keydata = {}", RAWKEY)).expect("failed to parse");
+        let ah = Aheader::from_str(&format!(" _foo; __FOO=BAR ;;; addr = a@b.example.org ;\r\n   prefer-encrypt = mutual ; keydata = {}", rawkey())).expect("failed to parse");
         assert_eq!(ah.addr, "a@b.example.org");
         assert_eq!(ah.prefer_encrypt, EncryptPreference::Mutual);
 
         Aheader::from_str(&format!(
             "addr=a@b.example.org; prefer-encrypt=ignoreUnknownValues; keydata={}",
-            RAWKEY
+            rawkey()
         ))
         .expect("failed to parse");
 
-        Aheader::from_str(&format!("addr=a@b.example.org; keydata={}", RAWKEY))
+        Aheader::from_str(&format!("addr=a@b.example.org; keydata={}", rawkey()))
             .expect("failed to parse");
     }
 
@@ -276,30 +256,4 @@ mod tests {
         assert!(Aheader::from_str(" ;;").is_err());
         assert!(Aheader::from_str("addr=a@t.de; unknwon=1; keydata=jau").is_err());
     }
-
-    #[test]
-    fn test_display_aheader() {
-        assert!(format!(
-            "{}",
-            Aheader::new(
-                "test@example.com".to_string(),
-                SignedPublicKey::from_base64(RAWKEY).unwrap(),
-                EncryptPreference::Mutual
-            )
-        )
-        .contains("prefer-encrypt=mutual;"));
-
-        // According to Autocrypt Level 1 specification,
-        // only "prefer-encrypt=mutual;" can be used.
-        // If the setting is nopreference, the whole attribute is omitted.
-        assert!(!format!(
-            "{}",
-            Aheader::new(
-                "test@example.com".to_string(),
-                SignedPublicKey::from_base64(RAWKEY).unwrap(),
-                EncryptPreference::NoPreference
-            )
-        )
-        .contains("prefer-encrypt"));
-    }
 }

src/blob.rs

@@ -1,640 +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 self::image::GenericImageView;
-use crate::constants::AVATAR_SIZE;
-use crate::context::Context;
-use crate::events::Event;
-
-extern crate image;
-
-/// 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 new_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 stem: String = iter.next().unwrap_or_default().chars().take(64).collect();
-        let ext: String = iter.next().unwrap_or_default().chars().take(32).collect();
-        if ext.is_empty() {
-            (stem, "".to_string())
-        } else {
-            (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
-    }
-
-    pub fn recode_to_avatar_size(&self, context: &Context) -> Result<(), BlobError> {
-        let blob_abs = self.to_abs_path();
-        let img = image::open(&blob_abs).map_err(|err| BlobError::RecodeFailure {
-            blobdir: context.get_blobdir().to_path_buf(),
-            blobname: blob_abs.to_str().unwrap_or_default().to_string(),
-            cause: err,
-            backtrace: failure::Backtrace::new(),
-        })?;
-
-        if img.width() <= AVATAR_SIZE && img.height() <= AVATAR_SIZE {
-            return Ok(());
-        }
-
-        let img = img.thumbnail(AVATAR_SIZE, AVATAR_SIZE);
-
-        img.save(&blob_abs).map_err(|err| BlobError::WriteFailure {
-            blobdir: context.get_blobdir().to_path_buf(),
-            blobname: blob_abs.to_str().unwrap_or_default().to_string(),
-            cause: err,
-            backtrace: failure::Backtrace::new(),
-        })?;
-
-        Ok(())
-    }
-}
-
-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,
-    },
-    RecodeFailure {
-        blobdir: PathBuf,
-        blobname: String,
-        #[cause]
-        cause: image::ImageError,
-        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::RecodeFailure {
-                blobdir, blobname, ..
-            } => write!(f, "Failed to recode {} in {}", 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::new_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::new_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::new_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"));
-    }
-
-    #[test]
-    fn test_sanitise_name() {
-        let (_, ext) =
-            BlobObject::sanitise_name("Я ЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯ.txt");
-        assert_eq!(ext, ".txt");
-    }
-}

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<(ChatId, 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_set_chat_visibility(). 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: ChatId = 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=?1))
-                 WHERE c.id>9
-                   AND c.blocked=0
-                   AND c.id IN(SELECT chat_id FROM chats_contacts WHERE contact_id=?2)
-                 GROUP BY c.id
-                 ORDER BY c.archived=?3 DESC, IFNULL(m.timestamp,c.created_timestamp) DESC, m.id DESC;",
-                params![MessageState::OutDraft, query_contact_id as i32, ChatVisibility::Pinned],
-                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,
             )?
@@ -162,70 +150,50 @@ impl Chatlist {
             let query = query.trim().to_string();
             ensure!(!query.is_empty(), "missing query");
 
-            // allow searching over special names that may change at any time
-            // when the ui calls set_stock_translation()
-            if let Err(err) = update_special_chat_names(context) {
-                warn!(context, "cannot update special chat names: {:?}", err)
-            }
-
             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=?1))
-                 WHERE c.id>9
-                   AND c.blocked=0
-                   AND NOT c.archived=?2
-                 GROUP BY c.id
-                 ORDER BY c.archived=?3 DESC, IFNULL(m.timestamp,c.created_timestamp) DESC, m.id DESC;",
-                params![MessageState::OutDraft, ChatVisibility::Archived, ChatVisibility::Pinned],
+                "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) {
-                    ids.insert(
-                        0,
-                        (ChatId::new(DC_CHAT_ID_DEADDROP), last_deaddrop_fresh_msg_id),
-                    );
+                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((ChatId::new(DC_CHAT_ID_ALLDONE_HINT), MsgId::new(0)));
+                ids.push((DC_CHAT_ID_ALLDONE_HINT, 0));
             }
-            ids.push((ChatId::new(DC_CHAT_ID_ARCHIVED_LINK), MsgId::new(0)));
+            ids.push((DC_CHAT_ID_ARCHIVED_LINK, 0));
         }
 
         Ok(Chatlist { ids })
@@ -236,7 +204,6 @@ impl Chatlist {
         self.ids.len()
     }
 
-    /// Returns true if chatlist is empty.
     pub fn is_empty(&self) -> bool {
         self.ids.is_empty()
     }
@@ -244,9 +211,9 @@ impl Chatlist {
     /// Get a single chat ID of a chatlist.
     ///
     /// To get the message object from the message ID, use dc_get_chat().
-    pub fn get_chat_id(&self, index: usize) -> ChatId {
+    pub fn get_chat_id(&self, index: usize) -> u32 {
         if index >= self.ids.len() {
-            return ChatId::new(0);
+            return 0;
         }
         self.ids[index].0
     }
@@ -254,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.
@@ -278,8 +248,8 @@ impl Chatlist {
         // This is because we may want to display drafts here or stuff as
         // "is typing".
         // Also, sth. as "No messages" would not work if the summary comes from a message.
-        let mut ret = Lot::new();
 
+        let mut ret = Lot::new();
         if index >= self.ids.len() {
             ret.text2 = Some("ErrBadChatlistIndex".to_string());
             return ret;
@@ -298,19 +268,23 @@ 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
         };
 
-        if chat.id.is_archived_link() {
+        if chat.id == DC_CHAT_ID_ARCHIVED_LINK {
             ret.text2 = None;
         } else if lastmsg.is_none() || lastmsg.as_ref().unwrap().from_id == DC_CONTACT_ID_UNDEFINED
         {
@@ -321,13 +295,8 @@ impl Chatlist {
 
         ret
     }
-
-    pub fn get_index_for_id(&self, id: ChatId) -> Option<usize> {
-        self.ids.iter().position(|(chat_id, _)| chat_id == &id)
-    }
 }
 
-/// Returns the number of archived chats
 pub fn dc_get_archived_cnt(context: &Context) -> u32 {
     context
         .sql
@@ -339,86 +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::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()));
-        chat_id2.set_draft(&t.ctx, 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_id1
-            .set_visibility(&t.ctx, ChatVisibility::Archived)
-            .ok();
-        let chats = Chatlist::try_load(&t.ctx, DC_GCL_ARCHIVED_ONLY, None, None).unwrap();
-        assert_eq!(chats.len(), 1);
-    }
-
-    #[test]
-    fn test_search_special_chat_names() {
-        let t = dummy_context();
-        t.ctx.update_device_chats().unwrap();
-
-        let chats = Chatlist::try_load(&t.ctx, 0, Some("t-1234-s"), None).unwrap();
-        assert_eq!(chats.len(), 0);
-        let chats = Chatlist::try_load(&t.ctx, 0, Some("t-5678-b"), None).unwrap();
-        assert_eq!(chats.len(), 0);
-
-        t.ctx
-            .set_stock_translation(StockMessage::SavedMessages, "test-1234-save".to_string())
-            .unwrap();
-        let chats = Chatlist::try_load(&t.ctx, 0, Some("t-1234-s"), None).unwrap();
-        assert_eq!(chats.len(), 1);
-
-        t.ctx
-            .set_stock_translation(StockMessage::DeviceMessages, "test-5678-babbel".to_string())
-            .unwrap();
-        let chats = Chatlist::try_load(&t.ctx, 0, Some("t-5678-b"), 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()
 }