aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Cerqueira <cyanogenmod@cerqueira.org>2012-11-19 17:31:24 +0000
committerRicardo Cerqueira <cyanogenmod@cerqueira.org>2012-11-19 17:31:24 +0000
commit299c6048c5643bcc1e4ac2f8cf9b569b85c333b0 (patch)
tree7194260ec0769a0c0eac15b0ee1017b280d95bc7
parentcd7c576df0771121ca4438c1d733c263a09857f1 (diff)
downloadsystem_core-299c6048c5643bcc1e4ac2f8cf9b569b85c333b0.tar.gz
system_core-299c6048c5643bcc1e4ac2f8cf9b569b85c333b0.tar.bz2
system_core-299c6048c5643bcc1e4ac2f8cf9b569b85c333b0.zip
Revert "init: Add support for properties expansion in exec command"
This reverts commit 590e70506cab66bd6b41adfd15ef09bb42df2953.
-rw-r--r--init/builtins.c20
1 files changed, 0 insertions, 20 deletions
diff --git a/init/builtins.c b/init/builtins.c
index a2d73475..6d52b21a 100644
--- a/init/builtins.c
+++ b/init/builtins.c
@@ -266,32 +266,12 @@ int do_exec(int nargs, char **args)
pid_t pid;
int status, i, j;
char *par[MAX_PARAMETERS];
- char prop_val[PROP_VALUE_MAX];
- int len;
-
if (nargs > MAX_PARAMETERS)
{
return -1;
}
for(i=0, j=1; i<(nargs-1) ;i++,j++)
{
- if ((args[j])
- &&
- (!expand_props(prop_val, args[j], sizeof(prop_val))))
-
- {
- len = strlen(args[j]);
- if (strlen(prop_val) <= len) {
- /* Overwrite arg with expansion.
- *
- * For now, only allow an expansion length that
- * can fit within the original arg length to
- * avoid extra allocations.
- * On failure, use original argument.
- */
- strncpy(args[j], prop_val, len + 1);
- }
- }
par[i] = args[j];
}
par[i] = (char*)0;