COMMON: fixes for RUN/EXEC

Author: chrisws

configure.ac

@@ -336,7 +336,6 @@ function buildConsole() {
       dnl preconfigured values for unix console build
       TARGET="Building Unix console version."
       AC_DEFINE(_UnixOS, 1, [Building under Unix like systems.])
-      AC_DEFINE(USE_TERM_IO, 0, [Uses terminal-io functions.])
       AC_DEFINE(DEV_EVENTS_OSD, 0, [dev_events() implemented using osd_events().])
       PACKAGE_LIBS="${PACKAGE_LIBS} -lm -ldl -lpthread"
       BUILD_SUBDIRS="src/common src/platform/unix"

src/common/device.c

@@ -18,24 +18,6 @@
 #define usleep(s) Sleep((DWORD)((s+500)/1000))
 #endif
 
-/**
- * break signal
- */
-#if defined(_UnixOS) || defined(_DOS)
-void termination_handler(int signum) {
-  static int ctrlc_count;
-
-  prog_error = -2;
-  ctrlc_count++;
-  if (ctrlc_count == 1) {
-    dev_printf("\n\n\033[0m\033[7m\a * %s %d * \033[0m\n", WORD_BREAK_AT, prog_line);
-  } else if (ctrlc_count == 3) {
-    dev_restore();
-    exit(1);
-  }
-}
-#endif
-
 /**
  * initialize all drivers
  */
@@ -398,26 +380,31 @@ void dev_printf(const char *fmt, ...) {
  * prints to the output device as per dev_printf
  */
 void log_printf(const char *format, ...) {
-  char buf[4096], *p = buf;
   va_list args;
-
   va_start(args, format);
-  p += vsnprintf(p, sizeof buf - 1, format, args);
+  unsigned size = vsnprintf(NULL, 0, format, args);
   va_end(args);
 
-  while (p > buf && isspace(p[-1])) {
-    *--p = '\0';
-  }
+  if (size) {
+    char *buf = malloc(size + 3);
+    va_start(args, format);
+    vsnprintf(buf, size + 1, format, args);
+    va_end(args);
 
-  *p++ = '\r';
-  *p++ = '\n';
-  *p = '\0';
+    buf[size] = '\0';
+    int i = size - 1;
+    while (i >= 0 && isspace(buf[i])) {
+      buf[i--] = '\0';
+    }
+    strcat(buf, "\r\n");
 
 #if defined(IMPL_LOG_WRITE)
-  lwrite(buf);
+    lwrite(buf);
 #else
-  dev_print(buf);
+    dev_print(buf);
 #endif
+    free(buf);
+  }
 }
 
 #if defined(BUILD_CONSOLE)

src/common/scan.c

@@ -4010,11 +4010,11 @@ void comp_preproc_unit_path(char *p) {
         *up++ = *p++;
       }
       *up = '\0';
-#if defined(setenv)
-      setenv(LCN_UNIT_PATH, upath, 1);
-#else
+#ifdef __MINGW32__
       sprintf(comp_bc_temp, "UNITPATH=%s", upath);
       putenv(strdup(comp_bc_temp));
+#else
+      setenv(LCN_UNIT_PATH, upath, 1);
 #endif
     }
   }

src/common/system.c

@@ -26,7 +26,6 @@
 extern char **environ;
 
 #define BUFSIZE 1024
-#define POPEN_BUFFSIZE 255
 
 #if defined(_Win32)
 
@@ -35,9 +34,9 @@ extern char **environ;
  *
  * returns a newly allocated string with the result or NULL
  *
- * warning: if the cmd is a GUI process, the pw_shell will hang
+ * warning: if the cmd is a GUI process, the shell will hang
  */
-char *pw_shell(const char *cmd) {
+char *shell(const char *cmd) {
   HANDLE h_inppip, h_outpip, h_errpip, h_pid;
   char buf[BUFSIZE + 1], cv_buf[BUFSIZE + 1];
   char *result = NULL;
@@ -52,7 +51,9 @@ char *pw_shell(const char *cmd) {
   sa.nLength = sizeof(sa);
   sa.bInheritHandle = TRUE;
 
+  log_printf("shell: %s\n", cmd);
   if (!CreatePipe(&h_inppip, &h_outpip, &sa, BUFSIZE)) {
+    log_printf("CreatePipe failed");
     return NULL;
   }
 
@@ -66,7 +67,6 @@ char *pw_shell(const char *cmd) {
   si.cb = sizeof(si);
   si.dwFlags = STARTF_USESHOWWINDOW | STARTF_USESTDHANDLES;
   si.wShowWindow = SW_HIDE;
-
   si.hStdOutput = h_outpip;
   si.hStdError = h_errpip;
 
@@ -92,9 +92,10 @@ char *pw_shell(const char *cmd) {
       strcat(result, cv_buf);
     }
     CloseHandle(pi.hProcess);
+    log_printf("shell completed %d bytes\n", strlen(result));
   }
   else {
-    // could not run it
+    log_printf("Failed to launch %s\n", cmd);
     result = NULL;
   }
 
@@ -112,7 +113,7 @@ char *pw_shell(const char *cmd) {
 int dev_run(const char *src, var_t *r, int wait) {
   int result = 1;
   if (r != NULL) {
-    char *buf = pw_shell(src);
+    char *buf = shell(src);
     if (buf != NULL) {
       r->type = V_STR;
       r->v.p.ptr = buf;
@@ -121,7 +122,7 @@ int dev_run(const char *src, var_t *r, int wait) {
       result = 0;
     }
   } else if (wait) {
-    char *out = pw_shell(src);
+    char *out = shell(src);
     if (out != NULL) {
       free(out);
     } else {
@@ -139,25 +140,24 @@ int dev_run(const char *src, var_t *r, int wait) {
   int result = 1;
   if (r != NULL) {
     r->type = V_STR;
-    r->v.p.size = POPEN_BUFFSIZE + 1;
+    r->v.p.size = BUFSIZE + 1;
     r->v.p.ptr = malloc(r->v.p.size);
-    *r->v.p.ptr = '\0';
+    r->v.p.ptr[0] = '\0';
 
     int bytes = 0;
     int total = 0;
-    char buf[256];
-
+    char buf[BUFSIZE + 1];
     FILE *fin = popen(src, "r");
     if (fin) {
       while (!feof(fin)) {
-        bytes = fread(buf, 1, POPEN_BUFFSIZE, fin);
-        total += bytes;
+        bytes = fread(buf, 1, BUFSIZE, fin);
         buf[bytes] = '\0';
-        strcat(r->v.p.ptr, buf);
-        if (total + POPEN_BUFFSIZE + 1 >= r->v.p.size) {
-          r->v.p.size += POPEN_BUFFSIZE + 1;
+        total += bytes;
+        if (total >= r->v.p.size) {
+          r->v.p.size += BUFSIZE + 1;
           r->v.p.ptr = realloc(r->v.p.ptr, r->v.p.size);
         }
+        strcat(r->v.p.ptr, buf);
       }
       pclose(fin);
     } else {

src/languages/messages.en.h

@@ -191,7 +191,7 @@
 #define ERR_GPF                 "\n\aOUT OF ADDRESS SPACE\n"
 #define ERR_CRITICAL_MISSING_PROC  "Unsupported built-in procedure call %ld, please report this bug"
 #define ERR_CHAIN_FILE          "CHAIN: File '%s' does not exist"
-#define ERR_RUN_FILE            "RUN/EXEC\"%s\" Failed"
+#define ERR_RUN_FILE            "RUN/EXEC \"%s\" Failed"
 #define ERR_RUNFUNC_FILE        "RUN(\"%s\"): Failed"
 #define ERR_PARCOUNT_SP         "Parameter count error @%d=%X"
 #define ERR_DATE                "Invalid DATE: '%s'. Expected DD/MM/YYYY"

src/ui/system.cpp

@@ -1034,19 +1034,26 @@ void System::setRestart() {
 }
 
 void System::systemPrint(const char *format, ...) {
-  char buf[4096], *p = buf;
   va_list args;
 
   va_start(args, format);
-  p += vsnprintf(p, sizeof(buf) - 1, format, args);
+  unsigned size = vsnprintf(NULL, 0, format, args);
   va_end(args);
-  *p = '\0';
 
-  deviceLog("%s", buf);
+  if (size) {
+    char *buf = (char *)malloc(size + 1);
+    va_start(args, format);
+    vsnprintf(buf, size + 1, format, args);
+    va_end(args);
+    buf[size] = '\0';
 
-  int prevScreen = _output->selectBackScreen(CONSOLE_SCREEN);
-  _output->print(buf);
-  _output->selectBackScreen(prevScreen);
+    deviceLog("%s", buf);
+
+    int prevScreen = _output->selectBackScreen(CONSOLE_SCREEN);
+    _output->print(buf);
+    _output->selectBackScreen(prevScreen);
+    free(buf);
+  }
 }
 
 //