lighttpd
/
lighttpd1.4
2
0
Fork 0
Code Issues Releases Wiki Activity

[core] specialized buffer_eq_*() for short strings 

specialized buffer_eq_*() funcs for use with short strings,
e.g. case-insensitive comparison for equality
This commit is contained in:
Glenn Strauss 2019-06-04 21:18:28 -04:00
parent ca059d580d
commit ac8444f2e6
2 changed files with 47 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/buffer.c
View File

@ -346,6 +346,40 @@ char hex2int(unsigned char hex) {
return li_cton(hex,n) ? (char)n : 0xFF;
}
int buffer_eq_icase_ssn(const char * const a, const char * const b, const size_t len) {
for (size_t i = 0; i < len; ++i) {
unsigned int ca = ((unsigned char *)a)[i];
unsigned int cb = ((unsigned char *)b)[i];
if (ca != cb) {
ca |= 0x20;
cb |= 0x20;
if (ca != cb) return 0;
if (ca < 'a' || 'z' < ca) return 0;
if (cb < 'a' || 'z' < cb) return 0;
}
}
return 1;
}
int buffer_eq_icase_ss(const char * const a, const size_t alen, const char * const b, const size_t blen) {
/* 1 = equal; 0 = not equal */ /* short string sizes expected (< INT_MAX) */
return (alen == blen && buffer_eq_icase_ssn(a, b, blen));
}
int buffer_eq_icase_slen(const buffer * const b, const char * const s, const size_t slen) {
/* Note: b must be initialized, i.e. 0 != b->used; uninitialized is not eq*/
/* 1 = equal; 0 = not equal */ /* short string sizes expected (< INT_MAX) */
return (b->used == slen + 1 && buffer_eq_icase_ssn(b->ptr, s, slen));
}
int buffer_eq_slen(const buffer * const b, const char * const s, const size_t slen) {
/* Note: b must be initialized, i.e. 0 != b->used; uninitialized is not eq*/
/* 1 = equal; 0 = not equal */ /* short string sizes expected (< INT_MAX) */
return (b->used == slen + 1 && 0 == memcmp(b->ptr, s, slen));
}
/**
* check if two buffer contain the same data
*/
@ -369,28 +403,8 @@ int buffer_is_equal_string(const buffer *a, const char *s, size_t b_len) {
int buffer_is_equal_caseless_string(const buffer *a, const char *s, size_t b_len) {
force_assert(NULL != a && NULL != s);
force_assert(b_len + 1 > b_len);
/* 1 = equal; 0 = not equal */
return (a->used == b_len + 1 && 0 == strncasecmp(a->ptr, s, b_len));
}
int buffer_caseless_compare(const char *a, size_t a_len, const char *b, size_t b_len) {
size_t const len = (a_len < b_len) ? a_len : b_len;
size_t i;
for (i = 0; i < len; ++i) {
unsigned char ca = a[i], cb = b[i];
if (ca == cb) continue;
/* always lowercase for transitive results */
if (ca >= 'A' && ca <= 'Z') ca |= 32;
if (cb >= 'A' && cb <= 'Z') cb |= 32;
if (ca == cb) continue;
return ((int)ca) - ((int)cb);
}
if (a_len == b_len) return 0;
return a_len < b_len ? -1 : 1;
return buffer_eq_icase_slen(a, s, b_len);
}
int buffer_is_equal_right_len(const buffer *b1, const buffer *b2, size_t len) {

13
src/buffer.h
View File

@ -106,11 +106,22 @@ static inline int buffer_is_empty(const buffer *b);
/* NULL buffer, empty buffer (used == 0) or empty string (used == 1) */
static inline int buffer_string_is_empty(const buffer *b);
__attribute_pure__
int buffer_eq_icase_ssn(const char * const a, const char * const b, const size_t len);
__attribute_pure__
int buffer_eq_icase_ss(const char * const a, const size_t alen, const char * const b, const size_t blen);
__attribute_pure__
int buffer_eq_icase_slen(const buffer * const b, const char * const s, const size_t slen);
__attribute_pure__
int buffer_eq_slen(const buffer * const b, const char * const s, const size_t slen);
int buffer_is_equal(const buffer *a, const buffer *b);
int buffer_is_equal_right_len(const buffer *a, const buffer *b, size_t len);
int buffer_is_equal_string(const buffer *a, const char *s, size_t b_len);
int buffer_is_equal_caseless_string(const buffer *a, const char *s, size_t b_len);
int buffer_caseless_compare(const char *a, size_t a_len, const char *b, size_t b_len);
void buffer_substr_replace (buffer *b, size_t offset, size_t len, const buffer *replace);