X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=lib%2Findexopts.c;h=1e8d180e8af7bdf54d784b46876e5b843f111c62;hp=a04d1c1ce310d504a4ca28349d4d9495869ec4d8;hb=HEAD;hpb=e4890b5bf9e2260b36bcc36ddb77d8e97e2abe7d

diff --git a/lib/indexopts.c b/lib/indexopts.c
index a04d1c1c..2ffd1942 100644
--- a/lib/indexopts.c
+++ b/lib/indexopts.c
@@ -20,26 +20,36 @@
 
 #include "notmuch-private.h"
 
+struct _notmuch_indexopts {
+    _notmuch_crypto_t crypto;
+};
+
 notmuch_indexopts_t *
 notmuch_database_get_default_indexopts (notmuch_database_t *db)
 {
     notmuch_indexopts_t *ret = talloc_zero (db, notmuch_indexopts_t);
-    if (!ret)
+
+    if (! ret)
 	return ret;
-    ret->crypto.decrypt = NOTMUCH_DECRYPT_FALSE;
+    ret->crypto.decrypt = NOTMUCH_DECRYPT_AUTO;
 
-    char * decrypt_policy;
+    char *decrypt_policy;
     notmuch_status_t err = notmuch_database_get_config (db, "index.decrypt", &decrypt_policy);
+
     if (err)
-	return ret;
+	return NULL;
 
     if (decrypt_policy) {
-	if ((!(strcasecmp(decrypt_policy, "true"))) ||
-	    (!(strcasecmp(decrypt_policy, "yes"))) ||
-	    (!(strcasecmp(decrypt_policy, "1"))))
+	if ((! (strcasecmp (decrypt_policy, "true"))) ||
+	    (! (strcasecmp (decrypt_policy, "yes"))) ||
+	    (! (strcasecmp (decrypt_policy, "1"))))
 	    notmuch_indexopts_set_decrypt_policy (ret, NOTMUCH_DECRYPT_TRUE);
-	else if (!strcasecmp(decrypt_policy, "auto"))
-	    notmuch_indexopts_set_decrypt_policy (ret, NOTMUCH_DECRYPT_AUTO);
+	else if ((! (strcasecmp (decrypt_policy, "false"))) ||
+		 (! (strcasecmp (decrypt_policy, "no"))) ||
+		 (! (strcasecmp (decrypt_policy, "0"))))
+	    notmuch_indexopts_set_decrypt_policy (ret, NOTMUCH_DECRYPT_FALSE);
+	else if (! strcasecmp (decrypt_policy, "nostash"))
+	    notmuch_indexopts_set_decrypt_policy (ret, NOTMUCH_DECRYPT_NOSTASH);
     }
 
     free (decrypt_policy);
@@ -50,7 +60,7 @@ notmuch_status_t
 notmuch_indexopts_set_decrypt_policy (notmuch_indexopts_t *indexopts,
 				      notmuch_decryption_policy_t decrypt_policy)
 {
-    if (!indexopts)
+    if (! indexopts)
 	return NOTMUCH_STATUS_NULL_POINTER;
     indexopts->crypto.decrypt = decrypt_policy;
     return NOTMUCH_STATUS_SUCCESS;
@@ -59,7 +69,7 @@ notmuch_indexopts_set_decrypt_policy (notmuch_indexopts_t *indexopts,
 notmuch_decryption_policy_t
 notmuch_indexopts_get_decrypt_policy (const notmuch_indexopts_t *indexopts)
 {
-    if (!indexopts)
+    if (! indexopts)
 	return false;
     return indexopts->crypto.decrypt;
 }