Print prompt at the beginning of function and use len instead of builtin variable

2 files changed, 7 insertions, 11 deletions

diff --git a/src/utils.c b/src/utils.c
index 3375349..68f92a8 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -5,36 +5,32 @@
 #include <ncurses.h>
 
 int
-get_input(const char *prompt, char *buf)
+get_input(const char *prompt, char *buf, size_t len)
 {
 	if (!prompt || !buf)
 		return -1;
 
 	int ch;
-	int i = 0;
 	curs_set(1);
 
 	werase(status_window->win);
-	mvwprintw(status_window->win, 0, 0, "%s", prompt);
+	mvwprintw(status_window->win, 0, 0, "%s%s", prompt, buf);
 	wrefresh(status_window->win);
 
 	while ((ch = getch())) {
 		werase(status_window->win);
 
-		if (i < 0)
-			i = 0;
-
 		if (ch >= 32 && ch <= 126) {
-			buf[i++] = ch;
+			buf[len++] = ch;
 		} else if (ch == KEY_BACKSPACE || ch == 127 || ch == '\b') {
-			buf[--i] = '\0';
+			buf[--len] = '\0';
 		} else if (ch == 27) {
 			werase(status_window->win);
 			curs_set(0);
 			return -1;
 		} else if (ch == KEY_ENTER || ch == '\n' || ch == '\r') {
-			if (i < PATH_MAX) {
-				buf[++i] = '\0';
+			if (len < PATH_MAX) {
+				buf[++len] = '\0';
 				curs_set(0);
 				return 0;
 			} else {
diff --git a/src/utils.h b/src/utils.h
index 2e99a21..fedbc5e 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -4,6 +4,6 @@
 #include "fm.h"
 #include "wm.h"
 
-int get_input(const char *prompt, char *buf);
+int get_input(const char *prompt, char *buf, size_t len);
 
 #endif /* SF_UTILS_H */