ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

init: Clean up dynamic argument handling for services

Browse source 
Signed-off-by: San Mehat <san@google.com>
This commit is contained in:
San Mehat 2009-05-20 09:52:16 -07:00
parent e6be870641
commit d4cdd13f6f
1 changed files with 10 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
init/init.c
View file

@ -193,7 +193,8 @@ void service_start(struct service *svc, const char *dynamic_args)
} }
if ((!(svc->flags & SVC_ONESHOT)) && dynamic_args) { if ((!(svc->flags & SVC_ONESHOT)) && dynamic_args) {
ERROR("service '%s' must be one-shot to use dynamic args, disabling\n", svc->args[0]); ERROR("service '%s' must be one-shot to use dynamic args, disabling\n",
svc->args[0]);
svc->flags |= SVC_DISABLED; svc->flags |= SVC_DISABLED;
return; return;
} }
@ -258,42 +259,18 @@ void service_start(struct service *svc, const char *dynamic_args)
execve(svc->args[0], (char**) svc->args, (char**) ENV); execve(svc->args[0], (char**) svc->args, (char**) ENV);
else { else {
char *arg_ptrs[SVC_MAXARGS+1]; char *arg_ptrs[SVC_MAXARGS+1];
int arg_idx; int arg_idx = svc->nargs;
char *tmp = strdup(dynamic_args); char *tmp = strdup(dynamic_args);
char *p = tmp; char *next = tmp;
char *bword;
/* Copy the static arguments */ /* Copy the static arguments */
for (arg_idx = 0; arg_idx < svc->nargs; arg_idx++) { memcpy(arg_ptrs, svc->args, (svc->nargs * sizeof(char *)));
arg_ptrs[arg_idx] = svc->args[arg_idx];
}
int done = 0; while((bword = strsep(&next, " "))) {
while(!done) { arg_ptrs[arg_idx++] = bword;
if (arg_idx == SVC_MAXARGS)
if (arg_idx == SVC_MAXARGS)
break; break;
/* Advance over any leading whitespace */
if (*p == ' ') {
for (p; *p != ' '; p++);
p++;
}
/* Locate next argument */
char *q = p;
while(1) {
if (*q == ' ') {
*q = '\0';
break;
} else if (*q == '\0') {
done = 1;
break;
}
q++;
}
arg_ptrs[arg_idx++] = p;
q++; // Advance q to the next string
p = q;
} }
arg_ptrs[arg_idx] = '\0'; arg_ptrs[arg_idx] = '\0';
execve(svc->args[0], (char**) arg_ptrs, (char**) ENV); execve(svc->args[0], (char**) arg_ptrs, (char**) ENV);
@ -462,7 +439,6 @@ static void msg_start(const char *name)
svc = service_find_by_name(name); svc = service_find_by_name(name);
else { else {
tmp = strdup(name); tmp = strdup(name);
strcpy(tmp, name);
args = strchr(tmp, ':'); args = strchr(tmp, ':');
*args = '\0'; *args = '\0';
args++; args++;
@ -802,7 +778,7 @@ void handle_keychord(int fd)
svc = service_find_by_keychord(id); svc = service_find_by_keychord(id);
if (svc) { if (svc) {
INFO("starting service %s from keychord\n", svc->name); INFO("starting service %s from keychord\n", svc->name);
service_start(svc, NULL); service_start(svc, NULL);
} else { } else {
ERROR("service for keychord %d not found\n", id); ERROR("service for keychord %d not found\n", id);
} }