Add a "input" module

3 files changed, 46 insertions, 29 deletions

diff --git a/src/input.c b/src/input.c
new file mode 100644
index 0000000..9ac68be
--- /dev/null
+++ b/src/input.c
@@ -0,0 +1,33 @@
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "input.h"
+
+int prompt_yes_no(void)
+{
+	puts(" [Y/n]");
+	fflush(stdout);
+	size_t line_size = 3;
+	char *line = malloc(line_size);
+	int attempts = 0;
+	do {
+		getline(&line, &line_size, stdin);
+		char input = line[0];
+		if (input == '\n'/*no input*/ || input == 'y' || input == 'Y')
+			return 1;
+		else if (input == 'n' || input == 'N')
+			return 0;
+		attempts++;
+	}
+	while(attempts < 3);
+	return 0;
+}
+
+void remove_ending_newline(char *str)
+{
+	int idx = strlen(str) - 1;
+	assert(str[idx] == '\n');
+	str[idx] = '\0';
+}
diff --git a/src/input.h b/src/input.h
new file mode 100644
index 0000000..7085bac
--- /dev/null
+++ b/src/input.h
@@ -0,0 +1,12 @@
+#ifndef INPUT_H
+#define INPUT_H
+
+/* Functions for command-line user interaction. */
+
+/* Prompt the user for yes or no (default is yes). Before calling, a prompt
+ * should be printed to stdout, eventually not with an ending newline. */
+int prompt_yes_no(void);
+
+void remove_ending_newline(char *str);
+
+#endif
diff --git a/src/main.c b/src/main.c
index a8e4176..58d30ca 100644
--- a/src/main.c
+++ b/src/main.c
@@ -11,6 +11,7 @@
 #include <unistd.h>
 
 #include "config.h"
+#include "input.h"
 #include "system.h"
 #include "utils.h"
 
@@ -53,35 +54,6 @@ static void __sqlite3_check(int rc, sqlite3 *db, const char *file, int line, con
 #define sqlite3_check(RC, DB) \
 	__sqlite3_check(RC, DB, __FILE__, __LINE__, __func__)
 
-/* Prompt the user for yes or no (default is yes). Before calling, a prompt
- * should be printed to stdout, eventually not with an ending newline. */
-static int prompt_yes_no(void)
-{
-	puts(" [Y/n]");
-	fflush(stdout);
-	size_t line_size = 3;
-	char *line = malloc(line_size);
-	int attempts = 0;
-	do {
-		getline(&line, &line_size, stdin);
-		char input = line[0];
-		if (input == '\n'/*no input*/ || input == 'y' || input == 'Y')
-			return 1;
-		else if (input == 'n' || input == 'N')
-			return 0;
-		attempts++;
-	}
-	while(attempts < 3);
-	return 0;
-}
-
-static void remove_ending_newline(char *str)
-{
-	int idx = strlen(str) - 1;
-	assert(str[idx] == '\n');
-	str[idx] = '\0';
-}
-
 /* Convert heap-allocated *STR from C string to SQL string, essentially by
  * adding single quotes to escape single quotes. */
 static void sanitize_sql_str(char **str)