Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit c97b96ae c97b96ae673278d60906314001aec978bdcf4485 by Sergey Poznyakoff
Options

Reorganize directory tree. 

Move libproto/include/(*)0.h to include/mailutils/sys/\1.h
Remove libproto/include.
1 parent 81166ab6
Inline Side-by-side
Showing 73 changed files with 298 additions and 459 deletions
...@@ -69,7 +69,7 @@ AC_SUBST(MU_APP_LIBRARIES,'../libmu_argp/libmu_argp.a ../libmu_cfg/libmu_cfg.la ...@@ -69,7 +69,7 @@ AC_SUBST(MU_APP_LIBRARIES,'../libmu_argp/libmu_argp.a ../libmu_cfg/libmu_cfg.la
69 # header files. There are two exceptions, though. See NOTE before the 69 # header files. There are two exceptions, though. See NOTE before the
70 # AC_CONFIG_LINKS statements, below. 70 # AC_CONFIG_LINKS statements, below.
71 71
72 AC_SUBST(MU_LIB_COMMON_INCLUDES,'-I${top_builddir} -I${top_srcdir}/include -I${top_builddir}/include -I${top_srcdir}/mailbox -I${top_srcdir}/libproto/include') 72 AC_SUBST(MU_LIB_COMMON_INCLUDES,'-I${top_builddir} -I${top_srcdir}/include -I${top_builddir}/include -I${top_srcdir}/mailbox')
73 73
74 AC_SUBST(MU_APP_COMMON_INCLUDES,'-I${srcdir} -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_builddir}/lib -I${top_builddir} -I${top_builddir}/include -I${top_srcdir}/mailbox -I${top_srcdir}/libmu_argp -I${top_srcdir}/libmu_cfg') 74 AC_SUBST(MU_APP_COMMON_INCLUDES,'-I${srcdir} -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_builddir}/lib -I${top_builddir} -I${top_builddir}/include -I${top_srcdir}/mailbox -I${top_srcdir}/libmu_argp -I${top_srcdir}/libmu_cfg')
75 75
...@@ -1350,7 +1350,6 @@ AC_CONFIG_FILES([ ...@@ -1350,7 +1350,6 @@ AC_CONFIG_FILES([
1350 libproto/pop/Makefile 1350 libproto/pop/Makefile
1351 libproto/nntp/Makefile 1351 libproto/nntp/Makefile
1352 libproto/imap/Makefile 1352 libproto/imap/Makefile
1353 libproto/include/Makefile
1354 maidag/Makefile 1353 maidag/Makefile
1355 mail/Makefile 1354 mail/Makefile
1356 mail/testsuite/Makefile 1355 mail/testsuite/Makefile
......
...@@ -19,25 +19,42 @@ ...@@ -19,25 +19,42 @@
19 19
20 sysincludedir=$(pkgincludedir)/sys 20 sysincludedir=$(pkgincludedir)/sys
21 sysinclude_HEADERS = \ 21 sysinclude_HEADERS = \
22 amd.h\
23 attribute.h\
24 auth.h\
25 body.h\
22 dbgstream.h\ 26 dbgstream.h\
27 debug.h\
28 envelope.h\
23 file_stream.h\ 29 file_stream.h\
24 filter.h\ 30 filter.h\
31 folder.h\
25 gsasl-stream.h\ 32 gsasl-stream.h\
26 header_stream.h\ 33 header_stream.h\
27 header.h\ 34 header.h\
35 imap.h\
36 iterator.h\
28 iostream.h\ 37 iostream.h\
38 list.h\
39 mailbox.h\
40 mailer.h\
29 mapfile_stream.h\ 41 mapfile_stream.h\
30 memory_stream.h\ 42 memory_stream.h\
31 message_stream.h\ 43 message_stream.h\
32 message.h\ 44 message.h\
33 mime.h\ 45 mime.h\
46 monitor.h\
47 nntp.h\
48 observer.h\
49 pop3.h\
34 prog_stream.h\ 50 prog_stream.h\
51 property.h\
52 registrar.h\
35 socket_stream.h\ 53 socket_stream.h\
36 stdio_stream.h\ 54 stdio_stream.h\
37 streamref.h\ 55 streamref.h\
38 streamtrans.h\ 56 streamtrans.h\
39 stream.h\ 57 stream.h\
40 tls-stream.h\ 58 tls-stream.h\
41 pop3.h\ 59 url.h\
42 nntp.h\
43 xscript-stream.h 60 xscript-stream.h
......
...@@ -17,10 +17,12 @@ ...@@ -17,10 +17,12 @@
17 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 17 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18 Boston, MA 02110-1301 USA */ 18 Boston, MA 02110-1301 USA */
19 19
20 #define MAX_OPEN_STREAMS 16 20 #ifndef _MAILUTILS_SYS_AMD_H
21 # define _MAILUTILS_SYS_AMD_H
22 # define MAX_OPEN_STREAMS 16
21 23
22 /* Notifications ADD_MESG. */ 24 /* Notifications ADD_MESG. */
23 #define DISPATCH_ADD_MSG(mbox,mhd,n) \ 25 # define DISPATCH_ADD_MSG(mbox,mhd,n) \
24 do \ 26 do \
25 { \ 27 { \
26 int bailing = 0; \ 28 int bailing = 0; \
...@@ -42,7 +44,7 @@ ...@@ -42,7 +44,7 @@
42 mu_monitor_wrlock (mbox->monitor); \ 44 mu_monitor_wrlock (mbox->monitor); \
43 } while (0); 45 } while (0);
44 46
45 #define MU_AMD_SIZE_FILE_NAME ".mu-size" 47 # define MU_AMD_SIZE_FILE_NAME ".mu-size"
46 48
47 struct _amd_data; 49 struct _amd_data;
48 struct _amd_message 50 struct _amd_message
...@@ -110,3 +112,5 @@ void amd_cleanup (void *arg); ...@@ -110,3 +112,5 @@ void amd_cleanup (void *arg);
110 struct _amd_message *_amd_get_message (struct _amd_data *amd, size_t msgno); 112 struct _amd_message *_amd_get_message (struct _amd_data *amd, size_t msgno);
111 int amd_msg_lookup (struct _amd_data *amd, struct _amd_message *msg, 113 int amd_msg_lookup (struct _amd_data *amd, struct _amd_message *msg,
112 size_t *pret); 114 size_t *pret);
115
116 #endif
......
...@@ -17,12 +17,8 @@ ...@@ -17,12 +17,8 @@
17 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 17 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18 Boston, MA 02110-1301 USA */ 18 Boston, MA 02110-1301 USA */
19 19
20 #ifndef _ATTRIBUTE0_H 20 #ifndef _MAILUTILS_SYS_ATTRIBUTE_H
21 # define _ATTRIBUTE0_H 21 # define _MAILUTILS_SYS_ATTRIBUTE_H
22
23 #ifdef DMALLOC
24 # include <dmalloc.h>
25 #endif
26 22
27 #include <mailutils/attribute.h> 23 #include <mailutils/attribute.h>
28 24
...@@ -46,4 +42,4 @@ struct _mu_attribute ...@@ -46,4 +42,4 @@ struct _mu_attribute
46 } 42 }
47 #endif 43 #endif
48 44
49 #endif /* _ATTRIBUTE0_H */ 45 #endif /* _MAILUTILS_SYS_ATTRIBUTE_H */
......
...@@ -17,16 +17,12 @@ ...@@ -17,16 +17,12 @@
17 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 17 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18 Boston, MA 02110-1301 USA */ 18 Boston, MA 02110-1301 USA */
19 19
20 #ifndef _AUTH0_H 20 #ifndef _MAILUTILS_SYS_AUTH_H
21 #define _AUTH0_H 21 # define _MAILUTILS_SYS_AUTH_H
22
23 #ifdef DMALLOC
24 # include <dmalloc.h>
25 #endif
26 22
23 #include <sys/types.h>
27 #include <mailutils/auth.h> 24 #include <mailutils/auth.h>
28 #include <mailutils/list.h> 25 #include <mailutils/list.h>
29 #include <sys/types.h>
30 26
31 #ifdef __cplusplus 27 #ifdef __cplusplus
32 extern "C" { 28 extern "C" {
...@@ -67,4 +63,4 @@ struct _mu_wicket ...@@ -67,4 +63,4 @@ struct _mu_wicket
67 } 63 }
68 #endif 64 #endif
69 65
70 #endif /* _AUTH0_H */ 66 #endif /* _MAILUTILS_SYS_AUTH_H */
......
...@@ -17,12 +17,8 @@ ...@@ -17,12 +17,8 @@
17 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 17 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18 Boston, MA 02110-1301 USA */ 18 Boston, MA 02110-1301 USA */
19 19
20 #ifndef _BODY0_H 20 #ifndef _MAILUTILS_SYS_BODY_H
21 #define _BODY0_H 21 # define _MAILUTILS_SYS_BODY_H
22
23 #ifdef DMALLOC
24 # include <dmalloc.h>
25 #endif
26 22
27 #include <mailutils/stream.h> 23 #include <mailutils/stream.h>
28 #include <mailutils/body.h> 24 #include <mailutils/body.h>
...@@ -50,4 +46,4 @@ struct _mu_body ...@@ -50,4 +46,4 @@ struct _mu_body
50 } 46 }
51 #endif 47 #endif
52 48
53 #endif /* _BODY0_H */ 49 #endif /* _MAILUTILS_SYS_BODY_H */
......
...@@ -17,12 +17,8 @@ ...@@ -17,12 +17,8 @@
17 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 17 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18 Boston, MA 02110-1301 USA */ 18 Boston, MA 02110-1301 USA */
19 19
20 #ifndef _DEBUG0_H 20 #ifndef _MAILUTILS_SYS_DEBUG_H
21 #define _DEBUG0_H 21 # define _MAILUTILS_SYS_DEBUG_H
22
23 #ifdef DMALLOC
24 # include <dmalloc.h>
25 #endif
26 22
27 #include <mailutils/debug.h> 23 #include <mailutils/debug.h>
28 #include <mailutils/stream.h> 24 #include <mailutils/stream.h>
...@@ -47,4 +43,4 @@ struct _mu_debug ...@@ -47,4 +43,4 @@ struct _mu_debug
47 } 43 }
48 #endif 44 #endif
49 45
50 #endif /* _DEBUG0_H */ 46 #endif /* _MAILUTILS_SYS_DEBUG_H */
......
...@@ -17,12 +17,8 @@ ...@@ -17,12 +17,8 @@
17 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 17 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18 Boston, MA 02110-1301 USA */ 18 Boston, MA 02110-1301 USA */
19 19
20 #ifndef _ENVELOPE0_H 20 #ifndef _MAILUTILS_SYS_ENVELOPE_H
21 #define _ENVELOPE0_H 21 # define _MAILUTILS_SYS_ENVELOPE_H
22
23 #ifdef DMALLOC
24 #include <dmalloc.h>
25 #endif
26 22
27 #include <mailutils/envelope.h> 23 #include <mailutils/envelope.h>
28 24
...@@ -44,4 +40,4 @@ struct _mu_envelope ...@@ -44,4 +40,4 @@ struct _mu_envelope
44 } 40 }
45 #endif 41 #endif
46 42
47 #endif /* _ENVELOPE0_H */ 43 #endif /* _MAILUTILS_SYS_ENVELOPE_H */
......
...@@ -17,25 +17,21 @@ ...@@ -17,25 +17,21 @@
17 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 17 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18 Boston, MA 02110-1301 USA */ 18 Boston, MA 02110-1301 USA */
19 19
20 #ifndef _FOLDER0_H 20 #ifndef _MAILUTILS_SYS_FOLDER_H
21 #define _FOLDER0_H 21 # define _MAILUTILS_SYS_FOLDER_H
22 22
23 #ifdef DMALLOC 23 # include <sys/types.h>
24 # include <dmalloc.h> 24 # include <stdio.h>
25 #endif
26 25
27 #include <sys/types.h> 26 # include <mailutils/monitor.h>
28 #include <stdio.h> 27 # include <mailutils/folder.h>
29 28
30 #include <mailutils/monitor.h> 29 # ifdef __cplusplus
31 #include <mailutils/folder.h>
32
33 #ifdef __cplusplus
34 extern "C" { 30 extern "C" {
35 #endif 31 # endif
36 32
37 #define MU_FOLDER_LIST 0 33 # define MU_FOLDER_LIST 0
38 #define MU_FOLDER_ENUM 1 34 # define MU_FOLDER_ENUM 1
39 35
40 struct _mu_folder 36 struct _mu_folder
41 { 37 {
...@@ -70,8 +66,8 @@ struct _mu_folder ...@@ -70,8 +66,8 @@ struct _mu_folder
70 int (*_unsubscribe) (mu_folder_t, const char *); 66 int (*_unsubscribe) (mu_folder_t, const char *);
71 }; 67 };
72 68
73 #ifdef __cplusplus 69 # ifdef __cplusplus
74 } 70 }
75 #endif 71 # endif
76 72
77 #endif /* _FOLDER0_H */ 73 #endif /* _MAILUTILS_SYS_FOLDER_H */
......
...@@ -17,28 +17,24 @@ ...@@ -17,28 +17,24 @@
17 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 17 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18 Boston, MA 02110-1301 USA */ 18 Boston, MA 02110-1301 USA */
19 19
20 #ifndef _IMAP0_H 20 #ifndef _MAILUTILS_SYS_IMAP_H
21 #define _IMAP0_H 21 # define _MAILUTILS_SYS_IMAP_H
22 22
23 #ifdef DMALLOC 23 # include <mailutils/sys/folder.h>
24 # include <dmalloc.h> 24 # include <mailutils/sys/mailbox.h>
25 #endif 25 # include <mailutils/sys/registrar.h>
26 # include <mailutils/sys/auth.h>
26 27
27 #include <folder0.h> 28 # ifdef __cplusplus
28 #include <mailbox0.h>
29 #include <registrar0.h>
30 #include <auth0.h>
31
32 #ifdef __cplusplus
33 extern "C" { 29 extern "C" {
34 #endif 30 # endif
35 31
36 #define CLEAR_STATE(f_imap) \ 32 # define CLEAR_STATE(f_imap) \
37 f_imap->selected = NULL, f_imap->state = IMAP_NO_STATE 33 f_imap->selected = NULL, f_imap->state = IMAP_NO_STATE
38 34
39 /* Clear the state and close the stream. */ 35 /* Clear the state and close the stream. */
40 #define CHECK_ERROR_CLOSE(folder, f_imap, status) \ 36 # define CHECK_ERROR_CLOSE(folder, f_imap, status) \
41 do \ 37 do \
42 { \ 38 { \
43 if (status != 0) \ 39 if (status != 0) \
44 { \ 40 { \
...@@ -47,11 +43,11 @@ do \ ...@@ -47,11 +43,11 @@ do \
47 return status; \ 43 return status; \
48 } \ 44 } \
49 } \ 45 } \
50 while (0) 46 while (0)
51 47
52 /* Clear the state. */ 48 /* Clear the state. */
53 #define CHECK_ERROR(f_imap, status) \ 49 # define CHECK_ERROR(f_imap, status) \
54 do \ 50 do \
55 { \ 51 { \
56 if (status != 0) \ 52 if (status != 0) \
57 { \ 53 { \
...@@ -62,8 +58,8 @@ do \ ...@@ -62,8 +58,8 @@ do \
62 while (0) 58 while (0)
63 59
64 /* Clear the state for non recoverable error. */ 60 /* Clear the state for non recoverable error. */
65 #define CHECK_EAGAIN(f_imap, status) \ 61 # define CHECK_EAGAIN(f_imap, status) \
66 do \ 62 do \
67 { \ 63 { \
68 if (status != 0) \ 64 if (status != 0) \
69 { \ 65 { \
...@@ -74,8 +70,7 @@ do \ ...@@ -74,8 +70,7 @@ do \
74 return status; \ 70 return status; \
75 } \ 71 } \
76 } \ 72 } \
77 while (0) 73 while (0)
78
79 74
80 struct _f_imap; 75 struct _f_imap;
81 struct _m_imap; 76 struct _m_imap;
...@@ -234,8 +229,8 @@ int imap_parse (f_imap_t); ...@@ -234,8 +229,8 @@ int imap_parse (f_imap_t);
234 int imap_readline (f_imap_t); 229 int imap_readline (f_imap_t);
235 char *section_name (msg_imap_t); 230 char *section_name (msg_imap_t);
236 231
237 #ifdef __cplusplus 232 # ifdef __cplusplus
238 } 233 }
239 #endif 234 # endif
240 235
241 #endif /* _IMAP0_H */ 236 #endif /* _MAILUTILS_SYS_IMAP_H */
......
...@@ -17,18 +17,14 @@ ...@@ -17,18 +17,14 @@
17 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 17 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18 Boston, MA 02110-1301 USA */ 18 Boston, MA 02110-1301 USA */
19 19
20 #ifndef _ITERATOR0_H 20 #ifndef _MAILUTILS_SYS_ITERATOR_H
21 #define _ITERATOR0_H 21 # define _MAILUTILS_SYS_ITERATOR_H
22 22
23 #ifdef DMALLOC 23 # include <mailutils/iterator.h>
24 # include <dmalloc.h>
25 #endif
26 24
27 #include <mailutils/iterator.h> 25 # ifdef __cplusplus
28
29 #ifdef __cplusplus
30 extern "C" { 26 extern "C" {
31 #endif 27 # endif
32 28
33 struct _mu_iterator 29 struct _mu_iterator
34 { 30 {
...@@ -46,8 +42,8 @@ struct _mu_iterator ...@@ -46,8 +42,8 @@ struct _mu_iterator
46 int (*itrctl) (void *owner, enum mu_itrctl_req req, void *arg); 42 int (*itrctl) (void *owner, enum mu_itrctl_req req, void *arg);
47 }; 43 };
48 44
49 #ifdef __cplusplus 45 # ifdef __cplusplus
50 } 46 }
51 #endif 47 # endif
52 48
53 #endif /* _ITERATOR0_H */ 49 #endif /* _MAILUTILS_SYS_ITERATOR_H */
......
...@@ -17,22 +17,18 @@ ...@@ -17,22 +17,18 @@
17 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 17 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18 Boston, MA 02110-1301 USA */ 18 Boston, MA 02110-1301 USA */
19 19
20 #ifndef _LIST0_H 20 #ifndef _MAILUTILS_SYS_LIST_H
21 #define _LIST0_H 21 # define _MAILUTILS_SYS_LIST_H
22 22
23 #ifdef DMALLOC 23 # include <sys/types.h>
24 # include <dmalloc.h>
25 #endif
26 24
27 #include <sys/types.h> 25 # include <mailutils/list.h>
26 # include <mailutils/monitor.h>
27 # include <mailutils/iterator.h>
28 28
29 #include <mailutils/list.h> 29 # ifdef __cplusplus
30 #include <mailutils/monitor.h>
31 #include <mailutils/iterator.h>
32
33 #ifdef __cplusplus
34 extern "C" { 30 extern "C" {
35 #endif 31 # endif
36 32
37 struct list_data 33 struct list_data
38 { 34 {
...@@ -59,8 +55,8 @@ extern void _mu_list_insert_sublist (mu_list_t list, ...@@ -59,8 +55,8 @@ extern void _mu_list_insert_sublist (mu_list_t list,
59 size_t count, 55 size_t count,
60 int insert_before); 56 int insert_before);
61 57
62 #ifdef __cplusplus 58 # ifdef __cplusplus
63 } 59 }
64 #endif 60 # endif
65 61
66 #endif /* _LIST0_H */ 62 #endif /* _MAILUTILS_SYS_LIST_H */
......
...@@ -17,23 +17,19 @@ ...@@ -17,23 +17,19 @@
17 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 17 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18 Boston, MA 02110-1301 USA */ 18 Boston, MA 02110-1301 USA */
19 19
20 #ifndef _MAILBOX0_H 20 #ifndef _MAILUTILS_SYS_MAILBOX_H
21 #define _MAILBOX0_H 21 # define _MAILUTILS_SYS_MAILBOX_H
22 22
23 #ifdef DMALLOC 23 # include <sys/types.h>
24 # include <dmalloc.h> 24 # include <stdio.h>
25 #endif
26 25
27 #include <sys/types.h> 26 # include <mailutils/monitor.h>
28 #include <stdio.h> 27 # include <mailutils/mailbox.h>
28 # include <mailutils/iterator.h>
29 29
30 #include <mailutils/monitor.h> 30 # ifdef __cplusplus
31 #include <mailutils/mailbox.h>
32 #include <mailutils/iterator.h>
33
34 #ifdef __cplusplus
35 extern "C" { 31 extern "C" {
36 #endif 32 # endif
37 33
38 struct _mu_mailbox 34 struct _mu_mailbox
39 { 35 {
...@@ -80,8 +76,8 @@ struct _mu_mailbox ...@@ -80,8 +76,8 @@ struct _mu_mailbox
80 int (*_get_uidls) (mu_mailbox_t, mu_list_t); 76 int (*_get_uidls) (mu_mailbox_t, mu_list_t);
81 }; 77 };
82 78
83 #ifdef __cplusplus 79 # ifdef __cplusplus
84 } 80 }
85 #endif 81 # endif
86 82
87 #endif /* _MAILBOX0_H */ 83 #endif /* _MAILUTILS_SYS_MAILBOX_H */
......
...@@ -17,26 +17,22 @@ ...@@ -17,26 +17,22 @@
17 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 17 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18 Boston, MA 02110-1301 USA */ 18 Boston, MA 02110-1301 USA */
19 19
20 #ifndef _MAILER0_H 20 #ifndef _MAILUTILS_SYS_MAILER_H
21 #define _MAILER0_H 21 # define _MAILUTILS_SYS_MAILER_H
22 22
23 #ifdef DMALLOC 23 # include <sys/types.h>
24 # include <dmalloc.h> 24 # include <mailutils/mailer.h>
25 #endif 25 # include <mailutils/monitor.h>
26 26
27 #include <sys/types.h> 27 # ifdef __cplusplus
28 #include <mailutils/mailer.h>
29 #include <mailutils/monitor.h>
30
31 #ifdef __cplusplus
32 extern "C" { 28 extern "C" {
33 #endif 29 # endif
34 30
35 /* Default mailer URL. */ 31 /* Default mailer URL. */
36 32
37 #define MAILER_URL_DEFAULT "sendmail:" 33 # define MAILER_URL_DEFAULT "sendmail:"
38 34
39 #define MAILER_LINE_BUF_SIZE 1000 35 # define MAILER_LINE_BUF_SIZE 1000
40 36
41 struct _mu_mailer 37 struct _mu_mailer
42 { 38 {
...@@ -61,11 +57,11 @@ struct _mu_mailer ...@@ -61,11 +57,11 @@ struct _mu_mailer
61 int _mu_mailer_mailbox_init (mu_mailbox_t mailbox); 57 int _mu_mailer_mailbox_init (mu_mailbox_t mailbox);
62 int _mu_mailer_folder_init (mu_folder_t folder MU_ARG_UNUSED); 58 int _mu_mailer_folder_init (mu_folder_t folder MU_ARG_UNUSED);
63 59
64 #define MAILER_NOTIFY(mailer, type) \ 60 # define MAILER_NOTIFY(mailer, type) \
65 if (mailer->observer) observer_notify (mailer->observer, type) 61 if (mailer->observer) observer_notify (mailer->observer, type)
66 62
67 #ifdef __cplusplus 63 # ifdef __cplusplus
68 } 64 }
69 #endif 65 # endif
70 66
71 #endif /* MAILER0_H */ 67 #endif /* _MAILUTILS_SYS_MAILER_H */
......
...@@ -16,26 +16,22 @@ ...@@ -16,26 +16,22 @@
16 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 16 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
17 Boston, MA 02110-1301 USA */ 17 Boston, MA 02110-1301 USA */
18 18
19 #ifndef _MONITOR0_H 19 #ifndef _MAILUTILS_SYS_MONITOR_H
20 #define _MONITOR0_H 20 # define _MAILUTILS_SYS_MONITOR_H
21 21
22 #ifdef DMALLOC 22 # ifdef HAVE_CONFIG_H
23 # include <dmalloc.h>
24 #endif
25
26 #ifdef HAVE_CONFIG_H
27 # include <config.h> 23 # include <config.h>
28 #endif 24 # endif
29 25
30 #include <sys/types.h> 26 # include <sys/types.h>
31 #include <mailutils/monitor.h> 27 # include <mailutils/monitor.h>
32 28
33 #ifdef __cplusplus 29 # ifdef __cplusplus
34 extern "C" { 30 extern "C" {
35 #endif 31 # endif
36 /* FIXME: any protos? */ 32 /* FIXME: any protos? */
37 #ifdef __cplusplus 33 # ifdef __cplusplus
38 } 34 }
39 #endif 35 # endif
40 36
41 #endif /* _MONITOR0_H */ 37 #endif /* _MONITOR0_H */
......
...@@ -17,18 +17,14 @@ ...@@ -17,18 +17,14 @@
17 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 17 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18 Boston, MA 02110-1301 USA */ 18 Boston, MA 02110-1301 USA */
19 19
20 #ifndef _OBSERVER0_H 20 #ifndef _MAILUTILS_SYS_OBSERVER_H
21 #define _OBSERVER0_H 21 # define _MAILUTILS_SYS_OBSERVER_H
22 22
23 #ifdef DMALLOC 23 # include <mailutils/observer.h>
24 # include <dmalloc.h>
25 #endif
26 24
27 #include <mailutils/observer.h> 25 # ifdef __cplusplus
28
29 #ifdef __cplusplus
30 extern "C" { 26 extern "C" {
31 #endif 27 # endif
32 28
33 struct _mu_observer 29 struct _mu_observer
34 { 30 {
...@@ -53,10 +49,8 @@ struct _event ...@@ -53,10 +49,8 @@ struct _event
53 49
54 typedef struct _event *event_t; 50 typedef struct _event *event_t;
55 51
56 52 # ifdef __cplusplus
57
58 #ifdef __cplusplus
59 } 53 }
60 #endif 54 # endif
61 55
62 #endif /* _OBSERVER0_H */ 56 #endif /* _MAILUTILS_SYS_OBSERVER_H */
......
...@@ -17,24 +17,20 @@ ...@@ -17,24 +17,20 @@
17 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 17 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18 Boston, MA 02110-1301 USA */ 18 Boston, MA 02110-1301 USA */
19 19
20 #ifndef _PROPERTY0_H 20 #ifndef _MAILUTILS_SYS_PROPERTY_H
21 #define _PROPERTY0_H 21 # define _MAILUTILS_SYS_PROPERTY_H
22 22
23 #ifdef DMALLOC 23 # include <errno.h>
24 # include <dmalloc.h> 24 # include <stdlib.h>
25 #endif 25 # include <string.h>
26 26
27 #include <errno.h> 27 # include <mailutils/property.h>
28 #include <stdlib.h> 28 # include <mailutils/monitor.h>
29 #include <string.h> 29 # include <mailutils/assoc.h>
30 30
31 #include <mailutils/property.h> 31 # ifdef __cplusplus
32 #include <mailutils/monitor.h>
33 #include <mailutils/assoc.h>
34
35 #ifdef __cplusplus
36 extern "C" { 32 extern "C" {
37 #endif 33 # endif
38 34
39 struct property_item 35 struct property_item
40 { 36 {
...@@ -48,8 +44,8 @@ struct _mu_property ...@@ -48,8 +44,8 @@ struct _mu_property
48 mu_monitor_t lock; 44 mu_monitor_t lock;
49 }; 45 };
50 46
51 #ifdef __cplusplus 47 # ifdef __cplusplus
52 } 48 }
53 #endif 49 # endif
54 50
55 #endif /* _PROPERTY0_H */ 51 #endif /* _MAILUTILS_SYS_PROPERTY_H */
......
...@@ -17,14 +17,14 @@ ...@@ -17,14 +17,14 @@
17 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 17 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18 Boston, MA 02110-1301 USA */ 18 Boston, MA 02110-1301 USA */
19 19
20 #ifndef _REGISTRAR0_H 20 #ifndef _MAILUTILS_SYS_REGISTRAR_H
21 #define _REGISTRAR0_H 21 # define _MAILUTILS_SYS_REGISTRAR_H
22 22
23 #include <mailutils/registrar.h> 23 # include <mailutils/registrar.h>
24 24
25 #ifdef __cplusplus 25 # ifdef __cplusplus
26 extern "C" { 26 extern "C" {
27 #endif 27 # endif
28 28
29 /* The pop and imap defines are all wrong now, since they seem intertwined 29 /* The pop and imap defines are all wrong now, since they seem intertwined
30 with the old url parsing code. Also, "pop://" is not the POP scheme, 30 with the old url parsing code. Also, "pop://" is not the POP scheme,
...@@ -32,67 +32,67 @@ extern "C" { ...@@ -32,67 +32,67 @@ extern "C" {
32 32
33 Perhaps they can be changed? 33 Perhaps they can be changed?
34 */ 34 */
35 #define MU_POP_PORT 110 35 # define MU_POP_PORT 110
36 #define MU_POP_SCHEME "pop" 36 # define MU_POP_SCHEME "pop"
37 #define MU_POP_SCHEME_LEN (sizeof (MU_POP_SCHEME) - 1) 37 # define MU_POP_SCHEME_LEN (sizeof (MU_POP_SCHEME) - 1)
38 extern int _url_pop_init (mu_url_t); 38 extern int _url_pop_init (mu_url_t);
39 extern int _mailbox_pop_init (mu_mailbox_t); 39 extern int _mailbox_pop_init (mu_mailbox_t);
40 extern int _folder_pop_init (mu_folder_t); 40 extern int _folder_pop_init (mu_folder_t);
41 41
42 #define MU_POPS_PORT 995 42 # define MU_POPS_PORT 995
43 #define MU_POPS_SCHEME "pops" 43 # define MU_POPS_SCHEME "pops"
44 #define MU_POPS_SCHEME_LEN (sizeof (MU_POPS_SCHEME) - 1) 44 # define MU_POPS_SCHEME_LEN (sizeof (MU_POPS_SCHEME) - 1)
45 extern int _url_pops_init (mu_url_t); 45 extern int _url_pops_init (mu_url_t);
46 extern int _mailbox_pops_init (mu_mailbox_t); 46 extern int _mailbox_pops_init (mu_mailbox_t);
47 47
48 #define MU_IMAP_PORT 143 48 # define MU_IMAP_PORT 143
49 #define MU_IMAP_SCHEME "imap" 49 # define MU_IMAP_SCHEME "imap"
50 #define MU_IMAP_SCHEME_LEN (sizeof (MU_IMAP_SCHEME) - 1) 50 # define MU_IMAP_SCHEME_LEN (sizeof (MU_IMAP_SCHEME) - 1)
51 extern int _url_imap_init (mu_url_t); 51 extern int _url_imap_init (mu_url_t);
52 extern int _mailbox_imap_init (mu_mailbox_t); 52 extern int _mailbox_imap_init (mu_mailbox_t);
53 extern int _folder_imap_init (mu_folder_t); 53 extern int _folder_imap_init (mu_folder_t);
54 54
55 #define MU_IMAPS_PORT 993 55 # define MU_IMAPS_PORT 993
56 #define MU_IMAPS_SCHEME "imaps" 56 # define MU_IMAPS_SCHEME "imaps"
57 #define MU_IMAPS_SCHEME_LEN (sizeof (MU_IMAPS_SCHEME) - 1) 57 # define MU_IMAPS_SCHEME_LEN (sizeof (MU_IMAPS_SCHEME) - 1)
58 extern int _url_imaps_init (mu_url_t); 58 extern int _url_imaps_init (mu_url_t);
59 extern int _mailbox_imaps_init (mu_mailbox_t); 59 extern int _mailbox_imaps_init (mu_mailbox_t);
60 60
61 #define MU_MBOX_SCHEME "mbox" 61 # define MU_MBOX_SCHEME "mbox"
62 #define MU_MBOX_SCHEME_LEN (sizeof (MU_MBOX_SCHEME) - 1) 62 # define MU_MBOX_SCHEME_LEN (sizeof (MU_MBOX_SCHEME) - 1)
63 extern int _mailbox_mbox_init (mu_mailbox_t); 63 extern int _mailbox_mbox_init (mu_mailbox_t);
64 extern int _folder_mbox_init (mu_folder_t); 64 extern int _folder_mbox_init (mu_folder_t);
65 65
66 #define MU_FILE_SCHEME "file" 66 # define MU_FILE_SCHEME "file"
67 #define MU_FILE_SCHEME_LEN (sizeof (MU_FILE_SCHEME) - 1) 67 # define MU_FILE_SCHEME_LEN (sizeof (MU_FILE_SCHEME) - 1)
68 68
69 #define MU_PATH_SCHEME "/" 69 # define MU_PATH_SCHEME "/"
70 #define MU_PATH_SCHEME_LEN (sizeof (MU_PATH_SCHEME) - 1) 70 # define MU_PATH_SCHEME_LEN (sizeof (MU_PATH_SCHEME) - 1)
71 extern int _mailbox_path_init (mu_mailbox_t); 71 extern int _mailbox_path_init (mu_mailbox_t);
72 extern int _folder_path_init (mu_folder_t); 72 extern int _folder_path_init (mu_folder_t);
73 73
74 #define MU_SMTP_SCHEME "smtp" 74 # define MU_SMTP_SCHEME "smtp"
75 #define MU_SMTP_SCHEME_LEN (sizeof (MU_SMTP_SCHEME) - 1) 75 # define MU_SMTP_SCHEME_LEN (sizeof (MU_SMTP_SCHEME) - 1)
76 #define MU_SMTP_PORT 25 76 # define MU_SMTP_PORT 25
77 77
78 #define MU_SENDMAIL_SCHEME "sendmail" 78 # define MU_SENDMAIL_SCHEME "sendmail"
79 #define MU_SENDMAIL_SCHEME_LEN (sizeof (MU_SENDMAIL_SCHEME) - 1) 79 # define MU_SENDMAIL_SCHEME_LEN (sizeof (MU_SENDMAIL_SCHEME) - 1)
80 extern int _mu_mailer_sendmail_init (mu_mailer_t mailer); 80 extern int _mu_mailer_sendmail_init (mu_mailer_t mailer);
81 81
82 #define MU_PROG_SCHEME "prog" 82 # define MU_PROG_SCHEME "prog"
83 #define MU_PROG_SCHEME_LEN (sizeof (MU_PROG_SCHEME) - 1) 83 # define MU_PROG_SCHEME_LEN (sizeof (MU_PROG_SCHEME) - 1)
84 extern int _mu_mailer_prog_init (mu_mailer_t); 84 extern int _mu_mailer_prog_init (mu_mailer_t);
85 85
86 #define MU_MH_SCHEME "mh" 86 # define MU_MH_SCHEME "mh"
87 #define MU_MH_SCHEME_LEN (sizeof (MU_MH_SCHEME) - 1) 87 # define MU_MH_SCHEME_LEN (sizeof (MU_MH_SCHEME) - 1)
88 extern int _mailbox_mh_init (mu_mailbox_t mailbox); 88 extern int _mailbox_mh_init (mu_mailbox_t mailbox);
89 89
90 #define MU_MAILDIR_SCHEME "maildir" 90 # define MU_MAILDIR_SCHEME "maildir"
91 #define MU_MAILDIR_SCHEME_LEN (sizeof (MU_MAILDIR_SCHEME) - 1) 91 # define MU_MAILDIR_SCHEME_LEN (sizeof (MU_MAILDIR_SCHEME) - 1)
92 extern int _mailbox_maildir_init (mu_mailbox_t mailbox); 92 extern int _mailbox_maildir_init (mu_mailbox_t mailbox);
93 93
94 #ifdef __cplusplus 94 # ifdef __cplusplus
95 } 95 }
96 #endif 96 # endif
97 97
98 #endif /* _REGISTRAR0_H */ 98 #endif /* _MAILUTILS_SYS_REGISTRAR_H */
......
...@@ -17,18 +17,14 @@ ...@@ -17,18 +17,14 @@
17 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 17 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18 Boston, MA 02110-1301 USA */ 18 Boston, MA 02110-1301 USA */
19 19
20 #ifndef _URL0_H 20 #ifndef _MAILUTILS_SYS_URL_H
21 #define _URL0_H 1 21 # define _MAILUTILS_SYS_URL_H
22 22
23 #ifdef DMALLOC 23 # include <mailutils/url.h>
24 # include <dmalloc.h>
25 #endif
26 24
27 #include <mailutils/url.h> 25 # ifdef __cplusplus
28
29 #ifdef __cplusplus
30 extern "C" { 26 extern "C" {
31 #endif 27 # endif
32 28
33 struct _mu_url 29 struct _mu_url
34 { 30 {
...@@ -63,9 +59,8 @@ struct _mu_url ...@@ -63,9 +59,8 @@ struct _mu_url
63 int (*_uplevel) (const mu_url_t, mu_url_t *); 59 int (*_uplevel) (const mu_url_t, mu_url_t *);
64 }; 60 };
65 61
66 62 # ifdef __cplusplus
67 #ifdef __cplusplus
68 } 63 }
69 #endif 64 # endif
70 65
71 #endif /* URL_H */ 66 #endif /* _MAILUTILS_SYS_URL_H */
......
...@@ -37,5 +37,5 @@ if MU_COND_SUPPORT_MAILDIR ...@@ -37,5 +37,5 @@ if MU_COND_SUPPORT_MAILDIR
37 MAILDIR_DIR = maildir 37 MAILDIR_DIR = maildir
38 endif 38 endif
39 39
40 SUBDIRS = include mbox $(POP_DIR) $(NNTP_DIR) $(IMAP_DIR) $(MH_DIR) $(MAILDIR_DIR) mailer 40 SUBDIRS = mbox $(POP_DIR) $(NNTP_DIR) $(IMAP_DIR) $(MH_DIR) $(MAILDIR_DIR) mailer
41 41
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
18 ## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 18 ## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
19 ## 02110-1301 USA 19 ## 02110-1301 USA
20 20
21 INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include 21 INCLUDES = @MU_LIB_COMMON_INCLUDES@
22 22
23 lib_LTLIBRARIES = libmu_imap.la 23 lib_LTLIBRARIES = libmu_imap.la
24 libmu_imap_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@ 24 libmu_imap_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
......
...@@ -34,8 +34,8 @@ ...@@ -34,8 +34,8 @@
34 # include <strings.h> 34 # include <strings.h>
35 #endif 35 #endif
36 36
37 #include <imap0.h> 37 #include <mailutils/sys/imap.h>
38 #include <url0.h> 38 #include <mailutils/sys/url.h>
39 39
40 #include <mailutils/auth.h> 40 #include <mailutils/auth.h>
41 #include <mailutils/attribute.h> 41 #include <mailutils/attribute.h>
...@@ -2612,7 +2612,7 @@ imap_parse (f_imap_t f_imap) ...@@ -2612,7 +2612,7 @@ imap_parse (f_imap_t f_imap)
2612 2612
2613 #else 2613 #else
2614 #include <stdio.h> 2614 #include <stdio.h>
2615 #include <registrar0.h> 2615 #include <mailutils/sys/registrar.h>
2616 mu_record_t mu_imap_record = NULL; 2616 mu_record_t mu_imap_record = NULL;
2617 mu_record_t mu_imaps_record = NULL; 2617 mu_record_t mu_imaps_record = NULL;
2618 #endif /* ENABLE_IMAP */ 2618 #endif /* ENABLE_IMAP */
......
...@@ -47,10 +47,10 @@ ...@@ -47,10 +47,10 @@
47 #include <mailutils/stream.h> 47 #include <mailutils/stream.h>
48 #include <mailutils/io.h> 48 #include <mailutils/io.h>
49 49
50 #include <imap0.h> 50 #include <mailutils/sys/imap.h>
51 #include <mailbox0.h> 51 #include <mailutils/sys/mailbox.h>
52 #include <registrar0.h> 52 #include <mailutils/sys/registrar.h>
53 #include <url0.h> 53 #include <mailutils/sys/url.h>
54 54
55 #undef min 55 #undef min
56 #define min(a,b) ((a) < (b) ? (a) : (b)) 56 #define min(a,b) ((a) < (b) ? (a) : (b))
......
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
31 # include <strings.h> 31 # include <strings.h>
32 #endif 32 #endif
33 33
34 #include <registrar0.h> 34 #include <mailutils/sys/registrar.h>
35 #include <url0.h> 35 #include <mailutils/sys/url.h>
36 36
37 static void url_imap_destroy (mu_url_t url); 37 static void url_imap_destroy (mu_url_t url);
38 38
......
1 ## Process this file with GNU Automake to create Makefile.in
2
3 ## Copyright (C) 2000, 2001, 2002, 2007, 2009, 2010 Free Software
4 ## Foundation, Inc.
5 ##
6 ## GNU Mailutils is free software; you can redistribute it and/or
7 ## modify it under the terms of the GNU General Public License as
8 ## published by the Free Software Foundation; either version 3, or (at
9 ## your option) any later version.
10 ##
11 ## This program is distributed in the hope that it will be useful, but
12 ## WITHOUT ANY WARRANTY; without even the implied warranty of
13 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
14 ## General Public License for more details.
15 ##
16 ## You should have received a copy of the GNU General Public License
17 ## along with this program; if not, write to the Free Software
18 ## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
19 ## 02110-1301 USA
20
21 noinst_HEADERS = \
22 attribute0.h \
23 amd.h \
24 auth0.h \
25 body0.h \
26 debug0.h \
27 envelope0.h \
28 folder0.h \
29 iterator0.h \
30 imap0.h \
31 list0.h \
32 mailbox0.h \
33 mailer0.h \
34 monitor0.h \
35 observer0.h \
36 property0.h \
37 registrar0.h \
38 stream0.h \
39 url0.h
1 /* GNU Mailutils -- a suite of utilities for electronic mail
2 Copyright (C) 1999, 2000, 2001, 2005, 2007, 2010 Free Software
3 Foundation, Inc.
4
5 This library is free software; you can redistribute it and/or
6 modify it under the terms of the GNU Lesser General Public
7 License as published by the Free Software Foundation; either
8 version 3 of the License, or (at your option) any later version.
9
10 This library is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 Lesser General Public License for more details.
14
15 You should have received a copy of the GNU Lesser General
16 Public License along with this library; if not, write to the
17 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18 Boston, MA 02110-1301 USA */
19
20 #ifndef _STREAM0_H
21 #define _STREAM0_H
22
23 #include <mailutils/stream.h>
24 #ifdef DMALLOC
25 #include <dmalloc.h>
26 #endif
27
28 #ifdef __cplusplus
29 extern "C" {
30 #endif
31
32 /* Read buffer */
33 struct rbuffer
34 {
35 char *base;
36 char *ptr;
37 size_t count;
38 size_t bufsiz;
39 mu_off_t offset;
40 };
41
42 struct _mu_stream
43 {
44 void *owner;
45 mu_property_t property;
46
47 int flags;
48 int state;
49
50 /* Read space */
51 struct rbuffer rbuffer;
52
53 /* Stream pointer for sequential offset. */
54 mu_off_t offset;
55
56 void (*_destroy) (mu_stream_t);
57 int (*_open) (mu_stream_t);
58 int (*_close) (mu_stream_t);
59 int (*_get_transport2) (mu_stream_t, mu_transport_t *, mu_transport_t *);
60 int (*_read) (mu_stream_t, char *, size_t, mu_off_t, size_t *);
61 int (*_readline) (mu_stream_t, char *, size_t, mu_off_t, size_t *);
62 int (*_write) (mu_stream_t, const char *, size_t, mu_off_t, size_t *);
63 int (*_truncate) (mu_stream_t, mu_off_t);
64 int (*_size) (mu_stream_t, mu_off_t *);
65 int (*_flush) (mu_stream_t);
66 int (*_setbufsiz)(mu_stream_t, size_t);
67 int (*_strerror) (mu_stream_t, const char **);
68 int (*_wait) (mu_stream_t, int *pflags, struct timeval *tvp);
69 int (*_shutdown) (mu_stream_t, int how);
70 };
71
72 #ifdef __cplusplus
73 }
74 #endif
75
76 #endif /* _STREAM0_H */
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
18 ## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 18 ## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
19 ## 02110-1301 USA 19 ## 02110-1301 USA
20 20
21 INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include 21 INCLUDES = @MU_LIB_COMMON_INCLUDES@
22 22
23 lib_LTLIBRARIES = libmu_maildir.la 23 lib_LTLIBRARIES = libmu_maildir.la
24 libmu_maildir_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@ 24 libmu_maildir_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
......
...@@ -28,13 +28,13 @@ ...@@ -28,13 +28,13 @@
28 #include <string.h> 28 #include <string.h>
29 #include <errno.h> 29 #include <errno.h>
30 30
31 #include <folder0.h> 31 #include <mailutils/sys/folder.h>
32 #include <registrar0.h> 32 #include <mailutils/sys/registrar.h>
33 33
34 #include <maildir.h> 34 #include <maildir.h>
35 #include <mailutils/mutil.h> 35 #include <mailutils/mutil.h>
36 #include <mailutils/url.h> 36 #include <mailutils/url.h>
37 #include <amd.h> 37 #include <mailutils/sys/amd.h>
38 38
39 static int 39 static int
40 _maildir_folder_init (mu_folder_t folder MU_ARG_UNUSED) 40 _maildir_folder_init (mu_folder_t folder MU_ARG_UNUSED)
...@@ -115,6 +115,6 @@ mu_record_t mu_maildir_record = &_maildir_record; ...@@ -115,6 +115,6 @@ mu_record_t mu_maildir_record = &_maildir_record;
115 115
116 #else 116 #else
117 #include <stdio.h> 117 #include <stdio.h>
118 #include <registrar0.h> 118 #include <mailutils/sys/registrar.h>
119 mu_record_t mu_maildir_record = NULL; 119 mu_record_t mu_maildir_record = NULL;
120 #endif 120 #endif
......
...@@ -66,9 +66,9 @@ ...@@ -66,9 +66,9 @@
66 #include <mailutils/observer.h> 66 #include <mailutils/observer.h>
67 #include <mailutils/errno.h> 67 #include <mailutils/errno.h>
68 #include <mailutils/locker.h> 68 #include <mailutils/locker.h>
69 #include <mailbox0.h> 69 #include <mailutils/sys/mailbox.h>
70 #include <registrar0.h> 70 #include <mailutils/sys/registrar.h>
71 #include <amd.h> 71 #include <mailutils/sys/amd.h>
72 #include <maildir.h> 72 #include <maildir.h>
73 73
74 #ifndef PATH_MAX 74 #ifndef PATH_MAX
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
17 ## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 17 ## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
18 ## 02110-1301 USA 18 ## 02110-1301 USA
19 19
20 INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include 20 INCLUDES = @MU_LIB_COMMON_INCLUDES@
21 21
22 lib_LTLIBRARIES = libmu_mailer.la 22 lib_LTLIBRARIES = libmu_mailer.la
23 libmu_mailer_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@ 23 libmu_mailer_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
......
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
30 #include <mailutils/mailer.h> 30 #include <mailutils/mailer.h>
31 #include <mailutils/url.h> 31 #include <mailutils/url.h>
32 #include <mailutils/mutil.h> 32 #include <mailutils/mutil.h>
33 #include <mailbox0.h> 33 #include <mailutils/sys/mailbox.h>
34 #include <mailer0.h> 34 #include <mailutils/sys/mailer.h>
35 35
36 struct remote_mbox_data 36 struct remote_mbox_data
37 { 37 {
......
...@@ -34,9 +34,9 @@ ...@@ -34,9 +34,9 @@
34 #include <mailutils/progmailer.h> 34 #include <mailutils/progmailer.h>
35 #include <mailutils/vartab.h> 35 #include <mailutils/vartab.h>
36 36
37 #include <url0.h> 37 #include <mailutils/sys/url.h>
38 #include <mailer0.h> 38 #include <mailutils/sys/mailer.h>
39 #include <registrar0.h> 39 #include <mailutils/sys/registrar.h>
40 40
41 static int _url_prog_init (mu_url_t); 41 static int _url_prog_init (mu_url_t);
42 42
...@@ -379,6 +379,6 @@ prog_send_message (mu_mailer_t mailer, mu_message_t msg, mu_address_t from, ...@@ -379,6 +379,6 @@ prog_send_message (mu_mailer_t mailer, mu_message_t msg, mu_address_t from,
379 379
380 #else 380 #else
381 #include <stdio.h> 381 #include <stdio.h>
382 #include <registrar0.h> 382 #include <mailutils/sys/registrar.h>
383 mu_record_t mu_prog_record = NULL; 383 mu_record_t mu_prog_record = NULL;
384 #endif 384 #endif
......
...@@ -34,9 +34,9 @@ ...@@ -34,9 +34,9 @@
34 #include <mailutils/error.h> 34 #include <mailutils/error.h>
35 #include <mailutils/diag.h> 35 #include <mailutils/diag.h>
36 36
37 #include <url0.h> 37 #include <mailutils/sys/url.h>
38 #include <mailer0.h> 38 #include <mailutils/sys/mailer.h>
39 #include <registrar0.h> 39 #include <mailutils/sys/registrar.h>
40 40
41 #ifdef ENABLE_SMTP 41 #ifdef ENABLE_SMTP
42 42
......
...@@ -40,9 +40,9 @@ ...@@ -40,9 +40,9 @@
40 #include <mailutils/errno.h> 40 #include <mailutils/errno.h>
41 #include <mailutils/progmailer.h> 41 #include <mailutils/progmailer.h>
42 42
43 #include <url0.h> 43 #include <mailutils/sys/url.h>
44 #include <mailer0.h> 44 #include <mailutils/sys/mailer.h>
45 #include <registrar0.h> 45 #include <mailutils/sys/registrar.h>
46 46
47 static void sendmail_destroy (mu_mailer_t); 47 static void sendmail_destroy (mu_mailer_t);
48 static int sendmail_open (mu_mailer_t, int); 48 static int sendmail_open (mu_mailer_t, int);
...@@ -293,6 +293,6 @@ mu_record_t mu_sendmail_record = &_sendmail_record; ...@@ -293,6 +293,6 @@ mu_record_t mu_sendmail_record = &_sendmail_record;
293 293
294 #else 294 #else
295 #include <stdio.h> 295 #include <stdio.h>
296 #include <registrar0.h> 296 #include <mailutils/sys/registrar.h>
297 mu_record_t mu_sendmail_record = NULL; 297 mu_record_t mu_sendmail_record = NULL;
298 #endif 298 #endif
......
...@@ -55,9 +55,9 @@ ...@@ -55,9 +55,9 @@
55 #include <mailutils/cctype.h> 55 #include <mailutils/cctype.h>
56 #include <mailutils/cstr.h> 56 #include <mailutils/cstr.h>
57 57
58 #include <mailer0.h> 58 #include <mailutils/sys/mailer.h>
59 #include <url0.h> 59 #include <mailutils/sys/url.h>
60 #include <registrar0.h> 60 #include <mailutils/sys/registrar.h>
61 61
62 static int _mailer_smtp_init (mu_mailer_t); 62 static int _mailer_smtp_init (mu_mailer_t);
63 63
...@@ -1513,7 +1513,7 @@ smtp_readline (smtp_t smtp) ...@@ -1513,7 +1513,7 @@ smtp_readline (smtp_t smtp)
1513 1513
1514 #else 1514 #else
1515 #include <stdio.h> 1515 #include <stdio.h>
1516 #include <registrar0.h> 1516 #include <mailutils/sys/registrar.h>
1517 mu_record_t mu_smtp_record = NULL; 1517 mu_record_t mu_smtp_record = NULL;
1518 mu_record_t mu_remote_smtp_record = NULL; 1518 mu_record_t mu_remote_smtp_record = NULL;
1519 #endif 1519 #endif
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
18 ## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 18 ## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
19 ## 02110-1301 USA 19 ## 02110-1301 USA
20 20
21 INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include 21 INCLUDES = @MU_LIB_COMMON_INCLUDES@
22 22
23 lib_LTLIBRARIES = libmu_mbox.la 23 lib_LTLIBRARIES = libmu_mbox.la
24 libmu_mbox_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@ 24 libmu_mbox_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
......
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
33 #include <stdio.h> 33 #include <stdio.h>
34 #include <stdlib.h> 34 #include <stdlib.h>
35 35
36 #include <folder0.h> 36 #include <mailutils/sys/folder.h>
37 #include <registrar0.h> 37 #include <mailutils/sys/registrar.h>
38 38
39 #include <mailutils/auth.h> 39 #include <mailutils/auth.h>
40 #include <mailutils/url.h> 40 #include <mailutils/url.h>
......
...@@ -42,8 +42,8 @@ ...@@ -42,8 +42,8 @@
42 # include <strings.h> 42 # include <strings.h>
43 #endif 43 #endif
44 44
45 #include <mailbox0.h> 45 #include <mailutils/sys/mailbox.h>
46 #include <registrar0.h> 46 #include <mailutils/sys/registrar.h>
47 47
48 #include <mailutils/address.h> 48 #include <mailutils/address.h>
49 #include <mailutils/attribute.h> 49 #include <mailutils/attribute.h>
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
18 ## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 18 ## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
19 ## 02110-1301 USA 19 ## 02110-1301 USA
20 20
21 INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include 21 INCLUDES = @MU_LIB_COMMON_INCLUDES@
22 22
23 lib_LTLIBRARIES = libmu_mh.la 23 lib_LTLIBRARIES = libmu_mh.la
24 libmu_mh_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@ 24 libmu_mh_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
......
...@@ -31,10 +31,10 @@ ...@@ -31,10 +31,10 @@
31 #include <unistd.h> 31 #include <unistd.h>
32 #include <dirent.h> 32 #include <dirent.h>
33 33
34 #include <url0.h> 34 #include <mailutils/sys/url.h>
35 #include <folder0.h> 35 #include <mailutils/sys/folder.h>
36 #include <registrar0.h> 36 #include <mailutils/sys/registrar.h>
37 #include <amd.h> 37 #include <mailutils/sys/amd.h>
38 #include <mailutils/mutil.h> 38 #include <mailutils/mutil.h>
39 #include <mailutils/cctype.h> 39 #include <mailutils/cctype.h>
40 40
...@@ -155,6 +155,6 @@ mu_record_t mu_mh_record = &_mh_record; ...@@ -155,6 +155,6 @@ mu_record_t mu_mh_record = &_mh_record;
155 155
156 #else 156 #else
157 #include <stdio.h> 157 #include <stdio.h>
158 #include <registrar0.h> 158 #include <mailutils/sys/registrar.h>
159 mu_record_t mu_mh_record = NULL; 159 mu_record_t mu_mh_record = NULL;
160 #endif 160 #endif
......
...@@ -64,9 +64,9 @@ ...@@ -64,9 +64,9 @@
64 #include <mailutils/observer.h> 64 #include <mailutils/observer.h>
65 #include <mailutils/io.h> 65 #include <mailutils/io.h>
66 #include <mailutils/cctype.h> 66 #include <mailutils/cctype.h>
67 #include <mailbox0.h> 67 #include <mailutils/sys/mailbox.h>
68 #include <registrar0.h> 68 #include <mailutils/sys/registrar.h>
69 #include <amd.h> 69 #include <mailutils/sys/amd.h>
70 70
71 struct _mh_message 71 struct _mh_message
72 { 72 {
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
18 ## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 18 ## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
19 ## 02110-1301 USA 19 ## 02110-1301 USA
20 20
21 INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include 21 INCLUDES = @MU_LIB_COMMON_INCLUDES@
22 22
23 lib_LTLIBRARIES = libmu_nntp.la 23 lib_LTLIBRARIES = libmu_nntp.la
24 libmu_nntp_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@ 24 libmu_nntp_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
......
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
36 #include <mailutils/registrar.h> 36 #include <mailutils/registrar.h>
37 #include <mailutils/url.h> 37 #include <mailutils/url.h>
38 38
39 #include <folder0.h> 39 #include <mailutils/sys/folder.h>
40 #include "nntp0.h" 40 #include "mailutils/sys/nntp.h"
41 41
42 /* We export url parsing and the initialisation of 42 /* We export url parsing and the initialisation of
43 the mailbox, via the register entry/record. */ 43 the mailbox, via the register entry/record. */
...@@ -194,6 +194,6 @@ nntp_folder_list (mu_folder_t folder, const char *ref, void *pat, int flags, ...@@ -194,6 +194,6 @@ nntp_folder_list (mu_folder_t folder, const char *ref, void *pat, int flags,
194 } 194 }
195 #else 195 #else
196 #include <stdio.h> 196 #include <stdio.h>
197 #include <registrar0.h> 197 #include <mailutils/sys/registrar.h>
198 mu_record_t mu_nntp_record = NULL; 198 mu_record_t mu_nntp_record = NULL;
199 #endif 199 #endif
......
...@@ -51,9 +51,9 @@ ...@@ -51,9 +51,9 @@
51 #include <mailutils/url.h> 51 #include <mailutils/url.h>
52 #include <mailutils/nntp.h> 52 #include <mailutils/nntp.h>
53 53
54 #include <folder0.h> 54 #include <mailutils/sys/folder.h>
55 #include <mailbox0.h> 55 #include <mailutils/sys/mailbox.h>
56 #include "nntp0.h" 56 #include "mailutils/sys/nntp.h"
57 57
58 58
59 /* Functions/Methods that implements the mu_mailbox_t API. */ 59 /* Functions/Methods that implements the mu_mailbox_t API. */
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
32 32
33 #include <mailutils/nntp.h> 33 #include <mailutils/nntp.h>
34 34
35 #include <url0.h> 35 #include <mailutils/sys/url.h>
36 36
37 static void url_nntp_destroy (mu_url_t url); 37 static void url_nntp_destroy (mu_url_t url);
38 38
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
18 ## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 18 ## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
19 ## 02110-1301 USA 19 ## 02110-1301 USA
20 20
21 INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include 21 INCLUDES = @MU_LIB_COMMON_INCLUDES@
22 22
23 lib_LTLIBRARIES = libmu_pop.la 23 lib_LTLIBRARIES = libmu_pop.la
24 libmu_pop_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@ 24 libmu_pop_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
......
...@@ -37,9 +37,9 @@ ...@@ -37,9 +37,9 @@
37 #include <mailutils/cstr.h> 37 #include <mailutils/cstr.h>
38 #include <mailutils/cctype.h> 38 #include <mailutils/cctype.h>
39 39
40 #include <folder0.h> 40 #include <mailutils/sys/folder.h>
41 #include <registrar0.h> 41 #include <mailutils/sys/registrar.h>
42 #include <url0.h> 42 #include <mailutils/sys/url.h>
43 43
44 /* We export url parsing and the initialisation of 44 /* We export url parsing and the initialisation of
45 the mailbox, via the register entry/record. */ 45 the mailbox, via the register entry/record. */
...@@ -160,7 +160,7 @@ folder_pop_get_authority (mu_folder_t folder, mu_authority_t *pauth) ...@@ -160,7 +160,7 @@ folder_pop_get_authority (mu_folder_t folder, mu_authority_t *pauth)
160 160
161 #else 161 #else
162 #include <stdio.h> 162 #include <stdio.h>
163 #include <registrar0.h> 163 #include <mailutils/sys/registrar.h>
164 mu_record_t mu_pop_record = NULL; 164 mu_record_t mu_pop_record = NULL;
165 mu_record_t mu_pops_record = NULL; 165 mu_record_t mu_pops_record = NULL;
166 #endif /* ENABLE_POP */ 166 #endif /* ENABLE_POP */
......
...@@ -58,10 +58,10 @@ ...@@ -58,10 +58,10 @@
58 #include <mailutils/cstr.h> 58 #include <mailutils/cstr.h>
59 #include <mailutils/cctype.h> 59 #include <mailutils/cctype.h>
60 60
61 #include <folder0.h> 61 #include <mailutils/sys/folder.h>
62 #include <mailbox0.h> 62 #include <mailutils/sys/mailbox.h>
63 #include <registrar0.h> 63 #include <mailutils/sys/registrar.h>
64 #include <url0.h> 64 #include <mailutils/sys/url.h>
65 65
66 #define PROP_RFC822 1 66 #define PROP_RFC822 1
67 67
......
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
31 # include <strings.h> 31 # include <strings.h>
32 #endif 32 #endif
33 33
34 #include <url0.h> 34 #include <mailutils/sys/url.h>
35 #include <registrar0.h> 35 #include <mailutils/sys/registrar.h>
36 36
37 static void url_pop_destroy (mu_url_t url); 37 static void url_pop_destroy (mu_url_t url);
38 38
......
...@@ -69,10 +69,10 @@ ...@@ -69,10 +69,10 @@
69 #include <mailutils/url.h> 69 #include <mailutils/url.h>
70 #include <mailutils/observer.h> 70 #include <mailutils/observer.h>
71 #include <mailutils/sys/stream.h> 71 #include <mailutils/sys/stream.h>
72 #include <mailbox0.h> 72 #include <mailutils/sys/mailbox.h>
73 #include <registrar0.h> 73 #include <mailutils/sys/registrar.h>
74 #include <url0.h> 74 #include <mailutils/sys/url.h>
75 #include <amd.h> 75 #include <mailutils/sys/amd.h>
76 76
77 static void amd_destroy (mu_mailbox_t mailbox); 77 static void amd_destroy (mu_mailbox_t mailbox);
78 static int amd_open (mu_mailbox_t, int); 78 static int amd_open (mu_mailbox_t, int);
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
29 #include <mailutils/iterator.h> 29 #include <mailutils/iterator.h>
30 #include <mailutils/mutil.h> 30 #include <mailutils/mutil.h>
31 #include <mailutils/cstr.h> 31 #include <mailutils/cstr.h>
32 #include <iterator0.h> 32 #include <mailutils/sys/iterator.h>
33 33
34 /* |hash_size| defines a sequence of symbol table sizes. These are prime 34 /* |hash_size| defines a sequence of symbol table sizes. These are prime
35 numbers, the distance between each pair of them grows exponentially, 35 numbers, the distance between each pair of them grows exponentially,
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
33 #include <mailutils/errno.h> 33 #include <mailutils/errno.h>
34 #include <mailutils/mutil.h> 34 #include <mailutils/mutil.h>
35 #include <mailutils/cstr.h> 35 #include <mailutils/cstr.h>
36 #include <attribute0.h> 36 #include <mailutils/sys/attribute.h>
37 37
38 int 38 int
39 mu_attribute_create (mu_attribute_t *pattr, void *owner) 39 mu_attribute_create (mu_attribute_t *pattr, void *owner)
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
27 #include <stdlib.h> 27 #include <stdlib.h>
28 28
29 #include <mailutils/errno.h> 29 #include <mailutils/errno.h>
30 #include <auth0.h> 30 #include <mailutils/sys/auth.h>
31 31
32 static int 32 static int
33 _authenticate_null (mu_authority_t auth MU_ARG_UNUSED) 33 _authenticate_null (mu_authority_t auth MU_ARG_UNUSED)
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
34 #include <mailutils/mutil.h> 34 #include <mailutils/mutil.h>
35 #include <mailutils/errno.h> 35 #include <mailutils/errno.h>
36 #include <mailutils/sys/stream.h> 36 #include <mailutils/sys/stream.h>
37 #include <body0.h> 37 #include <mailutils/sys/body.h>
38 38
39 #define BODY_MODIFIED 0x10000 39 #define BODY_MODIFIED 0x10000
40 40
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
28 28
29 #include <mailutils/errno.h> 29 #include <mailutils/errno.h>
30 #include <mailutils/nls.h> 30 #include <mailutils/nls.h>
31 #include <debug0.h> 31 #include <mailutils/sys/debug.h>
32 32
33 mu_debug_printer_fp mu_debug_default_printer = mu_debug_stderr_printer; 33 mu_debug_printer_fp mu_debug_default_printer = mu_debug_stderr_printer;
34 34
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
25 #include <string.h> 25 #include <string.h>
26 #include <mailutils/errno.h> 26 #include <mailutils/errno.h>
27 #include <mailutils/mutil.h> 27 #include <mailutils/mutil.h>
28 #include <envelope0.h> 28 #include <mailutils/sys/envelope.h>
29 29
30 int 30 int
31 mu_envelope_create (mu_envelope_t *penvelope, void *owner) 31 mu_envelope_create (mu_envelope_t *penvelope, void *owner)
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
37 #include <mailutils/url.h> 37 #include <mailutils/url.h>
38 #include <mailutils/errno.h> 38 #include <mailutils/errno.h>
39 39
40 #include <folder0.h> 40 #include <mailutils/sys/folder.h>
41 41
42 /* Internal folder list. */ 42 /* Internal folder list. */
43 static mu_list_t known_folder_list; 43 static mu_list_t known_folder_list;
......
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
24 #include <errno.h> 24 #include <errno.h>
25 #include <stdlib.h> 25 #include <stdlib.h>
26 26
27 #include <list0.h> 27 #include <mailutils/sys/list.h>
28 #include <iterator0.h> 28 #include <mailutils/sys/iterator.h>
29 #include <mailutils/errno.h> 29 #include <mailutils/errno.h>
30 30
31 int 31 int
......
...@@ -25,8 +25,8 @@ ...@@ -25,8 +25,8 @@
25 #include <stdlib.h> 25 #include <stdlib.h>
26 #include <string.h> 26 #include <string.h>
27 27
28 #include <list0.h> 28 #include <mailutils/sys/list.h>
29 #include <iterator0.h> 29 #include <mailutils/sys/iterator.h>
30 #include <mailutils/errno.h> 30 #include <mailutils/errno.h>
31 31
32 #define DESTROY_ITEM(list, elt) \ 32 #define DESTROY_ITEM(list, elt) \
......
...@@ -25,8 +25,8 @@ ...@@ -25,8 +25,8 @@
25 #include <stdlib.h> 25 #include <stdlib.h>
26 #include <string.h> 26 #include <string.h>
27 27
28 #include <list0.h> 28 #include <mailutils/sys/list.h>
29 #include <iterator0.h> 29 #include <mailutils/sys/iterator.h>
30 #include <mailutils/errno.h> 30 #include <mailutils/errno.h>
31 31
32 void 32 void
......
...@@ -41,8 +41,8 @@ ...@@ -41,8 +41,8 @@
41 #include <mailutils/message.h> 41 #include <mailutils/message.h>
42 #include <mailutils/mutil.h> 42 #include <mailutils/mutil.h>
43 43
44 #include <mailbox0.h> 44 #include <mailutils/sys/mailbox.h>
45 #include <url0.h> 45 #include <mailutils/sys/url.h>
46 46
47 static int 47 static int
48 mailbox_folder_create (mu_mailbox_t mbox, const char *name, 48 mailbox_folder_create (mu_mailbox_t mbox, const char *name,
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
50 #include <mailutils/mime.h> 50 #include <mailutils/mime.h>
51 #include <mailutils/io.h> 51 #include <mailutils/io.h>
52 52
53 #include <mailer0.h> 53 #include <mailutils/sys/mailer.h>
54 54
55 static char *mailer_url_default; 55 static char *mailer_url_default;
56 56
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
40 #include <mailutils/folder.h> 40 #include <mailutils/folder.h>
41 #include <mailutils/auth.h> 41 #include <mailutils/auth.h>
42 42
43 #include <mailbox0.h> 43 #include <mailutils/sys/mailbox.h>
44 44
45 char *mu_ticket_file = "~/.mu-tickets"; 45 char *mu_ticket_file = "~/.mu-tickets";
46 46
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
29 #include <mailutils/error.h> 29 #include <mailutils/error.h>
30 #include <mailutils/iterator.h> 30 #include <mailutils/iterator.h>
31 31
32 #include <mailbox0.h> 32 #include <mailutils/sys/mailbox.h>
33 33
34 struct mailbox_iterator 34 struct mailbox_iterator
35 { 35 {
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
34 #include <errno.h> 34 #include <errno.h>
35 #include <stdlib.h> 35 #include <stdlib.h>
36 36
37 #include <monitor0.h> 37 #include <mailutils/sys/monitor.h>
38 #include <mailutils/errno.h> 38 #include <mailutils/errno.h>
39 39
40 #ifdef WITH_PTHREAD 40 #ifdef WITH_PTHREAD
......
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
64 #include <mailutils/cctype.h> 64 #include <mailutils/cctype.h>
65 #include <mailutils/cstr.h> 65 #include <mailutils/cstr.h>
66 66
67 #include <registrar0.h> 67 #include <mailutils/sys/registrar.h>
68 68
69 /* convert a sequence of hex characters into an integer */ 69 /* convert a sequence of hex characters into an integer */
70 70
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
27 #include <mailutils/list.h> 27 #include <mailutils/list.h>
28 #include <mailutils/iterator.h> 28 #include <mailutils/iterator.h>
29 #include <mailutils/errno.h> 29 #include <mailutils/errno.h>
30 #include <observer0.h> 30 #include <mailutils/sys/observer.h>
31 31
32 int 32 int
33 mu_observer_create (mu_observer_t *pobserver, void *owner) 33 mu_observer_create (mu_observer_t *pobserver, void *owner)
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
24 # include <strings.h> 24 # include <strings.h>
25 #endif 25 #endif
26 26
27 #include <property0.h> 27 #include <mailutils/sys/property.h>
28 #include <mailutils/errno.h> 28 #include <mailutils/errno.h>
29 #include <mailutils/assoc.h> 29 #include <mailutils/assoc.h>
30 #include <stdlib.h> 30 #include <stdlib.h>
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
36 #include <mailutils/error.h> 36 #include <mailutils/error.h>
37 #include <mailutils/url.h> 37 #include <mailutils/url.h>
38 #include <mailutils/mutil.h> 38 #include <mailutils/mutil.h>
39 #include <registrar0.h> 39 #include <mailutils/sys/registrar.h>
40 40
41 /* NOTE: We will leak here since the monitor and the registrar will never 41 /* NOTE: We will leak here since the monitor and the registrar will never
42 be released. That's ok we can live with this, it's only done once. */ 42 be released. That's ok we can live with this, it's only done once. */
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
32 #include <mailutils/mutil.h> 32 #include <mailutils/mutil.h>
33 #include <mailutils/errno.h> 33 #include <mailutils/errno.h>
34 #include <mailutils/secret.h> 34 #include <mailutils/secret.h>
35 #include <auth0.h> 35 #include <mailutils/sys/auth.h>
36 36
37 static void 37 static void
38 echo_off (struct termios *stored_settings) 38 echo_off (struct termios *stored_settings)
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
35 #include <mailutils/secret.h> 35 #include <mailutils/secret.h>
36 #include <mailutils/cctype.h> 36 #include <mailutils/cctype.h>
37 #include <mailutils/cstr.h> 37 #include <mailutils/cstr.h>
38 #include <url0.h> 38 #include <mailutils/sys/url.h>
39 39
40 #define AC2(a,b) a ## b 40 #define AC2(a,b) a ## b
41 #define AC4(a,b,c,d) a ## b ## c ## d 41 #define AC4(a,b,c,d) a ## b ## c ## d
......
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
36 #include <mailutils/mu_auth.h> 36 #include <mailutils/mu_auth.h>
37 #include <mailutils/stream.h> 37 #include <mailutils/stream.h>
38 38
39 #include <auth0.h> 39 #include <mailutils/sys/auth.h>
40 #include <url0.h> 40 #include <mailutils/sys/url.h>
41 41
42 int 42 int
43 mu_wicket_create (mu_wicket_t *pwicket) 43 mu_wicket_create (mu_wicket_t *pwicket)
......