Re: [PATCH] config: Expand ~ to $HOME

diff --git a/42/b68018a488c5ba3181d157f91be9fbb033ca28 b/42/b68018a488c5ba3181d157f91be9fbb033ca28
new file mode 100644 (file)
index 0000000..454007e
--- /dev/null
+++ b/42/b68018a488c5ba3181d157f91be9fbb033ca28
@@ -0,0 +1,134 @@
+Return-Path: <tomi.ollila@iki.fi>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id DD1AD6DE026C\r
+ for <notmuch@notmuchmail.org>; Sun,  8 May 2016 09:47:43 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.594\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.594 tagged_above=-999 required=5 tests=[AWL=-0.058,\r
+  SPF_NEUTRAL=0.652] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id 7CXR1POuGX9b for <notmuch@notmuchmail.org>;\r
+ Sun,  8 May 2016 09:47:35 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 3604A6DE0022\r
+ for <notmuch@notmuchmail.org>; Sun,  8 May 2016 09:47:34 -0700 (PDT)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+ by guru.guru-group.fi (Postfix) with ESMTP id 1549F1000B3;\r
+ Sun,  8 May 2016 19:47:28 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Bijan Chokoufe Nejad <bijan@chokoufe.com>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] config: Expand ~ to $HOME\r
+In-Reply-To: <1462722574-4176-1-git-send-email-bijan@chokoufe.com>\r
+References: <1462722574-4176-1-git-send-email-bijan@chokoufe.com>\r
+User-Agent: Notmuch/0.22+9~gb26b5ad (http://notmuchmail.org) Emacs/24.3.1\r
+ (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+ $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+ !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Sun, 08 May 2016 19:47:27 +0300\r
+Message-ID: <m2r3dc7azk.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch/>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 08 May 2016 16:47:44 -0000\r
+\r
+On Sun, May 08 2016, Bijan Chokoufe Nejad <bijan@chokoufe.com> wrote:\r
+\r
+> Very useful in case you want to keep your .notmuch-config synchronized across\r
+> machines where you have different user names.\r
+\r
+Thank you for your interest in improving notmuch!\r
+\r
+There are a few things that needs to be sorted out for this feature to be\r
+good:\r
+\r
+This implementation does not handle ~user/ prefix: i.e. home directory of\r
+'user' (maybe this should not, but it should handle the case).\r
+\r
+Whether or not ~user is handled, it should check that slash (/) follows...\r
+\r
+IIRC there is some ready-made implementations of the above -- but if not,\r
+one option is to check how (expand-file-name) works in emacs for reference.\r
+\r
+\r
+Something more inline:\r
+\r
+\r
+> ---\r
+> Not sure this is completely plattform independent.\r
+\r
+The implementation looked like it is platform independent -- at least on\r
+plattforms we care about...\r
+\r
+> I also don't know how to implement a unit test for this.\r
+\r
+I know... and I can do that if we get 1) decide that this feature will be\r
+supported and 2) decide how this feature should work and 3) someone(tm)\r
+does proper implementation ;)\r
+\r
+Tomi\r
+\r
+PS: still more to follow below.\r
+\r
+\r
+> ---\r
+>  notmuch-config.c | 11 ++++++++++-\r
+>  1 file changed, 10 insertions(+), 1 deletion(-)\r
+>\r
+> diff --git a/notmuch-config.c b/notmuch-config.c\r
+> index d252bb2..c9f26ef 100644\r
+> --- a/notmuch-config.c\r
+> +++ b/notmuch-config.c\r
+> @@ -605,7 +605,16 @@ _config_set_list (notmuch_config_t *config,\r
+>  const char *\r
+>  notmuch_config_get_database_path (notmuch_config_t *config)\r
+>  {\r
+> -    return _config_get (config, &config->database_path, "database", "path");\r
+> +    const char* path = _config_get (config, &config->database_path, "database", "path");\r
+> +    if (path != NULL && path[0] == '~') {\r
+> +        char *home_path = getenv("HOME");\r
+> +        char *shortened_path = malloc( sizeof(char) * ( strlen (path) - 1 ) );\r
+> +        strncpy(shortened_path, path + 2, strlen(path));\r
+> +        return talloc_asprintf (NULL, "%s/%s", home_path, shortened_path);\r
+\r
+In the implementation above matching free() for malloc() is not done -- but\r
+actually the malloc is unnecessary -- path + 2 could have been used there\r
+(after one checked that path[1] is '/' (provided that ~/ were the only\r
+thing we supported...))\r
+\r
+In strncpy() above length arg is strlen(path) but there is 1 byte less\r
+allocated in shortened_path -- if src arg in the above strncpy() were\r
+something else it could overwrite the allocated space by 2 bytes.\r
+\r
+\r
+\r
+> +    }\r
+> +    else {\r
+> +        return path;\r
+> +    }\r
+>  }\r
+>  \r
+>  void\r
+> -- \r
+> 1.9.1\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> https://notmuchmail.org/mailman/listinfo/notmuch\r