Re: [PATCH] config: do not overwrite symlinks when saving config file

diff --git a/4c/8629314060bfdfcdca71bf426fdb0db744079c b/4c/8629314060bfdfcdca71bf426fdb0db744079c
new file mode 100644 (file)
index 0000000..dd1c0e5
--- /dev/null
+++ b/4c/8629314060bfdfcdca71bf426fdb0db744079c
@@ -0,0 +1,111 @@
+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 olra.theworths.org (Postfix) with ESMTP id 96F7A431FBD\r
+       for <notmuch@notmuchmail.org>; Sat,  2 Mar 2013 13:58:28 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id zr2dkgnBZfuE for <notmuch@notmuchmail.org>;\r
+       Sat,  2 Mar 2013 13:58:24 -0800 (PST)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id BC36B431FAF\r
+       for <notmuch@notmuchmail.org>; Sat,  2 Mar 2013 13:58:24 -0800 (PST)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id 7E7AC100093;\r
+       Sat,  2 Mar 2013 23:58:12 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] config: do not overwrite symlinks when saving config file\r
+In-Reply-To: <1362259442-21014-1-git-send-email-jani@nikula.org>\r
+References: <1362259442-21014-1-git-send-email-jani@nikula.org>\r
+User-Agent: Notmuch/0.15.2+48~g8dcc33e (http://notmuchmail.org) Emacs/24.2.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: Sat, 02 Mar 2013 23:58:12 +0200\r
+Message-ID: <m2mwultqff.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.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://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: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 02 Mar 2013 21:58:28 -0000\r
+\r
+On Sat, Mar 02 2013, Jani Nikula <jani@nikula.org> wrote:\r
+\r
+> Use realpath on the config path before writing. If that fails,\r
+> fallback to the previous behaviour.\r
+>\r
+> Previously 'notmuch setup' and 'notmuch config set' overwrote the\r
+> config file even if it was a symbolic link.\r
+> ---\r
+>  notmuch-config.c |   10 ++++++++--\r
+>  1 file changed, 8 insertions(+), 2 deletions(-)\r
+>\r
+> diff --git a/notmuch-config.c b/notmuch-config.c\r
+> index b5c2066..1e7389f 100644\r
+> --- a/notmuch-config.c\r
+> +++ b/notmuch-config.c\r
+> @@ -461,7 +461,7 @@ int\r
+>  notmuch_config_save (notmuch_config_t *config)\r
+>  {\r
+>      size_t length;\r
+> -    char *data;\r
+> +    char *data, *filename;\r
+>      GError *error = NULL;\r
+>  \r
+>      data = g_key_file_to_data (config->key_file, &length, NULL);\r
+> @@ -470,14 +470,20 @@ notmuch_config_save (notmuch_config_t *config)\r
+>      return 1;\r
+>      }\r
+>  \r
+> -    if (! g_file_set_contents (config->filename, data, length, &error)) {\r
+> +    /* Try not to overwrite symlinks. */\r
+> +    filename = realpath (config->filename, NULL);\r
+\r
+The code looks good to me. But should we handle realpath returning NULL\r
+differently. It should return NULL only on error. I suggest that\r
+when realpath returns NULL, descriptive enough error message is returned\r
+to the user so that the problem can be resolved and then tried again.\r
+\r
+Tomi\r
+\r
+> +\r
+> +    if (! g_file_set_contents (filename ? filename : config->filename,\r
+> +                           data, length, &error)) {\r
+>      fprintf (stderr, "Error saving configuration to %s: %s\n",\r
+>               config->filename, error->message);\r
+>      g_error_free (error);\r
+> +    free (filename);\r
+>      g_free (data);\r
+>      return 1;\r
+>      }\r
+>  \r
+> +    free (filename);\r
+>      g_free (data);\r
+>      return 0;\r
+>  }\r
+> -- \r
+> 1.7.10.4\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r