debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-21 18:38:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

notmuch-reply: Fix some whitespace issues.

Browse source 
No actual code change here. Just whitespace style, (mostly just my
preferred space before a left parenthesis, and a space after a comma).
This commit is contained in:
Carl Worth 2010-04-06 18:49:25 -07:00
parent 4fd9ea05e8
commit 3e216ba60d
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
notmuch-reply.c
View file

@ -282,9 +282,8 @@ add_recipients_from_message (GMimeMessage *reply,
return from_addr; return from_addr;
} }
static const char * static const char *
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; const char *received,*primary;
char **other; char **other;
@ -295,34 +294,37 @@ guess_from_received_header(notmuch_config_t *config, notmuch_message_t *message)
size_t i,other_len; size_t i,other_len;
received = notmuch_message_get_header (message, "received"); received = notmuch_message_get_header (message, "received");
by = strstr(received," by "); by = strstr (received, " by ");
if (by && *(by+4)) { if (by && *(by+4)) {
/* we know that there are 4 characters after by - either the 4th one /* 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 * 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 * that last received this email - which we'll use to guess the right
* from email address * from email address
*/ */
mta = strdup(by+4); mta = strdup (by+4);
if (mta == NULL) if (mta == NULL)
return NULL; return NULL;
/* After the MTA comes its IP address (or HELO response) in parenthesis. /* After the MTA comes its IP address (or HELO response) in parenthesis.
* so let's terminate the string there * so let's terminate the string there
*/ */
if ((ptr = strchr(mta,'(')) == NULL) { if ((ptr = strchr (mta, '(')) == NULL) {
free (mta); free (mta);
return NULL; return NULL;
} }
*ptr = '\0'; *ptr = '\0';
/* Now extract the last two components of the MTA host name /* Now extract the last two components of the MTA host name
* as domain and tld * as domain and tld
*/ */
token = mta; token = mta;
while ((ptr = strsep(&token,delim)) != NULL) { while ((ptr = strsep (&token, delim)) != NULL) {
if (*ptr == '\0') if (*ptr == '\0')
continue; continue;
domain = tld; domain = tld;
tld = ptr; tld = ptr;
} }
if (domain) { if (domain) {
/* recombine domain and tld and look for it among the configured /* recombine domain and tld and look for it among the configured
* email addresses * email addresses
@ -330,18 +332,20 @@ guess_from_received_header(notmuch_config_t *config, notmuch_message_t *message)
*(tld-1) = '.'; *(tld-1) = '.';
primary = notmuch_config_get_user_primary_email (config); primary = notmuch_config_get_user_primary_email (config);
if (strcasestr (primary, domain)) { if (strcasestr (primary, domain)) {
free(mta); free (mta);
return primary; return primary;
} }
other = notmuch_config_get_user_other_email (config, &other_len); other = notmuch_config_get_user_other_email (config, &other_len);
for (i = 0; i < other_len; i++) for (i = 0; i < other_len; i++)
if (strcasestr (other[i], domain)) { if (strcasestr (other[i], domain)) {
free(mta); free (mta);
return other[i]; return other[i];
} }
} }
free(mta);
free (mta);
} }
return NULL; return NULL;
} }
@ -375,7 +379,7 @@ notmuch_reply_format_default(void *ctx, notmuch_config_t *config, notmuch_query_
g_mime_message_set_subject (reply, subject); g_mime_message_set_subject (reply, subject);
from_addr = add_recipients_from_message (reply, config, message); from_addr = add_recipients_from_message (reply, config, message);
if (from_addr == NULL) { if (from_addr == NULL) {
from_addr = guess_from_received_header (config, message); from_addr = guess_from_received_header (config, message);
if (from_addr == NULL) { if (from_addr == NULL) {