archive-gh-me/jerryscript
1
0
Fork 0
mirror of https://github.com/jerryscript-project/jerryscript.git synced 2025-12-15 16:29:21 +00:00
Code Issues Projects Releases Wiki Activity

Improve the stdin handling of the command line tool (#1378)

Browse Source 
This patch improves the command line tool in two ways:
* The tool can be instructed to read and execute a script from
  stdin by invoking it as `jerry -`.
* The tool can be instructed to suppress its prompt when in repl
  mode by invoking it as `jerry --no-prompt`.

JerryScript-DCO-1.0-Signed-off-by: Akos Kiss akiss@inf.u-szeged.hu
This commit is contained in:
Akos Kiss 2016-09-28 14:14:05 +02:00 committed by GitHub
parent 9b5d0cc7ec
commit e2aa714565
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
jerry-main/main-unix.c
View File

@ -45,11 +45,19 @@ static const uint8_t *
read_file (const char *file_name,
size_t *out_size_p)
{
FILE *file = fopen (file_name, "r");
if (file == NULL)
FILE *file;
if (!strcmp ("-", file_name))
{
jerry_port_log (JERRY_LOG_LEVEL_ERROR, "Error: failed to open file: %s\n", file_name);
return NULL;
file = stdin;
}
else
{
file = fopen (file_name, "r");
if (file == NULL)
{
jerry_port_log (JERRY_LOG_LEVEL_ERROR, "Error: failed to open file: %s\n", file_name);
return NULL;
}
}
size_t bytes_read = fread (buffer, 1u, sizeof (buffer), file);
@ -117,6 +125,7 @@ print_help (char *name)
" --exec-snapshot FILE\n"
" --log-level [0-3]\n"
" --abort-on-fail\n"
" --no-prompt\n"
"\n",
name);
} /* print_help */
@ -183,6 +192,7 @@ main (int argc,
const char *save_snapshot_file_name_p = NULL;
bool is_repl_mode = false;
bool no_prompt = false;
for (i = 1; i < argc; i++)
{
@ -276,6 +286,14 @@ main (int argc,
{
jerry_port_default_set_abort_on_fail (true);
}
else if (!strcmp ("--no-prompt", argv[i]))
{
no_prompt = true;
}
else if (!strcmp ("-", argv[i]))
{
file_names[files_counter++] = argv[i];
}
else if (!strncmp ("-", argv[i], 1))
{
jerry_port_log (JERRY_LOG_LEVEL_ERROR, "Error: unrecognized option: %s\n", argv[i]);
@ -407,7 +425,7 @@ main (int argc,
if (is_repl_mode)
{
const char *prompt = "jerry> ";
const char *prompt = !no_prompt ? "jerry> " : "";
bool is_done = false;
jerry_value_t global_obj_val = jerry_get_global_object ();