* update to use config->params instead of argv
This commit is contained in:
15
src/mu.c
15
src/mu.c
@ -191,10 +191,10 @@ main (int argc, char *argv[])
|
|||||||
if (config.version)
|
if (config.version)
|
||||||
return show_version ();
|
return show_version ();
|
||||||
|
|
||||||
if (argc < 2)
|
if (!config.params[0]) /* no command? */
|
||||||
return show_usage (FALSE);
|
return show_usage (FALSE);
|
||||||
|
|
||||||
cmd = parse_cmd (argv[1]);
|
cmd = parse_cmd (config.params[0]);
|
||||||
if (cmd == MU_CMD_UNKNOWN)
|
if (cmd == MU_CMD_UNKNOWN)
|
||||||
return show_usage (FALSE);
|
return show_usage (FALSE);
|
||||||
|
|
||||||
@ -224,15 +224,11 @@ main (int argc, char *argv[])
|
|||||||
|
|
||||||
} else if (cmd == MU_CMD_QUERY) {
|
} else if (cmd == MU_CMD_QUERY) {
|
||||||
|
|
||||||
GSList *args;
|
if (!config.params[1]) {
|
||||||
if (argc < 3) {
|
|
||||||
g_printerr ("error: missing something to search for\n");
|
g_printerr ("error: missing something to search for\n");
|
||||||
rv = 1;
|
rv = 1;
|
||||||
} else {
|
} else
|
||||||
args = mu_util_strlist_from_args (argc-2, argv+2);
|
rv = mu_query_run (&config, &config.params[1]);
|
||||||
rv = mu_query_run (&config, args);
|
|
||||||
mu_util_strlist_free (args);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
mu_msg_gmime_uninit();
|
mu_msg_gmime_uninit();
|
||||||
@ -241,3 +237,4 @@ main (int argc, char *argv[])
|
|||||||
|
|
||||||
return rv == MU_OK ? 0 : 1;
|
return rv == MU_OK ? 0 : 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user