Mercurial > masqmail

comparison src/expand.c @ 405:0dd84c8f2524

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Broke long lines.
author markus schnalke <meillo@marmaro.de>
date Wed, 29 Feb 2012 10:28:23 +0100
parents b27f66555ba8
children
comparison
equal deleted inserted replaced
404:899c97e877a5 405:0dd84c8f2524
24 GList* 24 GList*
25 var_table_rcpt(GList *var_table, address *rcpt) 25 var_table_rcpt(GList *var_table, address *rcpt)
26 { 26 {
27 gchar *tmp_str; 27 gchar *tmp_str;
28 28
29 var_table = g_list_prepend(var_table, create_pair_string("rcpt_local", rcpt->local_part)); 29 var_table = g_list_prepend(var_table,
30 var_table = g_list_prepend(var_table, create_pair_string("rcpt_domain", rcpt->domain)); 30 create_pair_string("rcpt_local", rcpt->local_part));
31 var_table = g_list_prepend(var_table,
32 create_pair_string("rcpt_domain", rcpt->domain));
31 33
32 tmp_str = g_strdup_printf("%s@%s", rcpt->local_part, rcpt->domain); 34 tmp_str = g_strdup_printf("%s@%s", rcpt->local_part, rcpt->domain);
33 var_table = g_list_prepend(var_table, create_pair_string("rcpt", tmp_str)); 35 var_table = g_list_prepend(var_table,
36 create_pair_string("rcpt", tmp_str));
34 g_free(tmp_str); 37 g_free(tmp_str);
35 38
36 return var_table; 39 return var_table;
37 } 40 }
38 41
40 var_table_msg(GList *var_table, message *msg) 43 var_table_msg(GList *var_table, message *msg)
41 { 44 {
42 address *ret_path = msg->return_path; 45 address *ret_path = msg->return_path;
43 gchar *tmp_str; 46 gchar *tmp_str;
44 47
45 var_table = g_list_prepend(var_table, create_pair_string("uid", msg->uid)); 48 var_table = g_list_prepend(var_table,
46 var_table = g_list_prepend(var_table, create_pair_string("received_host", msg->received_host ? msg->received_host : "")); 49 create_pair_string("uid", msg->uid));
47 var_table = g_list_prepend(var_table, create_pair_string("ident", msg->ident ? msg->ident : "")); 50 var_table = g_list_prepend(var_table,
48 var_table = g_list_prepend(var_table, create_pair_string("return_path_local", ret_path->local_part)); 51 create_pair_string("received_host",
49 var_table = g_list_prepend(var_table, create_pair_string("return_path_domain", ret_path->domain)); 52 msg->received_host ? msg->received_host : ""));
53 var_table = g_list_prepend(var_table,
54 create_pair_string("ident",
55 msg->ident ? msg->ident : ""));
56 var_table = g_list_prepend(var_table,
57 create_pair_string("return_path_local",
58 ret_path->local_part));
59 var_table = g_list_prepend(var_table,
60 create_pair_string("return_path_domain",
61 ret_path->domain));
50 62
51 tmp_str = g_strdup_printf("%s@%s", ret_path->local_part, ret_path->domain); 63 tmp_str = g_strdup_printf("%s@%s",
52 var_table = g_list_prepend(var_table, create_pair_string("return_path", tmp_str)); 64 ret_path->local_part, ret_path->domain);
65 var_table = g_list_prepend(var_table,
66 create_pair_string("return_path", tmp_str));
53 g_free(tmp_str); 67 g_free(tmp_str);
54 68
55 return var_table; 69 return var_table;
56 } 70 }
57 71
58 GList* 72 GList*
59 var_table_conf(GList *var_table) 73 var_table_conf(GList *var_table)
60 { 74 {
61 var_table = g_list_prepend(var_table, create_pair_string("host_name", conf.host_name)); 75 var_table = g_list_prepend(var_table,
62 var_table = g_list_prepend(var_table, create_pair_string("package", PACKAGE)); 76 create_pair_string("host_name", conf.host_name));
63 var_table = g_list_prepend(var_table, create_pair_string("version", VERSION)); 77 var_table = g_list_prepend(var_table,
78 create_pair_string("package", PACKAGE));
79 var_table = g_list_prepend(var_table,
80 create_pair_string("version", VERSION));
64 81
65 return var_table; 82 return var_table;
66 } 83 }
67 84
68 gint 85 gint
90 j++; 107 j++;
91 } 108 }
92 p++; 109 p++;
93 } else { 110 } else {
94 /* $var style */ 111 /* $var style */
95 while (*p && (isalnum(*p) || (*p == '_') || (*p == '-')) && (j < MAX_VAR)) { 112 while (*p && (isalnum(*p) || (*p=='_') ||
113 (*p=='-')) && (j < MAX_VAR)) {
96 *(vq++) = *(p++); 114 *(vq++) = *(p++);
97 j++; 115 j++;
98 } 116 }
99 } 117 }
100 *vq = '\0'; 118 *vq = '\0';