From: Arun Prakash Jana <engineerarun@gmail.com>
Date: Sun, 4 Jun 2017 18:28:30 +0000 (+0530)
Subject: Fix issues with DEL on Mac on empty regex exprn
X-Git-Tag: v1.2~33
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=249b6f76fcc06892fa96c0972a03568ad1a26ea8;p=nnn.git

Fix issues with DEL on Mac on empty regex exprn

On Mac and error is thrown if the regex expression to regcomp() is empty.

Please refer to comments at:
https://github.com/jarun/nnn/commit/c42df81ae5f1206ee586d4e2f236c77f1f0dfbbe
---

diff --git a/nnn.c b/nnn.c
index 78a817f9..c73dcaa7 100644
--- a/nnn.c
+++ b/nnn.c
@@ -475,7 +475,7 @@ setfilter(regex_t *regex, char *filter)
 	static int r;
 
 	r = regcomp(regex, filter, REG_NOSUB | REG_EXTENDED | REG_ICASE);
-	if (r != 0) {
+	if (r != 0 && filter && filter[0] != '\0') {
 		len = COLS;
 		if (len > LINE_MAX)
 			len = LINE_MAX;
@@ -738,8 +738,10 @@ readln(char *path)
 				wln[--len] = '\0';
 				wcstombs(ln, wln, LINE_MAX << 2);
 				ndents = total;
-				if (matches(pln) == -1)
+				if (matches(pln) == -1) {
+					printprompt(ln);
 					continue;
+				}
 				redraw(path);
 				printprompt(ln);
 				break;