improved diagnostics for incorrect command line invokations.

Fixed bug in servalwrap (needed to trim arg[0])
This commit is contained in:
gardners 2012-04-26 16:59:55 +09:30
parent 51d933d8e2
commit 89c08fa2c3
2 changed files with 6 additions and 2 deletions

View File

@ -298,7 +298,11 @@ int parseCommandLine(int argc, const char *const *args)
/* Don't process ambiguous calls */
if (ambiguous) return -1;
/* Complain if we found no matching calls */
if (cli_call<0) return cli_usage();
if (cli_call<0) {
fprintf(stderr,"Unknown command line call:\n ");
int j; for(j=0;j<argc;j++) fprintf(stderr," %s",args[j]);
return cli_usage();
}
/* Otherwise, make call */
setVerbosity(confValueGet("debug",""));

View File

@ -25,6 +25,6 @@ int main(int argc,char **argv)
void *h = dlopen("/data/data/org.servalproject/lib/libserval.so",RTLD_LAZY);
int (*servalmain)(int,char **) = dlsym(h,"parseCommandLine");
if (!servalmain) return fprintf(stderr,"Could not load libserval.so\n");
return (*servalmain)(argc,argv);
return (*servalmain)(argc - 1, (const char*const*)&argv[1]);
}