King_DuckZ/dindexer
1
0
Fork 0
mirror of https://github.com/KingDuckZ/dindexer.git synced 2024-11-29 01:33:46 +00:00
Code Issues Releases Wiki Activity

Bugfix and improve behaviour

Browse source 
The program now tries to be more strict about the command lines it
accepts. See the comment added into main.c for more details.
Also fixed a bug introduced by a previous commit, and another one
about argv not being null-terminated. For some reasons it never
gave problems until now. But it's fixed now, so yeah.
This commit is contained in:
King_DuckZ 2016-03-16 18:39:18 +01:00
parent 6991fee7f7
commit 417459b806
1 changed files with 40 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/main/main.c
View file

@ -27,6 +27,22 @@
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <stdlib.h>
#include <getopt.h> #include <getopt.h>
#include <errno.h>
/* This program can be run either with the name of a subcommand as its first
* parameter (eg: dindexer locate), plus some optional parameters that are just
* passed on to the subcommand, or with options that are really meant for this
* program itself, and no subcommand is invoked.
* In the first case the program won't try to parse any parameters except from
* the first (the subcommand name), which is removed from the parameters list.
* The appropriate command is the invoked and all the remanining parameters are
* passed to it. No further action is taken by this program, which in fact
* terminates right after the subcommand is invoked.
* In the second case, the program won't try to invoke any other command. It will
* try to parse the command line itself and behave on itself. Passing an action
* name in this case is wrong. For example, the command "dindexer --version scan"
* is wrong and should be rejected.
*/
struct PrintContext { struct PrintContext {
FILE* stream; FILE* stream;
@ -65,9 +81,8 @@ int main (int parArgc, char* parArgv[]) {
return 1; return 1;
} }
if (1 < parArgc)
if (optind < parArgc) specified_action = parArgv[1];
specified_action = parArgv[optind];
else else
specified_action = ""; specified_action = "";
selected_action = foreach_avail_action(&same_action, actions, actions_count, specified_action); selected_action = foreach_avail_action(&same_action, actions, actions_count, specified_action);
@ -99,12 +114,18 @@ int main (int parArgc, char* parArgv[]) {
argv = (char**)malloc(sizeof(char*) * (parArgc - 1 + 1)); argv = (char**)malloc(sizeof(char*) * (parArgc - 1 + 1));
argv[0] = action_path; argv[0] = action_path;
for (z = 2; z <= parArgc; ++z) { for (z = 2; z < parArgc; ++z) {
argv[z - 1] = specified_action; argv[z - 1] = parArgv[z];
} }
argv[parArgc - 1] = NULL;
/*printf("would call %s\n", action_path);*/ /*printf("would call %s\n", action_path);*/
execv(action_path, argv); retval = execv(action_path, argv);
if (retval < 0) {
fprintf(stderr, "Error executing \"%s\": %d:\n%s\n", action_path, errno, strerror(errno));
free(action_path);
return 1;
}
/* the program won't get here, but just to be clean... */ /* the program won't get here, but just to be clean... */
free(action_path); free(action_path);
@ -172,6 +193,13 @@ static int manage_commandline (int parArgc, char* parArgv[], char** parActions,
int retval; int retval;
struct PrintContext actions_print_context; struct PrintContext actions_print_context;
/*Check if the program should just forward the invocation to some
subcommand*/
if (2 <= parArgc and parArgv[1][0] != '\0' and parArgv[1][0] != '-') {
*parShouldQuit = 0;
return 0;
}
struct option opts[] = { struct option opts[] = {
{ "printactions", optional_argument, NULL, 'a' }, { "printactions", optional_argument, NULL, 'a' },
{ "builtin", no_argument, &showbuiltin, 1 }, { "builtin", no_argument, &showbuiltin, 1 },
@ -202,6 +230,12 @@ static int manage_commandline (int parArgc, char* parArgv[], char** parActions,
option_index = 0; option_index = 0;
} }
if (optind != parArgc) {
fprintf(stderr, "Invalid command line - unexpected \"%s\"\n", parArgv[optind]);
*parShouldQuit = 1;
return 2;
}
if (parArgc < 2 or showhelp) { if (parArgc < 2 or showhelp) {
*parShouldQuit = 1; *parShouldQuit = 1;
if (parArgc < 2) { if (parArgc < 2) {