From 9f99edda55cf95697b109727f89eed6168160119 Mon Sep 17 00:00:00 2001 From: cinap_lenrek Date: Wed, 5 Feb 2014 08:43:31 +0100 Subject: [PATCH] mothra: better handling of malformed search regex --- sys/src/cmd/mothra/mothra.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/sys/src/cmd/mothra/mothra.c b/sys/src/cmd/mothra/mothra.c index 485ded812..c15bb4a80 100644 --- a/sys/src/cmd/mothra/mothra.c +++ b/sys/src/cmd/mothra/mothra.c @@ -699,7 +699,10 @@ void docmd(Panel *p, char *s){ pldraw(root, screen); } -void regerror(char*){} /* don't panic */ +void regerror(char *msg) +{ + werrstr("regerror: %s", msg); +} void search(void){ static char last[256]; @@ -713,10 +716,12 @@ void search(void){ strncpy(buf, last, sizeof(buf)-1); if(eenter("Search for", buf, sizeof(buf), &mouse) <= 0) return; - re = regcompnl(buf); - if(re == nil) - return; strncpy(last, buf, sizeof(buf)-1); + re = regcompnl(buf); + if(re == nil){ + message("%r"); + continue; + } for(tp=current->text;tp;tp=tp->next) if(tp->flags & PL_SEL) break;