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

diff --git a/4b/ea560ed5e3ca93548fa9e890a286cd608c198c b/4b/ea560ed5e3ca93548fa9e890a286cd608c198c
new file mode 100644 (file)
index 0000000..c5b5317
--- /dev/null
+++ b/4b/ea560ed5e3ca93548fa9e890a286cd608c198c
@@ -0,0 +1,131 @@
+Return-Path: <jani@nikula.org>\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 2E47C431FAF\r
+       for <notmuch@notmuchmail.org>; Sun,  3 Mar 2013 06:18:36 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 WvNfCAKmOkhO for <notmuch@notmuchmail.org>;\r
+       Sun,  3 Mar 2013 06:18:35 -0800 (PST)\r
+Received: from mail-la0-f46.google.com (mail-la0-f46.google.com\r
+       [209.85.215.46]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 7FA6F431FAE\r
+       for <notmuch@notmuchmail.org>; Sun,  3 Mar 2013 06:18:35 -0800 (PST)\r
+Received: by mail-la0-f46.google.com with SMTP id fq12so4158221lab.5\r
+       for <notmuch@notmuchmail.org>; Sun, 03 Mar 2013 06:18:32 -0800 (PST)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=google.com; s=20120113;\r
+       h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to\r
+       :references:x-gm-message-state;\r
+       bh=nvE8ta7V/iP2jnsQO+ImB6cAYABZeSb4fxsVxp3FQgE=;\r
+       b=XZXIfzQq0l2B2qkBZf5kr+fLUckiJQPq1MVaWc6n5iY3e+T8qB/rukIJZXPxtkdciZ\r
+       c+eZe6svJgM3h6pNqW9c201B7lStCvpY1JVW/KDAPooHeqRYfzwhNC6eOTYn2mE/rWPM\r
+       RQj/oKQDi9hlKBdc7xrH6gV5a+KwymfhJ+tyx0FBzXZjpxb9x2AF5oD/54qGp28fVs6j\r
+       vyhzqrR7NmPryvPNZtMC0OWUQ6P5ucPYjOL4S2wW/c/ljUuRNCVmHoKzCmVgxA1lBZHT\r
+       XmO/1cY44tK3kBpiA71r8TFRZFoNRnbNMKijVDEhpvOLy4G64Wrz6XRQpBSUv0rcbUoo\r
+       pW2g==\r
+X-Received: by 10.152.144.202 with SMTP id so10mr15105316lab.9.1362320312590; \r
+       Sun, 03 Mar 2013 06:18:32 -0800 (PST)\r
+Received: from localhost (dsl-hkibrasgw4-50df51-27.dhcp.inet.fi.\r
+       [80.223.81.27])\r
+       by mx.google.com with ESMTPS id e11sm6239987lbd.11.2013.03.03.06.18.30\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Sun, 03 Mar 2013 06:18:31 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v3] config: do not overwrite symlinks when saving config file\r
+Date: Sun,  3 Mar 2013 16:18:30 +0200\r
+Message-Id: <1362320310-10930-1-git-send-email-jani@nikula.org>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <m2mwultqff.fsf@guru.guru-group.fi>\r
+References: <m2mwultqff.fsf@guru.guru-group.fi>\r
+X-Gm-Message-State:\r
+ ALoCoQmFQkaZjEVYT5sxtPw1G+ssEArBrDgMjG+Vs6m1GRjhAH/sWBVV3LlaGUVu7TJ1jLemPcq0\r
+Cc: Tomi Ollila <tomi.ollila@iki.fi>\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 14:18:36 -0000\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
+ 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