Parse this: Tue Feb 16 2016 17:23:34 GMT+0800

[zhangao0086]

This PR contains parsing the broken format Tue Feb 16 2016 17:23:34 GMT+0800.

[dinhvh]

Could you create a new function instead?
mailimf_hack_date_time_parse()

Then in MailCore, MessageHeader::importIMAPEnvelope(), use:

void MessageHeader::importIMAPEnvelope(struct mailimap_envelope * env)
{
    if (env->env_date != NULL) {
        size_t cur_token;
        struct mailimf_date_time * date_time;
        int r;

        cur_token = 0;
        r = mailimf_date_time_parse(env->env_date, strlen(env->env_date),
            &cur_token, &date_time);
        if (r == MAILIMF_NO_ERROR) {
            time_t timestamp;

            // date
            timestamp = timestampFromDate(date_time);
            setDate(timestamp);
            setReceivedDate(timestamp);
            mailimf_date_time_free(date_time);
        }

        if (r != MAILIMF_NO_ERROR) {
            r = mailimf_hack_date_time_parse(env->env_date, strlen(env->env_date),
            &cur_token, &date_time);
            if (r == MAILIMAP_NO_ERROR) {
                time_t timestamp;

                timestamp = timestampFromDate(imap_date);
                setDate(timestamp);
                setReceivedDate(timestamp);
                mailimf_date_time_free(date_time);
            }
        }

        if (r != MAILIMF_NO_ERROR) {
            struct mailimap_date_time * imap_date;

            r = mailimap_hack_date_time_parse(env->env_date, &imap_date, 0, NULL);
            if (r == MAILIMAP_NO_ERROR) {
                time_t timestamp;

                timestamp = timestampFromIMAPDate(imap_date);
                setDate(timestamp);
                setReceivedDate(timestamp);
                mailimap_date_time_free(imap_date);
            }
        }
    }

    ...

[zhangao0086]

In my case, the MessageHeader::importIMAPEnvelope function is never getting called...

[dinhvh]

ah ok, you're fetching the full header.
Could you still have a separate mailimf_hack_date_time_parse() and call it in mailimf_date_time_parse() if it fails to parse the date (on MAILIMF_ERROR_PARSE)?

Basically, you would replace calls to return r to res = r; goto err; and in the label 'err:`, you would call the workaround mailimf_hack_date_time_parse() if there's a parse error.

[zhangao0086]

Updated. Please review again.

[zhangao0086]

Any problems?

[dinhvh]

I'm taking a closer look at the code to see the best way to do it.

[zhangao0086]

I believe you have a better way :)

[dinhvh]

I'm not sure. Anyway, the code you provided here is very useful.

[dinhvh]

I eventually used something similar to the first commit. Thanks!