alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* mu-cmd: some cosmetical updates in the output

Browse Source
This commit is contained in:
Dirk-Jan C. Binnema
2010-10-09 13:19:47 +03:00
parent 4e06349e65
commit e161fb6065
1 changed files with 16 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/mu-cmd.c
View File

@ -50,14 +50,13 @@ cmd_from_string (const char* cmd)
MuCmd _cmd; MuCmd _cmd;
} Cmd; } Cmd;
Cmd cmd_map[]= { Cmd cmd_map[] = {
{ "index", MU_CMD_INDEX }, { "index", MU_CMD_INDEX },
{ "find", MU_CMD_FIND }, { "find", MU_CMD_FIND },
{ "cleanup", MU_CMD_CLEANUP }, { "cleanup", MU_CMD_CLEANUP },
{ "mkdir", MU_CMD_MKDIR }, { "mkdir", MU_CMD_MKDIR },
{ "view", MU_CMD_VIEW }, { "view", MU_CMD_VIEW },
{ "index", MU_CMD_INDEX }, { "extract", MU_CMD_EXTRACT }
{ "extract", MU_CMD_EXTRACT }
}; };
for (i = 0; i != G_N_ELEMENTS(cmd_map); ++i) for (i = 0; i != G_N_ELEMENTS(cmd_map); ++i)
@ -67,53 +66,43 @@ cmd_from_string (const char* cmd)
return MU_CMD_UNKNOWN; return MU_CMD_UNKNOWN;
} }
static gboolean static void
show_usage (gboolean noerror) show_usage (gboolean noerror)
{ {
const char* usage= const char* usage=
"usage: mu [options] command [parameters]\n" "usage: mu [options] command [parameters]\n"
"\twhere command is one of index, find, view, mkdir, cleanup " "where command is one of index, find, view, mkdir, cleanup "
"or extract\n\n" "or extract\n\n"
"see mu(1) (the mu manpage) for more information, or try " "see the mu or mu-easy manpages for more information\n";
"mu --help\n";
if (noerror) if (noerror)
g_print ("%s", usage); g_print ("%s", usage);
else else
g_printerr ("%s", usage); g_printerr ("%s", usage);
return noerror;
} }
static gboolean static void
show_version (void) show_version (void)
{ {
const char* msg = g_print ("mu (mail indexer/searcher) " VERSION "\n"
"mu (mail indexer / searcher version) " VERSION "\n\n" "Copyright (C) 2008-2010 Dirk-Jan C. Binnema (GPLv3+)\n");
"Copyright (C) 2008-2010 Dirk-Jan C. Binnema\n"
"License GPLv3+: GNU GPL version 3 or later "
"<http://gnu.org/licenses/gpl.html>.";
g_print ("%s\n", msg);
return TRUE;
} }
gboolean gboolean
mu_cmd_execute (MuConfigOptions *opts) mu_cmd_execute (MuConfigOptions *opts)
{ {
MuCmd cmd; MuCmd cmd;
if (opts->version) if (opts->version) {
return show_version (); show_version ();
return TRUE;
}
if (!opts->params||!opts->params[0]) {/* no command? */ if (!opts->params||!opts->params[0]) {/* no command? */
show_version (); show_version ();
g_print ("\n"); g_print ("\n");
return show_usage (FALSE); show_usage (TRUE);
return FALSE;
} }
cmd = cmd_from_string (opts->params[0]); cmd = cmd_from_string (opts->params[0]);
@ -128,7 +117,8 @@ mu_cmd_execute (MuConfigOptions *opts)
case MU_CMD_VIEW: return mu_cmd_view (opts); case MU_CMD_VIEW: return mu_cmd_view (opts);
case MU_CMD_UNKNOWN: case MU_CMD_UNKNOWN:
return show_usage (FALSE); show_usage (FALSE);
return FALSE;
default: default:
g_return_val_if_reached (FALSE); g_return_val_if_reached (FALSE);
} }