7132c57a86
- Recreate dovecot-uidlist if updating it would shrink the file more than 25%. - imap_get_base_subject_cased(): Subject trailers weren't removed correctly. From the Dovecot Mercurial repo. ok sthen@
63 lines
2.0 KiB
Plaintext
63 lines
2.0 KiB
Plaintext
$OpenBSD: patch-src_lib-imap_imap-base-subject_c,v 1.1 2008/06/19 22:27:33 brad Exp $
|
|
--- src/lib-imap/imap-base-subject.c.orig Tue Jun 17 22:22:12 2008
|
|
+++ src/lib-imap/imap-base-subject.c Tue Jun 17 22:25:42 2008
|
|
@@ -90,14 +90,14 @@ static void remove_subj_trailers(buffer_t *buf, size_t
|
|
/* subj-trailer = "(fwd)" / WSP */
|
|
data = buffer_get_data(buf, &orig_size);
|
|
|
|
- if (orig_size < 2) /* size includes trailing \0 */
|
|
+ if (orig_size < 1) /* size includes trailing \0 */
|
|
return;
|
|
|
|
- for (size = orig_size-2; size > start_pos; ) {
|
|
- if (data[size] == ' ')
|
|
+ for (size = orig_size-1; size > start_pos; ) {
|
|
+ if (data[size-1] == ' ')
|
|
size--;
|
|
else if (size >= 5 &&
|
|
- memcmp(data + size - 5, "(fwd)", 5) == 0) {
|
|
+ memcmp(data + size - 5, "(FWD)", 5) == 0) {
|
|
if (is_reply_or_forward_r != NULL)
|
|
*is_reply_or_forward_r = TRUE;
|
|
size -= 5;
|
|
@@ -106,7 +106,7 @@ static void remove_subj_trailers(buffer_t *buf, size_t
|
|
}
|
|
}
|
|
|
|
- if (size != orig_size-2) {
|
|
+ if (size != orig_size-1) {
|
|
buffer_set_used_size(buf, size);
|
|
buffer_append_c(buf, '\0');
|
|
}
|
|
@@ -163,11 +163,11 @@ static bool remove_subj_leader(buffer_t *buf, size_t *
|
|
return ret;
|
|
}
|
|
|
|
- if (strncasecmp(data, "re", 2) == 0)
|
|
+ if (strncmp(data, "RE", 2) == 0)
|
|
data += 2;
|
|
- else if (strncasecmp(data, "fwd", 3) == 0)
|
|
+ else if (strncmp(data, "FWD", 3) == 0)
|
|
data += 3;
|
|
- else if (strncasecmp(data, "fw", 2) == 0)
|
|
+ else if (strncmp(data, "FW", 2) == 0)
|
|
data += 2;
|
|
else
|
|
return ret;
|
|
@@ -214,7 +214,7 @@ static bool remove_subj_fwd_hdr(buffer_t *buf, size_t
|
|
subj-fwd-trl = "]" */
|
|
data = buffer_get_data(buf, &size);
|
|
|
|
- if (strncasecmp(data + *start_pos, "[fwd:", 5) != 0)
|
|
+ if (strncmp(data + *start_pos, "[FWD:", 5) != 0)
|
|
return FALSE;
|
|
|
|
if (data[size-2] != ']')
|
|
@@ -282,5 +282,5 @@ const char *imap_get_base_subject_cased(pool_t pool, c
|
|
|
|
/* (7) The resulting text is the "base subject" used in the
|
|
SORT. */
|
|
- return (const char *)buffer_get_data(buf, NULL) + start_pos;
|
|
+ return (const char *)buf->data + start_pos;
|
|
}
|