aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00
Code

Don't call mblen() to not depend on locale

Browse Source 
mblen will fail with return code -1 if the locale used by the unit tests
isn't available on the machine. This will lead to an off by one error in some
tests where the needle is at the end of the haystack.

Since prof_occurrences expect null-terminated strings, the character after
the needle can simply be found by incrementing the address of the found needle
with strlen(needle).
This commit is contained in:
Frank Zschockelt 2019-05-08 22:33:19 +02:00
parent 91d17edcb4
commit 56e925ed03
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/common.c
View File

@ -410,9 +410,6 @@ prof_occurrences(const char *const needle, const char *const haystack, int offse
gchar *haystack_curr = g_utf8_offset_to_pointer(haystack, offset); gchar *haystack_curr = g_utf8_offset_to_pointer(haystack, offset);
if (g_str_has_prefix(haystack_curr, needle)) { if (g_str_has_prefix(haystack_curr, needle)) {
if (whole_word) { if (whole_word) {
gchar *needle_last_ch = g_utf8_offset_to_pointer(needle, g_utf8_strlen(needle, -1)- 1);
int needle_last_ch_len = mblen(needle_last_ch, MB_CUR_MAX);
gunichar before = 0; gunichar before = 0;
gchar *haystack_before_ch = g_utf8_find_prev_char(haystack, haystack_curr); gchar *haystack_before_ch = g_utf8_find_prev_char(haystack, haystack_curr);
if (haystack_before_ch) { if (haystack_before_ch) {
@ -420,8 +417,8 @@ prof_occurrences(const char *const needle, const char *const haystack, int offse
} }
gunichar after = 0; gunichar after = 0;
gchar *haystack_after_ch = g_utf8_find_next_char(haystack_curr + strlen(needle) - needle_last_ch_len, NULL); gchar *haystack_after_ch = haystack_curr + strlen(needle);
if (haystack_after_ch) { if (haystack_after_ch[0] != '\0') {
after = g_utf8_get_char(haystack_after_ch); after = g_utf8_get_char(haystack_after_ch);
} }