X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.c;h=966901f04b1c42b8affcfe23496b61eab3e4f6bc;hp=dac19d8955ec231bf9177df2f2e358adfd24b587;hb=7f254fb603f5ee073d48b052c00e1fdb6b8dc940;hpb=55c8ee9a862f8f25be84adb591564b3777d88135

diff --git a/notmuch.c b/notmuch.c
index dac19d89..966901f0 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -20,8 +20,13 @@
 
 #include "notmuch.h"
 
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE /* for getline */
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -30,7 +35,7 @@
 #include <dirent.h>
 #include <errno.h>
 
-#include <glib.h> /* GIOChannel */
+#include <glib.h> /* g_strdup_printf */
 
 #define ARRAY_SIZE(arr) (sizeof (arr) / sizeof (arr[0]))
 
@@ -42,42 +47,6 @@ typedef struct command {
     const char *usage;
 } command_t;
 
-/* Read a line from stdin, without any line-terminator character.  The
- * return value is a newly allocated string. The caller should free()
- * the string when finished with it.
- *
- * This function returns NULL if EOF is encountered before any
- * characters are input (otherwise it returns those characters).
- */
-char *
-read_line (void)
-{
-    char *result = NULL;
-    GError *error = NULL;
-    GIOStatus g_io_status;
-    gsize length;
-
-    GIOChannel *channel = g_io_channel_unix_new (fileno (stdin));
-
-    g_io_status = g_io_channel_read_line (channel, &result,
-					  &length, NULL, &error);
-
-    if (g_io_status == EOF)
-	goto DONE;
-
-    if (g_io_status != G_IO_STATUS_NORMAL) {
-	fprintf(stderr, "Read error: %s\n", error->message);
-	exit (1);
-    }
-
-    if (length && result[length - 1] == '\n')
-	result[length - 1] = '\0';
-
-  DONE:
-    g_io_channel_unref (channel);
-    return result;
-}
-
 typedef struct {
     int total_messages;
     int count;
@@ -285,7 +254,8 @@ int
 setup_command (int argc, char *argv[])
 {
     notmuch_database_t *notmuch;
-    char *mail_directory;
+    char *mail_directory, *default_path;
+    size_t line_size;
     int count;
     add_files_state_t add_files_state;
     double elapsed;
@@ -310,19 +280,35 @@ setup_command (int argc, char *argv[])
 	    "such as mb2md. In that case, press Control-C now and run notmuch again\n"
 	    "once the conversion is complete.\n\n");
 
-    {
-	char *default_path = notmuch_database_default_path ();
-	printf ("Top-level mail directory [%s]: ", default_path);
-	free (default_path);
-	fflush (stdout);
-    }
 
-    mail_directory = read_line ();
+    default_path = notmuch_database_default_path ();
+    printf ("Top-level mail directory [%s]: ", default_path);
+    fflush (stdout);
+
+    mail_directory = NULL;
+    getline (&mail_directory, &line_size, stdin);
+    printf ("\n");
 
     if (mail_directory == NULL || strlen (mail_directory) == 0) {
 	if (mail_directory)
 	    free (mail_directory);
-	mail_directory = notmuch_database_default_path ();
+	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. */
+	if (strcmp (mail_directory, default_path)) {
+	    printf ("Note: Since you are not using the default path, you will want to set\n"
+		    "the NOTMUCH_BASE environment variable to %s so that\n"
+		    "future calls to notmuch commands will know where to find your mail.\n",
+		    mail_directory);
+	    printf ("For example, if you are using bash for your shell, add:\n\n");
+	    printf ("\texport NOTMUCH_BASE=%s\n\n", mail_directory);
+	    printf ("to your ~/.bashrc file.\n\n");
+	}
+	free (default_path);
     }
 
     notmuch = notmuch_database_create (mail_directory);