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

diff --git a/a7/baabb3883778c8c92ddab0628c93143d1d46c0 b/a7/baabb3883778c8c92ddab0628c93143d1d46c0
new file mode 100644 (file)
index 0000000..1fd6c05
--- /dev/null
+++ b/a7/baabb3883778c8c92ddab0628c93143d1d46c0
@@ -0,0 +1,129 @@
+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 D9E74431FAF\r
+       for <notmuch@notmuchmail.org>; Sun,  3 Mar 2013 10:39:06 -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 2wtAZ8CICSdO for <notmuch@notmuchmail.org>;\r
+       Sun,  3 Mar 2013 10:39:05 -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 5E954431FAE\r
+       for <notmuch@notmuchmail.org>; Sun,  3 Mar 2013 10:39:05 -0800 (PST)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id 38407100051;\r
+       Sun,  3 Mar 2013 20:38:53 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v3] config: do not overwrite symlinks when saving config\r
+       file\r
+In-Reply-To: <1362320310-10930-1-git-send-email-jani@nikula.org>\r
+References: <m2mwultqff.fsf@guru.guru-group.fi>\r
+       <1362320310-10930-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: Sun, 03 Mar 2013 20:38:52 +0200\r
+Message-ID: <m2ehfwtjk3.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: Sun, 03 Mar 2013 18:39:07 -0000\r
+\r
+On Sun, Mar 03 2013, Jani Nikula <jani@nikula.org> wrote:\r
+\r
+> Use realpath to canonicalize the config path before writing.\r
+>\r
+> Previously 'notmuch setup' and 'notmuch config set' overwrote the\r
+> config file even if it was a symbolic link.\r
+>\r
+> ---\r
+>\r
+> v3: compared to v2, as suggested by Tomi on IRC:\r
+>\r
+> -       if (strcmp (filename, config->filename)) {\r
+> +       if (strcmp (filename, config->filename) != 0) {\r
+\r
+\r
+LGTM.\r
+\r
+Tomi\r
+\r
+> ---\r
+>  notmuch-config.c |   24 ++++++++++++++++++++----\r
+>  1 file changed, 20 insertions(+), 4 deletions(-)\r
+>\r
+> diff --git a/notmuch-config.c b/notmuch-config.c\r
+> index b5c2066..8adb404 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,30 @@ notmuch_config_save (notmuch_config_t *config)\r
+>      return 1;\r
+>      }\r
+>  \r
+> -    if (! g_file_set_contents (config->filename, data, length, &error)) {\r
+> -    fprintf (stderr, "Error saving configuration to %s: %s\n",\r
+> -             config->filename, error->message);\r
+> +    /* Try not to overwrite symlinks. */\r
+> +    filename = realpath (config->filename, NULL);\r
+> +    if (! filename) {\r
+> +    fprintf (stderr, "Error canonicalizing %s: %s\n", config->filename,\r
+> +             strerror (errno));\r
+> +    g_free (data);\r
+> +    return 1;\r
+> +    }\r
+> +\r
+> +    if (! g_file_set_contents (filename, data, length, &error)) {\r
+> +    if (strcmp (filename, config->filename) != 0) {\r
+> +        fprintf (stderr, "Error saving configuration to %s (-> %s): %s\n",\r
+> +                 config->filename, filename, error->message);\r
+> +    } else {\r
+> +        fprintf (stderr, "Error saving configuration to %s: %s\n",\r
+> +                 filename, error->message);\r
+> +    }\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