[hackers] [dmenu] revert using strcasestr and use a more optimized portable version || Hiltjo Posthuma

From: <git_AT_suckless.org>
Date: Tue, 8 Feb 2022 19:41:30 +0100 (CET)

commit 3e39c526d28582b0b5606d3e3bb36ee3d271e616
Author: Hiltjo Posthuma <hiltjo_AT_codemadness.org>
AuthorDate: Tue Feb 8 19:32:25 2022 +0100
Commit: Hiltjo Posthuma <hiltjo_AT_codemadness.org>
CommitDate: Tue Feb 8 19:38:23 2022 +0100

    revert using strcasestr and use a more optimized portable version
    
    ... compared to the old cistrstr().
    
    Thanks for the feedback!

diff --git a/config.mk b/config.mk
index bea4e4b..05d5a3e 100644
--- a/config.mk
+++ b/config.mk
_AT_@ -23,7 +23,7 @@ INCS = -I$(X11INC) -I$(FREETYPEINC)
 LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS)
 
 # flags
-CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS)
+CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS)
 CFLAGS = -std=c99 -pedantic -Wall -Os $(INCS) $(CPPFLAGS)
 LDFLAGS = $(LIBS)
 
diff --git a/dmenu.c b/dmenu.c
index d06bea1..88d2f12 100644
--- a/dmenu.c
+++ b/dmenu.c
_AT_@ -102,6 +102,25 @@ cleanup(void)
         XCloseDisplay(dpy);
 }
 
+static char *
+cistrstr(const char *h, const char *n)
+
+{
+ size_t i;
+
+ if (!n[0])
+ return (char *)h;
+
+ for (; *h; ++h) {
+ for (i = 0; n[i] && tolower((unsigned char)n[i]) ==
+ tolower((unsigned char)h[i]); ++i)
+ ;
+ if (n[i] == '\0')
+ return (char *)h;
+ }
+ return NULL;
+}
+
 static int
 drawitem(struct item *item, int x, int y, int w)
 {
_AT_@ -711,7 +730,7 @@ main(int argc, char *argv[])
                         fast = 1;
                 else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */
                         fstrncmp = strncasecmp;
- fstrstr = strcasestr;
+ fstrstr = cistrstr;
                 } else if (i + 1 == argc)
                         usage();
                 /* these options take one argument */
Received on Tue Feb 08 2022 - 19:41:30 CET