penwing/marukuru-dmenu
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

revert using strcasestr and use a more optimized portable version

Browse source 
... compared to the old cistrstr().

Thanks for the feedback!
This commit is contained in:
Hiltjo Posthuma 2022-02-08 19:32:25 +01:00
parent a9a3836861
commit 3e39c526d2
2 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config.mk
View file

@ -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)

21
dmenu.c
View file

@ -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)
{
@ -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 */