zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-20 17:12:51 +02:00
Code Issues Projects Releases Packages Wiki Activity

Added strstr_full() and strstr_full_case()

Browse source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1309 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2001-03-03 17:34:35 +00:00 • committed by cras
commit a47ce2c449
2 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/core/misc.c
View file

@ -339,10 +339,10 @@ char *stristr(const char *data, const char *key)
((unsigned char) (c) < 128 && \ ((unsigned char) (c) < 128 && \
(isspace((int) (c)) || ispunct((int) (c)))) (isspace((int) (c)) || ispunct((int) (c))))
char *stristr_full(const char *data, const char *key) char *strstr_full_case(const char *data, const char *key, int icase)
{ {
const char *start, *max; const char *start, *max;
int keylen, datalen, pos; int keylen, datalen, pos, match;
keylen = strlen(key); keylen = strlen(key);
datalen = strlen(data); datalen = strlen(data);
@ -364,8 +364,10 @@ char *stristr_full(const char *data, const char *key)
return (char *) data; return (char *) data;
} }
if (toupper(data[pos]) == toupper(key[pos]) && match = icase ? (toupper(data[pos]) == toupper(key[pos])) :
(pos != 0 || data == start || isbound(data[-1]))) data[pos] == key[pos];
if (match && (pos != 0 || data == start || isbound(data[-1])))
pos++; pos++;
else { else {
data++; data++;
@ -376,6 +378,16 @@ char *stristr_full(const char *data, const char *key)
return NULL; return NULL;
} }
char *strstr_full(const char *data, const char *key)
{
return strstr_full_case(data, key, FALSE);
}
char *stristr_full(const char *data, const char *key)
{
return strstr_full_case(data, key, TRUE);
}
int regexp_match(const char *str, const char *regexp) int regexp_match(const char *str, const char *regexp)
{ {
#ifdef HAVE_REGEX_H #ifdef HAVE_REGEX_H

7
src/core/misc.h
View file

@ -38,8 +38,13 @@ GSList *hashtable_get_keys(GHashTable *hash);
/* strstr() with case-ignoring */ /* strstr() with case-ignoring */
char *stristr(const char *data, const char *key); char *stristr(const char *data, const char *key);
/* stristr(), but matches only for full words */
/* like strstr(), but matches only for full words.
`icase' specifies if match is case sensitive */
char *strstr_full_case(const char *data, const char *key, int icase);
char *strstr_full(const char *data, const char *key);
char *stristr_full(const char *data, const char *key); char *stristr_full(const char *data, const char *key);
/* easy way to check if regexp matches */ /* easy way to check if regexp matches */
int regexp_match(const char *str, const char *regexp); int regexp_match(const char *str, const char *regexp);