tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

be more informative when monitoring not configured

Browse Source
This commit is contained in:
dockes 2008-08-29 09:51:24 +00:00
parent 87c5a4fcd1
commit 63d91ffefc
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/index/recollindex.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint #ifndef lint
static char rcsid[] = "@(#$Id: recollindex.cpp,v 1.35 2007-12-13 06:58:21 dockes Exp $ (C) 2004 J.F.Dockes"; static char rcsid[] = "@(#$Id: recollindex.cpp,v 1.36 2008-08-29 09:51:24 dockes Exp $ (C) 2004 J.F.Dockes";
#endif #endif
/* /*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -249,7 +249,7 @@ static const char usage [] =
; ;
static void static void
Usage(void) Usage(FILE *where = stderr)
{ {
FILE *fp = (op_flags & OPT_h) ? stdout : stderr; FILE *fp = (op_flags & OPT_h) ? stdout : stderr;
fprintf(fp, "%s: Usage: %s", thisprog, usage); fprintf(fp, "%s: Usage: %s", thisprog, usage);
@ -265,9 +265,8 @@ RclConfig *RclConfig::getMainConfig()
int main(int argc, const char **argv) int main(int argc, const char **argv)
{ {
string a_config; string a_config;
#ifdef RCL_MONITOR
int sleepsecs = 60; int sleepsecs = 60;
#endif
thisprog = argv[0]; thisprog = argv[0];
argc--; argv++; argc--; argv++;
@ -287,19 +286,15 @@ int main(int argc, const char **argv)
case 'h': op_flags |= OPT_h; break; case 'h': op_flags |= OPT_h; break;
case 'i': op_flags |= OPT_i; break; case 'i': op_flags |= OPT_i; break;
case 'l': op_flags |= OPT_l; break; case 'l': op_flags |= OPT_l; break;
#ifdef RCL_MONITOR
case 'm': op_flags |= OPT_m; break; case 'm': op_flags |= OPT_m; break;
#endif
case 's': op_flags |= OPT_s; break; case 's': op_flags |= OPT_s; break;
#ifdef RCL_USE_ASPELL #ifdef RCL_USE_ASPELL
case 'S': op_flags |= OPT_S; break; case 'S': op_flags |= OPT_S; break;
#endif #endif
#ifdef RCL_MONITOR
case 'w': op_flags |= OPT_w; if (argc < 2) Usage(); case 'w': op_flags |= OPT_w; if (argc < 2) Usage();
if ((sscanf(*(++argv), "%d", &sleepsecs)) != 1) if ((sscanf(*(++argv), "%d", &sleepsecs)) != 1)
Usage(); Usage();
argc--; goto b1; argc--; goto b1;
#endif
case 'x': op_flags |= OPT_x; break; case 'x': op_flags |= OPT_x; break;
case 'z': op_flags |= OPT_z; break; case 'z': op_flags |= OPT_z; break;
default: Usage(); break; default: Usage(); break;
@ -307,7 +302,15 @@ int main(int argc, const char **argv)
b1: argc--; argv++; b1: argc--; argv++;
} }
if (op_flags & OPT_h) if (op_flags & OPT_h)
Usage(); Usage(stdout);
#ifndef RCL_MONITOR
if (op_flags & (OPT_m | OPT_w|OPT_x)) {
cerr << "Sorry, -m not available: real-time monitoring was not "
"configured in this build\n";
exit(1);
}
#endif
if ((op_flags & OPT_z) && (op_flags & (OPT_i|OPT_e))) if ((op_flags & OPT_z) && (op_flags & (OPT_i|OPT_e)))
Usage(); Usage();