summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--comsat/comsat.h2
-rw-r--r--frm/frm.c3
-rw-r--r--from/from.c2
-rw-r--r--guimb/main.c3
-rw-r--r--imap4d/imap4d.h2
-rw-r--r--include/mailutils/Makefile.am3
-rw-r--r--include/mailutils/argp.h (renamed from include/mailutils/mu_argp.h)24
-rw-r--r--include/mailutils/mailutils.h1
-rw-r--r--mail.local/mail.local.h2
-rw-r--r--mail/mail.h2
-rw-r--r--messages/messages.c1
-rw-r--r--pop3d/pop3d.h2
-rw-r--r--sieve/sieve.c2
13 files changed, 24 insertions, 25 deletions
diff --git a/comsat/comsat.h b/comsat/comsat.h
index 6298d1448..223c5f87e 100644
--- a/comsat/comsat.h
+++ b/comsat/comsat.h
@@ -46,6 +46,7 @@
# include <strings.h>
#endif
+#include <mailutils/argp.h>
#include <mailutils/body.h>
#include <mailutils/errno.h>
#include <mailutils/error.h>
@@ -56,7 +57,6 @@
#include <mailutils/mutil.h>
#include <mailutils/registrar.h>
#include <mailutils/stream.h>
-#include <mailutils/mu_argp.h>
#include <argcv.h>
diff --git a/frm/frm.c b/frm/frm.c
index f248245ea..e5cfa0eb6 100644
--- a/frm/frm.c
+++ b/frm/frm.c
@@ -26,9 +26,8 @@
#include <unistd.h>
#include "getopt.h"
-#include <mailutils/mu_argp.h>
-
#include <mailutils/address.h>
+#include <mailutils/argp.h>
#include <mailutils/attribute.h>
#include <mailutils/debug.h>
#include <mailutils/errno.h>
diff --git a/from/from.c b/from/from.c
index 87d0d5c18..4d5cc1310 100644
--- a/from/from.c
+++ b/from/from.c
@@ -34,6 +34,7 @@
#include <unistd.h>
#include <mailutils/address.h>
+#include <mailutils/argp.h>
#include <mailutils/debug.h>
#include <mailutils/errno.h>
#include <mailutils/header.h>
@@ -42,7 +43,6 @@
#include <mailutils/message.h>
#include <mailutils/registrar.h>
#include <mailutils/stream.h>
-#include <mailutils/mu_argp.h>
const char *argp_program_version = "from (" PACKAGE ") " VERSION;
const char *argp_program_bug_address = "<bug-mailutils@gnu.org>";
diff --git a/guimb/main.c b/guimb/main.c
index ffd2692e9..5108ba6af 100644
--- a/guimb/main.c
+++ b/guimb/main.c
@@ -16,7 +16,8 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
#include "guimb.h"
-#include <mailutils/mu_argp.h>
+
+#include <mailutils/argp.h>
char *program_file;
char *program_expr;
diff --git a/imap4d/imap4d.h b/imap4d/imap4d.h
index 1892e4b5d..2f4f42709 100644
--- a/imap4d/imap4d.h
+++ b/imap4d/imap4d.h
@@ -70,6 +70,7 @@
#endif
#include <mailutils/address.h>
+#include <mailutils/argp.h>
#include <mailutils/attribute.h>
#include <mailutils/body.h>
#include <mailutils/envelope.h>
@@ -85,7 +86,6 @@
#include <mailutils/parse822.h>
#include <mailutils/registrar.h>
#include <mailutils/stream.h>
-#include <mailutils/mu_argp.h>
#ifdef __cplusplus
diff --git a/include/mailutils/Makefile.am b/include/mailutils/Makefile.am
index 8bafa156a..b64ea4e45 100644
--- a/include/mailutils/Makefile.am
+++ b/include/mailutils/Makefile.am
@@ -1,5 +1,6 @@
pkginclude_HEADERS = \
address.h \
+ argp.h \
attribute.h \
auth.h \
body.h \
@@ -7,7 +8,6 @@ pkginclude_HEADERS = \
envelope.h \
errno.h \
error.h \
- mu_features.h \
filter.h \
folder.h \
header.h \
@@ -20,7 +20,6 @@ pkginclude_HEADERS = \
message.h \
mime.h \
monitor.h \
- mu_argp.h \
mutil.h \
observer.h \
parse822.h \
diff --git a/include/mailutils/mu_argp.h b/include/mailutils/argp.h
index e56418d8a..56b998d4b 100644
--- a/include/mailutils/mu_argp.h
+++ b/include/mailutils/argp.h
@@ -15,10 +15,11 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-#ifndef MU_ARGP_H
-#define MU_ARGP_H 1
+#ifndef _MAILUTILS_ARGP_H
+#define _MAILUTILS_ARGP_H
+
+#include <mailutils/types.h>
-#include <mailutils/mailbox.h>
#include <argp.h>
#define MODE_INTERACTIVE 0
@@ -37,15 +38,14 @@ extern char *pam_service;
extern int log_facility;
extern int mu_argp_error_code;
-extern void mu_create_argcv __P((const char *capa[],
- int argc, char **argv,
- int *p_argc, char ***p_argv));
-extern error_t mu_argp_parse __P((const struct argp *argp,
- int *p_argc, char ***p_argv,
- unsigned flags,
- const char *capa[],
- int *arg_index,
- void *input));
+extern void mu_create_argcv __P ((const char *capa[],
+ int argc, char **argv,
+ int *p_argc, char ***p_argv));
+extern error_t mu_argp_parse __P ((const struct argp * argp,
+ int *p_argc, char ***p_argv,
+ unsigned flags,
+ const char *capa[],
+ int *arg_index, void *input));
#endif
diff --git a/include/mailutils/mailutils.h b/include/mailutils/mailutils.h
index e06aea323..a8aa877c2 100644
--- a/include/mailutils/mailutils.h
+++ b/include/mailutils/mailutils.h
@@ -16,6 +16,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
#include <mailutils/address.h>
+#include <mailutils/argp.h>
#include <mailutils/attribute.h>
#include <mailutils/auth.h>
#include <mailutils/body.h>
diff --git a/mail.local/mail.local.h b/mail.local/mail.local.h
index fc04ad74d..cbd50b1ee 100644
--- a/mail.local/mail.local.h
+++ b/mail.local/mail.local.h
@@ -68,6 +68,7 @@
# define INADDR_LOOPBAK 0x7f000001
#endif
+#include <mailutils/argp.h>
#include <mailutils/attribute.h>
#include <mailutils/errno.h>
#include <mailutils/error.h>
@@ -79,7 +80,6 @@
#include <mailutils/registrar.h>
#include <mailutils/stream.h>
#include <mailutils/url.h>
-#include <mailutils/mu_argp.h>
#include <mu_dbm.h>
diff --git a/mail/mail.h b/mail/mail.h
index eaaef18db..1f69b055b 100644
--- a/mail/mail.h
+++ b/mail/mail.h
@@ -59,6 +59,7 @@
#endif
#include <mailutils/address.h>
+#include <mailutils/argp.h>
#include <mailutils/attribute.h>
#include <mailutils/body.h>
#include <mailutils/debug.h>
@@ -75,7 +76,6 @@
#include <mailutils/registrar.h>
#include <mailutils/stream.h>
#include <mailutils/url.h>
-#include <mailutils/mu_argp.h>
#include <argcv.h>
#include <getline.h>
diff --git a/messages/messages.c b/messages/messages.c
index 9a1701387..18c4af4df 100644
--- a/messages/messages.c
+++ b/messages/messages.c
@@ -20,7 +20,6 @@
#endif
#include <mailutils/mailutils.h>
-#include <mailutils/mu_argp.h>
#include <stdio.h>
diff --git a/pop3d/pop3d.h b/pop3d/pop3d.h
index decef7be8..ea1354754 100644
--- a/pop3d/pop3d.h
+++ b/pop3d/pop3d.h
@@ -109,6 +109,7 @@
# include <strings.h>
#endif
+#include <mailutils/argp.h>
#include <mailutils/attribute.h>
#include <mailutils/body.h>
#include <mailutils/errno.h>
@@ -121,7 +122,6 @@
#include <mailutils/mutil.h>
#include <mailutils/registrar.h>
#include <mailutils/url.h>
-#include <mailutils/mu_argp.h>
/* For Berkley DB2 APOP password file */
#ifdef HAVE_DB_H
diff --git a/sieve/sieve.c b/sieve/sieve.c
index c1a252a25..632459963 100644
--- a/sieve/sieve.c
+++ b/sieve/sieve.c
@@ -39,6 +39,7 @@ sieve script interpreter.
#include "sieve.h"
+#include <mailutils/argp.h>
#include <mailutils/auth.h>
#include <mailutils/errno.h>
#include <mailutils/folder.h>
@@ -47,7 +48,6 @@ sieve script interpreter.
#include <mailutils/mutil.h>
#include <mailutils/registrar.h>
#include <mailutils/stream.h>
-#include <mailutils/mu_argp.h>
void mutil_register_all_mbox_formats(void);

Return to:

Send suggestions and report system problems to the System administrator.