Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix argument offsets

Browse Source
This commit is contained in:
Kevin Lange 2014-06-01 23:37:00 -07:00
parent 389f20f140
commit 4733a26c74
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/misc/elf.c
View File

@ -189,18 +189,18 @@ int exec_shebang(char * path, fs_node_t * file, int argc, char ** argv, char **
char script[strlen(path)+1]; char script[strlen(path)+1];
memcpy(script, path, strlen(path)+1); memcpy(script, path, strlen(path)+1);
char * args[argc+(arg ? 4 : 3)]; unsigned int nargc = argc + (arg ? 2 : 1);
char * args[nargc];
args[0] = cmd; args[0] = cmd;
args[1] = arg ? arg : script; args[1] = arg ? arg : script;
args[2] = arg ? script : NULL; args[2] = arg ? script : NULL;
args[4] = NULL; args[4] = NULL;
int j = arg ? 3 : 2; int j = arg ? 3 : 2;
for (int i = 0; i < argc + 1; ++i, ++j) { for (int i = 1; i < argc; ++i, ++j) {
args[j] = argv[i]; args[j] = argv[i];
} }
args[j] = NULL; args[j] = NULL;
unsigned int nargc = argc + (arg ? 2 : 1);
return exec(cmd, nargc, args, env); return exec(cmd, nargc, args, env);
} }