COMMON: fix crash on osx

Author: chrisws

ChangeLog

@@ -1,3 +1,6 @@
+2018-01-13 (0.12.12)
+	Fix osx crash
+
 2017-11-28 (0.12.11)
 	Fix img.save(dat) to build correct indexes
 	Fix ESCm implementation bug

src/common/blib.c

@@ -513,7 +513,7 @@ void cmd_print(int output) {
   byte last_op = 0;
   byte exitf = 0;
   byte use_format = 0;
-  int handle = 0;
+  intptr_t handle = 0;
   var_t var;
 
   // prefix - # (file)
@@ -654,7 +654,7 @@ void cmd_input(int input) {
   byte print_crlf = 1;
   var_t prompt;
   var_t *vuser_p = NULL;
-  int handle = 0;
+  intptr_t handle = 0;
   char *inps = NULL;
 
   v_init(&prompt);

src/common/blib_db.c

@@ -672,7 +672,7 @@ void cmd_floadln() {
 void cmd_fsaveln() {
   var_t file_name, *array_p = NULL, *var_p = NULL;
   int flags = DEV_FILE_OUTPUT;
-  int handle;
+  intptr_t handle;
 
   if (code_peek() == kwTYPE_SEP) {
     // "filename" is an already open file number

src/common/fmt.c

@@ -41,7 +41,7 @@ int fmt_cdig(char *fmt);
 char *fmt_getnumfmt(char *dest, char *source);
 char *fmt_getstrfmt(char *dest, char *source);
 void fmt_addfmt(const char *fmt, int type);
-void fmt_printL(int output, int handle);
+void fmt_printL(int output, intptr_t handle);
 
 typedef struct {
   char *fmt;    // the format or a string
@@ -787,7 +787,7 @@ void build_format(const char *fmt_cnst) {
 /*
  * print simple strings (parts of format)
  */
-void fmt_printL(int output, int handle) {
+void fmt_printL(int output, intptr_t handle) {
   if (fmt_count == 0) {
     return;
   } else {
@@ -808,15 +808,16 @@ void fmt_printL(int output, int handle) {
 /*
  * print formated number
  */
-void fmt_printN(var_num_t x, int output, int handle) {
+void fmt_printN(var_num_t x, int output, intptr_t handle) {
   if (fmt_count == 0) {
     rt_raise(ERR_FORMAT_INVALID_FORMAT);
   } else {
     fmt_printL(output, handle);
     fmt_node_t *node = &fmt_stack[fmt_cur];
     fmt_cur++;
-    if (fmt_cur >= fmt_count)
+    if (fmt_cur >= fmt_count) {
       fmt_cur = 0;
+    }
     if (node->type == 1) {
       char *buf = format_num(node->fmt, x);
       pv_write(buf, output, handle);
@@ -833,7 +834,7 @@ void fmt_printN(var_num_t x, int output, int handle) {
 /*
  * print formated string
  */
-void fmt_printS(const char *str, int output, int handle) {
+void fmt_printS(const char *str, int output, intptr_t handle) {
   if (fmt_count == 0) {
     rt_raise(ERR_FORMAT_INVALID_FORMAT);
   } else {

src/common/fmt.h

@@ -118,7 +118,7 @@ void free_format(void);
  * @param output is the output-set-of-routines code (see PV_xxx macros)
  * @param handle is the output handle (depented on output-code)
  */
-void fmt_printN(var_num_t x, int output, int handle);
+void fmt_printN(var_num_t x, int output, intptr_t handle);
 
 /**
  * @ingroup str
@@ -131,7 +131,7 @@ void fmt_printN(var_num_t x, int output, int handle);
  * @param output is the output-set-of-routines code (see PV_xxx macros)
  * @param handle is the output handle (depented on output-code)
  */
-void fmt_printS(const char *str, int output, int handle);
+void fmt_printS(const char *str, int output, intptr_t handle);
 
 #if defined(__cplusplus)
 }

src/common/pproc.h

@@ -79,7 +79,7 @@ void set_dataip(uint16_t label_id);
  *
  * @note avoid to use it
  */
-void pv_write(char *str, int method, int handle);
+void pv_write(char *str, int method, intptr_t handle);
 
 /**
  * @ingroup exec
@@ -88,7 +88,7 @@ void pv_write(char *str, int method, int handle);
  *
  * @note avoid to use it
  */
-void pv_writevar(var_t *var, int method, int handle);
+void pv_writevar(var_t *var, int method, intptr_t handle);
 
 /**
  * @ingroup exec
@@ -107,7 +107,7 @@ void print_var(var_t *var);
  * @param var is the variable
  * @param handle is the file-handle
  */
-void fprint_var(int handle, var_t *var);
+void fprint_var(intptr_t handle, var_t *var);
 
 /**
  * @ingroup exec

src/common/proc.c

@@ -163,33 +163,34 @@ void exec_usefunc2(var_t *var1, var_t *var2, bcip_t ip) {
   v_detach(old_y);
 }
 
+void pv_write_str(char *str, var_t *vp) {
+  vp->v.p.length += strlen(str);
+  if (vp->v.p.ptr == NULL) {
+    vp->v.p.ptr = malloc(vp->v.p.length + 1);
+    vp->v.p.owner = 1;
+    strcpy((char *)vp->v.p.ptr, str);
+  } else {
+    vp->v.p.ptr = realloc(vp->v.p.ptr, vp->v.p.length + 1);
+    strcat((char *)vp->v.p.ptr, str);
+  }
+}
+
 /*
  * Write string to output device
  */
-void pv_write(char *str, int method, int handle) {
-  var_t *vp;
-
+void pv_write(char *str, int method, intptr_t handle) {
   switch (method) {
   case PV_FILE:
-    dev_fwrite(handle, (byte *)str, strlen(str));
+    dev_fwrite((int)handle, (byte *)str, strlen(str));
     break;
   case PV_LOG:
     lwrite(str);
     break;
   case PV_STRING:
-    vp = (var_t*)(intptr_t)handle;
-    vp->v.p.length += strlen(str);
-    if (vp->v.p.ptr == NULL) {
-      vp->v.p.ptr = malloc(vp->v.p.length + 1);
-      vp->v.p.owner = 1;
-      strcpy((char *)vp->v.p.ptr, str);
-    } else {
-      vp->v.p.ptr = realloc(vp->v.p.ptr, vp->v.p.length + 1);
-      strcat((char *)vp->v.p.ptr, str);
-    }
+    pv_write_str(str, (var_t *)handle);
     break;
   case PV_NET:
-    net_print((socket_t) handle, (const char *)str);
+    net_print((socket_t)handle, (const char *)str);
     break;
   default:
     dev_print(str);
@@ -199,7 +200,7 @@ void pv_write(char *str, int method, int handle) {
 /*
  * just prints the value of variable 'var'
  */
-void pv_writevar(var_t *var, int method, int handle) {
+void pv_writevar(var_t *var, int method, intptr_t handle) {
   char tmpsb[64];
 
   // start with a clean buffer
@@ -244,7 +245,7 @@ void print_var(var_t *v) {
 /*
  * write a variable to a file
  */
-void fprint_var(int handle, var_t *v) {
+void fprint_var(intptr_t handle, var_t *v) {
   pv_writevar(v, PV_FILE, handle);
 }
 

src/common/var_map.c

@@ -404,7 +404,7 @@ char *map_to_str(const var_p_t var_p) {
 /**
  * Print the contents of the structure
  */
-void map_write(const var_p_t var_p, int method, int handle) {
+void map_write(const var_p_t var_p, int method, intptr_t handle) {
   if (var_p->type == V_MAP || var_p->type == V_ARRAY) {
     char *buffer = map_to_str(var_p);
     pv_write(buffer, method, handle);

src/common/var_map.h

@@ -35,7 +35,7 @@ void map_get_value(var_p_t base, var_p_t key, var_p_t *result);
 void map_set(var_p_t dest, const var_p_t src);
 void map_set_int(var_p_t base, const char *name, var_int_t n);
 char *map_to_str(const var_p_t var_p);
-void map_write(const var_p_t var_p, int method, int handle);
+void map_write(const var_p_t var_p, int method, intptr_t handle);
 void map_parse_str(const char *js, size_t len, var_p_t dest);
 void map_from_str(var_p_t var_p);
 void map_from_codearray(var_p_t var_p);

src/platform/console/main.c

@@ -253,10 +253,10 @@ int process_options(int argc, char *argv[]) {
   return 1;
 }
 
-#if defined(__GNUC__)
+#if defined(__GNUC__) && !defined(__MACH__)
 // for analysing excessive malloc calls using kdbg
 extern void *__libc_malloc(size_t size);
-void* malloc (size_t size) {
+void *malloc(size_t size) {
   return __libc_malloc(size);
 }
 #endif