Fixed handling of "init" flag in njs_vm_create().

diff --git a/src/njs_shell.c b/src/njs_shell.c
index d0428ca6ae62807a6214a1973b5aa2a02841efce..3a89ba552ab58057cdaedf3c3e0f2cd9aa0ba4f9 100644 (file)
--- a/src/njs_shell.c
+++ b/src/njs_shell.c
@@ -243,7 +243,7 @@ main(int argc, char **argv)
     vm_options.file.start = (u_char *) opts.file;
     vm_options.file.length = njs_strlen(opts.file);
 
-    vm_options.init = !opts.interactive;
+    vm_options.init = 1;
     vm_options.accumulative = opts.interactive;
     vm_options.disassemble = opts.disassemble;
     vm_options.backtrace = 1;

diff --git a/src/njs_vm.c b/src/njs_vm.c
index c2c948a73ad4dd7112caebb45475bd69dc16eb3a..d4c56358751f01c64b5d20835ea16d2e893a1b5a 100644 (file)
--- a/src/njs_vm.c
+++ b/src/njs_vm.c
@@ -85,7 +85,7 @@ njs_vm_create(njs_vm_opt_t *options)
         vm->debug = debug;
     }
 
-    if (options->accumulative) {
+    if (options->init) {
         ret = njs_vm_init(vm);
         if (njs_slow_path(ret != NJS_OK)) {
             return NULL;

diff --git a/src/test/njs_interactive_test.c b/src/test/njs_interactive_test.c
index 75bf97bda18c70755e67b0bdeb2f28f3e7a92f02..931b799735a92cbdb1499648bda3de96b18c8c74 100644 (file)
--- a/src/test/njs_interactive_test.c
+++ b/src/test/njs_interactive_test.c
@@ -289,6 +289,7 @@ njs_interactive_test(njs_bool_t verbose)
 
         njs_memzero(&options, sizeof(njs_vm_opt_t));
 
+        options.init = 1;
         options.accumulative = 1;
         options.backtrace = 1;