From: Carl Worth <cworth@cworth.org>
Date: Wed, 21 Oct 2009 22:59:11 +0000 (-0700)
Subject: Pull out a chomp_newline function from "notmuch setup"
X-Git-Tag: 0.1~783
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f96f4fe427d7fd8930db7589e377f5c8cb97f2dc;p=notmuch.git

Pull out a chomp_newline function from "notmuch setup"

We'll want this same thing with "notmuch restore", (and really
anything using getline).
---

diff --git a/notmuch.c b/notmuch.c
index d7642521..2d208cea 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -55,6 +55,13 @@ typedef struct {
     struct timeval tv_start;
 } add_files_state_t;
 
+static void
+chomp_newline (char *str)
+{
+    if (str && str[strlen(str)-1] == '\n')
+	str[strlen(str)-1] = '\0';
+}
+
 /* Compute the number of seconds elapsed from start to end. */
 double
 tv_elapsed (struct timeval start, struct timeval end)
@@ -289,13 +296,9 @@ setup_command (int argc, char *argv[])
 
     mail_directory = NULL;
     getline (&mail_directory, &line_size, stdin);
-    printf ("\n");
+    chomp_newline (mail_directory);
 
-    if (mail_directory &&
-	mail_directory[strlen(mail_directory)-1] == '\n')
-    {
-	mail_directory[strlen(mail_directory)-1] = '\0';
-    }
+    printf ("\n");
 
     if (mail_directory == NULL || strlen (mail_directory) == 0) {
 	if (mail_directory)