make sure c-doc upload dirs exist even if branch name has / in it

updates and fixes
unify naming in pgp
2026-07-06 07:25:09 +03:00 · 2019-10-09 23:23:33 +02:00 · 2019-10-09 23:00:15 +02:00 · 2019-10-09 22:55:16 +02:00 · 2019-10-09 22:55:16 +02:00 · 2019-10-09 22:55:16 +02:00
9 changed files with 235 additions and 245 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,24 +0,0 @@
-# API changes
-
-## 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.
-
- Most code is now "rustified" and does not do manual memory allocation anymore. 
-
- The `DC_EVENT_GET_STRING` event is not used anymore, removing the last
-  event where the core requested a return value from the event callback. 
-
-  Please now use `dc_set_stock_translation()` API for core messages
-  to be properly localized. 
-
- Deltachat FFI docs are automatically generated and available here: 
-  https://c.delta.chat 
-
- New events ImapMessageMoved and ImapMessageDeleted
-
-For a full list of changes, please see our closed Pull Requests: 
-
-https://github.com/deltachat/deltachat-core-rust/pulls?q=is%3Apr+is%3Aclosed
-
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -481,7 +481,7 @@ dependencies = [

 [[package]]
 name = "deltachat"
-version = "1.0.0-beta.1"
+version = "1.0.0-alpha.5"
 dependencies = [
 "backtrace 0.3.38 (registry+https://github.com/rust-lang/crates.io-index)",
 "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -516,7 +516,7 @@ dependencies = [
 "r2d2_sqlite 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "reqwest 0.9.22 (registry+https://github.com/rust-lang/crates.io-index)",
+ "reqwest 0.9.21 (registry+https://github.com/rust-lang/crates.io-index)",
 "rusqlite 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustyline 4.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -550,9 +550,9 @@ dependencies = [

 [[package]]
 name = "deltachat_ffi"
-version = "1.0.0-beta.1"
+version = "1.0.0-alpha.5"
 dependencies = [
- "deltachat 1.0.0-beta.1",
+ "deltachat 1.0.0-alpha.5",
 "deltachat-provider-database 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "human-panic 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1274,7 +1274,7 @@ dependencies = [
 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "openssl 0.10.25 (registry+https://github.com/rust-lang/crates.io-index)",
 "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl-sys 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl-sys 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
 "schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
 "security-framework 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "security-framework-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1410,7 +1410,7 @@ dependencies = [
 "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl-sys 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl-sys 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -1428,7 +1428,7 @@ dependencies = [

 [[package]]
 name = "openssl-sys"
-version = "0.9.51"
+version = "0.9.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1907,7 +1907,7 @@ dependencies = [

 [[package]]
 name = "reqwest"
-version = "0.9.22"
+version = "0.9.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2964,7 +2964,7 @@ dependencies = [
 "checksum openssl 0.10.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2f372b2b53ce10fb823a337aaa674e3a7d072b957c6264d0f4ff0bd86e657449"
 "checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
 "checksum openssl-src 111.6.0+1.1.1d (registry+https://github.com/rust-lang/crates.io-index)" = "b9c2da1de8a7a3f860919c01540b03a6db16de042405a8a07a5e9d0b4b825d9c"
-"checksum openssl-sys 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)" = "ba24190c8f0805d3bd2ce028f439fe5af1d55882bbe6261bed1dbc93b50dd6b1"
+"checksum openssl-sys 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)" = "2c42dcccb832556b5926bc9ae61e8775f2a61e725ab07ab3d1e7fcf8ae62c3b6"
 "checksum os_type 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7edc011af0ae98b7f88cf7e4a83b70a54a75d2b8cb013d6efd02e5956207e9eb"
 "checksum output_vt100 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "53cdc5b785b7a58c5aad8216b3dfa114df64b0b06ae6e1501cef91df2fbdf8f9"
 "checksum packed_simd 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a85ea9fc0d4ac0deb6fe7911d38786b32fc11119afd9e9d38b84ff691ce64220"
@@ -3012,7 +3012,7 @@ dependencies = [
 "checksum regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd"
 "checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716"
 "checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
-"checksum reqwest 0.9.22 (registry+https://github.com/rust-lang/crates.io-index)" = "2c2064233e442ce85c77231ebd67d9eca395207dec2127fe0bbedde4bd29a650"
+"checksum reqwest 0.9.21 (registry+https://github.com/rust-lang/crates.io-index)" = "02b7e953e14c6f3102b7e8d1f1ee3abf5ecee80b427f5565c9389835cecae95c"
 "checksum ripemd160 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ad5112e0dbbb87577bfbc56c42450235e3012ce336e29c5befd7807bd626da4a"
 "checksum rsa 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6ad8d3632f6745bb671c8637e2aa44015537c5e384789d2ea3235739301ed1e0"
 "checksum rusqlite 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2a194373ef527035645a1bc21b10dc2125f73497e6e155771233eb187aedd051"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "deltachat"
-version = "1.0.0-beta.1"
-authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
+version = "1.0.0-alpha.5"
+authors = ["dignifiedquire <dignifiedquire@gmail.com>"]
 edition = "2018"
 license = "MPL"

@@ -10,7 +10,7 @@ deltachat_derive = { path = "./deltachat_derive" }
 mmime = { version = "0.1.2", path = "./mmime" }

 libc = "0.2.51"
-pgp = { version = "0.2.3", default-features = false }
+pgp = "0.2.3"
 hex = "0.3.2"
 sha2 = "0.8.0"
 rand = "0.6.5"
--- a/deltachat-ffi/Cargo.toml
+++ b/deltachat-ffi/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "deltachat_ffi"
-version = "1.0.0-beta.1"
+version = "1.0.0-alpha.5"
 description = "Deltachat FFI"
-authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
+authors = ["dignifiedquire <dignifiedquire@gmail.com>"]
 edition = "2018"
 readme = "README.md"
 license = "MIT OR Apache-2.0"
--- a/deltachat-ffi/deltachat.h
+++ b/deltachat-ffi/deltachat.h
@@ -78,7 +78,8 @@ typedef struct _dc_provider dc_provider_t;
 *
 * The example above uses "pthreads",
 * however, you can also use anything else for thread handling.
- * All deltachat-core-functions, unless stated otherwise, are thread-safe.
+ * NB: The deltachat-core library itself does not create any threads on its own,
+ * however, functions, unless stated otherwise, are thread-safe.
 *
 * After that you can  **define and open a database.**
 * The database is a normal sqlite-file and is created as needed:
@@ -134,7 +135,7 @@ typedef struct _dc_provider dc_provider_t;
 *
 *     printf("Message %i: %s\n", i+1, text);
 *
- *     dc_str_unref(text);
+ *     free(text);
 *     dc_msg_unref(msg);
 * }
 * dc_array_unref(msglist);
@@ -320,7 +321,7 @@ int             dc_is_open                   (const dc_context_t* context);
 * @memberof dc_context_t
 * @param context The context object as created by dc_context_new().
 * @return Blob directory associated with the context object, empty string if unset or on errors. NULL is never returned.
- *     The returned string must be released using dc_str_unref().
+ *     The returned string must be free()'d.
 */
 char*           dc_get_blobdir               (const dc_context_t* context);

@@ -396,7 +397,7 @@ int             dc_set_config                (dc_context_t* context, const char*
 * @param context The context object as created by dc_context_new(). For querying system values, this can be NULL.
 * @param key The key to query.
 * @return Returns current value of "key", if "key" is unset, the default
- *     value is returned.  The returned value must be released using dc_str_unref(), NULL is never
+ *     value is returned.  The returned value must be free()'d, NULL is never
 *     returned.  If there is an error an empty string will be returned.
 */
 char*           dc_get_config                (dc_context_t* context, const char* key);
@@ -406,13 +407,12 @@ char*           dc_get_config                (dc_context_t* context, const char*
 *
 * 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 
 * @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);
+int             dc_set_stock_translation(dc_context_t* context, uint32_t, const char* value);


 /**
@@ -427,7 +427,7 @@ int             dc_set_stock_translation(dc_context_t* context, uint32_t stock_i
 *
 * @memberof dc_context_t
 * @param context The context as created by dc_context_new().
- * @return String which must be released using dc_str_unref() after usage.  Never returns NULL.
+ * @return String which must be free()'d after usage.  Never returns NULL.
 */
 char*           dc_get_info                  (dc_context_t* context);

@@ -458,7 +458,6 @@ char*           dc_get_info                  (dc_context_t* context);
 *     `https://localhost:PORT/PATH`, `urn:ietf:wg:oauth:2.0:oob`
 *     (the latter just displays the code the user can copy+paste then)
 * @return URL that can be opened in the browser to start OAuth2.
- *     Returned strings must be released using dc_str_unref().
 *     If OAuth2 is not possible for the given e-mail-address, NULL is returned.
 */
 char*           dc_get_oauth2_url            (dc_context_t* context, const char* addr, const char* redirect_uri);
@@ -707,7 +706,6 @@ void            dc_perform_mvbox_idle        (dc_context_t* context);
 */
 void            dc_interrupt_mvbox_idle      (dc_context_t* context);

-
 /**
 * Execute pending sentbox-jobs.
 * This function and dc_perform_sentbox_fetch() and dc_perform_sentbox_idle()
@@ -1479,7 +1477,7 @@ int             dc_set_chat_profile_image    (dc_context_t* context, uint32_t ch
 * @memberof dc_context_t
 * @param context The context object as created by dc_context_new().
 * @param msg_id The message id for which information should be generated
- * @return Text string, must be released using dc_str_unref() after usage
+ * @return Text string, must be free()'d after usage
 */
 char*           dc_get_msg_info              (dc_context_t* context, uint32_t msg_id);

@@ -1493,7 +1491,7 @@ char*           dc_get_msg_info              (dc_context_t* context, uint32_t ms
 * @memberof dc_context_t
 * @param context The context object as created by dc_context_new().
 * @param msg_id The message id, must be the id of an incoming message.
- * @return Raw headers as a multi-line string, must be released using dc_str_unref() after usage.
+ * @return Raw headers as a multi-line string, must be free()'d after usage.
 *     Returns NULL if there are no headers saved for the given message,
 *     eg. because of save_mime_headers is not set
 *     or the message is not incoming.
@@ -1734,7 +1732,7 @@ void            dc_block_contact             (dc_context_t* context, uint32_t co
 * @memberof dc_context_t
 * @param context The context object as created by dc_context_new().
 * @param contact_id ID of the contact to get the encryption info for.
- * @return Multi-line text, must be released using dc_str_unref() after usage.
+ * @return Multi-line text, must be free()'d after usage.
 */
 char*           dc_get_contact_encrinfo      (dc_context_t* context, uint32_t contact_id);

@@ -1870,8 +1868,7 @@ void            dc_imex                      (dc_context_t* context, int what, c
 * @memberof dc_context_t
 * @param context The context as created by dc_context_new().
 * @param dir Directory to search backups in.
- * @return String with the backup file, typically given to dc_imex(),
- *     returned strings must be released using dc_str_unref().
+ * @return String with the backup file, typically given to dc_imex(), returned strings must be free()'d.
 *     The function returns NULL if no backup was found.
 */
 char*           dc_imex_has_backup           (dc_context_t* context, const char* dir);
@@ -1919,7 +1916,7 @@ char*           dc_imex_has_backup           (dc_context_t* context, const char*
 *
 * @memberof dc_context_t
 * @param context The context object.
- * @return The setup code. Must be released using dc_str_unref() after usage.
+ * @return The setup code. Must be free()'d after usage.
 *     On errors, eg. if the message could not be sent, NULL is returned.
 */
 char*           dc_initiate_key_transfer     (dc_context_t* context);
@@ -2024,7 +2021,7 @@ dc_lot_t*       dc_check_qr                  (dc_context_t* context, const char*
 *     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.
+ *     The returned string must be free()'d after usage.
 */
 char*           dc_get_securejoin_qr         (dc_context_t* context, uint32_t chat_id);

@@ -2194,21 +2191,6 @@ dc_array_t* dc_get_locations                (dc_context_t* context, uint32_t cha
 void        dc_delete_all_locations         (dc_context_t* context);


-/**
- * Release a string returned by another deltachat-core function.
- * - Strings returned by any deltachat-core-function
- *   MUST NOT be released by the standard free() function;
- *   always use dc_str_unref() for this purpose.
- * - dc_str_unref() MUST NOT be called for strings not returned by deltachat-core.
- * - dc_str_unref() MUST NOT be called for other objectes returned by deltachat-core.
- *
- * @memberof dc_context_t
- * @param str The string to release.
- * @return None.
- */
-void dc_str_unref (char* str);
-
-
 /**
 * @class dc_array_t
 *
@@ -2349,7 +2331,7 @@ uint32_t         dc_array_get_msg_id         (const dc_array_t* array, size_t in
 * @param index Index of the item. Must be between 0 and dc_array_get_cnt()-1.
 * @return Marker-character of the item at the given index.
 *     NULL if there is no marker-character bound to the given item.
- *     The returned value must be released using dc_str_unref() after usage.
+ *     The returned value must be free()'d after usage.
 */
 char*            dc_array_get_marker         (const dc_array_t* array, size_t index);

@@ -2604,7 +2586,7 @@ int             dc_chat_get_type             (const dc_chat_t* chat);
 *
 * @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.
+ * @return Chat name as a string. Must be free()'d after usage. Never NULL.
 */
 char*           dc_chat_get_name             (const dc_chat_t* chat);

@@ -2617,7 +2599,7 @@ char*           dc_chat_get_name             (const dc_chat_t* chat);
 *
 * @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.
+ * @return Subtitle as a string. Must be free()'d after usage. Never NULL.
 */
 char*           dc_chat_get_subtitle         (const dc_chat_t* chat);

@@ -2633,7 +2615,7 @@ char*           dc_chat_get_subtitle         (const dc_chat_t* chat);
 * @param chat The chat object.
 * @return Path and file if the profile image, if any.
 *     NULL otherwise.
- *     Must be released using dc_str_unref() after usage.
+ *     Must be free()'d after usage.
 */
 char*           dc_chat_get_profile_image    (const dc_chat_t* chat);

@@ -2937,7 +2919,7 @@ int64_t          dc_msg_get_sort_timestamp     (const dc_msg_t* msg);
 *
 * @memberof dc_msg_t
 * @param msg The message object.
- * @return Message text. The result must be released using dc_str_unref(). Never returns NULL.
+ * @return Message text. The result must be free()'d. Never returns NULL.
 */
 char*           dc_msg_get_text               (const dc_msg_t* msg);

@@ -2951,9 +2933,9 @@ char*           dc_msg_get_text               (const dc_msg_t* msg);
 *
 * @memberof dc_msg_t
 * @param msg The message object.
- * @return Full path, file name and extension of the file associated with the message.
- *     If there is no file associated with the message, an emtpy string is returned.
- *     NULL is never returned and the returned value must be released using dc_str_unref().
+ * @return Full path, file name and extension of the file associated with the
+ *     message.  If there is no file associated with the message, an emtpy
+ *     string is returned.  NULL is never returned and the returned value must be free()'d.
 */
 char*           dc_msg_get_file               (const dc_msg_t* msg);

@@ -2966,7 +2948,7 @@ char*           dc_msg_get_file               (const dc_msg_t* msg);
 * @param msg The message object.
 * @return Base file name plus extension without part.  If there is no file
 *     associated with the message, an empty string is returned.  The returned
- *     value must be released using dc_str_unref().
+ *     value must be free()'d.
 */
 char*           dc_msg_get_filename           (const dc_msg_t* msg);

@@ -2978,8 +2960,7 @@ char*           dc_msg_get_filename           (const dc_msg_t* msg);
 *
 * @memberof dc_msg_t
 * @param msg The message object.
- * @return String containing the mime type.
- *     Must be released using dc_str_unref() after usage. NULL is never returned.
+ * @return String containing the mime type. Must be free()'d after usage. NULL is never returned.
 */
 char*           dc_msg_get_filemime           (const dc_msg_t* msg);

@@ -3087,8 +3068,7 @@ dc_lot_t*       dc_msg_get_summary            (const dc_msg_t* msg, const dc_cha
 * @memberof dc_msg_t
 * @param msg The message object.
 * @param approx_characters Rough length of the expected string.
- * @return A summary for the given messages.
- *     The returned string must be released using dc_str_unref().
+ * @return A summary for the given messages. The returned string must be free()'d.
 *     Returns an empty string on errors, never returns NULL.
 */
 char*           dc_msg_get_summarytext        (const dc_msg_t* msg, int approx_characters);
@@ -3233,7 +3213,7 @@ int             dc_msg_is_setupmessage        (const dc_msg_t* msg);
 * @memberof dc_msg_t
 * @param msg The message object.
 * @return Typically, the first two digits of the setup code or an empty string if unknown.
- *     NULL is never returned. Must be released using dc_str_unref() when done.
+ *     NULL is never returned. Must be free()'d when done.
 */
 char*           dc_msg_get_setupcodebegin     (const dc_msg_t* msg);

@@ -3390,8 +3370,7 @@ uint32_t        dc_contact_get_id            (const dc_contact_t* contact);
 *
 * @memberof dc_contact_t
 * @param contact The contact object.
- * @return String with the email address,
- *     must be released using dc_str_unref(). Never returns NULL.
+ * @return String with the email address, must be free()'d. Never returns NULL.
 */
 char*           dc_contact_get_addr          (const dc_contact_t* contact);

@@ -3405,8 +3384,7 @@ char*           dc_contact_get_addr          (const dc_contact_t* contact);
 *
 * @memberof dc_contact_t
 * @param contact The contact object.
- * @return String with the name to display, must be released using dc_str_unref().
- *     Empty string if unset, never returns NULL.
+ * @return String with the name to display, must be free()'d. Empty string if unset, never returns NULL.
 */
 char*           dc_contact_get_name          (const dc_contact_t* contact);

@@ -3420,8 +3398,7 @@ char*           dc_contact_get_name          (const dc_contact_t* contact);
 *
 * @memberof dc_contact_t
 * @param contact The contact object.
- * @return String with the name to display, must be released using dc_str_unref().
- *     Never returns NULL.
+ * @return String with the name to display, must be free()'d. Never returns NULL.
 */
 char*           dc_contact_get_display_name  (const dc_contact_t* contact);

@@ -3437,8 +3414,7 @@ char*           dc_contact_get_display_name  (const dc_contact_t* contact);
 *
 * @memberof dc_contact_t
 * @param contact The contact object.
- * @return Summary string, must be released using dc_str_unref().
- *     Never returns NULL.
+ * @return Summary string, must be free()'d. Never returns NULL.
 */
 char*           dc_contact_get_name_n_addr   (const dc_contact_t* contact);

@@ -3450,8 +3426,7 @@ char*           dc_contact_get_name_n_addr   (const dc_contact_t* contact);
 *
 * @memberof dc_contact_t
 * @param contact The contact object.
- * @return String with the name to display, must be released using dc_str_unref().
- *     Never returns NULL.
+ * @return String with the name to display, must be free()'d. Never returns NULL.
 */
 char*           dc_contact_get_first_name    (const dc_contact_t* contact);

@@ -3465,7 +3440,7 @@ char*           dc_contact_get_first_name    (const dc_contact_t* contact);
 * @param contact The contact object.
 * @return Path and file if the profile image, if any.
 *     NULL otherwise.
- *     Must be released using dc_str_unref() after usage.
+ *     Must be free()'d after usage.
 */
 char*           dc_contact_get_profile_image (const dc_contact_t* contact);

@@ -3546,7 +3521,7 @@ dc_provider_t*  dc_provider_new_from_email            (const char* email);
 *
 * @memberof dc_provider_t
 * @param provider The dc_provider_t struct.
- * @return A string which must be released using dc_str_unref().
+ * @return A string which must be free()d.
 */
 char*           dc_provider_get_overview_page         (const dc_provider_t* provider);

@@ -3558,7 +3533,7 @@ char*           dc_provider_get_overview_page         (const dc_provider_t* prov
 *
 * @memberof dc_provider_t
 * @param provider The dc_provider_t struct.
- * @return A string which must be released using dc_str_unref().
+ * @return A string which must be free()d.
 */
 char*           dc_provider_get_name                  (const dc_provider_t* provider);

@@ -3571,7 +3546,7 @@ char*           dc_provider_get_name                  (const dc_provider_t* prov
 *
 * @memberof dc_provider_t
 * @param provider The dc_provider_t struct.
- * @return A string which must be released using dc_str_unref().
+ * @return A string which must be free()d.
 */
 char*           dc_provider_get_markdown              (const dc_provider_t* provider);

@@ -3583,7 +3558,7 @@ char*           dc_provider_get_markdown              (const dc_provider_t* prov
 *
 * @memberof dc_provider_t
 * @param provider The dc_provider_t struct.
- * @return A string which must be released using dc_str_unref().
+ * @return A string which must be free()d.
 */
 char*           dc_provider_get_status_date           (const dc_provider_t* provider);

@@ -3645,9 +3620,7 @@ void            dc_lot_unref             (dc_lot_t* lot);
 *
 * @memberof dc_lot_t
 * @param lot The lot object.
- * @return A string, the string may be empty
- *     and the returned value must be released using dc_str_unref().
- *     NULL if there is no such string.
+ * @return A string, the string may be empty and the returned value must be free()'d. NULL if there is no such string.
 */
 char*           dc_lot_get_text1         (const dc_lot_t* lot);

@@ -3656,10 +3629,10 @@ char*           dc_lot_get_text1         (const dc_lot_t* lot);
 * Get second string. The meaning of the string is defined by the creator of the object.
 *
 * @memberof dc_lot_t
+ *
 * @param lot The lot object.
- * @return A string, the string may be empty
- *     and the returned value must be released using dc_str_unref().
- *     NULL if there is no such string.
+ *
+ * @return A string, the string may be empty and the returned value must be free()'d	. NULL if there is no such string.
 */
 char*           dc_lot_get_text2         (const dc_lot_t* lot);

@@ -3680,7 +3653,9 @@ int             dc_lot_get_text1_meaning (const dc_lot_t* lot);
 * Get the associated state. The meaning of the state is defined by the creator of the object.
 *
 * @memberof dc_lot_t
+ *
 * @param lot The lot object.
+ *
 * @return The state as defined by the creator of the object. 0 if there is not state or on errors.
 */
 int             dc_lot_get_state         (const dc_lot_t* lot);
@@ -3702,7 +3677,9 @@ uint32_t        dc_lot_get_id            (const dc_lot_t* lot);
 * The meaning of the timestamp is defined by the creator of the object.
 *
 * @memberof dc_lot_t
+ *
 * @param lot The lot object.
+ *
 * @return The timestamp as defined by the creator of the object. 0 if there is not timestamp or on errors.
 */
 int64_t          dc_lot_get_timestamp     (const dc_lot_t* lot);
@@ -3902,7 +3879,7 @@ int64_t          dc_lot_get_timestamp     (const dc_lot_t* lot);
 *
 * @param data1 0
 * @param data2 (const char*) Info string in english language.
- *     Must not be unref'd or modified and is valid only until the callback returns.
+ *     Must not be free()'d or modified and is valid only until the callback returns.
 * @return 0
 */
 #define DC_EVENT_INFO                     100
@@ -3913,7 +3890,7 @@ int64_t          dc_lot_get_timestamp     (const dc_lot_t* lot);
 *
 * @param data1 0
 * @param data2 (const char*) Info string in english language.
- *     Must not be unref'd or modified and is valid only until the callback returns.
+ *     Must not be free()'d or modified and is valid only until the callback returns.
 * @return 0
 */
 #define DC_EVENT_SMTP_CONNECTED           101
@@ -3924,7 +3901,7 @@ int64_t          dc_lot_get_timestamp     (const dc_lot_t* lot);
 *
 * @param data1 0
 * @param data2 (const char*) Info string in english language.
- *     Must not be unref'd or modified and is valid only until the callback returns.
+ *     Must not be free()'d or modified and is valid only until the callback returns.
 * @return 0
 */
 #define DC_EVENT_IMAP_CONNECTED           102
@@ -3934,7 +3911,7 @@ int64_t          dc_lot_get_timestamp     (const dc_lot_t* lot);
 *
 * @param data1 0
 * @param data2 (const char*) Info string in english language.
- *     Must not be unref'd or modified and is valid only until the callback returns.
+ *     Must not be free()'d or modified and is valid only until the callback returns.
 * @return 0
 */
 #define DC_EVENT_SMTP_MESSAGE_SENT        103
@@ -3944,7 +3921,7 @@ int64_t          dc_lot_get_timestamp     (const dc_lot_t* lot);
 *
 * @param data1 0
 * @param data2 (const char*) Info string in english language.
- *     Must not be unref'd or modified and is valid only until the callback returns.
+ *     Must not be free()'d or modified and is valid only until the callback returns.
 * @return 0
 */
 #define DC_EVENT_IMAP_MESSAGE_DELETED   104
@@ -3954,7 +3931,7 @@ int64_t          dc_lot_get_timestamp     (const dc_lot_t* lot);
 *
 * @param data1 0
 * @param data2 (const char*) Info string in english language.
- *     Must not be unref'd or modified and is valid only until the callback returns.
+ *     Must not be free()'d or modified and is valid only until the callback returns.
 * @return 0
 */
 #define DC_EVENT_IMAP_MESSAGE_MOVED   105
@@ -3964,7 +3941,7 @@ int64_t          dc_lot_get_timestamp     (const dc_lot_t* lot);
 *
 * @param data1 0
 * @param data2 (const char*) path name 
- *     Must not be unref'd or modified and is valid only until the callback returns.
+ *     Must not be free()'d or modified and is valid only until the callback returns.
 * @return 0
 */
 #define DC_EVENT_NEW_BLOB_FILE 150
@@ -3974,7 +3951,7 @@ int64_t          dc_lot_get_timestamp     (const dc_lot_t* lot);
 *
 * @param data1 0
 * @param data2 (const char*) path name 
- *     Must not be unref'd or modified and is valid only until the callback returns.
+ *     Must not be free()'d or modified and is valid only until the callback returns.
 * @return 0
 */
 #define DC_EVENT_DELETED_BLOB_FILE 151
@@ -3987,7 +3964,7 @@ int64_t          dc_lot_get_timestamp     (const dc_lot_t* lot);
 *
 * @param data1 0
 * @param data2 (const char*) Warning string in english language.
- *     Must not be unref'd or modified and is valid only until the callback returns.
+ *     Must not be free()'d or modified and is valid only until the callback returns.
 * @return 0
 */
 #define DC_EVENT_WARNING                  300
@@ -4007,10 +3984,9 @@ int64_t          dc_lot_get_timestamp     (const dc_lot_t* lot);
 * in a messasge box then.
 *
 * @param data1 0
- * @param data2 (const char*) Error string, always set, never NULL.
- *     Some error strings are taken from dc_set_stock_translation(),
- *     however, most error strings will be in english language.
- *     Must not be unref'd or modified and is valid only until the callback returns.
+ * @param data2 (const char*) Error string, always set, never NULL. Frequent error strings are
+ *     localized using #DC_EVENT_GET_STRING, however, most error strings will be in english language.
+ *     Must not be free()'d or modified and is valid only until the callback returns.
 * @return 0
 */
 #define DC_EVENT_ERROR                    400
@@ -4034,7 +4010,7 @@ int64_t          dc_lot_get_timestamp     (const dc_lot_t* lot);
 * @param data1 (int) 1=first/new network error, should be reported the user;
 *     0=subsequent network error, should be logged only
 * @param data2 (const char*) Error string, always set, never NULL.
- *     Must not be unref'd or modified and is valid only until the callback returns.
+ *     Must not be free()'d or modified and is valid only until the callback returns.
 * @return 0
 */
 #define DC_EVENT_ERROR_NETWORK            401
@@ -4049,7 +4025,7 @@ int64_t          dc_lot_get_timestamp     (const dc_lot_t* lot);
 *
 * @param data1 0
 * @param data2 (const char*) Info string in english language.
- *     Must not be unref'd or modified
+ *     Must not be free()'d or modified
 *     and is valid only until the callback returns.
 * @return 0
 */
@@ -4180,7 +4156,7 @@ int64_t          dc_lot_get_timestamp     (const dc_lot_t* lot);
 * services.
 *
 * @param data1 (const char*) Path and file name.
- *     Must not be unref'd or modified and is valid only until the callback returns.
+ *     Must not be free()'d or modified and is valid only until the callback returns.
 * @param data2 0
 * @return 0
 */
@@ -4221,21 +4197,30 @@ int64_t          dc_lot_get_timestamp     (const dc_lot_t* lot);
 #define DC_EVENT_SECUREJOIN_JOINER_PROGRESS       2061


+// the following events are functions that should be provided by the frontends
+
+
+/**
+ * (DEPRECATED, DC_EVENT_GET_STRING is not emmitted anymore.  Use
+ * dc_set_stock_translation() to pre-fill translations for stock
+ * messages. 
+ *
+ */
+#define DC_EVENT_GET_STRING               2091
+
 /**
 * @}
 */

-
-#define DC_EVENT_FILE_COPIED         2055 // not used anymore
-#define DC_EVENT_IS_OFFLINE          2081 // not used anymore
-#define DC_EVENT_GET_STRING          2091 // not used anymore, use dc_set_stock_translation()
-#define DC_ERROR_SEE_STRING          0    // not used anymore
-#define DC_ERROR_SELF_NOT_IN_GROUP   1    // not used anymore
-#define DC_STR_SELFNOTINGRP          21   // not used anymore
+#define DC_EVENT_FILE_COPIED         2055 // deprecated
+#define DC_EVENT_IS_OFFLINE          2081 // deprecated
+#define DC_ERROR_SEE_STRING          0    // deprecated
+#define DC_ERROR_SELF_NOT_IN_GROUP   1    // deprecated
+#define DC_STR_SELFNOTINGRP          21   // deprecated
 #define DC_EVENT_DATA1_IS_STRING(e)  ((e)==DC_EVENT_IMEX_FILE_WRITTEN || (e)==DC_EVENT_FILE_COPIED)
 #define DC_EVENT_DATA2_IS_STRING(e)  ((e)>=100 && (e)<=499)
-#define DC_EVENT_RETURNS_INT(e)      ((e)==DC_EVENT_IS_OFFLINE) // not used anymore
-#define DC_EVENT_RETURNS_STRING(e)   ((e)==DC_EVENT_GET_STRING) // not used anymore
+#define DC_EVENT_RETURNS_INT(e)      ((e)==DC_EVENT_IS_OFFLINE)
+#define DC_EVENT_RETURNS_STRING(e)   ((e)==DC_EVENT_GET_STRING)
 char*           dc_get_version_str           (void); // deprecated
 void            dc_array_add_id              (dc_array_t*, uint32_t); // deprecated

@@ -4340,6 +4325,9 @@ void            dc_array_add_id              (dc_array_t*, uint32_t); // depreca
 #define DC_STR_STICKER                    67
 #define DC_STR_COUNT                      67

+void dc_str_unref (char*);
+
+
 /*
 * @}
 */
--- a/mmime/src/other.rs
+++ b/mmime/src/other.rs
@@ -8,7 +8,7 @@ use crate::mailmime::types_helper::*;

 pub(crate) use libc::{
    calloc, close, free, isalpha, isdigit, malloc, memcmp, memcpy, memmove, memset, realloc,
-    strcpy, strlen, strncmp, strncpy, strnlen,
+    strcpy, strlen, strncmp, strncpy,
 };

 pub(crate) unsafe fn strcasecmp(s1: *const libc::c_char, s2: *const libc::c_char) -> libc::c_int {
@@ -40,10 +40,8 @@ pub(crate) unsafe fn strncasecmp(

    // s1 and s2 might not be null terminated.

-    let s1_slice =
-        std::slice::from_raw_parts(s1 as *const u8, strnlen(s1 as *const libc::c_char, n));
-    let s2_slice =
-        std::slice::from_raw_parts(s2 as *const u8, strnlen(s2 as *const libc::c_char, n));
+    let s1_slice = std::slice::from_raw_parts(s1 as *const u8, n);
+    let s2_slice = std::slice::from_raw_parts(s2 as *const u8, n);

    let s1 = std::ffi::CStr::from_bytes_with_nul_unchecked(s1_slice)
        .to_string_lossy()
@@ -1695,14 +1693,6 @@ mod tests {
                4,
            )
        });
-
-        assert_eq!(0, unsafe {
-            strncasecmp(
-                CString::new("hell").unwrap().as_ptr(),
-                CString::new("Hell").unwrap().as_ptr(),
-                100_000_000,
-            )
-        });
    }

    #[test]
--- a/python/src/deltachat/const.py
+++ b/python/src/deltachat/const.py
@@ -57,14 +57,6 @@ DC_MSG_AUDIO = 40
 DC_MSG_VOICE = 41
 DC_MSG_VIDEO = 50
 DC_MSG_FILE = 60
-DC_LP_AUTH_OAUTH2 = 0x2
-DC_LP_AUTH_NORMAL = 0x4
-DC_LP_IMAP_SOCKET_STARTTLS = 0x100
-DC_LP_IMAP_SOCKET_SSL = 0x200
-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_EVENT_INFO = 100
 DC_EVENT_SMTP_CONNECTED = 101
 DC_EVENT_IMAP_CONNECTED = 102
@@ -90,9 +82,9 @@ 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_GET_STRING = 2091
 DC_EVENT_FILE_COPIED = 2055
 DC_EVENT_IS_OFFLINE = 2081
-DC_EVENT_GET_STRING = 2091
 DC_STR_SELFNOTINGRP = 21
 DC_PROVIDER_STATUS_OK = 1
 DC_PROVIDER_STATUS_PREPARATION = 2
@@ -147,7 +139,7 @@ DC_STR_COUNT = 67


 def read_event_defines(f):
-    rex = re.compile(r'#define\s+((?:DC_EVENT_|DC_QR|DC_MSG|DC_LP|DC_STATE_|DC_STR|'
+    rex = re.compile(r'#define\s+((?:DC_EVENT_|DC_QR|DC_MSG|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)
--- a/src/dc_receive_imf.rs
+++ b/src/dc_receive_imf.rs
@@ -1,7 +1,7 @@
 use std::ptr;

 use itertools::join;
-use libc::strcmp;
+use libc::{free, strcmp};
 use mmime::clist::*;
 use mmime::mailimf::types::*;
 use mmime::mailmime::content::*;
@@ -319,8 +319,13 @@ unsafe fn add_parts(
    let mut chat_id_blocked = Blocked::Not;
    let mut sort_timestamp = 0;
    let mut rcvd_timestamp = 0;
-    let mut mime_in_reply_to = String::new();
-    let mut mime_references = String::new();
+    let mut mime_in_reply_to = std::ptr::null_mut();
+    let mut mime_references = std::ptr::null_mut();
+
+    let cleanup = |mime_in_reply_to: *mut libc::c_char, mime_references: *mut libc::c_char| {
+        free(mime_in_reply_to.cast());
+        free(mime_references.cast());
+    };

    // collect the rest information, CC: is added to the to-list, BCC: is ignored
    // (we should not add BCC to groups as this would split groups. We could add them as "known contacts",
@@ -354,6 +359,7 @@ unsafe fn add_parts(
            message::update_server_uid(context, &rfc724_mid, server_folder.as_ref(), server_uid);
        }

+        cleanup(mime_in_reply_to, mime_references);
        bail!("Message already in DB");
    }

@@ -582,14 +588,20 @@ unsafe fn add_parts(
    if let Some(field) = mime_parser.lookup_field_typ("In-Reply-To", MAILIMF_FIELD_IN_REPLY_TO) {
        let fld_in_reply_to = (*field).fld_data.fld_in_reply_to;
        if !fld_in_reply_to.is_null() {
-            mime_in_reply_to = dc_str_from_clist((*(*field).fld_data.fld_in_reply_to).mid_list, " ")
+            mime_in_reply_to = dc_str_from_clist(
+                (*(*field).fld_data.fld_in_reply_to).mid_list,
+                b" \x00" as *const u8 as *const libc::c_char,
+            )
        }
    }

    if let Some(field) = mime_parser.lookup_field_typ("References", MAILIMF_FIELD_REFERENCES) {
        let fld_references = (*field).fld_data.fld_references;
        if !fld_references.is_null() {
-            mime_references = dc_str_from_clist((*(*field).fld_data.fld_references).mid_list, " ")
+            mime_references = dc_str_from_clist(
+                (*(*field).fld_data.fld_references).mid_list,
+                b" \x00" as *const u8 as *const libc::c_char,
+            )
        }
    }

@@ -600,91 +612,97 @@ unsafe fn add_parts(
    let icnt = mime_parser.parts.len();
    let mut txt_raw = None;

-    context.sql.prepare(
-        "INSERT INTO msgs \
-         (rfc724_mid, server_folder, server_uid, chat_id, from_id, to_id, timestamp, \
-         timestamp_sent, timestamp_rcvd, type, state, msgrmsg,  txt, txt_raw, param, \
-         bytes, hidden, mime_headers,  mime_in_reply_to, mime_references) \
-         VALUES (?,?,?,?,?,?, ?,?,?,?,?,?, ?,?,?,?,?,?, ?,?);",
-        |mut stmt, conn| {
-            for i in 0..icnt {
-                let part = &mut mime_parser.parts[i];
-                if part.is_meta {
-                    continue;
-                }
+    context
+        .sql
+        .prepare(
+            "INSERT INTO msgs \
+             (rfc724_mid, server_folder, server_uid, chat_id, from_id, to_id, timestamp, \
+             timestamp_sent, timestamp_rcvd, type, state, msgrmsg,  txt, txt_raw, param, \
+             bytes, hidden, mime_headers,  mime_in_reply_to, mime_references) \
+             VALUES (?,?,?,?,?,?, ?,?,?,?,?,?, ?,?,?,?,?,?, ?,?);",
+            |mut stmt, conn| {
+                for i in 0..icnt {
+                    let part = &mut mime_parser.parts[i];
+                    if part.is_meta {
+                        continue;
+                    }

-                if let Some(ref msg) = part.msg {
-                    if mime_parser.location_kml.is_some()
-                        && icnt == 1
-                        && (msg == "-location-" || msg.is_empty())
-                    {
-                        *hidden = 1;
-                        if state == MessageState::InFresh {
-                            state = MessageState::InNoticed;
+                    if let Some(ref msg) = part.msg {
+                        if mime_parser.location_kml.is_some()
+                            && icnt == 1
+                            && (msg == "-location-" || msg.is_empty())
+                        {
+                            *hidden = 1;
+                            if state == MessageState::InFresh {
+                                state = MessageState::InNoticed;
+                            }
                        }
                    }
-                }
-                if part.typ == Viewtype::Text {
-                    let msg_raw = part.msg_raw.as_ref().cloned().unwrap_or_default();
-                    let subject = mime_parser
-                        .subject
-                        .as_ref()
-                        .map(|s| s.to_string())
-                        .unwrap_or("".into());
-                    txt_raw = Some(format!("{}\n\n{}", subject, msg_raw));
-                }
-                if mime_parser.is_system_message != SystemMessage::Unknown {
-                    part.param
-                        .set_int(Param::Cmd, mime_parser.is_system_message as i32);
-                }
+                    if part.typ == Viewtype::Text {
+                        let msg_raw = part.msg_raw.as_ref().cloned().unwrap_or_default();
+                        let subject = mime_parser
+                            .subject
+                            .as_ref()
+                            .map(|s| s.to_string())
+                            .unwrap_or("".into());
+                        txt_raw = Some(format!("{}\n\n{}", subject, msg_raw));
+                    }
+                    if mime_parser.is_system_message != SystemMessage::Unknown {
+                        part.param
+                            .set_int(Param::Cmd, mime_parser.is_system_message as i32);
+                    }

-                /*
-                info!(
-                    context,
-                    "received mime message {:?}",
-                    String::from_utf8_lossy(std::slice::from_raw_parts(
-                        imf_raw_not_terminated as *const u8,
-                        imf_raw_bytes,
-                    ))
-                );
-                */
+                    /*
+                    info!(
+                        context,
+                        "received mime message {:?}",
+                        String::from_utf8_lossy(std::slice::from_raw_parts(
+                            imf_raw_not_terminated as *const u8,
+                            imf_raw_bytes,
+                        ))
+                    );
+                    */

-                stmt.execute(params![
-                    rfc724_mid,
-                    server_folder.as_ref(),
-                    server_uid as libc::c_int,
-                    *chat_id as libc::c_int,
-                    *from_id as libc::c_int,
-                    *to_id as libc::c_int,
-                    sort_timestamp,
-                    *sent_timestamp,
-                    rcvd_timestamp,
-                    part.typ,
-                    state,
-                    msgrmsg,
-                    part.msg.as_ref().map_or("", String::as_str),
-                    // txt_raw might contain invalid utf8
-                    txt_raw.unwrap_or_default(),
-                    part.param.to_string(),
-                    part.bytes,
-                    *hidden,
-                    if save_mime_headers {
-                        Some(String::from_utf8_lossy(imf_raw))
-                    } else {
-                        None
-                    },
-                    mime_in_reply_to,
-                    mime_references,
-                ])?;
+                    stmt.execute(params![
+                        rfc724_mid,
+                        server_folder.as_ref(),
+                        server_uid as libc::c_int,
+                        *chat_id as libc::c_int,
+                        *from_id as libc::c_int,
+                        *to_id as libc::c_int,
+                        sort_timestamp,
+                        *sent_timestamp,
+                        rcvd_timestamp,
+                        part.typ,
+                        state,
+                        msgrmsg,
+                        part.msg.as_ref().map_or("", String::as_str),
+                        // txt_raw might contain invalid utf8
+                        txt_raw.unwrap_or_default(),
+                        part.param.to_string(),
+                        part.bytes,
+                        *hidden,
+                        if save_mime_headers {
+                            Some(String::from_utf8_lossy(imf_raw))
+                        } else {
+                            None
+                        },
+                        to_string_lossy(mime_in_reply_to),
+                        to_string_lossy(mime_references),
+                    ])?;

-                txt_raw = None;
-                *insert_msg_id =
-                    sql::get_rowid_with_conn(context, conn, "msgs", "rfc724_mid", &rfc724_mid);
-                created_db_entries.push((*chat_id as usize, *insert_msg_id as usize));
-            }
-            Ok(())
-        },
-    )?;
+                    txt_raw = None;
+                    *insert_msg_id =
+                        sql::get_rowid_with_conn(context, conn, "msgs", "rfc724_mid", &rfc724_mid);
+                    created_db_entries.push((*chat_id as usize, *insert_msg_id as usize));
+                }
+                Ok(())
+            },
+        )
+        .map_err(|err| {
+            cleanup(mime_in_reply_to, mime_references);
+            err
+        })?;

    info!(
        context,
@@ -704,6 +722,8 @@ unsafe fn add_parts(
        }
    }

+    cleanup(mime_in_reply_to, mime_references);
+
    Ok(())
 }

--- a/src/dc_tools.rs
+++ b/src/dc_tools.rs
@@ -74,18 +74,36 @@ pub(crate) fn dc_truncate(buf: &str, approx_chars: usize, do_unwrap: bool) -> Co
    }
 }

-pub(crate) fn dc_str_from_clist(list: *const clist, delimiter: &str) -> String {
+pub(crate) unsafe fn dc_str_from_clist(
+    list: *const clist,
+    delimiter: *const libc::c_char,
+) -> *mut libc::c_char {
    let mut res = String::new();

    if !list.is_null() {
-        for rfc724_mid in unsafe { (*list).into_iter() } {
-            if !res.is_empty() {
-                res += delimiter;
+        let mut cur: *mut clistiter = (*list).first;
+        while !cur.is_null() {
+            let rfc724_mid = (if !cur.is_null() {
+                (*cur).data
+            } else {
+                ptr::null_mut()
+            }) as *const libc::c_char;
+
+            if !rfc724_mid.is_null() {
+                if !res.is_empty() && !delimiter.is_null() {
+                    res += as_str(delimiter);
+                }
+                res += as_str(rfc724_mid);
+            }
+            cur = if !cur.is_null() {
+                (*cur).next
+            } else {
+                ptr::null_mut()
            }
-            res += as_str(rfc724_mid as *const libc::c_char);
        }
    }
-    res
+
+    res.strdup()
 }

 pub(crate) fn dc_str_to_clist(str: &str, delimiter: &str) -> *mut clist {
@@ -1042,11 +1060,17 @@ mod tests {
        unsafe {
            let list: *mut clist = dc_str_to_clist("foo bar test", " ");
            assert_eq!((*list).count, 3);
-            let str = dc_str_from_clist(list, " ");
-            assert_eq!(str, "foo bar test");
+            let str: *mut libc::c_char =
+                dc_str_from_clist(list, b" \x00" as *const u8 as *const libc::c_char);
+
+            assert_eq!(
+                CStr::from_ptr(str as *const libc::c_char).to_str().unwrap(),
+                "foo bar test"
+            );

            clist_free_content(list);
            clist_free(list);
+            free(str as *mut libc::c_void);
        }
    }
Author	SHA1	Message	Date
holger krekel	e571750f96	make sure c-doc upload dirs exist even if branch name has / in it	2019-10-09 23:23:33 +02:00
dignifiedquire	0f22b75207	updates and fixes	2019-10-09 23:00:15 +02:00
dignifiedquire	13991d8dc5	unify naming in pgp	2019-10-09 22:55:16 +02:00
dignifiedquire	75d9eb08f7	fix and cleanup tests	2019-10-09 22:55:16 +02:00
dignifiedquire	8cf571c78a	wip	2019-10-09 22:55:16 +02:00