2 files changed, 21 insertions, 4 deletions

diff --git a/utils/hwstub/tools/hwstub_load.cpp b/utils/hwstub/tools/hwstub_load.cpp
index 87737939c3..6ca6079294 100644
--- a/utils/hwstub/tools/hwstub_load.cpp
+++ b/utils/hwstub/tools/hwstub_load.cpp
@@ -24,6 +24,7 @@
 #include <getopt.h>
 #include <stdbool.h>
 #include <ctype.h>
+#include <iostream>
 #include "hwstub.hpp"
 #include "hwstub_uri.hpp"
 
@@ -111,6 +112,7 @@ void usage(void)
     printf("  --quiet/-q      Quiet output\n");
     printf("  --type/-t <t>   Override file type\n");
     printf("  --dev/-d <uri>  Device URI (see below)\n");
+    printf("  --verbose/-v    Display debug output\n");
     printf("file types:\n");
     printf("  raw      Load a raw binary blob\n");
     printf("  rockbox  Load a rockbox image produced by scramble\n");
@@ -128,6 +130,7 @@ int main(int argc, char **argv)
     bool quiet = false;
     enum image_type_t type = IT_DETECT;
     const char *uri = "usb:";
+    bool verbose = false;
 
     // parse command line
     while(1)
@@ -138,10 +141,11 @@ int main(int argc, char **argv)
             {"quiet", no_argument, 0, 'q'},
             {"type", required_argument, 0, 't'},
             {"dev", required_argument, 0, 'd'},
+            {"verbose", no_argument, 0, 'v'},
             {0, 0, 0, 0}
         };
 
-        int c = getopt_long(argc, argv, "?qt:d:", long_options, NULL);
+        int c = getopt_long(argc, argv, "?qt:d:v", long_options, NULL);
         if(c == -1)
             break;
         switch(c)
@@ -170,6 +174,9 @@ int main(int argc, char **argv)
             case 'd':
                 uri = optarg;
                 break;
+            case 'v':
+                verbose = true;
+                break;
             default:
                 abort();
         }
@@ -236,6 +243,8 @@ int main(int argc, char **argv)
         printf("Cannot create context: %s\n", errstr.c_str());
         return 1;
     }
+    if(verbose)
+        hwctx->set_debug(std::cout);
     std::vector<std::shared_ptr<hwstub::device>> list;
     hwstub::error ret = hwctx->get_device_list(list);
     if(ret != hwstub::error::SUCCESS)
@@ -277,7 +286,7 @@ int main(int argc, char **argv)
         char buffer[128];
         size_t size = sizeof(buffer) - 1;
         hwstub::error err = hwdev->get_log(buffer, size);
-        if(err != hwstub::error::SUCCESS)
+        if(err != error::SUCCESS || size == 0)
             break;
         buffer[size] = 0;
         fprintf(stderr, "%s", buffer);
diff --git a/utils/hwstub/tools/hwstub_shell.cpp b/utils/hwstub/tools/hwstub_shell.cpp
index 5fb3e13840..b2cf2cec60 100644
--- a/utils/hwstub/tools/hwstub_shell.cpp
+++ b/utils/hwstub/tools/hwstub_shell.cpp
@@ -1239,6 +1239,7 @@ void usage(void)
     printf("options:\n");
     printf("  --help/-?       Display this help\n");
     printf("  --quiet/-q      Quiet non-command messages\n");
+    printf("  -b/--batch      Disable interactive mode after running commands and files\n");
     printf("  --verbose/-v    Verbose output\n");
     printf("  -i <init>       Set lua init file (default is init.lua)\n");
     printf("  -e <cmd>        Execute <cmd> at startup\n");
@@ -1293,6 +1294,7 @@ int main(int argc, char **argv)
 {
     std::string dev_uri = hwstub::uri::default_uri().full_uri();
     bool verbose = false;
+    bool batch = false;
 
     const char *lua_init = "init.lua";
     std::vector< std::pair< exec_type, std::string > > startup_cmds;
@@ -1309,11 +1311,12 @@ int main(int argc, char **argv)
             {"startfile", required_argument, 0, 'f'},
             {"dev", required_argument, 0, 'd'},
             {"verbose", no_argument, 0, 'v'},
+            {"batch", no_argument, 0, 'b'},
             {"debug-rw", no_argument, 0, OPT_DBG_RW},
             {0, 0, 0, 0}
         };
 
-        int c = getopt_long(argc, argv, "?qi:e:f:d:v", long_options, NULL);
+        int c = getopt_long(argc, argv, "?qi:e:f:d:vb", long_options, NULL);
         if(c == -1)
             break;
         switch(c)
@@ -1344,6 +1347,9 @@ int main(int argc, char **argv)
             case OPT_DBG_RW:
                 g_print_mem_rw = true;
                 break;
+            case 'b':
+                batch = true;
+                break;
             default:
                 abort();
         }
@@ -1441,7 +1447,9 @@ int main(int argc, char **argv)
     /* intercept CTRL+C */
     signal(SIGINT, do_signal);
     // start interactive shell
-    luap_enter(g_lua, &g_exit);
+    if(!batch)
+        luap_enter(g_lua, &g_exit);
+    // cleanup
     lua_close(g_lua);
 
     // display log if handled