* mu-cmd: some very minor cleanups

This commit is contained in:
Dirk-Jan C. Binnema
2010-01-23 12:29:57 +02:00
parent 3743fb2b39
commit f6befa53b3

View File

@ -55,9 +55,6 @@ cmd_from_string (const char* cmd)
(strcmp (cmd, "mkdir") == 0)) (strcmp (cmd, "mkdir") == 0))
return MU_CMD_MKDIR; return MU_CMD_MKDIR;
/* if (strcmp (cmd, "link") == 0) */
/* return MU_CMD_LINK; */
/* if ((strcmp (cmd, "help") == 0) || */ /* if ((strcmp (cmd, "help") == 0) || */
/* (strcmp (cmd, "info") == 0)) */ /* (strcmp (cmd, "info") == 0)) */
/* return MU_CMD_HELP; */ /* return MU_CMD_HELP; */
@ -172,12 +169,13 @@ print_rows (MuQueryXapian *xapian, const gchar *query, MuConfigOptions *opts)
const MuMsgField* field; const MuMsgField* field;
field = mu_msg_field_from_shortcut (*fields); field = mu_msg_field_from_shortcut (*fields);
if (!field || if (!field ||
!mu_msg_field_is_xapian_enabled (field)) !mu_msg_field_is_xapian_enabled (field))
printlen += printf ("%c", *fields); printlen += printf ("%c", *fields);
else else
printlen += printf ("%s", printlen +=
display_field(row, field)); printf ("%s",
display_field(row, field));
++fields; ++fields;
} }
@ -415,6 +413,8 @@ cmd_index (MuConfigOptions *opts)
NULL, NULL); NULL, NULL);
if (!opts->nocleanup) { if (!opts->nocleanup) {
stats._processed = 0; /* start over */ stats._processed = 0; /* start over */
g_print ("\n");
g_message ("Cleaning up missing messages");
mu_index_cleanup (midx, &stats, mu_index_cleanup (midx, &stats,
opts->quiet ? NULL : index_msg_cb, opts->quiet ? NULL : index_msg_cb,
NULL); NULL);
@ -424,8 +424,9 @@ cmd_index (MuConfigOptions *opts)
index_msg_cb (&stats, NULL); index_msg_cb (&stats, NULL);
g_print ("\n"); g_print ("\n");
} }
MU_WRITE_LOG ("processed: %d; updated/new: %d, cleaned-up: %d", MU_WRITE_LOG ("processed: %d; updated/new: %d, "
"cleaned-up: %d",
stats._processed, stats._updated, stats._processed, stats._updated,
stats._cleaned_up); stats._cleaned_up);
@ -472,13 +473,15 @@ cmd_mkdir (MuConfigOptions *opts)
if (!opts->params[1]) { if (!opts->params[1]) {
g_printerr ( g_printerr (
"usage: mu mkdir [-u,--mode=<mode>] <dir> [more dirs]\n"); "usage: mu mkdir [-u,--mode=<mode>] "
"<dir> [more dirs]\n");
return FALSE; return FALSE;
} }
i = 1; i = 1;
while (opts->params[i]) { while (opts->params[i]) {
if (!mu_maildir_mkmdir (opts->params[i], opts->dirmode, FALSE)) if (!mu_maildir_mkmdir (opts->params[i], opts->dirmode,
FALSE))
return FALSE; return FALSE;
++i; ++i;
} }
@ -489,20 +492,6 @@ cmd_mkdir (MuConfigOptions *opts)
#if 0 /* currently, turned off */ #if 0 /* currently, turned off */
static gboolean
cmd_link (MuConfigOptions *opts)
{
if (!opts->params[0])
return FALSE; /* shouldn't happen */
if (!opts->params[1] || !opts->params[2]) {
g_printerr ("usage: mu link <src> <targetdir>\n");
return FALSE;
}
return mu_maildir_link (opts->params[1], opts->params[2]);
}
static gboolean static gboolean
cmd_help (MuConfigOptions *opts) cmd_help (MuConfigOptions *opts)
@ -605,12 +594,10 @@ mu_cmd_execute (MuConfigOptions *opts)
case MU_CMD_INDEX: return cmd_index (opts); case MU_CMD_INDEX: return cmd_index (opts);
case MU_CMD_FIND: return cmd_find (opts); case MU_CMD_FIND: return cmd_find (opts);
case MU_CMD_MKDIR: return cmd_mkdir (opts); case MU_CMD_MKDIR: return cmd_mkdir (opts);
/* case MU_CMD_CLEANUP: return _cmd_cleanup (opts); */ /* case MU_CMD_CLEANUP: return cmd_cleanup (opts); */
/* case MU_CMD_HELP: return _cmd_help (opts); */ /* case MU_CMD_HELP: return cmd_help (opts); */
/* case MU_CMD_LINK: return _cmd_link (opts); */
case MU_CMD_UNKNOWN: return show_usage (FALSE); case MU_CMD_UNKNOWN: return show_usage (FALSE);
default: default: