diff options
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> @@ -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/ |