From 249b6f76fcc06892fa96c0972a03568ad1a26ea8 Mon Sep 17 00:00:00 2001 From: Arun Prakash Jana Date: Sun, 4 Jun 2017 23:58:30 +0530 Subject: [PATCH] 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 --- nnn.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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;