From 1ed46514e2424200a583b872ebb6ea9eee569375 Mon Sep 17 00:00:00 2001
From: oga
Date: Fri, 26 Jun 2009 12:45:12 +0000
Subject: use fnmatch to glob the entries in the exec menu.

allows shell globbing constructs such as *ctl, etc in the exec menu (m-?
by default).

Adapted from a diff from Thomas Pfaff, okan@ got almost the same diff as
me when reworking it, and oked this one.
---
 search.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'search.c')

diff --git a/search.c b/search.c
index a3efec2..b3ae65b 100644
--- a/search.c
+++ b/search.c
@@ -14,9 +14,10 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id: search.c,v 1.16 2009/06/17 12:30:17 okan Exp $
+ * $Id: search.c,v 1.17 2009/06/26 12:45:12 oga Exp $
  */
 
+#include <fnmatch.h>
 #include "headers.h"
 #include "calmwm.h"
 
@@ -178,8 +179,9 @@ search_match_exec(struct menu_q *menuq, struct menu_q *resultq, char *search)
 	TAILQ_INIT(resultq);
 
 	TAILQ_FOREACH(mi, menuq, entry) {
-		if (strsubmatch(search, mi->text, 1) == 0)
-			continue;
+		if (strsubmatch(search, mi->text, 1) == 0 &&
+		    fnmatch(search, mi->text, 0) == FNM_NOMATCH)
+				continue;
 		for (mj = TAILQ_FIRST(resultq); mj != NULL;
 		     mj = TAILQ_NEXT(mj, resultentry)) {
 			if (strcasecmp(mi->text, mj->text) < 0) {
-- 
cgit v1.2.3-2-gb3c3