crtxcr/adhocify
1
0
Fork 0
Code Issues 4 Pull Requests Releases Wiki Activity

Prepare the script arguments when we process adhocify's arguments.

Browse Source 
This way all children don't have to do the same work all and over again.
They only need to replace {}.
This commit is contained in:
Albert S. 2014-10-21 23:41:53 +02:00
parent 9c29c163c1
commit a8db2df993
1 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
adhocify.c
View File

@ -236,26 +236,16 @@ bool run_prog(const char *eventfile, uint32_t eventmask)
putenv(envvar); putenv(envvar);
} }
char *arguments[n_script_arguments + 2]; //2 = argv0 and terminating NULL //This can be thrown away, if in create_script_args we create pointer to the pointer pointing to the SCRIPT_PLACE_SPECIFIER string.
//Then all what we have to do here is to set the pointer to eventfile. However, we can have multiple of those, probably not worth it as we shouldn't have tons of arguments
const char *argv0 = memrchr(prog, '/', strlen(prog)); for(unsigned int i = 0; i < n_script_arguments; i++)
argv0 = ( argv0 == NULL ) ? prog : argv0+1;
arguments[0] = argv0;
const int begin_offset = 1;
for(int i = 0; i < n_script_arguments; i++)
{ {
char *argument = script_arguments[i]; char *argument = script_arguments[i];
if(STREQ(argument, SCRIPT_PLACE_SPECIFIER)) if(argument && STREQ(argument, SCRIPT_PLACE_SPECIFIER))
arguments[i+begin_offset] = eventfile; script_arguments[i] = eventfile;
else
arguments[i+begin_offset] = argument;
} }
arguments[n_script_arguments+begin_offset] = NULL; execv(prog, script_arguments);
execv(prog, arguments);
perror("execlp"); perror("execlp");
@ -430,6 +420,28 @@ static struct option long_options[] =
{ "help", no_argument, 0, 'h' } { "help", no_argument, 0, 'h' }
}; };
//fills global n_script_arguments and script_arguments var
void fill_script_arguments(size_t n_args, char *args[])
{
n_script_arguments = n_args + 2; //2 = argv0 and terminating NULL
char **arguments = xmalloc( n_script_arguments * sizeof(char *) );
const char *argv0 = memrchr(prog, '/', strlen(prog));
argv0 = ( argv0 == NULL ) ? prog : argv0+1;
arguments[0] = argv0;
const int begin_offset = 1;
for(unsigned int i = 0; i < n_args; i++)
{
char *argument = args[i];
arguments[i+begin_offset] = strdup(argument);
}
arguments[n_args+begin_offset] = NULL;
script_arguments = arguments;
}
void parse_options(int argc, char **argv) void parse_options(int argc, char **argv)
{ {
@ -491,8 +503,7 @@ void parse_options(int argc, char **argv)
prog = argv[optind++]; prog = argv[optind++];
if(optind < argc) if(optind < argc)
{ {
script_arguments = &argv[optind]; fill_script_arguments(argc - optind, &argv[optind]);
n_script_arguments = argc - optind;
} }
} }