summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--comsat/comsat.h11
-rw-r--r--frm/frm.c12
-rw-r--r--from/from.c4
-rw-r--r--imap4d/imap4d.h5
-rw-r--r--include/mailutils/address.h3
-rw-r--r--include/mailutils/attribute.h6
-rw-r--r--include/mailutils/auth.h14
-rw-r--r--include/mailutils/body.h8
-rw-r--r--include/mailutils/debug.h7
-rw-r--r--include/mailutils/envelope.h6
-rw-r--r--include/mailutils/errno.h10
-rw-r--r--include/mailutils/error.h3
-rw-r--r--include/mailutils/filter.h16
-rw-r--r--include/mailutils/folder.h15
-rw-r--r--include/mailutils/header.h8
-rw-r--r--include/mailutils/iterator.h7
-rw-r--r--include/mailutils/list.h6
-rw-r--r--include/mailutils/mailbox.h9
-rw-r--r--include/mailutils/mailer.h15
-rw-r--r--include/mailutils/mailutils.h2
-rw-r--r--include/mailutils/message.h12
-rw-r--r--include/mailutils/mime.h9
-rw-r--r--include/mailutils/monitor.h3
-rw-r--r--include/mailutils/mutil.h5
-rw-r--r--include/mailutils/observer.h8
-rw-r--r--include/mailutils/parse822.h3
-rw-r--r--include/mailutils/property.h6
-rw-r--r--include/mailutils/registrar.h13
-rw-r--r--include/mailutils/stream.h7
-rw-r--r--include/mailutils/types.h50
-rw-r--r--include/mailutils/url.h7
-rw-r--r--mail.local/mail.local.h23
-rw-r--r--mail/mail.h20
-rw-r--r--mailbox/attachment.c4
-rw-r--r--mailbox/filter.c2
-rw-r--r--mailbox/filter_rfc822.c2
-rw-r--r--mailbox/filter_trans.c2
-rw-r--r--mailbox/folder.c7
-rw-r--r--mailbox/folder_imap.c7
-rw-r--r--mailbox/folder_mbox.c4
-rw-r--r--mailbox/folder_pop.c5
-rw-r--r--mailbox/iterator.c2
-rw-r--r--mailbox/mailbox.c7
-rw-r--r--mailbox/mailer.c11
-rw-r--r--mailbox/mbx_default.c2
-rw-r--r--mailbox/mbx_file.c2
-rw-r--r--mailbox/mbx_imap.c12
-rw-r--r--mailbox/mbx_mbox.c7
-rw-r--r--mailbox/mbx_mh.c16
-rw-r--r--mailbox/mbx_pop.c18
-rw-r--r--mailbox/message.c10
-rw-r--r--mailbox/muerrno.c6
-rw-r--r--mailbox/observer.c3
-rw-r--r--mailbox/registrar.c2
-rw-r--r--mailbox/sendmail.c6
-rw-r--r--mailbox/smtp.c18
-rw-r--r--mailbox/stream.c2
-rw-r--r--mailbox/url_mbox.c1
-rw-r--r--mailbox2/include/mailutils/authority.h8
-rw-r--r--messages/messages.c21
-rw-r--r--pop3d/pop3d.h12
-rw-r--r--readmsg/readmsg.h7
-rw-r--r--sieve/sieve.c25
-rw-r--r--sieve/sieve.h17
-rw-r--r--sieve/sv.h22
-rw-r--r--sieve/svcb.c21
-rw-r--r--sieve/svctx.c20
-rw-r--r--sieve/svfield.c17
-rw-r--r--sieve/svfield.h17
-rw-r--r--sieve/svutil.c20
70 files changed, 455 insertions, 243 deletions
diff --git a/comsat/comsat.h b/comsat/comsat.h
index 865aa8985..b8a5ed785 100644
--- a/comsat/comsat.h
+++ b/comsat/comsat.h
@@ -46,15 +46,16 @@
# include <strings.h>
#endif
+#include <mailutils/body.h>
+#include <mailutils/errno.h>
+#include <mailutils/error.h>
+#include <mailutils/header.h>
+#include <mailutils/list.h>
#include <mailutils/mailbox.h>
#include <mailutils/message.h>
-#include <mailutils/header.h>
-#include <mailutils/body.h>
+#include <mailutils/mutil.h>
#include <mailutils/registrar.h>
#include <mailutils/stream.h>
-#include <mailutils/mutil.h>
-#include <mailutils/error.h>
-#include <mailutils/errno.h>
#include <argcv.h>
#include <mu_argp.h>
diff --git a/frm/frm.c b/frm/frm.c
index 048d111b1..636e87095 100644
--- a/frm/frm.c
+++ b/frm/frm.c
@@ -27,11 +27,17 @@
#include "getopt.h"
#include <mu_argp.h>
-#include <mailutils/mailbox.h>
+
+#include <mailutils/address.h>
+#include <mailutils/attribute.h>
+#include <mailutils/debug.h>
#include <mailutils/header.h>
-#include <mailutils/registrar.h>
+#include <mailutils/list.h>
+#include <mailutils/mailbox.h>
+#include <mailutils/message.h>
#include <mailutils/observer.h>
-#include <mailutils/address.h>
+#include <mailutils/registrar.h>
+#include <mailutils/stream.h>
static char* show_field;
static int show_to;
diff --git a/from/from.c b/from/from.c
index 3b53e2188..b0c743f0e 100644
--- a/from/from.c
+++ b/from/from.c
@@ -35,8 +35,12 @@
#include <mailutils/address.h>
#include <mailutils/errno.h>
+#include <mailutils/header.h>
+#include <mailutils/list.h>
#include <mailutils/mailbox.h>
+#include <mailutils/message.h>
#include <mailutils/registrar.h>
+#include <mailutils/stream.h>
int
main(int argc, char **argv)
diff --git a/imap4d/imap4d.h b/imap4d/imap4d.h
index d9ae634de..6a1c908b7 100644
--- a/imap4d/imap4d.h
+++ b/imap4d/imap4d.h
@@ -70,18 +70,21 @@
#endif
#include <mailutils/address.h>
+#include <mailutils/attribute.h>
#include <mailutils/body.h>
+#include <mailutils/envelope.h>
#include <mailutils/errno.h>
#include <mailutils/error.h>
#include <mailutils/filter.h>
#include <mailutils/folder.h>
#include <mailutils/header.h>
+#include <mailutils/list.h>
#include <mailutils/mailbox.h>
#include <mailutils/message.h>
+#include <mailutils/mutil.h>
#include <mailutils/parse822.h>
#include <mailutils/registrar.h>
#include <mailutils/stream.h>
-#include <mailutils/mutil.h>
#include <mu_argp.h>
diff --git a/include/mailutils/address.h b/include/mailutils/address.h
index c38de1e78..3632399ce 100644
--- a/include/mailutils/address.h
+++ b/include/mailutils/address.h
@@ -18,9 +18,6 @@
#ifndef _MAILUTILS_ADDRESS_H
#define _MAILUTILS_ADDRESS_H
-#include <sys/types.h>
-
-#include <mailutils/mu_features.h>
#include <mailutils/types.h>
#ifdef __cplusplus
diff --git a/include/mailutils/attribute.h b/include/mailutils/attribute.h
index dd2393ad1..b195da505 100644
--- a/include/mailutils/attribute.h
+++ b/include/mailutils/attribute.h
@@ -18,16 +18,12 @@
#ifndef _MAILUTILS_ATTRIBUTE_H
#define _MAILUTILS_ATTRIBUTE_H
-#include <sys/types.h>
-#include <mailutils/mu_features.h>
+#include <mailutils/types.h>
#ifdef __cplusplus
extern "C" {
#endif
-struct _attribute;
-typedef struct _attribute * attribute_t;
-
#define MU_ATTRIBUTE_ANSWERED 0x01
#define MU_ATTRIBUTE_FLAGGED 0x02
#define MU_ATTRIBUTE_DELETED 0x04
diff --git a/include/mailutils/auth.h b/include/mailutils/auth.h
index 0b31ab0cb..e84c69730 100644
--- a/include/mailutils/auth.h
+++ b/include/mailutils/auth.h
@@ -18,18 +18,12 @@
#ifndef _MAILUTILS_AUTH_H
#define _MAILUTILS_AUTH_H
-#include <sys/types.h>
-#include <mailutils/mu_features.h>
-#include <mailutils/url.h>
+#include <mailutils/types.h>
#ifdef __cplusplus
extern "C" {
#endif
-/* forward declaration */
-struct _ticket;
-typedef struct _ticket *ticket_t;
-
extern int ticket_create __P ((ticket_t *, void *owner));
extern void ticket_destroy __P ((ticket_t *, void *owner));
extern int ticket_set_destroy __P ((ticket_t, void (*)
@@ -42,9 +36,6 @@ extern int ticket_pop __P ((ticket_t, url_t, const char *, char **)
extern int ticket_set_data __P ((ticket_t, void *, void *owner));
extern int ticket_get_data __P ((ticket_t, void **));
-struct _authority;
-typedef struct _authority *authority_t;
-
extern int authority_create __P ((authority_t *, ticket_t, void *));
extern void authority_destroy __P ((authority_t *, void *));
extern void *authority_get_owner __P ((authority_t));
@@ -55,9 +46,6 @@ extern int authority_set_authenticate __P ((authority_t, int (*_authenticate) __
extern int authority_create_null __P ((authority_t *pauthority, void *owner));
-struct _wicket;
-typedef struct _wicket *wicket_t;
-
extern int wicket_create __P ((wicket_t *, const char *));
extern void wicket_destroy __P ((wicket_t *));
extern int wicket_set_filename __P ((wicket_t, const char *));
diff --git a/include/mailutils/body.h b/include/mailutils/body.h
index 88a121355..b60df4b67 100644
--- a/include/mailutils/body.h
+++ b/include/mailutils/body.h
@@ -18,18 +18,12 @@
#ifndef _MAILUTILS_BODY_H
#define _MAILUTILS_BODY_H
-#include <sys/types.h>
-#include <mailutils/mu_features.h>
-#include <mailutils/stream.h>
+#include <mailutils/types.h>
#ifdef __cplusplus
extern "C" {
#endif
-/* forward declaration */
-struct _body;
-typedef struct _body *body_t;
-
extern int body_create __P ((body_t *, void *owner));
extern void body_destroy __P ((body_t *, void *owner));
extern void * body_get_owner __P ((body_t));
diff --git a/include/mailutils/debug.h b/include/mailutils/debug.h
index 015422bdc..503893ea7 100644
--- a/include/mailutils/debug.h
+++ b/include/mailutils/debug.h
@@ -18,17 +18,14 @@
#ifndef _MAILUTILS_DEBUG_H
#define _MAILUTILS_DEBUG_H
-#include <sys/types.h>
#include <stdarg.h>
-#include <mailutils/mu_features.h>
+
+#include <mailutils/types.h>
#ifdef __cplusplus
extern "C" {
#endif
-struct _debug;
-typedef struct _debug* mu_debug_t;
-
#define MU_DEBUG_ERROR 0x0001
#define MU_DEBUG_TRACE 0x0002
#define MU_DEBUG_PROT 0x0004
diff --git a/include/mailutils/envelope.h b/include/mailutils/envelope.h
index bf5401cf2..b6967e962 100644
--- a/include/mailutils/envelope.h
+++ b/include/mailutils/envelope.h
@@ -18,16 +18,12 @@
#ifndef _MAILUTILS_ENVELOPE_H
# define _MAILUTILS_ENVELOPE_H
-#include <sys/types.h>
-#include <mailutils/mu_features.h>
+#include <mailutils/types.h>
#ifdef __cplusplus
extern "C" { /*}*/
#endif
-struct _envelope;
-typedef struct _envelope *envelope_t;
-
int envelope_create (envelope_t *, void *);
void envelope_destroy (envelope_t *, void *);
void * envelope_get_owner (envelope_t);
diff --git a/include/mailutils/errno.h b/include/mailutils/errno.h
index 82bc4a8d4..916f8ae9a 100644
--- a/include/mailutils/errno.h
+++ b/include/mailutils/errno.h
@@ -18,9 +18,7 @@
#ifndef _MAILUTILS_ERRNO_H
#define _MAILUTILS_ERRNO_H 1
-#include <sys/types.h>
-#include <errno.h>
-#include <mailutils/mu_features.h>
+#include <mailutils/types.h>
#ifdef __cplusplus
extern "C" {
@@ -44,6 +42,12 @@ extern "C" {
#define MU_ERR_LOCK_BAD_LOCK (MU_ERR_BASE | 0x00a)
#define MU_ERR_LOCK_BAD_FILE (MU_ERR_BASE | 0x00b)
#define MU_ERR_LOCK_NOT_HELD (MU_ERR_BASE | 0x00c)
+#define MU_ERR_LOCK_EXT_FAIL (MU_ERR_BASE | 0x00d)
+ /* external program not found, or lack of system resources */
+#define MU_ERR_LOCK_EXT_ERR (MU_ERR_BASE | 0x00e)
+ /* external program failed, specific reason unknown */
+#define MU_ERR_LOCK_EXT_KILLED (MU_ERR_BASE | 0x00f)
+ /* external program was interrupted */
const char* mu_errname __P((int e));
const char* mu_errstring __P((int e));
diff --git a/include/mailutils/error.h b/include/mailutils/error.h
index 451545923..bed979fd3 100644
--- a/include/mailutils/error.h
+++ b/include/mailutils/error.h
@@ -19,7 +19,8 @@
#define _MAILUTILS_ERROR_H
#include <stdarg.h>
-#include <mailutils/mu_features.h>
+
+#include <mailutils/types.h>
#ifdef __cplusplus
extern "C" {
diff --git a/include/mailutils/filter.h b/include/mailutils/filter.h
index abde4e517..5f9dc2c32 100644
--- a/include/mailutils/filter.h
+++ b/include/mailutils/filter.h
@@ -15,18 +15,10 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-/* Notes:
-
- */
-
#ifndef _MAILUTILS_FILTER_H
#define _MAILUTILS_FILTER_H
-#include <stdlib.h>
-#include <mailutils/mu_features.h>
-#include <mailutils/list.h>
-#include <mailutils/property.h>
-#include <mailutils/stream.h>
+#include <mailutils/types.h>
#ifdef __cplusplus
extern "C" {
@@ -41,12 +33,6 @@ extern "C" {
#define MU_FILTER_WRITE MU_STREAM_WRITE
#define MU_FILTER_RDWR MU_STREAM_RDWR
-struct _filter;
-typedef struct _filter * filter_t;
-
-struct _filter_record;
-typedef struct _filter_record * filter_record_t;
-
struct _filter_record
{
const char *name;
diff --git a/include/mailutils/folder.h b/include/mailutils/folder.h
index 3870f32d9..76b1a8708 100644
--- a/include/mailutils/folder.h
+++ b/include/mailutils/folder.h
@@ -18,25 +18,12 @@
#ifndef _MAILUTILS_FOLDER_H
# define _MAILUTILS_FOLDER_H
-#include <sys/types.h>
-
-#include <mailutils/mu_features.h>
-#include <mailutils/url.h>
-#include <mailutils/observer.h>
-#include <mailutils/debug.h>
-#include <mailutils/stream.h>
-#include <mailutils/auth.h>
-#include <mailutils/stream.h>
-
+#include <mailutils/types.h>
#ifdef __cplusplus
extern "C" {
#endif
-/* Forward declaration. */
-struct _folder;
-typedef struct _folder *folder_t;
-
#define MU_FOLDER_ATTRIBUTE_DIRECTORY 0x001
#define MU_FOLDER_ATTRIBUTE_FILE 0x002
struct list_response
diff --git a/include/mailutils/header.h b/include/mailutils/header.h
index 089a2892c..9a9090881 100644
--- a/include/mailutils/header.h
+++ b/include/mailutils/header.h
@@ -18,9 +18,7 @@
#ifndef _MAILUTILS_HEADER_H
#define _MAILUTILS_HEADER_H
-#include <sys/types.h>
-#include <mailutils/mu_features.h>
-#include <mailutils/stream.h>
+#include <mailutils/types.h>
#ifdef __cplusplus
extern "C" {
@@ -66,10 +64,6 @@ extern "C" {
/* Mime support header attribute */
-/* forward declaration */
-struct _header;
-typedef struct _header * header_t;
-
extern int header_create __P ((header_t *, const char *,
size_t, void *));
extern void header_destroy __P ((header_t *, void *));
diff --git a/include/mailutils/iterator.h b/include/mailutils/iterator.h
index 1f5b92790..416f65ddc 100644
--- a/include/mailutils/iterator.h
+++ b/include/mailutils/iterator.h
@@ -18,17 +18,12 @@
#ifndef _MAILUTILS_ITERATOR_H
#define _MAILUTILS_ITERATOR_H
-#include <mailutils/mu_features.h>
-#include <mailutils/list.h>
-#include <sys/types.h>
+#include <mailutils/types.h>
#ifdef __cplusplus
extern "C" {
#endif
-struct _iterator;
-typedef struct _iterator *iterator_t;
-
extern int iterator_create __P ((iterator_t *, list_t));
extern void iterator_destroy __P ((iterator_t *));
extern int iterator_first __P ((iterator_t));
diff --git a/include/mailutils/list.h b/include/mailutils/list.h
index a4f272084..eace39b3a 100644
--- a/include/mailutils/list.h
+++ b/include/mailutils/list.h
@@ -18,16 +18,12 @@
#ifndef _MAILUTILS_LIST_H
#define _MAILUTILS_LIST_H
-#include <mailutils/mu_features.h>
-#include <sys/types.h>
+#include <mailutils/types.h>
#ifdef __cplusplus
extern "C" {
#endif
-struct _list;
-typedef struct _list *list_t;
-
extern int list_create __P ((list_t *));
extern void list_destroy __P ((list_t *));
extern int list_append __P ((list_t, void *item));
diff --git a/include/mailutils/mailbox.h b/include/mailutils/mailbox.h
index 8c90ccc36..8854cb31a 100644
--- a/include/mailutils/mailbox.h
+++ b/include/mailutils/mailbox.h
@@ -20,16 +20,7 @@
#include <sys/types.h>
-#include <mailutils/debug.h>
-#include <mailutils/folder.h>
-#include <mailutils/locker.h>
-#include <mailutils/message.h>
-#include <mailutils/mu_features.h>
-#include <mailutils/observer.h>
-#include <mailutils/property.h>
-#include <mailutils/stream.h>
#include <mailutils/types.h>
-#include <mailutils/url.h>
#ifdef __cplusplus
extern "C" {
diff --git a/include/mailutils/mailer.h b/include/mailutils/mailer.h
index b331058ba..4b3007f9a 100644
--- a/include/mailutils/mailer.h
+++ b/include/mailutils/mailer.h
@@ -18,25 +18,12 @@
#ifndef _MAILUTILS_MAILER_H
#define _MAILUTILS_MAILER_H
-#include <sys/types.h>
-
-#include <mailutils/mu_features.h>
-#include <mailutils/address.h>
-#include <mailutils/debug.h>
-#include <mailutils/message.h>
-#include <mailutils/observer.h>
-#include <mailutils/property.h>
-#include <mailutils/stream.h>
-#include <mailutils/url.h>
+#include <mailutils/types.h>
#ifdef __cplusplus
extern "C" {
#endif
-/* forward declaration */
-struct _mailer;
-typedef struct _mailer *mailer_t;
-
extern int mailer_create __P ((mailer_t *, const char *));
extern void mailer_destroy __P ((mailer_t *));
diff --git a/include/mailutils/mailutils.h b/include/mailutils/mailutils.h
index 40c7fad9b..e06aea323 100644
--- a/include/mailutils/mailutils.h
+++ b/include/mailutils/mailutils.h
@@ -21,6 +21,7 @@
#include <mailutils/body.h>
#include <mailutils/debug.h>
#include <mailutils/envelope.h>
+#include <mailutils/errno.h>
#include <mailutils/error.h>
#include <mailutils/filter.h>
#include <mailutils/folder.h>
@@ -40,3 +41,4 @@
#include <mailutils/registrar.h>
#include <mailutils/stream.h>
#include <mailutils/url.h>
+
diff --git a/include/mailutils/message.h b/include/mailutils/message.h
index b1f52b220..a30cc66fd 100644
--- a/include/mailutils/message.h
+++ b/include/mailutils/message.h
@@ -18,17 +18,7 @@
#ifndef _MAILUTILS_MESSAGE_H
#define _MAILUTILS_MESSAGE_H
-#include <sys/types.h>
-
-#include <mailutils/attribute.h>
-#include <mailutils/auth.h>
-#include <mailutils/body.h>
-#include <mailutils/envelope.h>
-#include <mailutils/header.h>
-#include <mailutils/mailbox.h>
-#include <mailutils/mu_features.h>
-#include <mailutils/observer.h>
-#include <mailutils/stream.h>
+#include <mailutils/types.h>
#ifdef __cplusplus
extern "C" {
diff --git a/include/mailutils/mime.h b/include/mailutils/mime.h
index 7a82f00ed..916b5f290 100644
--- a/include/mailutils/mime.h
+++ b/include/mailutils/mime.h
@@ -18,10 +18,7 @@
#ifndef _MAILUTILS_MIME_H
#define _MAILUTILS_MIME_H
-#include <sys/types.h>
-#include <mailutils/mu_features.h>
-#include <mailutils/header.h>
-#include <mailutils/stream.h>
+#include <mailutils/types.h>
/* mime flags */
#define MIME_INCREAMENTAL_PARSER 0x1
@@ -33,10 +30,6 @@
extern "C" {
#endif
-/* forward declaration */
-struct _mime;
-typedef struct _mime *mime_t;
-
int mime_create __P ((mime_t *pmime, message_t msg, int flags));
void mime_destroy __P ((mime_t *pmime));
int mime_is_multipart __P ((mime_t mime));
diff --git a/include/mailutils/monitor.h b/include/mailutils/monitor.h
index 48104d44a..4ff8b2f99 100644
--- a/include/mailutils/monitor.h
+++ b/include/mailutils/monitor.h
@@ -18,8 +18,7 @@
#ifndef _MAILUTILS_MONITOR_H
#define _MAILUTILS_MONITOR_H
-#include <sys/types.h>
-#include <mailutils/mu_features.h>
+#include <mailutils/types.h>
#ifdef __cplusplus
extern "C" {
diff --git a/include/mailutils/mutil.h b/include/mailutils/mutil.h
index b3f62b865..0d49df3ce 100644
--- a/include/mailutils/mutil.h
+++ b/include/mailutils/mutil.h
@@ -24,6 +24,7 @@
*/
#include <time.h>
+
#include <mailutils/mu_features.h>
#ifdef __cplusplus
@@ -76,9 +77,11 @@ extern int mu_tempfile __P((const char *tmpdir, char **namep));
extern char * mu_get_full_path __P((const char *file));
extern char * mu_getcwd __P((void));
+extern int mu_spawnvp(const char* prog, const char* const av[], int* stat);
+
#ifdef __cplusplus
}
#endif
-#endif /* _MAILUTILS_MUTIL_H */
+#endif
diff --git a/include/mailutils/observer.h b/include/mailutils/observer.h
index a1f364e40..ef214b8bc 100644
--- a/include/mailutils/observer.h
+++ b/include/mailutils/observer.h
@@ -18,18 +18,12 @@
#ifndef _MAILUTILS_OBSERVER_H
#define _MAILUTILS_OBSERVER_H
-#include <sys/types.h>
-#include <mailutils/mu_features.h>
+#include <mailutils/types.h>
#ifdef __cplusplus
extern "C" {
#endif
-struct _observer;
-struct _observable;
-typedef struct _observer* observer_t;
-typedef struct _observable* observable_t;
-
#define MU_EVT_MAILBOX_DESTROY 0x001
#define MU_EVT_FOLDER_DESTROY 0x002
#define MU_EVT_MAILER_DESTROY 0x004
diff --git a/include/mailutils/parse822.h b/include/mailutils/parse822.h
index 82abab369..c44a3bcd8 100644
--- a/include/mailutils/parse822.h
+++ b/include/mailutils/parse822.h
@@ -22,8 +22,7 @@
#ifndef _MAILUTILS_PARSE822_H
#define _MAILUTILS_PARSE822_H
-#include <mailutils/mu_features.h>
-#include <mailutils/address.h>
+#include <mailutils/types.h>
#include <mailutils/mutil.h>
#ifdef __cplusplus
diff --git a/include/mailutils/property.h b/include/mailutils/property.h
index 2154f3120..28a64fe21 100644
--- a/include/mailutils/property.h
+++ b/include/mailutils/property.h
@@ -19,15 +19,13 @@
#define _MAILUTILS_PROPERTY_H
#include <sys/types.h>
-#include <mailutils/mu_features.h>
+
+#include <mailutils/types.h>
#ifdef __cplusplus
extern "C" {
#endif
-struct _property;
-typedef struct _property *property_t;
-
extern int property_create __P ((property_t *, void *));
extern void property_destroy __P ((property_t *, void *));
extern void *property_get_owner __P ((property_t));
diff --git a/include/mailutils/registrar.h b/include/mailutils/registrar.h
index dc4513d69..800bf8ee1 100644
--- a/include/mailutils/registrar.h
+++ b/include/mailutils/registrar.h
@@ -18,23 +18,12 @@
#ifndef _MAILUTILS_REGISTRAR_H
#define _MAILUTILS_REGISTRAR_H
-#include <sys/types.h>
-
-#include <mailutils/mu_features.h>
-#include <mailutils/url.h>
-#include <mailutils/mailbox.h>
-#include <mailutils/mailer.h>
-#include <mailutils/folder.h>
-#include <mailutils/list.h>
+#include <mailutils/types.h>
#ifdef __cplusplus
extern "C" {
#endif
-/* Record. */
-struct _record;
-typedef struct _record* record_t;
-
/* Public Interface, to allow static initialization. */
struct _record
{
diff --git a/include/mailutils/stream.h b/include/mailutils/stream.h
index e54d9ff0b..a47ce8b07 100644
--- a/include/mailutils/stream.h
+++ b/include/mailutils/stream.h
@@ -19,18 +19,13 @@
# define _MAILUTILS_STREAM_H
#include <stdio.h>
-#include <sys/types.h>
-#include <mailutils/mu_features.h>
-#include <mailutils/property.h>
+#include <mailutils/types.h>
#ifdef __cplusplus
extern "C" { /*}*/
#endif
-struct _stream;
-typedef struct _stream *stream_t;
-
#define MU_STREAM_READ 0x00000001
#define MU_STREAM_WRITE 0x00000002
#define MU_STREAM_RDWR 0x00000004
diff --git a/include/mailutils/types.h b/include/mailutils/types.h
index 42e2438ef..2cde45941 100644
--- a/include/mailutils/types.h
+++ b/include/mailutils/types.h
@@ -18,21 +18,65 @@
#ifndef _MAILUTILS_TYPES_H
#define _MAILUTILS_TYPES_H
+#include <sys/types.h>
+
#include <mailutils/mu_features.h>
#ifdef __cplusplus
extern "C" {
#endif
+struct _address;
+struct _attribute;
+struct _authority;
+struct _body;
+struct _debug;
+struct _envelope;
+struct _filter;
+struct _filter_record;
+struct _folder;
+struct _header;
+struct _iterator;
+struct _list;
struct _locker;
struct _mailbox;
+struct _mailer;
struct _message;
-struct _address;
+struct _mime;
+struct _observable;
+struct _observer;
+struct _property;
+struct _record;
+struct _stream;
+struct _ticket;
+struct _url;
+struct _wicket;
-typedef struct _locker *locker_t;
+typedef struct _address *address_t;
+typedef struct _attribute *attribute_t;
+typedef struct _authority *authority_t;
+typedef struct _body *body_t;
+typedef struct _debug *mu_debug_t;
+typedef struct _envelope *envelope_t;
+typedef struct _filter *filter_t;
+typedef struct _filter_record *filter_record_t;
+typedef struct _folder *folder_t;
+typedef struct _header * header_t;
+typedef struct _iterator *iterator_t;
+typedef struct _list *list_t;
+typedef struct _locker *locker_t;
typedef struct _mailbox *mailbox_t;
+typedef struct _mailer *mailer_t;
typedef struct _message *message_t;
-typedef struct _address *address_t;
+typedef struct _mime *mime_t;
+typedef struct _observable *observable_t;
+typedef struct _observer *observer_t;
+typedef struct _property *property_t;
+typedef struct _record* record_t;
+typedef struct _stream *stream_t;
+typedef struct _ticket *ticket_t;
+typedef struct _url *url_t;
+typedef struct _wicket *wicket_t;
#ifdef __cplusplus
}
diff --git a/include/mailutils/url.h b/include/mailutils/url.h
index 2deb7bfb7..bcedbb533 100644
--- a/include/mailutils/url.h
+++ b/include/mailutils/url.h
@@ -18,17 +18,12 @@
#ifndef _MAILUTILS_URL_H
#define _MAILUTILS_URL_H 1
-#include <sys/types.h>
-#include <mailutils/mu_features.h>
+#include <mailutils/types.h>
#ifdef __cplusplus
extern "C" {
#endif
-/* forward declaration */
-struct _url;
-typedef struct _url * url_t;
-
extern int url_create __P ((url_t *, const char *name));
extern void url_destroy __P ((url_t *));
extern int url_parse __P ((url_t));
diff --git a/mail.local/mail.local.h b/mail.local/mail.local.h
index 15966e543..5d03c0416 100644
--- a/mail.local/mail.local.h
+++ b/mail.local/mail.local.h
@@ -18,20 +18,23 @@
#if defined(HAVE_CONFIG_H)
# include <config.h>
#endif
+
#include <errno.h>
+#include <grp.h>
+#include <netdb.h>
+#include <pwd.h>
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
-#include <unistd.h>
#include <string.h>
#include <syslog.h>
-#include <pwd.h>
-#include <grp.h>
-#include <stdarg.h>
-#include <sys/stat.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
+#include <unistd.h>
+
#include <arpa/inet.h>
-#include <netdb.h>
+#include <netinet/in.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+
#include "getopt.h"
#ifdef HAVE_STRINGS_H
@@ -65,14 +68,18 @@
# define INADDR_LOOPBAK 0x7f000001
#endif
+#include <mailutils/attribute.h>
#include <mailutils/errno.h>
#include <mailutils/error.h>
+#include <mailutils/list.h>
#include <mailutils/locker.h>
#include <mailutils/mailbox.h>
#include <mailutils/message.h>
#include <mailutils/mutil.h>
#include <mailutils/registrar.h>
#include <mailutils/stream.h>
+#include <mailutils/url.h>
+
#include <mu_dbm.h>
#include <mu_argp.h>
diff --git a/mail/mail.h b/mail/mail.h
index fe43919a2..8c380647e 100644
--- a/mail/mail.h
+++ b/mail/mail.h
@@ -59,17 +59,23 @@
#include <readline/history.h>
#endif
+#include <mailutils/address.h>
+#include <mailutils/attribute.h>
+#include <mailutils/body.h>
+#include <mailutils/debug.h>
#include <mailutils/errno.h>
-#include <mailutils/mailbox.h>
-#include <mailutils/message.h>
+#include <mailutils/envelope.h>
+#include <mailutils/filter.h>
#include <mailutils/header.h>
-#include <mailutils/body.h>
-#include <mailutils/registrar.h>
-#include <mailutils/list.h>
#include <mailutils/iterator.h>
-#include <mailutils/address.h>
+#include <mailutils/list.h>
+#include <mailutils/mailbox.h>
+#include <mailutils/mailer.h>
+#include <mailutils/message.h>
#include <mailutils/mutil.h>
-#include <mailutils/filter.h>
+#include <mailutils/registrar.h>
+#include <mailutils/stream.h>
+#include <mailutils/url.h>
#include <argcv.h>
#include <getline.h>
diff --git a/mailbox/attachment.c b/mailbox/attachment.c
index d4c61058e..9ee73a2b5 100644
--- a/mailbox/attachment.c
+++ b/mailbox/attachment.c
@@ -38,8 +38,10 @@
# include <strings.h>
#endif
-#include <mailutils/message.h>
+#include <mailutils/body.h>
#include <mailutils/filter.h>
+#include <mailutils/header.h>
+#include <mailutils/message.h>
#include <mailutils/stream.h>
#define MAX_HDR_LEN 256
diff --git a/mailbox/filter.c b/mailbox/filter.c
index c047c1ee5..f9b77157d 100644
--- a/mailbox/filter.c
+++ b/mailbox/filter.c
@@ -33,7 +33,9 @@ First draft: Alain Magloire.
#endif
#include <filter0.h>
+
#include <mailutils/iterator.h>
+#include <mailutils/stream.h>
static void
filter_destroy (stream_t stream)
diff --git a/mailbox/filter_rfc822.c b/mailbox/filter_rfc822.c
index ed66a6df2..85949b87a 100644
--- a/mailbox/filter_rfc822.c
+++ b/mailbox/filter_rfc822.c
@@ -25,6 +25,8 @@
#include <errno.h>
#include <mailutils/property.h>
+#include <mailutils/stream.h>
+
#include <filter0.h>
static int rfc822_init __P ((filter_t));
diff --git a/mailbox/filter_trans.c b/mailbox/filter_trans.c
index 4e0bda881..cc80d8e06 100644
--- a/mailbox/filter_trans.c
+++ b/mailbox/filter_trans.c
@@ -28,6 +28,8 @@ First Draft: Dave Inglis.
#include <stdlib.h>
#include <string.h>
+#include <mailutils/stream.h>
+
#include <filter0.h>
#define MU_TRANS_DECODE 1
diff --git a/mailbox/folder.c b/mailbox/folder.c
index a9032d513..d34fc0229 100644
--- a/mailbox/folder.c
+++ b/mailbox/folder.c
@@ -23,10 +23,15 @@
#include <stdlib.h>
#include <string.h>
-#include <mailutils/registrar.h>
+#include <mailutils/auth.h>
+#include <mailutils/debug.h>
#include <mailutils/iterator.h>
#include <mailutils/list.h>
#include <mailutils/monitor.h>
+#include <mailutils/observer.h>
+#include <mailutils/registrar.h>
+#include <mailutils/stream.h>
+#include <mailutils/url.h>
#include <folder0.h>
diff --git a/mailbox/folder_imap.c b/mailbox/folder_imap.c
index a72d867e4..f5a676f1c 100644
--- a/mailbox/folder_imap.c
+++ b/mailbox/folder_imap.c
@@ -37,7 +37,14 @@
#include <imap0.h>
#include <url0.h>
+
+#include <mailutils/auth.h>
+#include <mailutils/attribute.h>
+#include <mailutils/debug.h>
#include <mailutils/error.h>
+#include <mailutils/header.h>
+#include <mailutils/observer.h>
+#include <mailutils/stream.h>
/* For dbg purposes set to one to see different level of traffic. */
/* Print to stderr the command sent to the IMAP server. */
diff --git a/mailbox/folder_mbox.c b/mailbox/folder_mbox.c
index a5106da91..e91b654b1 100644
--- a/mailbox/folder_mbox.c
+++ b/mailbox/folder_mbox.c
@@ -34,6 +34,10 @@
#include <folder0.h>
#include <registrar0.h>
+#include <mailutils/auth.h>
+#include <mailutils/url.h>
+#include <mailutils/stream.h>
+
/* We export url parsing and the initialisation of
the mailbox, via the register entry/record. */
diff --git a/mailbox/folder_pop.c b/mailbox/folder_pop.c
index 0417d35ac..2750ddbfc 100644
--- a/mailbox/folder_pop.c
+++ b/mailbox/folder_pop.c
@@ -27,9 +27,12 @@
# include <strings.h>
#endif
+#include <mailutils/auth.h>
+#include <mailutils/mailbox.h>
+
#include <folder0.h>
-#include <url0.h>
#include <registrar0.h>
+#include <url0.h>
/* We export url parsing and the initialisation of
the mailbox, via the register entry/record. */
diff --git a/mailbox/iterator.c b/mailbox/iterator.c
index 966b593bb..167765b6a 100644
--- a/mailbox/iterator.c
+++ b/mailbox/iterator.c
@@ -22,6 +22,8 @@
#include <errno.h>
#include <stdlib.h>
+#include <mailutils/list.h>
+
#include <iterator0.h>
int
diff --git a/mailbox/mailbox.c b/mailbox/mailbox.c
index 770728a3e..40429a206 100644
--- a/mailbox/mailbox.c
+++ b/mailbox/mailbox.c
@@ -22,11 +22,18 @@
#include <stdlib.h>
#include <errno.h>
+#include <mailutils/debug.h>
#include <mailutils/errno.h>
#include <mailutils/error.h>
+#include <mailutils/folder.h>
#include <mailutils/iterator.h>
#include <mailutils/locker.h>
+#include <mailutils/observer.h>
+#include <mailutils/property.h>
#include <mailutils/registrar.h>
+#include <mailutils/stream.h>
+#include <mailutils/url.h>
+
#include <mailbox0.h>
/* The Mailbox Factory.
diff --git a/mailbox/mailer.c b/mailbox/mailer.c
index bb06b238b..ef6154ac4 100644
--- a/mailbox/mailer.c
+++ b/mailbox/mailer.c
@@ -25,12 +25,17 @@
#include <stdarg.h>
#include <errno.h>
-#include <mailutils/registrar.h>
+#include <mailutils/address.h>
+#include <mailutils/debug.h>
#include <mailutils/iterator.h>
+#include <mailutils/observer.h>
+#include <mailutils/property.h>
+#include <mailutils/registrar.h>
+#include <mailutils/stream.h>
+#include <mailutils/url.h>
+
#include <mailer0.h>
-/*
- */
int
mailer_create (mailer_t *pmailer, const char *name)
{
diff --git a/mailbox/mbx_default.c b/mailbox/mbx_default.c
index 23fa3343e..6ddb8ee6c 100644
--- a/mailbox/mbx_default.c
+++ b/mailbox/mbx_default.c
@@ -176,7 +176,7 @@ plus_expand (const char *file, char **buf)
return 0;
}
-/* Do ~ , if necessary. We do not use $HOME. */
+/* Do ~ , if necessary. */
static int
tilde_expand (const char *file, char **buf)
{
diff --git a/mailbox/mbx_file.c b/mailbox/mbx_file.c
index 7bb9429af..6e3d1a363 100644
--- a/mailbox/mbx_file.c
+++ b/mailbox/mbx_file.c
@@ -24,6 +24,8 @@
#include <stdlib.h>
#include <sys/stat.h>
+#include <mailutils/url.h>
+
#include <mailbox0.h>
#include <registrar0.h>
diff --git a/mailbox/mbx_imap.c b/mailbox/mbx_imap.c
index 7c8a5ce78..242c7bee6 100644
--- a/mailbox/mbx_imap.c
+++ b/mailbox/mbx_imap.c
@@ -29,11 +29,21 @@
#include <time.h>
#include <mailutils/address.h>
+#include <mailutils/attribute.h>
+#include <mailutils/body.h>
+#include <mailutils/debug.h>
+#include <mailutils/envelope.h>
#include <mailutils/error.h>
+#include <mailutils/header.h>
+#include <mailutils/message.h>
#include <mailutils/mutil.h>
+#include <mailutils/observer.h>
+#include <mailutils/property.h>
+#include <mailutils/stream.h>
+
+#include <imap0.h>
#include <mailbox0.h>
#include <registrar0.h>
-#include <imap0.h>
#include <url0.h>
#undef min
diff --git a/mailbox/mbx_mbox.c b/mailbox/mbx_mbox.c
index c3de2459c..d3962790d 100644
--- a/mailbox/mbx_mbox.c
+++ b/mailbox/mbx_mbox.c
@@ -52,14 +52,21 @@
#include <mailbox0.h>
#include <registrar0.h>
+#include <mailutils/address.h>
#include <mailutils/attribute.h>
#include <mailutils/body.h>
+#include <mailutils/debug.h>
+#include <mailutils/envelope.h>
#include <mailutils/errno.h>
#include <mailutils/error.h>
#include <mailutils/header.h>
#include <mailutils/locker.h>
#include <mailutils/message.h>
+#include <mailutils/mutil.h>
+#include <mailutils/observer.h>
+#include <mailutils/property.h>
#include <mailutils/stream.h>
+#include <mailutils/url.h>
#define ATTRIBUTE_IS_DELETED(flag) (flag & MU_ATTRIBUTE_DELETED)
#define ATTRIBUTE_IS_EQUAL(flag1, flag2) (flag1 == flag2)
diff --git a/mailbox/mbx_mh.c b/mailbox/mbx_mh.c
index e481500b0..41e92449e 100644
--- a/mailbox/mbx_mh.c
+++ b/mailbox/mbx_mh.c
@@ -44,15 +44,21 @@
# include <strings.h>
#endif
-#include <mailutils/message.h>
-#include <mailutils/stream.h>
-#include <mailutils/body.h>
-#include <mailutils/header.h>
#include <mailutils/attribute.h>
+#include <mailutils/body.h>
+#include <mailutils/debug.h>
+#include <mailutils/envelope.h>
#include <mailutils/error.h>
+#include <mailutils/header.h>
+#include <mailutils/locker.h>
+#include <mailutils/message.h>
#include <mailutils/mutil.h>
-#include <registrar0.h>
+#include <mailutils/property.h>
+#include <mailutils/stream.h>
+#include <mailutils/url.h>
+
#include <mailbox0.h>
+#include <registrar0.h>
#define MAX_OPEN_STREAMS 16
diff --git a/mailbox/mbx_pop.c b/mailbox/mbx_pop.c
index f399cc44c..07a126e96 100644
--- a/mailbox/mbx_pop.c
+++ b/mailbox/mbx_pop.c
@@ -40,17 +40,21 @@
#include <md5-rsa.h>
-#include <mailutils/errno.h>
-#include <mailutils/stream.h>
-#include <mailutils/body.h>
-#include <mailutils/message.h>
-#include <mailutils/header.h>
#include <mailutils/attribute.h>
-#include <mailutils/url.h>
#include <mailutils/auth.h>
+#include <mailutils/body.h>
+#include <mailutils/debug.h>
+#include <mailutils/errno.h>
#include <mailutils/error.h>
-#include <mailbox0.h>
+#include <mailutils/header.h>
+#include <mailutils/message.h>
+#include <mailutils/observer.h>
+#include <mailutils/property.h>
+#include <mailutils/stream.h>
+#include <mailutils/url.h>
+
#include <folder0.h>
+#include <mailbox0.h>
#include <registrar0.h>
#include <url0.h>
diff --git a/mailbox/message.c b/mailbox/message.c
index 9797b788c..52c4dd753 100644
--- a/mailbox/message.c
+++ b/mailbox/message.c
@@ -35,8 +35,18 @@
#include <message0.h>
#include <mailutils/address.h>
+#include <mailutils/attribute.h>
+#include <mailutils/auth.h>
+#include <mailutils/body.h>
+#include <mailutils/debug.h>
+#include <mailutils/envelope.h>
#include <mailutils/errno.h>
+#include <mailutils/folder.h>
+#include <mailutils/header.h>
+#include <mailutils/mailbox.h>
#include <mailutils/mutil.h>
+#include <mailutils/observer.h>
+#include <mailutils/stream.h>
#define MESSAGE_MODIFIED 0x10000;
diff --git a/mailbox/muerrno.c b/mailbox/muerrno.c
index 1004c5e21..049914855 100644
--- a/mailbox/muerrno.c
+++ b/mailbox/muerrno.c
@@ -61,6 +61,9 @@ mu_errname (int e)
EN(MU_ERR_LOCK_BAD_LOCK)
EN(MU_ERR_LOCK_BAD_FILE)
EN(MU_ERR_LOCK_NOT_HELD)
+ EN(MU_ERR_LOCK_EXT_FAIL)
+ EN(MU_ERR_LOCK_EXT_ERR)
+ EN(MU_ERR_LOCK_EXT_KILLED)
}
return "SYSTEM ERROR";
@@ -89,6 +92,9 @@ const char* mu_errstring (int e)
ES(MU_ERR_LOCK_BAD_LOCK, "Lock file check failed")
ES(MU_ERR_LOCK_BAD_FILE, "File check failed")
ES(MU_ERR_LOCK_NOT_HELD, "Lock not held on file")
+ ES(MU_ERR_LOCK_EXT_FAIL, "Failed to exec external locker")
+ ES(MU_ERR_LOCK_EXT_ERR, "External locker failed")
+ ES(MU_ERR_LOCK_EXT_KILLED, "External locker killed")
}
return strerror(e);
diff --git a/mailbox/observer.c b/mailbox/observer.c
index b4de25935..f6dbbadfb 100644
--- a/mailbox/observer.c
+++ b/mailbox/observer.c
@@ -21,7 +21,10 @@
#include <errno.h>
#include <stdlib.h>
+
+#include <mailutils/list.h>
#include <mailutils/iterator.h>
+
#include <observer0.h>
int
diff --git a/mailbox/registrar.c b/mailbox/registrar.c
index 79d75c396..b214f9ca2 100644
--- a/mailbox/registrar.c
+++ b/mailbox/registrar.c
@@ -27,7 +27,9 @@
#endif
#include <mailutils/iterator.h>
+#include <mailutils/list.h>
#include <mailutils/monitor.h>
+
#include <registrar0.h>
/* NOTE: We will leak here since the monitor and the registrar will never
diff --git a/mailbox/sendmail.c b/mailbox/sendmail.c
index 029d82073..b4a01315a 100644
--- a/mailbox/sendmail.c
+++ b/mailbox/sendmail.c
@@ -30,7 +30,13 @@
#include <sys/wait.h>
#include <mailutils/address.h>
+#include <mailutils/debug.h>
+#include <mailutils/message.h>
+#include <mailutils/observer.h>
+#include <mailutils/property.h>
#include <mailutils/stream.h>
+#include <mailutils/url.h>
+
#include <mailer0.h>
#include <registrar0.h>
diff --git a/mailbox/smtp.c b/mailbox/smtp.c
index 20c04955d..fd3c815c2 100644
--- a/mailbox/smtp.c
+++ b/mailbox/smtp.c
@@ -19,18 +19,24 @@
# include <config.h>
#endif
-#include <sys/types.h>
-#include <stdio.h>
-#include <pwd.h>
-#include <unistd.h>
#include <errno.h>
+#include <netdb.h>
+#include <pwd.h>
+#include <stdarg.h>
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <netdb.h>
+#include <unistd.h>
#include <mailutils/address.h>
-#include <mailutils/stream.h>
+#include <mailutils/debug.h>
+#include <mailutils/header.h>
+#include <mailutils/message.h>
#include <mailutils/mutil.h>
+#include <mailutils/observer.h>
+#include <mailutils/property.h>
+#include <mailutils/stream.h>
+#include <mailutils/url.h>
#include <mailer0.h>
#include <registrar0.h>
diff --git a/mailbox/stream.c b/mailbox/stream.c
index bc7e76272..d88ac462d 100644
--- a/mailbox/stream.c
+++ b/mailbox/stream.c
@@ -34,6 +34,8 @@
#include <stdio.h>
#include <string.h>
+#include <mailutils/property.h>
+
#include <stream0.h>
static int refill (stream_t, off_t);
diff --git a/mailbox/url_mbox.c b/mailbox/url_mbox.c
index eff7107f2..ebbefaa57 100644
--- a/mailbox/url_mbox.c
+++ b/mailbox/url_mbox.c
@@ -21,6 +21,7 @@
#include <errno.h>
#include <stdlib.h>
+#include <stdio.h>
#include <string.h>
#ifdef HAVE_STRINGS_H
diff --git a/mailbox2/include/mailutils/authority.h b/mailbox2/include/mailutils/authority.h
index bd55eabd7..49f9c84da 100644
--- a/mailbox2/include/mailutils/authority.h
+++ b/mailbox2/include/mailutils/authority.h
@@ -18,18 +18,12 @@
#ifndef _MAILUTILS_AUTHORITY_H
#define _MAILUTILS_AUTHORITY_H
-#include <sys/types.h>
-#include <mailutils/mu_features.h>
-#include <mailutils/ticket.h>
+#include <mailutils/types.h>
#ifdef __cplusplus
extern "C" {
#endif
-/* forward declaration */
-struct _authority;
-typedef struct _authority *authority_t;
-
extern int authority_ref __P ((authority_t));
extern void authority_destroy __P ((authority_t *));
extern int authority_set_ticket __P ((authority_t, ticket_t));
diff --git a/messages/messages.c b/messages/messages.c
index f164b6bc5..112375478 100644
--- a/messages/messages.c
+++ b/messages/messages.c
@@ -1,6 +1,27 @@
+/* GNU mailutils - a suite of utilities for electronic mail
+ Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Library Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+
#include "config.h"
+
#include <mailutils/mailutils.h>
+
#include <stdio.h>
+#include <malloc.h>
+
#include <mu_argp.h>
static int messages_count (const char *);
diff --git a/pop3d/pop3d.h b/pop3d/pop3d.h
index 268808dad..d513e21d0 100644
--- a/pop3d/pop3d.h
+++ b/pop3d/pop3d.h
@@ -109,14 +109,18 @@
# include <strings.h>
#endif
+#include <mailutils/attribute.h>
+#include <mailutils/body.h>
#include <mailutils/errno.h>
+#include <mailutils/error.h>
+#include <mailutils/header.h>
+#include <mailutils/list.h>
+#include <mailutils/locker.h>
#include <mailutils/mailbox.h>
#include <mailutils/message.h>
-#include <mailutils/header.h>
-#include <mailutils/body.h>
-#include <mailutils/registrar.h>
-#include <mailutils/error.h>
#include <mailutils/mutil.h>
+#include <mailutils/registrar.h>
+#include <mailutils/url.h>
#include <mu_argp.h>
diff --git a/readmsg/readmsg.h b/readmsg/readmsg.h
index 19441bf56..09ebc002e 100644
--- a/readmsg/readmsg.h
+++ b/readmsg/readmsg.h
@@ -28,12 +28,19 @@
#include <errno.h>
#include <getopt.h>
+#include <mailutils/body.h>
+#include <mailutils/debug.h>
#include <mailutils/errno.h>
#include <mailutils/mailbox.h>
#include <mailutils/header.h>
+#include <mailutils/list.h>
+#include <mailutils/message.h>
#include <mailutils/mime.h>
#include <mailutils/filter.h>
#include <mailutils/registrar.h>
+#include <mailutils/stream.h>
int msglist __P ((mailbox_t mbox, int show_all, int argc, char **argv, int **set, int *n));
+
#endif
+
diff --git a/sieve/sieve.c b/sieve/sieve.c
index 5093335f0..97a33bd4f 100644
--- a/sieve/sieve.c
+++ b/sieve/sieve.c
@@ -1,7 +1,22 @@
-/*
+/* GNU mailutils - a suite of utilities for electronic mail
+ Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
-sieve script interpreter.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Library Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Library General Public License for more details.
+ You should have received a copy of the GNU Library General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+
+/*
+sieve script interpreter.
*/
#ifdef HAVE_CONFIG_H
@@ -26,10 +41,14 @@ sieve script interpreter.
#include "mu_argp.h"
+#include <mailutils/auth.h>
#include <mailutils/errno.h>
+#include <mailutils/folder.h>
+#include <mailutils/list.h>
#include <mailutils/mailbox.h>
#include <mailutils/mutil.h>
#include <mailutils/registrar.h>
+#include <mailutils/stream.h>
void mutil_register_all_mbox_formats(void);
@@ -231,7 +250,7 @@ main (int argc, char *argv[])
mailbox_t mbox = 0;
struct options opts = { 0 };
- const char* capa[] = { 0 };
+/*const char* capa[] = { 0 };*/
size_t count = 0;
int msgno = 0;
diff --git a/sieve/sieve.h b/sieve/sieve.h
index b3a56b96c..ded4855b1 100644
--- a/sieve/sieve.h
+++ b/sieve/sieve.h
@@ -1,5 +1,22 @@
+/* GNU mailutils - a suite of utilities for electronic mail
+ Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Library Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
/** mailutils' sieve implementation */
+
/*
Configuration:
diff --git a/sieve/sv.h b/sieve/sv.h
index 502f8862f..7ee833142 100644
--- a/sieve/sv.h
+++ b/sieve/sv.h
@@ -1,10 +1,24 @@
+/* GNU mailutils - a suite of utilities for electronic mail
+ Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Library Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+
#ifndef SV_H
#define SV_H
-#include <mailutils/errno.h>
-#include <mailutils/mailbox.h>
-#include <mailutils/address.h>
-#include <mailutils/registrar.h>
+#include <mailutils/types.h>
#include "sieve_interface.h"
diff --git a/sieve/svcb.c b/sieve/svcb.c
index 806c38fd9..2b5991ab6 100644
--- a/sieve/svcb.c
+++ b/sieve/svcb.c
@@ -1,11 +1,30 @@
+/* GNU mailutils - a suite of utilities for electronic mail
+ Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Library Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+
/* sieve callback implementations */
#include <assert.h>
#include <stdlib.h>
#include <string.h>
-#include <mailutils/errno.h>
+#include <mailutils/address.h>
#include <mailutils/envelope.h>
+#include <mailutils/errno.h>
+#include <mailutils/header.h>
#include "sv.h"
diff --git a/sieve/svctx.c b/sieve/svctx.c
index 9fd71d94a..2ada6338a 100644
--- a/sieve/svctx.c
+++ b/sieve/svctx.c
@@ -1,6 +1,26 @@
+/* GNU mailutils - a suite of utilities for electronic mail
+ Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Library Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+
#include "sv.h"
+#include <mailutils/attribute.h>
+#include <mailutils/errno.h>
+
#include <assert.h>
#include <errno.h>
#include <stdlib.h>
diff --git a/sieve/svfield.c b/sieve/svfield.c
index 2748f45b5..a304978e7 100644
--- a/sieve/svfield.c
+++ b/sieve/svfield.c
@@ -1,3 +1,20 @@
+/* GNU mailutils - a suite of utilities for electronic mail
+ Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Library Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+
/*
* sieve header field cache.
*/
diff --git a/sieve/svfield.h b/sieve/svfield.h
index 184e293ea..f8e65404a 100644
--- a/sieve/svfield.h
+++ b/sieve/svfield.h
@@ -1,3 +1,20 @@
+/* GNU mailutils - a suite of utilities for electronic mail
+ Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Library Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+
/*
* sieve field cache.
*/
diff --git a/sieve/svutil.c b/sieve/svutil.c
index 8fe964f55..8c729b30b 100644
--- a/sieve/svutil.c
+++ b/sieve/svutil.c
@@ -1,3 +1,20 @@
+/* GNU mailutils - a suite of utilities for electronic mail
+ Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Library Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+
/** utility wrappers around mailutils functionality **/
#include <assert.h>
@@ -6,6 +23,9 @@
#include "sv.h"
+#include <mailutils/attribute.h>
+#include <mailutils/message.h>
+
#if 0
int
sv_mu_copy_debug_level (const mailbox_t from, mailbox_t to)

Return to:

Send suggestions and report system problems to the System administrator.