diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2015-06-29 09:49:45 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2015-07-02 16:38:19 +0300 |
commit | b60a56980c2a728618f65aaa72a84b5c5d018938 (patch) | |
tree | 8040cfc577cb49380a5a97a407b1e844e8242275 /mu | |
parent | df44a47997cfe1c0f9e33333f446fac0987be413 (diff) | |
download | mailutils-b60a56980c2a728618f65aaa72a84b5c5d018938.tar.gz mailutils-b60a56980c2a728618f65aaa72a84b5c5d018938.tar.bz2 |
Version 2.99.99
* configure.ac: Version 2.99.99
* NEWS: Update.
* libmu_argp/mailutils.c: New file.
* libmu_argp/Makefile.am: Add mailutils.c
* libmu_argp/cmdline.c (all_cmdline_capa): Add mu_mailutils_cmdline.
(mu_libargp_init): Register modflags function.
* libmu_argp/mu_argp.c (mu_build_argp): Retain negative group numbers.
(argp_capa): New member: modflags.
(mu_register_argp_capa): Take pointer to modflags function as 3rd
parameter.
(mu_build_argp): Use modflags member to alter argp flags.
(mu_argp_build): Take pointer to flags as its third argument.
* libmu_argp/muinit.c (mu_app_init): Pass pointer to flags to mu_argp_build.
* libmu_cfg/init.c (mu_libcfg_init): Silently ignore unknown groups
* include/mailutils/libargp.h (mu_mailutils_cmdline): New extern.
(mu_cmdline_capa): New member: modflags.
(mu_argp_build): Change signature.
(mu_register_argp_capa): Change signature.
* libmailutils/cfg/gocs.c (std_gocs_table): Add dummy entry for "mailutils"
* mu/Makefile.am (bin_PROGRAMS): Rename to "mailutils".
* mu/dispatch.c (dispatch_docstring): Use mu_program_name instead of
the hardcoded name.
* mu/mu.c: Use "mailutils" capability.
* mu/mailutils-config.in: Rename to mu/mailutils-config
* comsat/comsat.c: Use "mailutils" capability.
* dotlock/dotlock.c: Likewise.
* examples/muauth.c: Likewise.
* examples/muemail.c: Likewise.
* frm/frm.c: Likewise.
* frm/from.c: Likewise.
* imap4d/imap4d.c: Likewise.
* maidag/maidag.c: Likewise.
* mail/mail.c: Likewise.
* messages/messages.c: Likewise.
* mimeview/mimeview.c: Likewise.
* movemail/movemail.c: Likewise.
* pop3d/pop3d.c: Likewise.
* pop3d/popauth.c: Likewise.
* readmsg/readmsg.c: Likewise.
* sieve/sieve.c: Likewise.
Diffstat (limited to 'mu')
-rw-r--r-- | mu/.gitignore | 3 | ||||
-rw-r--r-- | mu/Makefile.am | 21 | ||||
-rw-r--r-- | mu/dispatch.c | 11 | ||||
-rwxr-xr-x[-rw-r--r--] | mu/mailutils-config (renamed from mu/mailutils-config.in) | 4 | ||||
-rw-r--r-- | mu/mu.c | 5 |
5 files changed, 19 insertions, 25 deletions
diff --git a/mu/.gitignore b/mu/.gitignore index de89b9af8..a8c536420 100644 --- a/mu/.gitignore +++ b/mu/.gitignore @@ -1,4 +1,3 @@ -mu +mailutils mu-setup.c mu-setup.h -mailutils-config diff --git a/mu/Makefile.am b/mu/Makefile.am index ec15ed2b1..42fbd7411 100644 --- a/mu/Makefile.am +++ b/mu/Makefile.am @@ -15,18 +15,9 @@ ## You should have received a copy of the GNU General Public License ## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>. -bin_PROGRAMS = mu +bin_PROGRAMS = mailutils bin_SCRIPTS = mailutils-config -CLEANFILES=mailutils-config -mailutils-config: $(top_srcdir)/mu/mailutils-config.in - $(AM_V_GEN)muname=mu; \ - test -n "$(transform)" && \ - muname=`echo $$muname | \ - sed -e 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - sed 's/MUNAME/'$$muname'/g' $(top_srcdir)/mu/mailutils-config.in > mailutils-config - - IDLE_MODULES= if MU_COND_SUPPORT_POP @@ -71,7 +62,7 @@ MODULES = \ $(SMTP_C)\ wicket.c -mu_SOURCES = \ +mailutils_SOURCES = \ dispatch.c\ getans.c\ getarg.c\ @@ -83,7 +74,7 @@ mu_SOURCES = \ verbose.c\ $(MODULES) -mu_LDADD = \ +mailutils_LDADD = \ ${MU_APP_LIBRARIES}\ ${MU_LIB_MBOX}\ ${MU_LIB_IMAP}\ @@ -110,12 +101,12 @@ AM_CPPFLAGS = \ -DDBMLIBS="\"$(DBMLIBS)\"" BUILT_SOURCES=mu-setup.c mu-setup.h -EXTRA_DIST=mu-setup.awk mu-setup.c mu-setup.h template.c mailutils-config.in +EXTRA_DIST=mu-setup.awk mu-setup.c mu-setup.h template.c mailutils-config mu-setup.h: Makefile.am $(MODULES) $(IDLE_MODULES) - $(AM_V_GEN)$(AWK) -f $(top_srcdir)/mu/mu-setup.awk -v mode=h \ + $(AM_V_GEN)$(AWK) -f $(srcdir)/mu-setup.awk -v mode=h \ $(MODULES) $(IDLE_MODULES) > mu-setup.h mu-setup.c: Makefile.am $(MODULES) - $(AM_V_GEN)$(AWK) -f $(top_srcdir)/mu/mu-setup.awk -v mode=c \ + $(AM_V_GEN)$(AWK) -f $(srcdir)/mu-setup.awk -v mode=c \ $(MODULES) $(IDLE_MODULES) > mu-setup.c diff --git a/mu/dispatch.c b/mu/dispatch.c index ec112ea0c..991bb4f41 100644 --- a/mu/dispatch.c +++ b/mu/dispatch.c @@ -21,6 +21,7 @@ #include <string.h> #include <mailutils/alloc.h> #include <mailutils/stream.h> +#include <mailutils/stdstream.h> #include <mailutils/nls.h> #include "mu.h" #include "mu-setup.h" @@ -60,11 +61,13 @@ dispatch_docstring (const char *text) mu_memory_stream_create (&str, MU_STREAM_RDWR); mu_stream_printf (str, "%s\n%s\n\n", text, _("Commands are:")); for (p = mutool_action_tab; p->name; p++) - mu_stream_printf (str, " mu %-16s - %s\n", + mu_stream_printf (str, " %s %-16s - %s\n", + mu_program_name, p->name, gettext (p->docstring)); - mu_stream_printf (str, "\n%s\n\n", - _("Try `mu COMMAND --help' to get help on a particular " - "COMMAND.")); + mu_stream_printf (str, + _("\nTry `%s COMMAND --help' to get help on a particular " + "COMMAND.\n\n"), + mu_program_name); mu_stream_printf (str, "%s\n", _("Options are:")); mu_stream_flush (str); mu_stream_size (str, &size); diff --git a/mu/mailutils-config.in b/mu/mailutils-config index 6c3877b5f..e4690b437 100644..100755 --- a/mu/mailutils-config.in +++ b/mu/mailutils-config @@ -23,7 +23,7 @@ mode= file= dir=`expr "$0" : '\(.*\)/.*'` -muname=MUNAME +muname=mailutils test -n "$dir" && PATH=$PATH:$dir @@ -94,7 +94,7 @@ do usage ;; -V|--version|--versio|--versi|--vers|--ver|--ve|--v) - $muname --version | sed -n '1{s/^MUNAME/mailutils-config/;s/(\(GNU Mailutils\)) \([0-9][0-9.]*\).*/(\1 \2)/;p}' + $muname --version | sed -n '1{s/^mailutils/mailutils-config/;s/(\(GNU Mailutils\)) \([0-9][0-9.]*\).*/(\1 \2)/;p}' exit 0 ;; *) @@ -25,7 +25,7 @@ #include "mu.h" static char args_doc[] = N_("COMMAND [CMDOPTS]"); -static char doc[] = N_("mu -- GNU Mailutils multi-purpose tool."); +static char doc[] = N_("GNU Mailutils multi-purpose tool."); static struct argp_option options[] = { { NULL } @@ -52,7 +52,7 @@ mu_help_filter (int key, const char *text, void *input) case ARGP_KEY_HELP_PRE_DOC: s = dispatch_docstring (text); break; - + default: s = (char*) text; } @@ -71,6 +71,7 @@ static struct argp argp = { }; static const char *mu_tool_capa[] = { + "mailutils", "common", "debug", "locking", |