diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2016-10-21 17:48:26 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2016-10-21 17:57:59 +0300 |
commit | f434857b8318b05b7036025605ab18cdf3e7c238 (patch) | |
tree | 28223e6cc500a5f82f561ce0677d30a266ad8f8d /mh/mh.h | |
parent | 53eb68133eeede20c49445cd4ff58ad6e4becc07 (diff) | |
download | mailutils-f434857b8318b05b7036025605ab18cdf3e7c238.tar.gz mailutils-f434857b8318b05b7036025605ab18cdf3e7c238.tar.bz2 |
Begin rewriting MH to get rid of argp stuff.
MH utilities will use only single-dash long options.
* include/mailutils/opt.h (mu_option) <opt_default>: New member.
* libmailutils/opt/opt.c (find_long_option): Improve detection
of ambiguous options.
(mu_option_set_value): Use default value (opt_default), if
supplied.
* mh/mh_argp.c: Delete.
* mh/Makefile.am (libmh_a_SOURCES): Remove mh_argp.c
* mh/mh_getopt.c: Rewrite from scratch using mailutils/opt
* mh/mh_getopt.h: Likewise.
* mh/mh.h: Add missing includes
(mh_read_formfile, mh_alias_read): Change signatures.
* mh/mh_alias.l (mh_alias_read): Name is const
* mh/mh_init.c (mh_read_formfile): Name is const.
* mh/ali.c: Convert to mh_getopt.
* mh/anno.c: Likewise.
* mh/burst.c: Likewise.
* mh/comp.c: Likewise.
* mh/fmtcheck.c: Likewise.
* mh/folder.c: Likewise.
* mh/forw.c: Likewise.
* mh/inc.c: Likewise.
* mh/install-mh.c: Likewise.
* mh/mark.c: Likewise.
* mh/mhl.c: Likewise.
* mh/scan.c: Likewise.
* mh/tests/burst.at: Don't use double-dash options
* mh/tests/folder.at: Likewise.
Diffstat (limited to 'mh/mh.h')
-rw-r--r-- | mh/mh.h | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -57,6 +57,7 @@ #include <mailutils/io.h> #include <mailutils/property.h> #include <mailutils/prog.h> +#include <mailutils/opool.h> #include <mailutils/mh.h> #include <mailutils/stdstream.h> #include <mailutils/datetime.h> @@ -230,7 +231,7 @@ extern int mh_mailbox_cur_default; void mh_init (void); void mh_init2 (void); void mh_read_profile (void); -int mh_read_formfile (char *name, char **pformat); +int mh_read_formfile (char const *name, char **pformat); mu_message_t mh_file_to_message (const char *folder, const char *file_name); mu_message_t mh_stream_to_message (mu_stream_t stream); void mh_install (char *name, int automode); @@ -342,7 +343,7 @@ void mh_set_reply_regex (const char *str); int mh_decode_2047 (char *text, char **decoded_text); const char *mh_charset (const char *); -int mh_alias_read (char *name, int fail); +int mh_alias_read (char const *name, int fail); int mh_alias_get (const char *name, mu_list_t *return_list); int mh_alias_get_address (const char *name, mu_address_t *addr, int *incl); int mh_alias_get_alias (const char *uname, mu_list_t *return_list); |