emacs
/
mu
mirror of https://github.com/djcb/mu.git
1
0
Fork 0
Code Issues Releases Wiki Activity

mu: improve mu verify output, update man page

This commit is contained in:
djcb 2015-06-14 11:40:07 +03:00
parent 0041cd47ef
commit 2d75b3d3ec
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
man/mu-verify.1
View File

@ -1,4 +1,4 @@
.TH MU VERIFY 1 "September 2012" "User Manuals"
.TH MU VERIFY 1 "June 2015" "User Manuals"
.SH NAME
@ -38,7 +38,7 @@ attempt to find keys online (see the \fBauto-key-retrieve\fR option in the
To display aggregated (one-line) information about the signatures in a message:
.nf
$ mu verify --verbose msgfile
$ mu verify msgfile
.fi
To display information about all the signatures:

18
mu/mu-cmd.c
View File

@ -436,38 +436,40 @@ each_sig (MuMsg *msg, MuMsgPart *part, VData *vdata)
static void
print_verdict (VData *vdata, gboolean color)
print_verdict (VData *vdata, gboolean color, gboolean verbose)
{
g_print ("verdict: ");
switch (vdata->combined_status) {
case MU_MSG_PART_SIG_STATUS_UNSIGNED:
g_print ("%s", "no signature found");
g_print ("no signature found");
break;
case MU_MSG_PART_SIG_STATUS_GOOD:
color_maybe (MU_COLOR_GREEN);
g_print ("%s", "signature(s) verified");
g_print ("signature(s) verified");
break;
case MU_MSG_PART_SIG_STATUS_BAD:
color_maybe (MU_COLOR_RED);
g_print ("%s", "bad signature");
g_print ("bad signature");
break;
case MU_MSG_PART_SIG_STATUS_ERROR:
color_maybe (MU_COLOR_RED);
g_print ("%s", "verification failed");
g_print ("verification failed");
break;
case MU_MSG_PART_SIG_STATUS_FAIL:
color_maybe(MU_COLOR_RED);
g_print ("%s", "error in verification process");
g_print ("error in verification process");
break;
default: g_return_if_reached ();
}
color_maybe (MU_COLOR_DEFAULT);
if (vdata->report)
if (vdata->report && verbose)
g_print ("%s%s\n",
(vdata->oneline) ? ";" : "\n",
vdata->report);
else
g_print ("\n");
}
@ -502,7 +504,7 @@ mu_cmd_verify (MuConfig *opts, GError **err)
(MuMsgPartForeachFunc)each_sig, &vdata);
if (!opts->quiet)
print_verdict (&vdata, !opts->nocolor);
print_verdict (&vdata, !opts->nocolor, opts->verbose);
mu_msg_unref (msg);
g_free (vdata.report);