Fix modification of recollindex args processing which was broken

This commit is contained in:
Jean-Francois Dockes 2020-04-16 18:01:34 +02:00
parent a00a3b0fbb
commit d67fe267d8

View File

@ -641,6 +641,7 @@ int main(int argc, char **argv)
b1: b1:
; ;
} }
aremain = args.size() - argidx;
if (op_flags & OPT_h) if (op_flags & OPT_h)
Usage(stdout); Usage(stdout);
@ -795,7 +796,7 @@ int main(int argc, char **argv)
flushIdxReasons(); flushIdxReasons();
exit(status ? 0 : 1); exit(status ? 0 : 1);
} else if (op_flags & OPT_l) { } else if (op_flags & OPT_l) {
if (argc != 0) if (aremain != 0)
Usage(); Usage();
vector<string> stemmers = ConfIndexer::getStemmerNames(); vector<string> stemmers = ConfIndexer::getStemmerNames();
for (vector<string>::const_iterator it = stemmers.begin(); for (vector<string>::const_iterator it = stemmers.begin();
@ -804,7 +805,7 @@ int main(int argc, char **argv)
} }
exit(0); exit(0);
} else if (op_flags & OPT_s) { } else if (op_flags & OPT_s) {
if (argc != 1) if (aremain != 1)
Usage(); Usage();
string lang = args[argidx++]; aremain--; string lang = args[argidx++]; aremain--;
exit(!createstemdb(config, lang)); exit(!createstemdb(config, lang));
@ -816,7 +817,7 @@ int main(int argc, char **argv)
#ifdef RCL_MONITOR #ifdef RCL_MONITOR
} else if (op_flags & OPT_m) { } else if (op_flags & OPT_m) {
if (argc != 0) if (aremain != 0)
Usage(); Usage();
lockorexit(&pidfile, config); lockorexit(&pidfile, config);
if (updater) { if (updater) {