nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'wip/795906-turkish-locale'. Fixes Bug 795906.

Browse source
This commit is contained in:
Michael James Gratton 2018-05-17 15:43:16 +10:00
commit ffb4befdd8
17 changed files with 190 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/engine/imap/message/imap-data-format.vala
View file

@ -23,10 +23,10 @@ public enum Quoting {
private bool is_special_char(char ch, char[] ar, string? exceptions) {
if (ch > 0x7F || ch.iscntrl())
return true;
if (ch in ar)
return (exceptions != null) ? exceptions.index_of_char(ch) < 0 : true;
return (exceptions != null) ? Ascii.index_of(exceptions, ch) < 0 : true;
return false;
}

22
src/engine/imap/message/imap-fetch-body-data-specifier.vala
View file

@ -73,15 +73,15 @@ public class Geary.Imap.FetchBodyDataSpecifier : BaseObject, Gee.Hashable<FetchB
assert_not_reached();
}
}
public static SectionPart deserialize(string value) throws ImapError {
if (String.is_empty(value))
return NONE;
switch (value.down()) {
switch (Ascii.strdown(value)) {
case "header":
return HEADER;
case "header.fields":
return HEADER_FIELDS;
@ -178,25 +178,23 @@ public class Geary.Imap.FetchBodyDataSpecifier : BaseObject, Gee.Hashable<FetchB
this.subset_start = subset_start;
this.subset_count = subset_count;
this.is_peek = is_peek;
if (field_names != null && field_names.length > 0) {
this.field_names = new Gee.TreeSet<string>((s1, s2) => {
return GLib.strcmp(s1, s2);
});
this.field_names = new Gee.TreeSet<string>(Ascii.strcmp);
foreach (string field_name in field_names) {
string converted = field_name.strip().down();
string converted = Ascii.strdown(field_name.strip());
if (!String.is_empty(converted))
this.field_names.add(converted);
}
} else {
this.field_names = null;
}
// see equal_to() for why the response version is used
hashable = serialize_response();
}
/**
* Returns the {@link FetchBodyDataSpecifier} in a string ready for a {@link Command}.
*

8
src/engine/imap/message/imap-internal-date.vala
View file

@ -64,18 +64,18 @@ public class Geary.Imap.InternalDate : Geary.MessageData.AbstractMessageData, Ge
|| year < 1970) {
throw new ImapError.PARSE_ERROR("Invalid INTERNALDATE \"%s\": bad numerical range", internaldate);
}
// check month (this catches localization problems)
int month = -1;
string mon_down = ((string) mon).down();
string mon_down = Ascii.strdown(((string) mon));
for (int ctr = 0; ctr < EN_US_MON_DOWN.length; ctr++) {
if (mon_down == EN_US_MON_DOWN[ctr]) {
month = ctr;
break;
}
}
if (month < 0)
throw new ImapError.PARSE_ERROR("Invalid INTERNALDATE \"%s\": bad month", internaldate);

24
src/engine/imap/message/imap-mailbox-specifier.vala
View file

@ -77,7 +77,7 @@ public class Geary.Imap.MailboxSpecifier : BaseObject, Gee.Hashable<MailboxSpeci
public static bool is_inbox_name(string name) {
return Ascii.stri_equal(name, CANONICAL_INBOX_NAME);
}
/**
* Returns true if the string is the ''canonical'' name of the IMAP Inbox.
*
@ -90,9 +90,9 @@ public class Geary.Imap.MailboxSpecifier : BaseObject, Gee.Hashable<MailboxSpeci
* @see is_inbox_name
*/
public static bool is_canonical_inbox_name(string name) {
return (name == CANONICAL_INBOX_NAME);
return Ascii.str_equal(name, CANONICAL_INBOX_NAME);
}
/**
* Converts a generic {@link FolderPath} into an IMAP mailbox specifier.
*/
@ -195,27 +195,27 @@ public class Geary.Imap.MailboxSpecifier : BaseObject, Gee.Hashable<MailboxSpeci
public uint hash() {
return is_inbox ? Ascii.stri_hash(name) : Ascii.str_hash(name);
}
public bool equal_to(MailboxSpecifier other) {
if (this == other)
return true;
if (is_inbox)
return Ascii.stri_equal(name, other.name);
return (name == other.name);
return Ascii.str_equal(name, other.name);
}
public int compare_to(MailboxSpecifier other) {
if (this == other)
return 0;
if (is_inbox && other.is_inbox)
return 0;
return GLib.strcmp(name, other.name);
return Ascii.strcmp(name, other.name);
}
public string to_string() {
return name;
}

16
src/engine/imap/parameter/imap-string-parameter.vala
View file

@ -134,35 +134,35 @@ public abstract class Geary.Imap.StringParameter : Geary.Imap.Parameter {
public bool is_empty() {
return String.is_empty(ascii);
}
/**
* Case-sensitive comparison.
*/
public bool equals_cs(string value) {
return (ascii == value);
return Ascii.str_equal(ascii, value);
}
/**
* Case-insensitive comparison.
*/
public bool equals_ci(string value) {
return Ascii.stri_equal(ascii, value);
}
/**
* Returns the string lowercased.
*/
public string as_lower() {
return ascii.down();
return Ascii.strdown(ascii);
}
/**
* Returns the string uppercased.
*/
public string as_upper() {
return ascii.up();
return Ascii.strup(ascii);
}
/**
* Converts the {@link ascii} to a signed 32-bit integer, clamped between clamp_min and
* clamp_max.

8
src/engine/imap/response/imap-response-code-type.vala
View file

@ -64,17 +64,17 @@ public class Geary.Imap.ResponseCodeType : BaseObject, Gee.Hashable<ResponseCode
public ResponseCodeType.from_parameter(StringParameter stringp) throws ImapError {
init(stringp.ascii);
}
private void init(string ascii) throws ImapError {
// note that is_quoting_required() also catches empty strings (as they require quoting)
if (DataFormat.is_quoting_required(ascii) != DataFormat.Quoting.OPTIONAL)
throw new ImapError.INVALID("\"%s\" cannot be represented as a ResponseCodeType", ascii);
// store lowercased so it's easily compared with const strings above
original = ascii;
value = ascii.down();
value = Ascii.strdown(ascii);
}
public bool is_value(string str) {
return Ascii.stri_equal(value, str);
}

8
src/engine/mime/mime-content-parameters.vala
View file

@ -78,7 +78,7 @@ public class Geary.Mime.ContentParameters : BaseObject {
return (stored != null) ? Ascii.stri_equal(stored, value) : false;
}
/**
* Returns true if the attribute has the supplied value (case-sensitive comparison).
*
@ -86,10 +86,10 @@ public class Geary.Mime.ContentParameters : BaseObject {
*/
public bool has_value_cs(string attribute, string value) {
string? stored = params.get(attribute);
return (stored != null) ? (stored == value) : false;
return (stored != null) ? Ascii.str_equal(stored, value) : false;
}
/**
* Add or replace the parameter.
*

14
src/engine/mime/mime-disposition-type.vala
View file

@ -31,24 +31,24 @@ public enum Geary.Mime.DispositionType {
*/
public static DispositionType deserialize(string? str, out bool is_unknown) {
is_unknown = false;
if (String.is_empty_or_whitespace(str))
return UNSPECIFIED;
switch (str.down()) {
switch (Ascii.strdown(str)) {
case "inline":
return INLINE;
case "attachment":
return ATTACHMENT;
default:
is_unknown = true;
return ATTACHMENT;
}
}
/**
* Returns null if value is {@link UNSPECIFIED}
*/

14
src/engine/mime/mime-multipart-subtype.vala
View file

@ -48,24 +48,24 @@ public enum Geary.Mime.MultipartSubtype {
public static MultipartSubtype from_content_type(ContentType? content_type, out bool is_unknown) {
if (content_type == null || !content_type.has_media_type("multipart")) {
is_unknown = true;
return MIXED;
}
is_unknown = false;
switch (content_type.media_subtype.down()) {
switch (Ascii.strdown(content_type.media_subtype)) {
case "mixed":
return MIXED;
case "alternative":
return ALTERNATIVE;
case "related":
return RELATED;
default:
is_unknown = true;
return MIXED;
}
}

6
src/engine/rfc822/rfc822-mailbox-address.vala
View file

@ -127,7 +127,7 @@ public class Geary.RFC822.MailboxAddress :
this.source_route = null;
this.address = address;
int atsign = address.last_index_of_char('@');
int atsign = Ascii.last_index_of(address, '@');
if (atsign > 0) {
this.mailbox = address[0:atsign];
this.domain = address[atsign + 1:address.length];
@ -173,12 +173,12 @@ public class Geary.RFC822.MailboxAddress :
}
string address = mailbox.get_addr();
int atsign = address.last_index_of_char('@');
int atsign = Ascii.last_index_of(address, '@');
if (atsign == -1) {
// No @ detected, try decoding in case a mailer (wrongly)
// encoded the whole thing and re-try
address = decode_address_part(address);
atsign = address.last_index_of_char('@');
atsign = Ascii.last_index_of(address, '@');
}
if (atsign >= 0) {

22
src/engine/smtp/smtp-command.vala
View file

@ -56,36 +56,36 @@ public enum Geary.Smtp.Command {
assert_not_reached();
}
}
public static Command deserialize(string str) throws SmtpError {
switch (str.down()) {
switch (Ascii.strdown(str)) {
case "helo":
return HELO;
case "ehlo":
return EHLO;
case "quit":
return QUIT;
case "help":
return HELP;
case "noop":
return NOOP;
case "rset":
return RSET;
case "auth":
return AUTH;
case "mail":
return MAIL;
case "rcpt":
return RCPT;
case "data":
return DATA;

10
src/engine/smtp/smtp-greeting.vala
View file

@ -25,21 +25,21 @@ public class Geary.Smtp.Greeting : Response {
return "";
}
}
public static ServerFlavor deserialize(string str) {
switch (str.up()) {
switch (Ascii.strup(str)) {
case "SMTP":
return SMTP;
case "ESMTP":
return ESMTP;
default:
return UNSPECIFIED;
}
}
}
public string? domain { get; private set; default = null; }
public ServerFlavor flavor { get; private set; default = ServerFlavor.UNSPECIFIED; }
public string? message { get; private set; default = null; }

82
src/engine/util/util-ascii.vala
View file

@ -4,40 +4,80 @@
* (version 2.1 or later). See the COPYING file in this distribution.
*/
/**
* US-ASCII string utilities.
*
* Using ASCII-specific, non-localised functions is essential when
* dealing with protocol strings since any case-insensitive
* comparisons may be incorrect under certain locales — especially for
* Turkish, where translating between upper-case and lower-case `i` is
* not necessarily preserved.
*/
namespace Geary.Ascii {
public int index_of(string str, char ch) {
// Use a pointer and explicit null check, since testing against
// the length of the string as in a traditional for loop will mean
// a call to strlen(), making the loop O(n^2)
int ret = -1;
char *strptr = str;
int i = 0;
while (*strptr != String.EOS) {
if (*strptr++ == ch) {
ret = i;
break;
}
i++;
}
return ret;
}
public int last_index_of(string str, char ch) {
// Use a pointer and explicit null check, since testing against
// the length of the string as in a traditional for loop will mean
// a call to strlen(), making the loop O(n^2)
int ret = -1;
char *strptr = str;
int i = 0;
while (*strptr != String.EOS) {
if (*strptr++ == ch) {
ret = i;
}
i++;
}
return ret;
}
public bool get_next_char(string str, ref int index, out char ch) {
ch = str[index++];
return ch != String.EOS;
}
public bool stri_equal(string a, string b) {
// XXX Is this marginally faster than a.down() == b.down() in the
// best case, slower in the worse case, so not worth it?
char *aptr = a;
char *bptr = b;
for (;;) {
int diff = (int) (*aptr).tolower() - (int) (*bptr).tolower();
if (diff != 0)
return false;
public inline int strcmp(string a, string b) {
return GLib.strcmp(a, b);
}
if (*aptr == String.EOS)
return true;
public inline int stricmp(string a, string b) {
return a.ascii_casecmp(b);
}
aptr++;
bptr++;
}
public inline bool str_equal(string a, string b) {
return a == b;
}
public inline bool stri_equal(string a, string b) {
return a.ascii_casecmp(b) == 0;
}
public bool nullable_stri_equal(string? a, string? b) {
if (a == null)
return (b == null);
// a != null, so always false
if (b == null)
return false;
return stri_equal(a, b);
}
@ -55,6 +95,14 @@ public uint nullable_stri_hash(string? str) {
return (str != null) ? stri_hash(str) : 0;
}
public inline string strdown(string str) {
return str.ascii_down();
}
public inline string strup(string str) {
return str.ascii_up();
}
/**
* Returns true if the ASCII string contains only whitespace and at least one numeric character.
*/

1
test/CMakeLists.txt
View file

@ -36,6 +36,7 @@ set(TEST_ENGINE_SRC
engine/rfc822-message-test.vala
engine/rfc822-message-data-test.vala
engine/rfc822-utils-test.vala
engine/util-ascii-test.vala
engine/util-html-test.vala
engine/util-idle-manager-test.vala
engine/util-inet-test.vala

44
test/engine/util-ascii-test.vala Normal file
View file

@ -0,0 +1,44 @@
/*
* Copyright 2018 Michael Gratton <mike@vee.net>
*
* This software is licensed under the GNU Lesser General Public License
* (version 2.1 or later). See the COPYING file in this distribution.
*/
class Geary.Ascii.Test : TestCase {
public Test() {
base("Geary.Ascii.Test");
add_test("index_of", index_of);
add_test("last_index_of", last_index_of);
}
public void index_of() throws Error {
assert_int(-1, Ascii.index_of("", 'a'));
assert_int(0, Ascii.index_of("a", 'a'));
assert_int(0, Ascii.index_of("aa", 'a'));
assert_int(0, Ascii.index_of("abcabc", 'a'));
assert_int(1, Ascii.index_of("abcabc", 'b'));
assert_int(2, Ascii.index_of("abcabc", 'c'));
assert_int(0, Ascii.index_of("@", '@'));
assert_int(-1, Ascii.index_of("abc", 'd'));
}
public void last_index_of() throws Error {
assert_int(-1, Ascii.last_index_of("", 'a'));
assert_int(0, Ascii.last_index_of("a", 'a'));
assert_int(1, Ascii.last_index_of("aa", 'a'));
assert_int(3, Ascii.last_index_of("abcabc", 'a'));
assert_int(4, Ascii.last_index_of("abcabc", 'b'));
assert_int(5, Ascii.last_index_of("abcabc", 'c'));
assert_int(0, Ascii.last_index_of("@", '@'));
assert_int(-1, Ascii.last_index_of("abc", 'd'));
}
}

1
test/meson.build
View file

@ -32,6 +32,7 @@ geary_test_engine_sources = [
'engine/rfc822-message-test.vala',
'engine/rfc822-message-data-test.vala',
'engine/rfc822-utils-test.vala',
'engine/util-ascii-test.vala',
'engine/util-html-test.vala',
'engine/util-idle-manager-test.vala',
'engine/util-inet-test.vala',

1
test/test-engine.vala
View file

@ -30,6 +30,7 @@ int main(string[] args) {
engine.add_suite(new Geary.App.ConversationSetTest().get_suite());
// Depends on ConversationTest and ConversationSetTest passing
engine.add_suite(new Geary.App.ConversationMonitorTest().get_suite());
engine.add_suite(new Geary.Ascii.Test().get_suite());
engine.add_suite(new Geary.HTML.UtilTest().get_suite());
engine.add_suite(new Geary.Imap.DeserializerTest().get_suite());
engine.add_suite(new Geary.Imap.CreateCommandTest().get_suite());