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

* use differerent exit codes for error, no matches as >0 matches; as per man page

Browse Source
This commit is contained in:
Dirk-Jan C. Binnema
2011-03-05 15:07:49 +02:00
parent f14f8f45d7
commit 1e9ec55034
3 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/mu-cmd-cfind.c
View File

@ -101,6 +101,8 @@ mu_cmd_cfind (MuConfig *opts)
{
OutputFormat format;
MuContacts *contacts;
gboolean rv;
size_t num;
g_return_val_if_fail (opts, MU_EXITCODE_ERROR);
g_return_val_if_fail (opts->cmd == MU_CONFIG_CMD_CFIND,
@ -112,11 +114,12 @@ mu_cmd_cfind (MuConfig *opts)
opts->formatstr ? opts->formatstr : "<none>");
return FALSE;
}
/* if (!opts->params[1]) { */
/* g_warning ("usage: mu cfind [OPTIONS] [<ptrn>]"); */
/* return MU_EXITCODE_ERROR; */
/* } */
/* only one pattern allowed */
if (opts->params[1] && opts->params[2]) {
g_warning ("usage: mu cfind [OPTIONS] [<ptrn>]");
return MU_EXITCODE_ERROR;
}
contacts = mu_contacts_new (mu_runtime_contacts_cache_file());
if (!contacts) {
@ -124,10 +127,14 @@ mu_cmd_cfind (MuConfig *opts)
return MU_EXITCODE_ERROR;
}
mu_contacts_foreach (contacts, (MuContactsForeachFunc)each_contact,
GINT_TO_POINTER(format), opts->params[1]);
mu_contacts_destroy (contacts);
rv = mu_contacts_foreach (contacts, (MuContactsForeachFunc)each_contact,
GINT_TO_POINTER(format), opts->params[1], &num);
return MU_OK;
mu_contacts_destroy (contacts);
if (rv)
return (num == 0) ? MU_EXITCODE_NO_MATCHES : MU_EXITCODE_OK;
else
return MU_EXITCODE_ERROR;
}