caskd/bemenu
1
0
Fork 0
forked from RepoMirrors/bemenu
Code Pull Requests Activity

Make comparator functions follow standard more.

Browse Source
This commit is contained in:
Jari Vetoniemi 2014-04-12 12:55:05 +03:00
parent 058d8a98ed
commit 471046d1b2
2 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/internal.h
View File

@ -159,6 +159,7 @@ int _bmItemListRemoveItem(struct _bmItemList *list, const bmItem *item);
/* util.c */
char* _bmStrdup(const char *s);
int _bmStrupcmp(const char *hay, const char *needle);
int _bmStrnupcmp(const char *hay, const char *needle, size_t len);
char* _bmStrupstr(const char *hay, const char *needle);
bmItem** _bmShrinkItemList(bmItem ***inOutList, size_t osize, size_t nsize);
int _bmUtf8StringScreenWidth(const char *string);

41
lib/util.c
View File

@ -32,19 +32,38 @@ char* _bmStrdup(const char *string)
*
* @param hay C "string" to match against.
* @param needle C "string" to match.
* @return Less than, equal to or greater than zero if hay is lexicographically less than, equal to or greater than needle.
*/
int _bmStrupcmp(const char *hay, const char *needle)
{
size_t i, len;
size_t len, len2;
if ((len = strlen(hay)) != strlen(needle))
return 1;
if ((len = strlen(hay)) != (len2 = strlen(needle)))
return hay[len] - needle[len2];
for (i = 0; i != len; ++i)
if (toupper(hay[i]) != toupper(needle[i]))
return 1;
return _bmStrnupcmp(hay, needle, len);
}
return 0;
/**
* Portable case-insensitive strncmp.
*
* @param hay C "string" to match against.
* @param needle C "string" to match.
* @return Less than, equal to or greater than zero if hay is lexicographically less than, equal to or greater than needle.
*/
int _bmStrnupcmp(const char *hay, const char *needle, size_t len)
{
size_t i = 0;
unsigned char a = 0, b = 0;
const unsigned char *p1 = (const unsigned char*)hay;
const unsigned char *p2 = (const unsigned char*)needle;
for (i = 0; len > 0; --len, ++i)
if ((a = toupper(*p1++)) != (b = toupper(*p2++)))
return a - b;
return a - b;
}
/**
@ -57,13 +76,13 @@ char* _bmStrupstr(const char *hay, const char *needle)
{
size_t i, r = 0, p = 0, len, len2;
if (!_bmStrupcmp(hay, needle))
return (char*)hay;
if ((len = strlen(hay)) < (len2 = strlen(needle)))
return NULL;
for (i = 0; i != len; ++i) {
if (!_bmStrnupcmp(hay, needle, len2))
return (char*)hay;
for (i = 0; i < len; ++i) {
if (p == len2)
return (char*)hay + r;