Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit b02eb9b0 b02eb9b062494d2ed77ca1f52cd7733486df0bef by Sergey Poznyakoff
Options

Remove the --license option. 

It is not needed because the --version option shows a terse info about the
license, as well as a link to its full text.
1 parent 89bdc373
Inline Side-by-side
Showing 23 changed files with 1 additions and 81 deletions
......@@ -87,7 +87,6 @@ static const char *comsat_argp_capa[] = {
"logging",
"mailbox",
"locking",
"license",
NULL
};
......
......@@ -134,7 +134,6 @@ struct mu_cfg_param dotlock_cfg_param[] = {
const char *dotlock_capa[] = {
"license",
"common",
"debug",
NULL
......
......@@ -31,7 +31,6 @@ static char args_doc[] = "key";
static const char *capa[] = {
"auth",
"license",
"common",
"debug",
NULL
......
......@@ -203,7 +203,6 @@ static struct argp argp = {
static const char *frm_argp_capa[] = {
"common",
"debug",
"license",
"mailbox",
"locking",
NULL
......
......@@ -70,7 +70,6 @@ static struct argp argp = {
static const char *capa[] = {
"common",
"debug",
"license",
"mailbox",
"locking",
NULL
......
......@@ -139,7 +139,6 @@ static const char *guimb_argp_capa[] = {
"debug",
"mailbox",
"locking",
"license",
NULL
};
......
......@@ -90,7 +90,6 @@ static const char *imap4d_capa[] = {
"mailbox",
"locking",
"logging",
"license",
NULL
};
......
......@@ -47,7 +47,6 @@ extern int (*mu_app_cfg_verifier) (void);
extern struct mu_cmdline_capa mu_common_cmdline;
extern struct mu_cmdline_capa mu_logging_cmdline;
extern struct mu_cmdline_capa mu_license_cmdline;
extern struct mu_cmdline_capa mu_mailbox_cmdline;
extern struct mu_cmdline_capa mu_locking_cmdline;
extern struct mu_cmdline_capa mu_address_cmdline;
......
......@@ -30,7 +30,6 @@ struct mu_conf_option
char *descr;
};
extern char *mu_license_text;
extern void mu_print_options (void);
extern void mu_fprint_options (FILE *fp, int verbose);
extern void mu_fprint_conf_option (FILE *fp, const struct mu_conf_option *opt,
......
......@@ -27,23 +27,6 @@
#include <confpaths.h>
char *mu_license_text =
N_(" GNU Mailutils is free software; you can redistribute it and/or modify\n"
" it under the terms of the GNU General Public License as published by\n"
" the Free Software Foundation; either version 3 of the License, or\n"
" (at your option) any later version.\n"
"\n"
" GNU Mailutils is distributed in the hope that it will be useful,\n"
" but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
" GNU General Public License for more details.\n"
"\n"
" You should have received a copy of the GNU General Public License along\n"
" with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.\n"
"\n"
"\n"
);
static struct mu_conf_option mu_conf_option[] = {
{ "VERSION=" VERSION, N_("Version of this package") },
{ "SYSCONFDIR=" SYSCONFDIR, N_("System configuration directory") },
......
......@@ -299,7 +299,6 @@ find_init_function (struct mu_gocs_entry *tab, const char *capa)
static struct mu_gocs_entry std_gocs_table[] = {
{ "common", mu_gocs_dummy },
{ "license", mu_gocs_dummy },
{ "mailbox", mu_gocs_mailbox_init },
{ "locking", mu_gocs_locking_init },
{ "address", mu_gocs_source_email_init },
......
......@@ -24,7 +24,6 @@
static struct mu_cmdline_capa *all_cmdline_capa[] = {
&mu_common_cmdline,
&mu_logging_cmdline,
&mu_license_cmdline,
&mu_mailer_cmdline,
&mu_debug_cmdline,
&mu_tls_cmdline,
......
......@@ -197,49 +197,6 @@ struct mu_cmdline_capa mu_logging_cmdline = {
/* ************************************************************************* */
/* License */
/* ************************************************************************* */
/* Option to print the license. */
static struct argp_option mu_license_argp_option[] = {
{ "license", OPT_LICENSE, NULL, 0, N_("print license and exit"), -2 },
{ NULL, 0, NULL, 0, NULL, 0 }
};
static error_t
mu_license_argp_parser (int key, char *arg, struct argp_state *state)
{
switch (key)
{
case OPT_LICENSE:
printf (_("License for %s:\n\n"), argp_program_version);
printf ("%s", mu_license_text);
exit (0);
default:
return ARGP_ERR_UNKNOWN;
}
return 0;
}
struct argp mu_license_argp = {
mu_license_argp_option,
mu_license_argp_parser,
};
struct argp_child mu_license_argp_child = {
&mu_license_argp,
0,
NULL,
0
};
struct mu_cmdline_capa mu_license_cmdline = {
"license", &mu_license_argp_child
};
/* ************************************************************************* */
/* Mailer */
/* ************************************************************************* */
......
......@@ -57,7 +57,7 @@ find_cfg_capa (const char *name)
static int
reserved_name (const char *name)
{
static char *reserved[] = { "common", "license", NULL };
static char *reserved[] = { "common", NULL };
char **p;
for (p = reserved; *p; p++)
if (strcmp (name, *p) == 0)
......
......@@ -131,7 +131,6 @@ static const char *maidag_argp_capa[] = {
"auth",
"common",
"debug",
"license",
"logging",
"mailbox",
"locking",
......
......@@ -203,7 +203,6 @@ static struct argp argp = {
static const char *mail_capa[] = {
"common",
"debug",
"license",
"mailbox",
"locking",
NULL
......
......@@ -44,7 +44,6 @@ static struct argp_option options[] = {
static const char *argp_capa[] = {
"common",
"debug",
"license",
"mailbox",
"locking",
NULL
......
......@@ -178,7 +178,6 @@ struct mu_cfg_param mimeview_cfg_param[] = {
static const char *capa[] = {
"common",
"debug",
"license",
NULL
};
......
......@@ -330,7 +330,6 @@ struct mu_cfg_param movemail_cfg_param[] = {
static const char *movemail_capa[] = {
"common",
"debug",
"license",
"locking",
"mailbox",
"auth",
......
......@@ -73,7 +73,6 @@ static struct argp argp = {
static const char *mu_tool_capa[] = {
"common",
"debug",
"license",
"locking",
"mailbox",
"auth",
......
......@@ -139,7 +139,6 @@ static const char *pop3d_argp_capa[] = {
"mailbox",
"locking",
"logging",
"license",
NULL
};
......
......@@ -98,7 +98,6 @@ static struct argp argp = {
static const char *popauth_argp_capa[] = {
"common",
"license",
NULL
};
......
......@@ -307,7 +307,6 @@ static const char *sieve_argp_capa[] =
"debug",
"mailbox",
"locking",
"license",
"logging",
"mailer",
NULL
......