Merge branch 'master' into win32

Author: haileys

platform/win32.c

@@ -118,8 +118,8 @@ sl_environ(sl_vm_t* vm)
     size_t i = 0;
     for(char* eptr = envzz; *eptr; eptr += strlen(eptr) + 1) {
         enva[i] = sl_alloc_buffer(vm->arena, strlen(eptr) + 1);
-	strcpy(enva[i], eptr);
-	i++;
+        strcpy(enva[i], eptr);
+        i++;
     }
     enva[i] = NULL;
     FreeEnvironmentStrings(envzz);

sapi/cli/cli.c

@@ -4,6 +4,14 @@
 #include <stdio.h>
 #include "readline.h"
 
+#ifdef SL_HAS_UNISTD
+    #include <unistd.h>
+#endif
+
+#ifdef __WIN32
+    #include <io.h>
+#endif
+
 static bool
 opt_interactive;
 
@@ -213,6 +221,22 @@ main(int argc, char** argv)
 {
     sl_vm_t* vm = setup_vm(&argc);
 
+    if(argc == 1) {
+        // if we have no command line args and we're running in a TTY,
+        // enable interactive mode by default
+        #ifdef SL_HAS_UNISTD
+            if(isatty(0)) {
+                opt_interactive = true;
+            }
+        #else
+            #ifdef __WIN32
+                if(_isatty(_fileno(stdin))) {
+                    opt_interactive = true;
+                }
+            #endif
+        #endif
+    }
+
     process_arguments(vm, argc, argv);
 
     sl_vm_frame_t frame;