YourWishes/jerryscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove limitation on number of command line arguments in jerry-main (#1806)

Browse Source 
Since JerryScript has been a C99 project for a while now, we can
use variable-length arrays. This allows the removal of the
artificial limit on command line arguments in jerry-main.

JerryScript-DCO-1.0-Signed-off-by: Akos Kiss akiss@inf.u-szeged.hu
This commit is contained in:
Akos Kiss
2017-05-09 05:40:37 +02:00
committed by yichoi
parent 59c7ffe363
commit 7f32abf75c
1 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-main/main-unix.c
+2 -18
View File
@@ -22,11 +22,6 @@
#include "jerryscript-port.h" #include "jerryscript-port.h"
#include "jerryscript-port-default.h" #include "jerryscript-port-default.h"
/**
* Maximum command line arguments number
*/
#define JERRY_MAX_COMMAND_LINE_ARGS (64)
/** /**
* Maximum size of source code * Maximum size of source code
*/ */
@@ -494,22 +489,12 @@ int
main (int argc, main (int argc,
char **argv) char **argv)
{ {
if (argc > JERRY_MAX_COMMAND_LINE_ARGS) const char *file_names[argc];
{
jerry_port_log (JERRY_LOG_LEVEL_ERROR,
"Error: too many command line arguments: %d (JERRY_MAX_COMMAND_LINE_ARGS=%d)\n",
argc,
JERRY_MAX_COMMAND_LINE_ARGS);
return JERRY_STANDALONE_EXIT_CODE_FAIL;
}
const char *file_names[JERRY_MAX_COMMAND_LINE_ARGS];
int files_counter = 0; int files_counter = 0;
jerry_init_flag_t flags = JERRY_INIT_EMPTY; jerry_init_flag_t flags = JERRY_INIT_EMPTY;
const char *exec_snapshot_file_names[JERRY_MAX_COMMAND_LINE_ARGS]; const char *exec_snapshot_file_names[argc];
int exec_snapshots_count = 0; int exec_snapshots_count = 0;
bool is_parse_only = false; bool is_parse_only = false;
@@ -598,7 +583,6 @@ main (int argc,
if (check_feature (JERRY_FEATURE_SNAPSHOT_EXEC, argv[i++])) if (check_feature (JERRY_FEATURE_SNAPSHOT_EXEC, argv[i++]))
{ {
assert (exec_snapshots_count < JERRY_MAX_COMMAND_LINE_ARGS);
exec_snapshot_file_names[exec_snapshots_count++] = argv[i]; exec_snapshot_file_names[exec_snapshots_count++] = argv[i];
} }
} }