From: Carl Worth <cworth@cworth.org>
Date: Tue, 20 Oct 2009 20:16:16 +0000 (-0700)
Subject: notmuch: Fix setup so that accepting the default mail path works.
X-Git-Tag: 0.1~811
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=28fa0bc2d686761f50f5bd6782b81000c45ee0c4

notmuch: Fix setup so that accepting the default mail path works.

The recent change from GIOChannel to getline, (with a semantic
change of the newline terminator now being included in the
result that setup_command sees), broke this.
---

diff --git a/notmuch.c b/notmuch.c
index 966901f0..1ebd613e 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -289,13 +289,17 @@ setup_command (int argc, char *argv[])
     getline (&mail_directory, &line_size, stdin);
     printf ("\n");
 
+    if (mail_directory &&
+	mail_directory[strlen(mail_directory)-1] == '\n')
+    {
+	mail_directory[strlen(mail_directory)-1] = '\0';
+    }
+
     if (mail_directory == NULL || strlen (mail_directory) == 0) {
 	if (mail_directory)
 	    free (mail_directory);
 	mail_directory = default_path;
     } else {
-	if (mail_directory[strlen(mail_directory)-1] == '\n')
-	    mail_directory[strlen(mail_directory)-1] = '\0';
 	/* XXX: Instead of telling the user to use an environment
 	 * variable here, we should really be writing out a configuration
 	 * file and loading that on the next run. */