X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-setup.c;h=622bbaa68343c7633ade295d794e86e66c64d137;hp=d06fbf80e6aac2e41e80f13abcbf7606f92a9440;hb=eb0cf86c7a9d5cda464d4d36a9cac66f26b5529d;hpb=91d1d3f043b82d5f3f8c04f2db71a829a7406131

diff --git a/notmuch-setup.c b/notmuch-setup.c
index d06fbf80..622bbaa6 100644
--- a/notmuch-setup.c
+++ b/notmuch-setup.c
@@ -100,12 +100,15 @@ notmuch_setup_command (unused (void *ctx),
     unsigned int i;
     int is_new;
 
-#define prompt(format, ...)				\
-    do {						\
-	printf (format, ##__VA_ARGS__);			\
-	fflush (stdout);				\
-	getline (&response, &response_size, stdin);	\
-	chomp_newline (response);			\
+#define prompt(format, ...)					\
+    do {							\
+	printf (format, ##__VA_ARGS__);				\
+	fflush (stdout);					\
+	if (getline (&response, &response_size, stdin) < 0) {	\
+	    printf ("Exiting.\n");				\
+	    exit (1);						\
+	}							\
+	chomp_newline (response);				\
     } while (0)
 
     config = notmuch_config_open (ctx, NULL, &is_new);
@@ -156,10 +159,11 @@ notmuch_setup_command (unused (void *ctx),
 	notmuch_config_set_database_path (config, absolute_path);
     }
 
-    notmuch_config_save (config);
-
-    if (is_new)
-	welcome_message_post_setup ();
-
-    return 0;
+    if (! notmuch_config_save (config)) {
+	if (is_new)
+	  welcome_message_post_setup ();
+	return 0;
+    } else {
+	return 1;
+    }
 }