Skip to content

Commit

Permalink
Remove manipulation of environ in SetupArgs()
Browse files Browse the repository at this point in the history
  • Loading branch information
paddybyers committed Nov 25, 2011
1 parent 3a3c4d1 commit 2aaa46a
Showing 1 changed file with 1 addition and 41 deletions.
42 changes: 1 addition & 41 deletions src/platform_android.cc
Original file line number Diff line number Diff line change
Expand Up @@ -61,47 +61,7 @@ static struct {


char** Platform::SetupArgs(int argc, char *argv[]) {
char **new_argv;
char **new_env;
size_t size;
int envc;
char *s;
int i;

for (envc = 0; environ[envc]; envc++);

s = envc ? environ[envc - 1] : argv[argc - 1];

process_title.str = argv[0];
process_title.len = s + strlen(s) + 1 - argv[0];

size = process_title.len;
size += (argc + 1) * sizeof(char **);
size += (envc + 1) * sizeof(char **);

if ((s = (char *) malloc(size)) == NULL) {
process_title.str = NULL;
process_title.len = 0;
return argv;
}

new_argv = (char **) s;
new_env = new_argv + argc + 1;
s = (char *) (new_env + envc + 1);
memcpy(s, process_title.str, process_title.len);

for (i = 0; i < argc; i++)
new_argv[i] = s + (argv[i] - argv[0]);
new_argv[argc] = NULL;

s += environ[0] - argv[0];

for (i = 0; i < envc; i++)
new_env[i] = s + (environ[i] - environ[0]);
new_env[envc] = NULL;

environ = new_env;
return new_argv;
return argv;
}


Expand Down

0 comments on commit 2aaa46a

Please sign in to comment.