uncrustify.cfg: label indent, some known types, not, # and ##

[notmuch] / mime-node.c

diff --git a/mime-node.c b/mime-node.c
index d26bb445db142173dd3e38b0c4dec53d5da1341b..d6b4506cbad5b7b19271bd237d87860bb4232ce8 100644 (file)
--- a/mime-node.c
+++ b/mime-node.c
@@ -33,7 +33,11 @@ typedef struct mime_node_context {
     GMimeMessage *mime_message;
 
     /* Context provided by the caller. */
+#ifdef GMIME_ATLEAST_26
+    GMimeCryptoContext *cryptoctx;
+#else
     GMimeCipherContext *cryptoctx;
+#endif
     notmuch_bool_t decrypt;
 } mime_node_context_t;
 
@@ -57,8 +61,12 @@ _mime_node_context_free (mime_node_context_t *res)
 
 notmuch_status_t
 mime_node_open (const void *ctx, notmuch_message_t *message,
-               GMimeCipherContext *cryptoctx, notmuch_bool_t decrypt,
-               mime_node_t **root_out)
+#ifdef GMIME_ATLEAST_26
+               GMimeCryptoContext *cryptoctx,
+#else
+               GMimeCipherContext *cryptoctx,
+#endif
+               notmuch_bool_t decrypt, mime_node_t **root_out)
 {
     const char *filename = notmuch_message_get_filename (message);
     mime_node_context_t *mctx;
@@ -104,6 +112,11 @@ mime_node_open (const void *ctx, notmuch_message_t *message,
     root->nchildren = 1;
     root->ctx = mctx;
 
+    root->parent = NULL;
+    root->part_num = 0;
+    root->next_child = 0;
+    root->next_part_num = 1;
+
     *root_out = root;
     return NOTMUCH_STATUS_SUCCESS;
 
@@ -112,15 +125,24 @@ DONE:
     return status;
 }
 
+#ifdef GMIME_ATLEAST_26
+static int
+_signature_list_free (GMimeSignatureList **proxy)
+{
+    g_object_unref (*proxy);
+    return 0;
+}
+#else
 static int
 _signature_validity_free (GMimeSignatureValidity **proxy)
 {
     g_mime_signature_validity_free (*proxy);
     return 0;
 }
+#endif
 
 static mime_node_t *
-_mime_node_create (const mime_node_t *parent, GMimeObject *part)
+_mime_node_create (mime_node_t *parent, GMimeObject *part)
 {
     mime_node_t *node = talloc_zero (parent, mime_node_t);
     GError *err = NULL;
@@ -133,6 +155,9 @@ _mime_node_create (const mime_node_t *parent, GMimeObject *part)
        talloc_free (node);
        return NULL;
     }
+    node->parent = parent;
+    node->part_num = node->next_part_num = -1;
+    node->next_child = 0;
 
     /* Deal with the different types of parts */
     if (GMIME_IS_PART (part)) {
@@ -165,11 +190,25 @@ _mime_node_create (const mime_node_t *parent, GMimeObject *part)
            GMimeMultipartEncrypted *encrypteddata =
                GMIME_MULTIPART_ENCRYPTED (part);
            node->decrypt_attempted = TRUE;
+#ifdef GMIME_ATLEAST_26
+           GMimeDecryptResult *decrypt_result = NULL;
+           node->decrypted_child = g_mime_multipart_encrypted_decrypt
+               (encrypteddata, node->ctx->cryptoctx, &decrypt_result, &err);
+#else
            node->decrypted_child = g_mime_multipart_encrypted_decrypt
                (encrypteddata, node->ctx->cryptoctx, &err);
+#endif
            if (node->decrypted_child) {
                node->decrypt_success = node->verify_attempted = TRUE;
+#ifdef GMIME_ATLEAST_26
+               /* This may be NULL if the part is not signed. */
+               node->sig_list = g_mime_decrypt_result_get_signatures (decrypt_result);
+               if (node->sig_list)
+                   g_object_ref (node->sig_list);
+               g_object_unref (decrypt_result);
+#else
                node->sig_validity = g_mime_multipart_encrypted_get_signature_validity (encrypteddata);
+#endif
            } else {
                fprintf (stderr, "Failed to decrypt part: %s\n",
                         (err ? err->message : "no error explanation given"));
@@ -182,6 +221,15 @@ _mime_node_create (const mime_node_t *parent, GMimeObject *part)
                     "(must be exactly 2)\n",
                     node->nchildren);
        } else {
+#ifdef GMIME_ATLEAST_26
+           node->sig_list = g_mime_multipart_signed_verify
+               (GMIME_MULTIPART_SIGNED (part), node->ctx->cryptoctx, &err);
+           node->verify_attempted = TRUE;
+
+           if (!node->sig_list)
+               fprintf (stderr, "Failed to verify signed part: %s\n",
+                        (err ? err->message : "no error explanation given"));
+#else
            /* For some reason the GMimeSignatureValidity returned
             * here is not a const (inconsistent with that
             * returned by
@@ -200,12 +248,25 @@ _mime_node_create (const mime_node_t *parent, GMimeObject *part)
                *proxy = sig_validity;
                talloc_set_destructor (proxy, _signature_validity_free);
            }
+#endif
        }
     }
 
+#ifdef GMIME_ATLEAST_26
+    /* sig_list may be created in both above cases, so we need to
+     * cleanly handle it here. */
+    if (node->sig_list) {
+       GMimeSignatureList **proxy = talloc (node, GMimeSignatureList *);
+       *proxy = node->sig_list;
+       talloc_set_destructor (proxy, _signature_list_free);
+    }
+#endif
+
+#ifndef GMIME_ATLEAST_26
     if (node->verify_attempted && !node->sig_validity)
        fprintf (stderr, "Failed to verify signed part: %s\n",
                 (err ? err->message : "no error explanation given"));
+#endif
 
     if (err)
        g_error_free (err);
@@ -214,9 +275,10 @@ _mime_node_create (const mime_node_t *parent, GMimeObject *part)
 }
 
 mime_node_t *
-mime_node_child (const mime_node_t *parent, int child)
+mime_node_child (mime_node_t *parent, int child)
 {
     GMimeObject *sub;
+    mime_node_t *node;
 
     if (!parent || child < 0 || child >= parent->nchildren)
        return NULL;
@@ -234,7 +296,30 @@ mime_node_child (const mime_node_t *parent, int child)
        INTERNAL_ERROR ("Unexpected GMimeObject type: %s",
                        g_type_name (G_OBJECT_TYPE (parent->part)));
     }
-    return _mime_node_create (parent, sub);
+    node = _mime_node_create (parent, sub);
+
+    if (child == parent->next_child && parent->next_part_num != -1) {
+       /* We're traversing in depth-first order.  Record the child's
+        * depth-first numbering. */
+       node->part_num = parent->next_part_num;
+       node->next_part_num = node->part_num + 1;
+
+       /* Prepare the parent for its next depth-first child. */
+       parent->next_child++;
+       parent->next_part_num = -1;
+
+       if (node->nchildren == 0) {
+           /* We've reached a leaf, so find the parent that has more
+            * children and set it up to number its next child. */
+           mime_node_t *iter = node->parent;
+           while (iter && iter->next_child == iter->nchildren)
+               iter = iter->parent;
+           if (iter)
+               iter->next_part_num = node->part_num + 1;
+       }
+    }
+
+    return node;
 }
 
 static mime_node_t *