summaryrefslogtreecommitdiff
path: root/libsieve
diff options
context:
space:
mode:
authorWojciech Polak <polak@gnu.org>2005-08-27 11:37:43 +0000
committerWojciech Polak <polak@gnu.org>2005-08-27 11:37:43 +0000
commit755146b443774be9fdff992ede4cb921762b9649 (patch)
treed92ea93eaf520c557231e7dca1d9051eac00d5be /libsieve
parent6178304b1670d7288d8a37b9165bda5cbc44c180 (diff)
downloadmailutils-755146b443774be9fdff992ede4cb921762b9649.tar.gz
mailutils-755146b443774be9fdff992ede4cb921762b9649.tar.bz2
Normalize global namespace. Part 2
Diffstat (limited to 'libsieve')
-rw-r--r--libsieve/actions.c148
-rw-r--r--libsieve/argp.c6
-rw-r--r--libsieve/comparator.c14
-rw-r--r--libsieve/extensions/list.c6
-rw-r--r--libsieve/extensions/spamd.c72
-rw-r--r--libsieve/extensions/timestamp.c8
-rw-r--r--libsieve/extensions/vacation.c84
-rw-r--r--libsieve/load.c4
-rw-r--r--libsieve/prog.c22
-rw-r--r--libsieve/register.c10
-rw-r--r--libsieve/relational.c2
-rw-r--r--libsieve/require.c4
-rw-r--r--libsieve/runtime.c28
-rw-r--r--libsieve/sieve.h42
-rw-r--r--libsieve/sieve.l4
-rw-r--r--libsieve/sieve.y20
-rw-r--r--libsieve/tests.c56
-rw-r--r--libsieve/util.c24
18 files changed, 277 insertions, 277 deletions
diff --git a/libsieve/actions.c b/libsieve/actions.c
index bc8593589..b49a0a278 100644
--- a/libsieve/actions.c
+++ b/libsieve/actions.c
@@ -27,7 +27,7 @@
#include <sieve.h>
int
-sieve_action_stop (mu_sieve_machine_t mach, list_t args, list_t tags)
+sieve_action_stop (mu_sieve_machine_t mach, mu_list_t args, mu_list_t tags)
{
mu_sieve_log_action (mach, "STOP", NULL);
mach->pc = 0;
@@ -35,7 +35,7 @@ sieve_action_stop (mu_sieve_machine_t mach, list_t args, list_t tags)
}
int
-sieve_action_keep (mu_sieve_machine_t mach, list_t args, list_t tags)
+sieve_action_keep (mu_sieve_machine_t mach, mu_list_t args, mu_list_t tags)
{
mu_sieve_log_action (mach, "KEEP", NULL);
if (mu_sieve_is_dry_run (mach))
@@ -45,7 +45,7 @@ sieve_action_keep (mu_sieve_machine_t mach, list_t args, list_t tags)
}
int
-sieve_action_discard (mu_sieve_machine_t mach, list_t args, list_t tags)
+sieve_action_discard (mu_sieve_machine_t mach, mu_list_t args, mu_list_t tags)
{
mu_sieve_log_action (mach, "DISCARD", _("marking as deleted"));
if (mu_sieve_is_dry_run (mach))
@@ -55,7 +55,7 @@ sieve_action_discard (mu_sieve_machine_t mach, list_t args, list_t tags)
}
int
-sieve_action_fileinto (mu_sieve_machine_t mach, list_t args, list_t tags)
+sieve_action_fileinto (mu_sieve_machine_t mach, mu_list_t args, mu_list_t tags)
{
int rc;
mu_sieve_value_t *val = mu_sieve_value_get (args, 0);
@@ -68,7 +68,7 @@ sieve_action_fileinto (mu_sieve_machine_t mach, list_t args, list_t tags)
if (mu_sieve_is_dry_run (mach))
return 0;
- rc = message_save_to_mailbox (mach->msg, mach->ticket, mach->debug,
+ rc = mu_message_save_to_mailbox (mach->msg, mach->ticket, mach->debug,
val->v.string);
if (rc)
mu_sieve_error (mach, _("cannot save to mailbox: %s"),
@@ -80,7 +80,7 @@ sieve_action_fileinto (mu_sieve_machine_t mach, list_t args, list_t tags)
}
int
-mu_stream_printf (stream_t stream, size_t *off, const char *fmt, ...)
+mu_stream_printf (mu_stream_t stream, size_t *off, const char *fmt, ...)
{
va_list ap;
char *buf = NULL;
@@ -91,7 +91,7 @@ mu_stream_printf (stream_t stream, size_t *off, const char *fmt, ...)
vasprintf (&buf, fmt, ap);
va_end (ap);
size = strlen (buf);
- rc = stream_write (stream, buf, size, *off, &bytes);
+ rc = mu_stream_write (stream, buf, size, *off, &bytes);
if (rc)
return rc;
*off += bytes;
@@ -101,14 +101,14 @@ mu_stream_printf (stream_t stream, size_t *off, const char *fmt, ...)
}
int
-mu_sieve_get_message_sender (message_t msg, char **ptext)
+mu_sieve_get_message_sender (mu_message_t msg, char **ptext)
{
int rc;
- envelope_t envelope;
+ mu_envelope_t envelope;
char *text;
size_t size;
- rc = message_get_envelope (msg, &envelope);
+ rc = mu_message_get_envelope (msg, &envelope);
if (rc)
return rc;
@@ -121,8 +121,8 @@ mu_sieve_get_message_sender (message_t msg, char **ptext)
}
else
{
- header_t hdr = NULL;
- message_get_header (msg, &hdr);
+ mu_header_t hdr = NULL;
+ mu_message_get_header (msg, &hdr);
if (rc = mu_header_aget_value (hdr, MU_HEADER_SENDER, &text))
rc = mu_header_aget_value (hdr, MU_HEADER_FROM, &text);
}
@@ -133,23 +133,23 @@ mu_sieve_get_message_sender (message_t msg, char **ptext)
}
static int
-build_mime (mime_t *pmime, message_t msg, const char *text)
+build_mime (mu_mime_t *pmime, mu_message_t msg, const char *text)
{
- mime_t mime = NULL;
+ mu_mime_t mime = NULL;
char datestr[80];
- mime_create (&mime, NULL, 0);
+ mu_mime_create (&mime, NULL, 0);
{
- message_t newmsg;
- stream_t stream;
+ mu_message_t newmsg;
+ mu_stream_t stream;
time_t t;
struct tm *tm;
char *sender;
size_t off = 0;
- body_t body;
+ mu_body_t body;
- message_create (&newmsg, NULL);
- message_get_body (newmsg, &body);
+ mu_message_create (&newmsg, NULL);
+ mu_message_get_body (newmsg, &body);
mu_body_get_stream (body, &stream);
time (&t);
@@ -166,24 +166,24 @@ build_mime (mime_t *pmime, message_t msg, const char *text)
"Message was refused by recipient's mail filtering program.\n");
mu_stream_printf (stream, &off, "Reason given was as follows:\n\n");
mu_stream_printf (stream, &off, "%s", text);
- stream_close (stream);
- mime_add_part (mime, newmsg);
+ mu_stream_close (stream);
+ mu_mime_add_part (mime, newmsg);
message_unref (newmsg);
}
/* message/delivery-status */
{
- message_t newmsg;
- stream_t stream;
- header_t hdr;
+ mu_message_t newmsg;
+ mu_stream_t stream;
+ mu_header_t hdr;
size_t off = 0;
- body_t body;
+ mu_body_t body;
char *email;
- message_create (&newmsg, NULL);
- message_get_header (newmsg, &hdr);
+ mu_message_create (&newmsg, NULL);
+ mu_message_get_header (newmsg, &hdr);
mu_header_set_value (hdr, "Content-Type", "message/delivery-status", 1);
- message_get_body (newmsg, &body);
+ mu_message_get_body (newmsg, &body);
mu_body_get_stream (body, &stream);
mu_stream_printf (stream, &off, "Reporting-UA: sieve; %s\n", PACKAGE_STRING);
mu_stream_printf (stream, &off, "Arrival-Date: %s\n", datestr);
@@ -195,39 +195,39 @@ build_mime (mime_t *pmime, message_t msg, const char *text)
mu_stream_printf (stream, &off,
"Disposition: automatic-action/MDN-sent-automatically;deleted\n");
mu_stream_printf (stream, &off, "Last-Attempt-Date: %s\n", datestr);
- stream_close (stream);
- mime_add_part(mime, newmsg);
+ mu_stream_close (stream);
+ mu_mime_add_part(mime, newmsg);
message_unref (newmsg);
}
/* Quote original message */
{
- message_t newmsg;
- stream_t istream, ostream;
- header_t hdr;
+ mu_message_t newmsg;
+ mu_stream_t istream, ostream;
+ mu_header_t hdr;
size_t ioff = 0, ooff = 0, n;
char buffer[512];
- body_t body;
+ mu_body_t body;
- message_create (&newmsg, NULL);
- message_get_header (newmsg, &hdr);
+ mu_message_create (&newmsg, NULL);
+ mu_message_get_header (newmsg, &hdr);
mu_header_set_value (hdr, "Content-Type", "message/rfc822", 1);
- message_get_body (newmsg, &body);
+ mu_message_get_body (newmsg, &body);
mu_body_get_stream (body, &ostream);
- message_get_stream (msg, &istream);
+ mu_message_get_stream (msg, &istream);
- while (stream_read (istream, buffer, sizeof buffer - 1, ioff, &n) == 0
+ while (mu_stream_read (istream, buffer, sizeof buffer - 1, ioff, &n) == 0
&& n != 0)
{
size_t sz;
- stream_write (ostream, buffer, n, ooff, &sz);
+ mu_stream_write (ostream, buffer, n, ooff, &sz);
if (sz != n)
return EIO;
ooff += n;
ioff += n;
}
- stream_close (ostream);
- mime_add_part (mime, newmsg);
+ mu_stream_close (ostream);
+ mu_mime_add_part (mime, newmsg);
message_unref (newmsg);
}
@@ -237,14 +237,14 @@ build_mime (mime_t *pmime, message_t msg, const char *text)
}
int
-sieve_action_reject (mu_sieve_machine_t mach, list_t args, list_t tags)
+sieve_action_reject (mu_sieve_machine_t mach, mu_list_t args, mu_list_t tags)
{
- mime_t mime = NULL;
- mailer_t mailer = mu_sieve_get_mailer (mach);
+ mu_mime_t mime = NULL;
+ mu_mailer_t mailer = mu_sieve_get_mailer (mach);
int rc;
- message_t newmsg;
+ mu_message_t newmsg;
char *addrtext;
- address_t from, to;
+ mu_address_t from, to;
mu_sieve_value_t *val = mu_sieve_value_get (args, 0);
if (!val)
@@ -258,7 +258,7 @@ sieve_action_reject (mu_sieve_machine_t mach, list_t args, list_t tags)
rc = build_mime (&mime, mach->msg, val->v.string);
- mime_get_message (mime, &newmsg);
+ mu_mime_get_message (mime, &newmsg);
mu_sieve_get_message_sender (mach->msg, &addrtext);
rc = mu_address_create (&to, addrtext);
@@ -284,26 +284,26 @@ sieve_action_reject (mu_sieve_machine_t mach, list_t args, list_t tags)
goto end;
}
- rc = mailer_open (mailer, 0);
+ rc = mu_mailer_open (mailer, 0);
if (rc)
{
- url_t url = NULL;
- mailer_get_url (mailer, &url);
+ mu_url_t url = NULL;
+ mu_mailer_get_url (mailer, &url);
mu_sieve_error (mach,
_("%d: cannot open mailer %s: %s"),
mu_sieve_get_message_num (mach),
- url_to_string (url),
+ mu_url_to_string (url),
mu_strerror (rc));
goto end;
}
- rc = mailer_send_message (mailer, newmsg, from, to);
- mailer_close (mailer);
+ rc = mu_mailer_send_message (mailer, newmsg, from, to);
+ mu_mailer_close (mailer);
end:
sieve_mark_deleted (mach->msg, rc == 0);
- mime_destroy (&mime);
+ mu_mime_destroy (&mime);
mu_address_destroy (&from);
mu_address_destroy (&to);
@@ -317,15 +317,15 @@ sieve_action_reject (mu_sieve_machine_t mach, list_t args, list_t tags)
contains our email address, we assume it is a loop and bail out. */
static int
-check_redirect_loop (message_t msg)
+check_redirect_loop (mu_message_t msg)
{
- header_t hdr = NULL;
+ mu_header_t hdr = NULL;
size_t i, num = 0;
char buf[512];
int loop = 0;
char *email = mu_get_user_email (NULL);
- message_get_header (msg, &hdr);
+ mu_message_get_header (msg, &hdr);
mu_header_get_field_count (hdr, &num);
for (i = 1; !loop && i <= num; i++)
{
@@ -333,7 +333,7 @@ check_redirect_loop (message_t msg)
if (strcasecmp (buf, "X-Loop-Prevention") == 0)
{
size_t j, cnt = 0;
- address_t addr;
+ mu_address_t addr;
mu_header_get_field_value (hdr, i, buf, sizeof buf, NULL);
if (mu_address_create (&addr, buf))
@@ -354,14 +354,14 @@ check_redirect_loop (message_t msg)
}
int
-sieve_action_redirect (mu_sieve_machine_t mach, list_t args, list_t tags)
+sieve_action_redirect (mu_sieve_machine_t mach, mu_list_t args, mu_list_t tags)
{
- message_t msg, newmsg = NULL;
- address_t addr = NULL, from = NULL;
- header_t hdr = NULL;
+ mu_message_t msg, newmsg = NULL;
+ mu_address_t addr = NULL, from = NULL;
+ mu_header_t hdr = NULL;
int rc;
char *fromaddr, *p;
- mailer_t mailer = mu_sieve_get_mailer (mach);
+ mu_mailer_t mailer = mu_sieve_get_mailer (mach);
mu_sieve_value_t *val = mu_sieve_value_get (args, 0);
if (!val)
@@ -415,7 +415,7 @@ sieve_action_redirect (mu_sieve_machine_t mach, list_t args, list_t tags)
free (fromaddr);
- rc = message_create_copy (&newmsg, msg);
+ rc = mu_message_create_copy (&newmsg, msg);
if (rc)
{
mu_sieve_error (mach,
@@ -425,7 +425,7 @@ sieve_action_redirect (mu_sieve_machine_t mach, list_t args, list_t tags)
goto end;
}
- message_get_header (newmsg, &hdr);
+ mu_message_get_header (newmsg, &hdr);
p = mu_get_user_email (NULL);
if (p)
{
@@ -439,26 +439,26 @@ sieve_action_redirect (mu_sieve_machine_t mach, list_t args, list_t tags)
goto end;
}
- rc = mailer_open (mailer, 0);
+ rc = mu_mailer_open (mailer, 0);
if (rc)
{
- url_t url = NULL;
- mailer_get_url (mailer, &url);
+ mu_url_t url = NULL;
+ mu_mailer_get_url (mailer, &url);
mu_sieve_error (mach,
_("%d: cannot open mailer %s: %s"),
mu_sieve_get_message_num (mach),
- url_to_string (url),
+ mu_url_to_string (url),
mu_strerror (rc));
goto end;
}
- rc = mailer_send_message (mailer, newmsg, from, addr);
- mailer_close (mailer);
+ rc = mu_mailer_send_message (mailer, newmsg, from, addr);
+ mu_mailer_close (mailer);
end:
sieve_mark_deleted (mach->msg, rc == 0);
- message_destroy (&newmsg, NULL);
+ mu_message_destroy (&newmsg, NULL);
mu_address_destroy (&from);
mu_address_destroy (&addr);
diff --git a/libsieve/argp.c b/libsieve/argp.c
index 7f86ae33d..81a470a50 100644
--- a/libsieve/argp.c
+++ b/libsieve/argp.c
@@ -23,8 +23,8 @@
#include <mailutils/argp.h>
#include <string.h>
-list_t mu_sieve_include_path = NULL;
-list_t mu_sieve_library_path = NULL;
+mu_list_t mu_sieve_include_path = NULL;
+mu_list_t mu_sieve_library_path = NULL;
static error_t sieve_argp_parser (int key, char *arg, struct argp_state *state);
@@ -52,7 +52,7 @@ static struct argp_child sieve_argp_child = {
static error_t
sieve_argp_parser (int key, char *arg, struct argp_state *state)
{
- list_t *plist = NULL;
+ mu_list_t *plist = NULL;
switch (key)
{
diff --git a/libsieve/comparator.c b/libsieve/comparator.c
index 825342f33..bee3f130c 100644
--- a/libsieve/comparator.c
+++ b/libsieve/comparator.c
@@ -66,9 +66,9 @@ mu_sieve_register_comparator (mu_sieve_machine_t mach,
}
sieve_comparator_record_t *
-_lookup (list_t list, const char *name)
+_lookup (mu_list_t list, const char *name)
{
- iterator_t itr;
+ mu_iterator_t itr;
sieve_comparator_record_t *reg;
if (!list || mu_list_get_iterator (list, &itr))
@@ -124,7 +124,7 @@ _find_comparator (void *item, void *data)
}
mu_sieve_comparator_t
-mu_sieve_get_comparator (mu_sieve_machine_t mach, list_t tags)
+mu_sieve_get_comparator (mu_sieve_machine_t mach, mu_list_t tags)
{
mu_sieve_comparator_t comp = NULL;
@@ -138,7 +138,7 @@ mu_sieve_get_comparator (mu_sieve_machine_t mach, list_t tags)
struct regex_data {
int flags;
- list_t list;
+ mu_list_t list;
};
#ifndef FNM_CASEFOLD
@@ -193,7 +193,7 @@ _free_regex (void *item, void *unused)
static void
_free_reglist (void *data)
{
- list_t list = data;
+ mu_list_t list = data;
mu_list_do (list, _free_regex, NULL);
mu_list_destroy (&list);
}
@@ -205,9 +205,9 @@ comp_false (const char *pattern, const char *text)
}
int
-mu_sieve_match_part_checker (const char *name, list_t tags, list_t args)
+mu_sieve_match_part_checker (const char *name, mu_list_t tags, mu_list_t args)
{
- iterator_t itr;
+ mu_iterator_t itr;
mu_sieve_runtime_tag_t *match = NULL;
mu_sieve_runtime_tag_t *comp = NULL;
mu_sieve_runtime_tag_t *tmp;
diff --git a/libsieve/extensions/list.c b/libsieve/extensions/list.c
index 6117699e2..a0f430894 100644
--- a/libsieve/extensions/list.c
+++ b/libsieve/extensions/list.c
@@ -32,7 +32,7 @@
/* Auxiliary functions */
struct header_closure {
- header_t header; /* Message header */
+ mu_header_t header; /* Message header */
int index; /* Header index */
char *delim; /* List delimiter */
char *value; /* Retrieved header value */
@@ -127,7 +127,7 @@ list_retrieve_header (void *item, void *data, int idx, char **pval)
*/
static int
-list_test (mu_sieve_machine_t mach, list_t args, list_t tags)
+list_test (mu_sieve_machine_t mach, mu_list_t args, mu_list_t tags)
{
mu_sieve_value_t *h, *v, *arg;
mu_sieve_comparator_t comp = mu_sieve_get_comparator (mach, tags);
@@ -162,7 +162,7 @@ list_test (mu_sieve_machine_t mach, list_t args, list_t tags)
mu_sieve_abort (mach);
}
- message_get_header (mu_sieve_get_message (mach), &clos.header);
+ mu_message_get_header (mu_sieve_get_message (mach), &clos.header);
result = mu_sieve_vlist_compare (h, v, comp, mu_sieve_get_relcmp (mach, tags),
list_retrieve_header,
&clos, NULL) > 0;
diff --git a/libsieve/extensions/spamd.c b/libsieve/extensions/spamd.c
index 2b5bc4674..1becc3b4e 100644
--- a/libsieve/extensions/spamd.c
+++ b/libsieve/extensions/spamd.c
@@ -39,23 +39,23 @@
/* Auxiliary functions */
static int
-spamd_connect_tcp (mu_sieve_machine_t mach, stream_t *stream,
+spamd_connect_tcp (mu_sieve_machine_t mach, mu_stream_t *stream,
char *host, int port)
{
- int rc = tcp_stream_create (stream, host, port, 0);
+ int rc = mu_tcp_stream_create (stream, host, port, 0);
if (rc)
{
- mu_sieve_error (mach, "tcp_stream_create: %s", mu_strerror (rc));
+ mu_sieve_error (mach, "mu_tcp_stream_create: %s", mu_strerror (rc));
return rc;
}
- rc = stream_open (*stream);
+ rc = mu_stream_open (*stream);
if (rc)
mu_sieve_error (mach, "opening tcp stream: %s", mu_strerror (rc));
return rc;
}
static int
-spamd_connect_socket (mu_sieve_machine_t mach, stream_t *stream, char *path)
+spamd_connect_socket (mu_sieve_machine_t mach, mu_stream_t *stream, char *path)
{
/* FIXME: A library deficiency: we cannot create a unix socket stream */
int fd, rc;
@@ -80,41 +80,41 @@ spamd_connect_socket (mu_sieve_machine_t mach, stream_t *stream, char *path)
}
fp = fdopen (fd, "w+");
- rc = stdio_stream_create (stream, fp, MU_STREAM_RDWR);
+ rc = mu_stdio_stream_create (stream, fp, MU_STREAM_RDWR);
if (rc)
{
- mu_sieve_error (mach, "stdio_stream_create: %s", mu_strerror (rc));
+ mu_sieve_error (mach, "mu_stdio_stream_create: %s", mu_strerror (rc));
fclose (fp);
return rc;
}
- rc = stream_open (*stream);
+ rc = mu_stream_open (*stream);
if (rc)
{
- mu_sieve_error (mach, "stream_open: %s", mu_strerror (rc));
- stream_destroy (stream, stream_get_owner (*stream));
+ mu_sieve_error (mach, "mu_stream_open: %s", mu_strerror (rc));
+ mu_stream_destroy (stream, mu_stream_get_owner (*stream));
}
return rc;
}
static void
-spamd_destroy (stream_t *stream)
+spamd_destroy (mu_stream_t *stream)
{
- stream_close (*stream);
- stream_destroy (stream, stream_get_owner (*stream));
+ mu_stream_close (*stream);
+ mu_stream_destroy (stream, mu_stream_get_owner (*stream));
}
static void
-spamd_shutdown (stream_t stream, int flag)
+spamd_shutdown (mu_stream_t stream, int flag)
{
mu_transport_t trans;
- stream_flush (stream);
- stream_get_transport (stream, &trans);
+ mu_stream_flush (stream);
+ mu_stream_get_transport (stream, &trans);
shutdown (fileno ((FILE*)trans), flag);
}
static void
-spamd_send_command (stream_t stream, const char *fmt, ...)
+spamd_send_command (mu_stream_t stream, const char *fmt, ...)
{
char buf[512];
size_t n;
@@ -123,20 +123,20 @@ spamd_send_command (stream_t stream, const char *fmt, ...)
va_start (ap, fmt);
n = vsnprintf (buf, sizeof buf, fmt, ap);
va_end (ap);
- stream_sequential_write (stream, buf, n);
- stream_sequential_write (stream, "\r\n", 2);
+ mu_stream_sequential_write (stream, buf, n);
+ mu_stream_sequential_write (stream, "\r\n", 2);
}
static void
-spamd_send_message (stream_t stream, message_t msg)
+spamd_send_message (mu_stream_t stream, mu_message_t msg)
{
size_t size;
char buf[512];
- stream_t mstr;
+ mu_stream_t mstr;
- message_get_stream (msg, &mstr);
- stream_seek (mstr, 0, SEEK_SET);
- while (stream_sequential_readline (mstr, buf, sizeof (buf), &size) == 0
+ mu_message_get_stream (msg, &mstr);
+ mu_stream_seek (mstr, 0, SEEK_SET);
+ while (mu_stream_sequential_readline (mstr, buf, sizeof (buf), &size) == 0
&& size > 0)
{
char *nl = NULL;
@@ -146,18 +146,18 @@ spamd_send_message (stream_t stream, message_t msg)
size--;
nl = "\r\n";
}
- stream_sequential_write (stream, buf, size);
+ mu_stream_sequential_write (stream, buf, size);
if (nl)
- stream_sequential_write (stream, nl, 2);
+ mu_stream_sequential_write (stream, nl, 2);
}
}
static size_t
-spamd_read_line (mu_sieve_machine_t mach, stream_t stream,
+spamd_read_line (mu_sieve_machine_t mach, mu_stream_t stream,
char *buffer, size_t size, size_t *pn)
{
size_t n = 0;
- int rc = stream_sequential_readline (stream, buffer, size, &n);
+ int rc = mu_stream_sequential_readline (stream, buffer, size, &n);
if (rc == 0)
{
if (pn)
@@ -243,7 +243,7 @@ set_signal_handler (int sig, signal_handler h)
}
void
-spamd_abort (mu_sieve_machine_t mach, stream_t *stream, signal_handler handler)
+spamd_abort (mu_sieve_machine_t mach, mu_stream_t *stream, signal_handler handler)
{
spamd_destroy (stream);
set_signal_handler (SIGPIPE, handler);
@@ -285,7 +285,7 @@ sigpipe_handler (int sig ARG_UNUSED)
*/
static int
-spamd_test (mu_sieve_machine_t mach, list_t args, list_t tags)
+spamd_test (mu_sieve_machine_t mach, mu_list_t args, mu_list_t tags)
{
char buffer[512];
char version_str[19];
@@ -294,14 +294,14 @@ spamd_test (mu_sieve_machine_t mach, list_t args, list_t tags)
long version;
int result;
long score, threshold, limit;
- stream_t stream = NULL;
+ mu_stream_t stream = NULL;
mu_sieve_value_t *arg;
- message_t msg;
+ mu_message_t msg;
size_t m_size, m_lines, size;
struct mu_auth_data *auth;
signal_handler handler;
char *host;
- header_t hdr;
+ mu_header_t hdr;
if (mu_sieve_get_debug_level (mach) & MU_SIEVE_DEBUG_TRACE)
{
@@ -328,8 +328,8 @@ spamd_test (mu_sieve_machine_t mach, list_t args, list_t tags)
mu_sieve_abort (mach);
msg = mu_sieve_get_message (mach);
- message_size (msg, &m_size);
- message_lines (msg, &m_lines);
+ mu_message_size (msg, &m_size);
+ mu_message_lines (msg, &m_lines);
auth = mu_get_auth_by_uid (geteuid ());
spamd_send_command (stream, "SYMBOLS SPAMC/1.2");
@@ -403,7 +403,7 @@ spamd_test (mu_sieve_machine_t mach, list_t args, list_t tags)
/* Read symbol list */
spamd_read_line (mach, stream, buffer, sizeof buffer, &size);
- rc = message_get_header (msg, &hdr);
+ rc = mu_message_get_header (msg, &hdr);
if (rc)
{
mu_sieve_error (mach, "cannot get message header: %s", mu_strerror (rc));
diff --git a/libsieve/extensions/timestamp.c b/libsieve/extensions/timestamp.c
index b98fe6e69..17c839d3b 100644
--- a/libsieve/extensions/timestamp.c
+++ b/libsieve/extensions/timestamp.c
@@ -48,10 +48,10 @@
/* Handler for the timestamp test */
static int
-timestamp_test (mu_sieve_machine_t mach, list_t args, list_t tags)
+timestamp_test (mu_sieve_machine_t mach, mu_list_t args, mu_list_t tags)
{
mu_sieve_value_t *h, *v;
- header_t hdr;
+ mu_header_t hdr;
char *val;
time_t now = time (NULL);
time_t tlimit, tval;
@@ -89,10 +89,10 @@ timestamp_test (mu_sieve_machine_t mach, list_t args, list_t tags)
mu_sieve_abort (mach);
}
- rc = message_get_header (mu_sieve_get_message (mach), &hdr);
+ rc = mu_message_get_header (mu_sieve_get_message (mach), &hdr);
if (rc)
{
- mu_sieve_error (mach, "message_get_header: %s", mu_strerror (rc));
+ mu_sieve_error (mach, "mu_message_get_header: %s", mu_strerror (rc));
mu_sieve_abort (mach);
}
diff --git a/libsieve/extensions/vacation.c b/libsieve/extensions/vacation.c
index e3bf1920e..54e4f217f 100644
--- a/libsieve/extensions/vacation.c
+++ b/libsieve/extensions/vacation.c
@@ -45,29 +45,29 @@
FIXME: This is for future use, when I add :mime tag
*/
static int
-build_mime (mime_t *pmime, message_t msg, const char *text)
+build_mime (mu_mime_t *pmime, mu_message_t msg, const char *text)
{
- mime_t mime = NULL;
- message_t newmsg;
- stream_t stream;
+ mu_mime_t mime = NULL;
+ mu_message_t newmsg;
+ mu_stream_t stream;
size_t off = 0;
- header_t hdr;
- body_t body;
+ mu_header_t hdr;
+ mu_body_t body;
/* FIXME: charset */
char *header = "Content-Type: text/plain;charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n\n";
- mime_create (&mime, NULL, 0);
+ mu_mime_create (&mime, NULL, 0);
- message_create (&newmsg, NULL);
- message_get_body (newmsg, &body);
+ mu_message_create (&newmsg, NULL);
+ mu_message_get_body (newmsg, &body);
mu_header_create (&hdr, header, strlen (header), newmsg);
- message_set_header (newmsg, hdr, NULL);
+ mu_message_set_header (newmsg, hdr, NULL);
mu_body_get_stream (body, &stream);
mu_stream_printf (stream, &off, "%s", text);
- stream_close (stream);
- mime_add_part (mime, newmsg);
+ mu_stream_close (stream);
+ mu_mime_add_part (mime, newmsg);
message_unref (newmsg);
*pmime = mime;
@@ -96,7 +96,7 @@ diag (mu_sieve_machine_t mach)
struct addr_data {
- address_t addr;
+ mu_address_t addr;
char *my_address;
};
@@ -114,7 +114,7 @@ _compare (void *item, void *data)
of the originating mail. Return non-zero if so and store a pointer
to the matching address to *MY_ADDRESS. */
static int
-match_addresses (header_t hdr, mu_sieve_value_t *addresses, char **my_address)
+match_addresses (mu_header_t hdr, mu_sieve_value_t *addresses, char **my_address)
{
int match = 0;
char *str;
@@ -174,7 +174,7 @@ regex_comparator (void *item, void *data)
/* Decide whether EMAIL address should not be responded to.
*/
static int
-noreply_address_p (mu_sieve_machine_t mach, list_t tags, char *email)
+noreply_address_p (mu_sieve_machine_t mach, mu_list_t tags, char *email)
{
int i, rc = 0;
mu_sieve_value_t *arg;
@@ -205,7 +205,7 @@ noreply_address_p (mu_sieve_machine_t mach, list_t tags, char *email)
/* Return T if letter precedence is 'bulk' or 'junk' */
static int
-bulk_precedence_p (header_t hdr)
+bulk_precedence_p (mu_header_t hdr)
{
int rc = 0;
char *str;
@@ -225,7 +225,7 @@ bulk_precedence_p (header_t hdr)
/* Check and updated vacation database. Return 0 if the mail should
be answered. */
static int
-check_db (mu_sieve_machine_t mach, list_t tags, char *from)
+check_db (mu_sieve_machine_t mach, mu_list_t tags, char *from)
{
#ifdef USE_DBM
DBM_FILE db;
@@ -319,7 +319,7 @@ check_db (mu_sieve_machine_t mach, list_t tags, char *from)
"reply_prefix" tag.
*/
static void
-re_subject (mu_sieve_machine_t mach, list_t tags, char **psubject)
+re_subject (mu_sieve_machine_t mach, mu_list_t tags, char **psubject)
{
char *subject;
mu_sieve_value_t *arg;
@@ -353,26 +353,26 @@ re_subject (mu_sieve_machine_t mach, list_t tags, char **psubject)
Otherwise, reply_prefix is prepended to it. */
static void
-vacation_subject (mu_sieve_machine_t mach, list_t tags,
- message_t msg, header_t newhdr)
+vacation_subject (mu_sieve_machine_t mach, mu_list_t tags,
+ mu_message_t msg, mu_header_t newhdr)
{
mu_sieve_value_t *arg;
char *value;
char *subject;
int subject_allocated;
- header_t hdr;
+ mu_header_t hdr;
if (mu_sieve_tag_lookup (tags, "subject", &arg))
{
subject = arg->v.string;
subject_allocated = 0;
}
- else if (message_get_header (msg, &hdr) == 0
+ else if (mu_message_get_header (msg, &hdr) == 0
&& mu_header_aget_value_unfold (hdr, MU_HEADER_SUBJECT, &value) == 0)
{
char *p;
- int rc = rfc2047_decode ("iso-8859-1", value, &p);
+ int rc = mu_rfc2047_decode ("iso-8859-1", value, &p);
subject_allocated = 1;
if (rc)
@@ -406,7 +406,7 @@ vacation_subject (mu_sieve_machine_t mach, list_t tags,
free (value);
}
- if (rfc2047_encode ("iso-8859-1", "quoted-printable",
+ if (mu_rfc2047_encode ("iso-8859-1", "quoted-printable",
subject, &value))
mu_header_set_value (newhdr, MU_HEADER_SUBJECT, subject, 0);
else
@@ -421,20 +421,20 @@ vacation_subject (mu_sieve_machine_t mach, list_t tags,
/* Generate and send the reply message */
static int
-vacation_reply (mu_sieve_machine_t mach, list_t tags, message_t msg,
+vacation_reply (mu_sieve_machine_t mach, mu_list_t tags, mu_message_t msg,
char *text, char *to, char *from)
{
- mime_t mime = NULL;
- message_t newmsg;
- header_t newhdr;
- address_t to_addr = NULL, from_addr = NULL;
+ mu_mime_t mime = NULL;
+ mu_message_t newmsg;
+ mu_header_t newhdr;
+ mu_address_t to_addr = NULL, from_addr = NULL;
char *value;
- mailer_t mailer;
+ mu_mailer_t mailer;
int rc;
build_mime (&mime, msg, text);
- mime_get_message (mime, &newmsg);
- message_get_header (newmsg, &newhdr);
+ mu_mime_get_message (mime, &newmsg);
+ mu_message_get_header (newmsg, &newhdr);
rc = mu_address_create (&to_addr, to);
if (rc)
@@ -468,32 +468,32 @@ vacation_reply (mu_sieve_machine_t mach, list_t tags, message_t msg,
free (value);
mailer = mu_sieve_get_mailer (mach);
- rc = mailer_open (mailer, 0);
+ rc = mu_mailer_open (mailer, 0);
if (rc)
{
- url_t url = NULL;
- mailer_get_url (mailer, &url);
+ mu_url_t url = NULL;
+ mu_mailer_get_url (mailer, &url);
mu_sieve_error (mach,
_("%d: cannot open mailer %s: %s"),
mu_sieve_get_message_num (mach),
- url_to_string (url), mu_strerror (rc));
+ mu_url_to_string (url), mu_strerror (rc));
return -1;
}
- rc = mailer_send_message (mailer, newmsg, from_addr, to_addr);
- mailer_close (mailer);
+ rc = mu_mailer_send_message (mailer, newmsg, from_addr, to_addr);
+ mu_mailer_close (mailer);
return rc;
}
int
-sieve_action_vacation (mu_sieve_machine_t mach, list_t args, list_t tags)
+sieve_action_vacation (mu_sieve_machine_t mach, mu_list_t args, mu_list_t tags)
{
int rc;
char *text, *from;
mu_sieve_value_t *val;
- message_t msg;
- header_t hdr;
+ mu_message_t msg;
+ mu_header_t hdr;
char *my_address = mu_sieve_get_daemon_email (mach);
if (diag (mach))
@@ -509,7 +509,7 @@ sieve_action_vacation (mu_sieve_machine_t mach, list_t args, list_t tags)
text = val->v.string;
msg = mu_sieve_get_message (mach);
- message_get_header (msg, &hdr);
+ mu_message_get_header (msg, &hdr);
if (mu_sieve_tag_lookup (tags, "sender", &val))
{
diff --git a/libsieve/load.c b/libsieve/load.c
index c354fc8bd..ad139c1ec 100644
--- a/libs