COMMON: fix memory leak, fix unit path error

Author: chrisws

README.md

@@ -81,29 +81,6 @@ Useful adb commands for debugging:
 adb shell dumpsys cpuinfo
 adb shell top -m 10
 
-## Building the TIZEN port
-
-1. Download and install the Tizen IDE
-
-2. Add the following lines to .bashrc
-```
-TIZEN_SDK=${HOME}/tizen-sdk
-TIZEN_ROOTSTRAP=${TIZEN_SDK}/platforms/mobile-3.0/rootstraps/mobile-3.0-device.native
-export TIZEN_BIN=${TIZEN_SDK}/tools/arm-linux-gnueabi-gcc-4.5/bin
-export TIZEN_LIBS=${HOME}/tizen-lib
-export PATH=${PATH}:${TIZEN_BIN}:~/bin
-export CHOST=arm-linux-gnueabi
-export LDFLAGS="--sysroot=${TIZEN_ROOTSTRAP} -L${TIZEN_LIBS}/lib"
-export CPPFLAGS="--sysroot=${TIZEN_ROOTSTRAP} -fmessage-length=0 -fPIC\
-  -I${TIZEN_ROOTSTRAP}/usr/include -I${TIZEN_LIBS}/include"
-export CFLAGS=${CPPFLAGS}
-```
-3. Build the common components
-```
-./configure --enable-tizen
-```
-4. Build the project using Tizen IDE
-
 ### .indent.pro settings
 ```
  -brf -nbap -br -brs -cdb -cdw -ce -cli0 -fca -i2 -l110 -lc110 -lp

configure.ac

@@ -34,11 +34,6 @@ AC_ARG_ENABLE(sdl,
   [ac_build_sdl="yes"],
   [ac_build_sdl="no"])
 
-AC_ARG_ENABLE(tizen,
-  AS_HELP_STRING([--enable-tizen],[build common library for Tizen(default=no)]),
-  [ac_build_tizen="yes"],
-  [ac_build_tizen="no"])
-
 AC_ARG_ENABLE(android,
   AS_HELP_STRING([--enable-android],[build common library for Android(default=no)]),
   [ac_build_android="yes"],
@@ -90,9 +85,6 @@ function checkPCRE() {
      have_pcre="no"
    esac
 
-   if test x$ac_build_tizen = xyes; then
-     have_pcre="no"
-   fi
    if test x$ac_build_android = xyes; then
      have_pcre="no"
    fi
@@ -253,23 +245,6 @@ function buildSDL() {
    (cd documentation && g++ -o build_kwp build_kwp.cpp && ./build_kwp > ../src/ui/kwp.h)
 }
 
-function buildTizen() {
-   TARGET="Building common library for Tizen."
-
-   defaultConditionals
-
-   AC_DEFINE(_UnixOS, 1, [Building under Unix like systems.])
-   AC_DEFINE(_TIZEN, 1, [Defined for Tizen build.])
-   AC_DEFINE(IMPL_DEV_READ, 1, [Implement dev_read()])
-   AC_DEFINE(DEV_EVENTS_OSD, 1, [dev_events() implemented using osd_events().])
-   AC_DEFINE(IMPL_DEV_DELAY, 1, [Driver implements dev_delay()])
-   AC_DEFINE(CPU_BIGENDIAN, 1, [Tizen uses big-endian])
-   AC_DEFINE(IMPL_LOG_WRITE, 1, [Driver implements lwrite()])
-
-   BUILD_SUBDIRS="src/platform/tizen/common"
-   AC_SUBST(BUILD_SUBDIRS)
-}
-
 function buildAndroid() {
    TARGET="Building for Android."
 
@@ -350,8 +325,6 @@ if test x$ac_build_fltk = xyes; then
    buildFLTK
 elif test x$ac_build_sdl = xyes; then
    buildSDL
-elif test x$ac_build_tizen = xyes; then
-   buildTizen
 elif test x$ac_build_android = xyes; then
    buildAndroid
 else
@@ -378,7 +351,6 @@ src/common/Makefile
 src/platform/fltk/Makefile
 src/platform/sdl/Makefile
 src/platform/unix/Makefile
-src/platform/tizen/common/Makefile
 src/platform/android/Makefile
 ])
 AC_OUTPUT

src/common/system.c

@@ -110,10 +110,10 @@ char *shell(const char *cmd) {
   return result;
 }
 
-int dev_run(const char *src, var_t *r, int wait) {
+int dev_run(const char *cmd, var_t *r, int wait) {
   int result = 1;
   if (r != NULL) {
-    char *buf = shell(src);
+    char *buf = shell(cmd);
     if (buf != NULL) {
       r->type = V_STR;
       r->v.p.ptr = buf;
@@ -137,13 +137,13 @@ int dev_run(const char *src, var_t *r, int wait) {
     }
   } else {
     HWND hwnd = GetActiveWindow();
-    ShellExecute(hwnd, "open", src, 0, 0, SW_SHOWNORMAL);
+    ShellExecute(hwnd, "open", cmd, 0, 0, SW_SHOWNORMAL);
   }
   return result;
 }
 
 #else
-int dev_run(const char *src, var_t *r, int wait) {
+int dev_run(const char *cmd, var_t *r, int wait) {
   int result = 1;
   if (r != NULL) {
     r->type = V_STR;
@@ -154,7 +154,7 @@ int dev_run(const char *src, var_t *r, int wait) {
     int bytes = 0;
     int total = 0;
     char buf[BUFSIZE + 1];
-    FILE *fin = popen(src, "r");
+    FILE *fin = popen(cmd, "r");
     if (fin) {
       while (!feof(fin)) {
         bytes = fread(buf, 1, BUFSIZE, fin);
@@ -172,18 +172,18 @@ int dev_run(const char *src, var_t *r, int wait) {
       result = 0;
     }
   } else if (wait) {
-    result = (system(src) != -1);
+    result = (system(cmd) != -1);
   }
   else if (fork() == 0) {
     // exec separate process
-    int size = strlen(src) + 3;
+    int size = strlen(cmd) + 3;
     char *src1 =  malloc(size);
     if (src1 != NULL) {
       memset(src1, '\0', size);
       // double quote the command
       *src1 = '"';
-      strcat(src1, src);
-      *(src1 + strlen(src) + 1) = '"';
+      strcat(src1, cmd);
+      *(src1 + strlen(cmd) + 1) = '"';
       // -c means the next argument is the command string to execute
       // this allow us to execute shell script
       execlp("sh", "sh", "-c", src1, NULL);

src/common/units.c

@@ -63,20 +63,14 @@ int find_unit_path(const char *name, char *file) {
     }
   }
 
-  // find in current directory
-  if (access(file, R_OK) == 0) {
+  // find in program launch directory
+  if (gsb_bas_dir[0] && sys_search_path(gsb_bas_dir, file, file)) {
     return 1;
   }
 
-  // find in program launch directory
-  if (gsb_bas_dir[0]) {
-    strcpy(file, gsb_bas_dir);
-    strcat(file, name);
-    strcat(file, ".bas");
-
-    if (access(file, R_OK) == 0) {
-      return 1;
-    }
+  // find in current directory
+  if (sys_search_path(".", file, file)) {
+    return 1;
   }
 
   return 0;

src/ui/system.cpp

@@ -438,6 +438,7 @@ char *System::loadResource(const char *fileName) {
       int len = cached->length();
       buffer = (char *)malloc(len + 1);
       memcpy(buffer, cached->c_str(), len);
+      buffer[len] = '\0';
     } else {
       int handle = 1;
       var_t *var_p = v_new();