# HG changeset patch
# User jbe
# Date 1420744037 -3600
# Node ID 6016547c6410fe0a2d814d5d571c4944faee7819
# Parent  a556c89270fe1803a99293950a9289755c5d9d60
Changed invocation of moonbridge command: single script with additional command line arguments for script

diff -r a556c89270fe -r 6016547c6410 moonbridge.c
--- a/moonbridge.c	Sun Jan 04 19:37:19 2015 +0100
+++ b/moonbridge.c	Thu Jan 08 20:07:17 2015 +0100
@@ -2530,7 +2530,7 @@
   fprintf(out, "           [-l|--logfile <logfile>] \\\n");
   fprintf(out, "           [-p|--pidfile <pidfile>] \\\n");
   fprintf(out, "           [-s|--stats] \\\n");
-  fprintf(out, "           <Lua file> [<Lua file> ...]\n");
+  fprintf(out, "           -- <Lua script> [<cmdline options for Lua script>]\n");
   exit(err);
 }
 
@@ -2609,7 +2609,7 @@
         moonbr_usage_error();
       }
     }
-    if (argc - optind <= 0) moonbr_usage_error();
+    if (argc - optind < 1) moonbr_usage_error();
     if (pid_filename) {
       pid_t otherpid;
       while ((moonbr_pidfh = pidfile_open(pid_filename, 0644, &otherpid)) == NULL) {
@@ -2687,19 +2687,15 @@
     lua_pushcfunction(L, moonbr_listen);
     lua_setglobal(L, "listen");
     lua_pushcfunction(L, moonbr_addtraceback);  // on stack position 1
-    {
-      int i;
-      for (i=optind; i<argc; i++) {
-        moonbr_log(LOG_INFO, "Loading \"%s\"", argv[i]);
-        if (luaL_loadfile(L, argv[i])) {
-          moonbr_log(LOG_ERR, "Error while loading \"%s\": %s", argv[i], lua_tostring(L, -1));
-          moonbr_terminate_error();
-        }
-        if (lua_pcall(L, 0, 0, 1)) {
-          moonbr_log(LOG_ERR, "Error while executing \"%s\": %s", argv[i], lua_tostring(L, -1));
-          moonbr_terminate_error();
-        }
-      }
+    moonbr_log(LOG_INFO, "Loading \"%s\"", argv[optind]);
+    if (luaL_loadfile(L, argv[optind])) {
+      moonbr_log(LOG_ERR, "Error while loading \"%s\": %s", argv[optind], lua_tostring(L, -1));
+      moonbr_terminate_error();
+    }
+    { int i; for (i=optind+1; i<argc; i++) lua_pushstring(L, argv[i]); }
+    if (lua_pcall(L, argc-(optind+1), 0, 1)) {
+      moonbr_log(LOG_ERR, "Error while executing \"%s\": %s", argv[optind], lua_tostring(L, -1));
+      moonbr_terminate_error();
     }
     lua_getglobal(L, "listen");
     lua_pushcfunction(L, moonbr_listen);