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

cli: make -p equivalent to -pe

Browse Source 
Fixes #3938.
This commit is contained in:
Ben Noordhuis 2012-09-03 16:42:18 +02:00
parent 7f404e3509
commit f03c3203a1
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/node.cc
View File

@ -2384,20 +2384,18 @@ static void ParseArgs(int argc, char **argv) {
} else if (strcmp(arg, "--help") == 0 || strcmp(arg, "-h") == 0) { } else if (strcmp(arg, "--help") == 0 || strcmp(arg, "-h") == 0) {
PrintHelp(); PrintHelp();
exit(0); exit(0);
} else if (strcmp(arg, "--eval") == 0 || strcmp(arg, "-e") == 0 || } else if (strcmp(arg, "--eval") == 0 ||
strcmp(arg, "-pe") == 0) { strcmp(arg, "-e") == 0 ||
strcmp(arg, "--print") == 0 ||
strcmp(arg, "-pe") == 0 ||
strcmp(arg, "-p") == 0) {
if (argc <= i + 1) { if (argc <= i + 1) {
fprintf(stderr, "Error: --eval requires an argument\n"); fprintf(stderr, "Error: %s requires an argument\n", arg);
exit(1); exit(1);
} }
if (arg[1] == 'p') { print_eval = print_eval || strchr(arg, 'p') != NULL;
print_eval = true;
}
argv[i] = const_cast<char*>(""); argv[i] = const_cast<char*>("");
eval_string = argv[++i]; eval_string = argv[++i];
} else if (strcmp(arg, "--print") == 0 || strcmp(arg, "-p") == 0) {
print_eval = true;
argv[i] = const_cast<char*>("");
} else if (strcmp(arg, "--interactive") == 0 || strcmp(arg, "-i") == 0) { } else if (strcmp(arg, "--interactive") == 0 || strcmp(arg, "-i") == 0) {
force_repl = true; force_repl = true;
argv[i] = const_cast<char*>(""); argv[i] = const_cast<char*>("");

2
test/simple/test-cli-eval.js
View File

@ -48,7 +48,7 @@ child.exec(nodejs + ' --eval "console.error(42)"',
}); });
// assert that the expected output is written to stdout // assert that the expected output is written to stdout
['--print --eval', '-p -e', '-pe'].forEach(function(s) { '--print -pe -p'.split(' ').forEach(function(s) {
var cmd = nodejs + ' ' + s + ' '; var cmd = nodejs + ' ' + s + ' ';
child.exec(cmd + '42', child.exec(cmd + '42',