No actual code change here. Just whitespace style, (mostly just my
preferred space before a left parenthesis, and a space after a comma).
-guess_from_received_header(notmuch_config_t *config, notmuch_message_t *message)
+guess_from_received_header (notmuch_config_t *config, notmuch_message_t *message)
{
const char *received,*primary;
char **other;
{
const char *received,*primary;
char **other;
size_t i,other_len;
received = notmuch_message_get_header (message, "received");
size_t i,other_len;
received = notmuch_message_get_header (message, "received");
- by = strstr(received," by ");
+ by = strstr (received, " by ");
if (by && *(by+4)) {
/* we know that there are 4 characters after by - either the 4th one
* is '\0' (broken header) or it is the first letter of the hostname
* that last received this email - which we'll use to guess the right
* from email address
*/
if (by && *(by+4)) {
/* we know that there are 4 characters after by - either the 4th one
* is '\0' (broken header) or it is the first letter of the hostname
* that last received this email - which we'll use to guess the right
* from email address
*/
if (mta == NULL)
return NULL;
if (mta == NULL)
return NULL;
/* After the MTA comes its IP address (or HELO response) in parenthesis.
* so let's terminate the string there
*/
/* After the MTA comes its IP address (or HELO response) in parenthesis.
* so let's terminate the string there
*/
- if ((ptr = strchr(mta,'(')) == NULL) {
+ if ((ptr = strchr (mta, '(')) == NULL) {
free (mta);
return NULL;
}
*ptr = '\0';
free (mta);
return NULL;
}
*ptr = '\0';
/* Now extract the last two components of the MTA host name
* as domain and tld
*/
token = mta;
/* Now extract the last two components of the MTA host name
* as domain and tld
*/
token = mta;
- while ((ptr = strsep(&token,delim)) != NULL) {
+ while ((ptr = strsep (&token, delim)) != NULL) {
if (*ptr == '\0')
continue;
domain = tld;
tld = ptr;
}
if (*ptr == '\0')
continue;
domain = tld;
tld = ptr;
}
if (domain) {
/* recombine domain and tld and look for it among the configured
* email addresses
if (domain) {
/* recombine domain and tld and look for it among the configured
* email addresses
*(tld-1) = '.';
primary = notmuch_config_get_user_primary_email (config);
if (strcasestr (primary, domain)) {
*(tld-1) = '.';
primary = notmuch_config_get_user_primary_email (config);
if (strcasestr (primary, domain)) {
return primary;
}
other = notmuch_config_get_user_other_email (config, &other_len);
for (i = 0; i < other_len; i++)
if (strcasestr (other[i], domain)) {
return primary;
}
other = notmuch_config_get_user_other_email (config, &other_len);
for (i = 0; i < other_len; i++)
if (strcasestr (other[i], domain)) {
g_mime_message_set_subject (reply, subject);
from_addr = add_recipients_from_message (reply, config, message);
g_mime_message_set_subject (reply, subject);
from_addr = add_recipients_from_message (reply, config, message);
if (from_addr == NULL) {
from_addr = guess_from_received_header (config, message);
if (from_addr == NULL) {
if (from_addr == NULL) {
from_addr = guess_from_received_header (config, message);
if (from_addr == NULL) {