From 3dfcb8ec3e913ff4fab38c8839ed4e53f994460f Mon Sep 17 00:00:00 2001 From: Titus von der Malsburg Date: Fri, 27 Sep 2013 19:56:20 +0200 Subject: [PATCH] Handle maxnum=0 the same way as in mu server. --- mu/mu-cmd-find.c | 4 ++-- mu/mu-config.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mu/mu-cmd-find.c b/mu/mu-cmd-find.c index d262275e..6b9ff452 100644 --- a/mu/mu-cmd-find.c +++ b/mu/mu-cmd-find.c @@ -132,7 +132,7 @@ run_query (MuQuery *xapian, const gchar *query, MuConfig *opts, GError **err) if (opts->threads) qflags |= MU_QUERY_FLAG_THREADS; - iter = mu_query_run (xapian, query, sortid, -1, qflags, err); + iter = mu_query_run (xapian, query, sortid, opts->maxnum, qflags, err); return iter; } @@ -598,7 +598,7 @@ output_query_results (MuMsgIter *iter, MuConfig *opts, GError **err) MuMsg *msg; - if (opts->maxnum > 0 && count == opts->maxnum) + if (count == opts->maxnum) break; msg = get_message (iter, opts->after); if (!msg) diff --git a/mu/mu-config.c b/mu/mu-config.c index 132b4b6c..dbad5d11 100644 --- a/mu/mu-config.c +++ b/mu/mu-config.c @@ -704,6 +704,8 @@ mu_config_init (int *argcp, char ***argvp, GError **err) memset (&MU_CONFIG, 0, sizeof(MU_CONFIG)); + MU_CONFIG.maxnum = -1; /* By default, output all matching entries. */ + if (!parse_cmd (argcp, argvp, err)) goto errexit;