masqmail
changeset 405:0dd84c8f2524
Broke long lines.
| author | markus schnalke <meillo@marmaro.de> |
|---|---|
| date | Wed, 29 Feb 2012 10:28:23 +0100 |
| parents | 899c97e877a5 |
| children | 8518fe2b0f36 |
| files | src/expand.c |
| diffstat | 1 files changed, 32 insertions(+), 14 deletions(-) [+] |
line diff
1.1 --- a/src/expand.c Wed Feb 29 10:21:58 2012 +0100 1.2 +++ b/src/expand.c Wed Feb 29 10:28:23 2012 +0100 1.3 @@ -26,11 +26,14 @@ 1.4 { 1.5 gchar *tmp_str; 1.6 1.7 - var_table = g_list_prepend(var_table, create_pair_string("rcpt_local", rcpt->local_part)); 1.8 - var_table = g_list_prepend(var_table, create_pair_string("rcpt_domain", rcpt->domain)); 1.9 + var_table = g_list_prepend(var_table, 1.10 + create_pair_string("rcpt_local", rcpt->local_part)); 1.11 + var_table = g_list_prepend(var_table, 1.12 + create_pair_string("rcpt_domain", rcpt->domain)); 1.13 1.14 tmp_str = g_strdup_printf("%s@%s", rcpt->local_part, rcpt->domain); 1.15 - var_table = g_list_prepend(var_table, create_pair_string("rcpt", tmp_str)); 1.16 + var_table = g_list_prepend(var_table, 1.17 + create_pair_string("rcpt", tmp_str)); 1.18 g_free(tmp_str); 1.19 1.20 return var_table; 1.21 @@ -42,14 +45,25 @@ 1.22 address *ret_path = msg->return_path; 1.23 gchar *tmp_str; 1.24 1.25 - var_table = g_list_prepend(var_table, create_pair_string("uid", msg->uid)); 1.26 - var_table = g_list_prepend(var_table, create_pair_string("received_host", msg->received_host ? msg->received_host : "")); 1.27 - var_table = g_list_prepend(var_table, create_pair_string("ident", msg->ident ? msg->ident : "")); 1.28 - var_table = g_list_prepend(var_table, create_pair_string("return_path_local", ret_path->local_part)); 1.29 - var_table = g_list_prepend(var_table, create_pair_string("return_path_domain", ret_path->domain)); 1.30 + var_table = g_list_prepend(var_table, 1.31 + create_pair_string("uid", msg->uid)); 1.32 + var_table = g_list_prepend(var_table, 1.33 + create_pair_string("received_host", 1.34 + msg->received_host ? msg->received_host : "")); 1.35 + var_table = g_list_prepend(var_table, 1.36 + create_pair_string("ident", 1.37 + msg->ident ? msg->ident : "")); 1.38 + var_table = g_list_prepend(var_table, 1.39 + create_pair_string("return_path_local", 1.40 + ret_path->local_part)); 1.41 + var_table = g_list_prepend(var_table, 1.42 + create_pair_string("return_path_domain", 1.43 + ret_path->domain)); 1.44 1.45 - tmp_str = g_strdup_printf("%s@%s", ret_path->local_part, ret_path->domain); 1.46 - var_table = g_list_prepend(var_table, create_pair_string("return_path", tmp_str)); 1.47 + tmp_str = g_strdup_printf("%s@%s", 1.48 + ret_path->local_part, ret_path->domain); 1.49 + var_table = g_list_prepend(var_table, 1.50 + create_pair_string("return_path", tmp_str)); 1.51 g_free(tmp_str); 1.52 1.53 return var_table; 1.54 @@ -58,9 +72,12 @@ 1.55 GList* 1.56 var_table_conf(GList *var_table) 1.57 { 1.58 - var_table = g_list_prepend(var_table, create_pair_string("host_name", conf.host_name)); 1.59 - var_table = g_list_prepend(var_table, create_pair_string("package", PACKAGE)); 1.60 - var_table = g_list_prepend(var_table, create_pair_string("version", VERSION)); 1.61 + var_table = g_list_prepend(var_table, 1.62 + create_pair_string("host_name", conf.host_name)); 1.63 + var_table = g_list_prepend(var_table, 1.64 + create_pair_string("package", PACKAGE)); 1.65 + var_table = g_list_prepend(var_table, 1.66 + create_pair_string("version", VERSION)); 1.67 1.68 return var_table; 1.69 } 1.70 @@ -92,7 +109,8 @@ 1.71 p++; 1.72 } else { 1.73 /* $var style */ 1.74 - while (*p && (isalnum(*p) || (*p == '_') || (*p == '-')) && (j < MAX_VAR)) { 1.75 + while (*p && (isalnum(*p) || (*p=='_') || 1.76 + (*p=='-')) && (j < MAX_VAR)) { 1.77 *(vq++) = *(p++); 1.78 j++; 1.79 }