1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix options parsing

Browse Source 
The current node has a bug where it will fail to pass the option argument
immediately preceding the first non-option argument to V8. That is the
--perf flag will be ignored by V8 when running 'node --perf script.js'.
This commit is contained in:
Peter Griess 2010-06-04 08:29:10 -07:00 committed by Ryan Dahl
parent 0055dd133d
commit 78d33f4fd5
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/node.cc
View File

@ -1900,7 +1900,7 @@ static void Load(int argc, char *argv[]) {
int i, j; int i, j;
Local<Array> arguments = Array::New(argc - option_end_index + 1); Local<Array> arguments = Array::New(argc - option_end_index + 1);
arguments->Set(Integer::New(0), String::New(argv[0])); arguments->Set(Integer::New(0), String::New(argv[0]));
for (j = 1, i = option_end_index + 1; i < argc; j++, i++) { for (j = 1, i = option_end_index; i < argc; j++, i++) {
Local<String> arg = String::New(argv[i]); Local<String> arg = String::New(argv[i]);
arguments->Set(Integer::New(j), arg); arguments->Set(Integer::New(j), arg);
} }
@ -2050,13 +2050,14 @@ static void PrintHelp() {
// Parse node command line arguments. // Parse node command line arguments.
static void ParseArgs(int *argc, char **argv) { static void ParseArgs(int *argc, char **argv) {
int i;
// TODO use parse opts // TODO use parse opts
for (int i = 1; i < *argc; i++) { for (i = 1; i < *argc; i++) {
const char *arg = argv[i]; const char *arg = argv[i];
if (strstr(arg, "--debug") == arg) { if (strstr(arg, "--debug") == arg) {
ParseDebugOpt(arg); ParseDebugOpt(arg);
argv[i] = const_cast<char*>(""); argv[i] = const_cast<char*>("");
option_end_index = i;
} else if (strcmp(arg, "--version") == 0 || strcmp(arg, "-v") == 0) { } else if (strcmp(arg, "--version") == 0 || strcmp(arg, "-v") == 0) {
printf("%s\n", NODE_VERSION); printf("%s\n", NODE_VERSION);
exit(0); exit(0);
@ -2069,12 +2070,12 @@ static void ParseArgs(int *argc, char **argv) {
exit(0); exit(0);
} else if (strcmp(arg, "--v8-options") == 0) { } else if (strcmp(arg, "--v8-options") == 0) {
argv[i] = const_cast<char*>("--help"); argv[i] = const_cast<char*>("--help");
option_end_index = i+1;
} else if (argv[i][0] != '-') { } else if (argv[i][0] != '-') {
option_end_index = i-1;
break; break;
} }
} }
option_end_index = i;
} }
} // namespace node } // namespace node