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

diff --git a/90/671e248da76012fb30265b64f19c66ae6c4f25 b/90/671e248da76012fb30265b64f19c66ae6c4f25
new file mode 100644 (file)
index 0000000..78b4f9f
--- /dev/null
+++ b/90/671e248da76012fb30265b64f19c66ae6c4f25
@@ -0,0 +1,110 @@
+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 84C65431FBD\r
+       for <notmuch@notmuchmail.org>; Sat,  2 Mar 2013 13:24:07 -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 TOT+pJQO-nEX for <notmuch@notmuchmail.org>;\r
+       Sat,  2 Mar 2013 13:24:06 -0800 (PST)\r
+Received: from mail-la0-f45.google.com (mail-la0-f45.google.com\r
+       [209.85.215.45]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id B0915431FAF\r
+       for <notmuch@notmuchmail.org>; Sat,  2 Mar 2013 13:24:05 -0800 (PST)\r
+Received: by mail-la0-f45.google.com with SMTP id er20so3975056lab.18\r
+       for <notmuch@notmuchmail.org>; Sat, 02 Mar 2013 13:24:04 -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\r
+       :x-gm-message-state;\r
+       bh=zo9nARvV//OgxC31amhfUTTwZFB+68pdqmZgcSJGvKc=;\r
+       b=Wnk4ZSTRuN6PW592zQYX9kJGwFC9f/cGNPx2S8xL8Q5qFIKCA6pXzz2vYGJOuh0ZDm\r
+       9iC/3Se7pBZJMSaTE/sRARYfw9z2ToPO55ldVQ9fmpqhgFf6s43aguAUnb6EW3tUvDQD\r
+       KDvxfB9q+9hxR+rOxOpZmjDZirCj3VX1LDJUlhAsAnBd7kfSGzCzz/GRE+dnsrbYOagb\r
+       RESlqKWOj/nMnOMcLceK2wW6nguE0bh71SXIGOsOR8wAAPcfNXvmuYiOvS5e6hXsBIpM\r
+       14CHrcTHStE/Dmj71nd8FQvX53Zz0XVTCuJEm5tc18MGUqLmAAT1bBfMqa+wYkxujDQR\r
+       ca0w==\r
+X-Received: by 10.152.46.17 with SMTP id r17mr13212033lam.47.1362259444006;\r
+       Sat, 02 Mar 2013 13:24:04 -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 fm8sm5573848lbb.17.2013.03.02.13.24.02\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Sat, 02 Mar 2013 13:24:03 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] config: do not overwrite symlinks when saving config file\r
+Date: Sat,  2 Mar 2013 23:24:02 +0200\r
+Message-Id: <1362259442-21014-1-git-send-email-jani@nikula.org>\r
+X-Mailer: git-send-email 1.7.10.4\r
+X-Gm-Message-State:\r
+ ALoCoQn1xtFMYHep2UHyAaHTFIyBAh+oSU7ICxxba7OH+PP8Vk9Kjc6YIQvg+aYccgI88xwYTvOq\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:24:07 -0000\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
++    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