rhodes 7.1.17 → 7.4.1

data/platform/shared/curl/lib/curl_config.h

@@ -365,9 +365,7 @@
 #define HAVE_IOCTL_FIONBIO 1
 
 /* Define to 1 if you have a working ioctl SIOCGIFADDR function. */
-#ifndef OS_LINUX
 #define HAVE_IOCTL_SIOCGIFADDR 1
-#endif
 
 /* Define to 1 if you have the <io.h> header file. */
 /* #undef HAVE_IO_H */
@@ -873,7 +871,7 @@
 #define RECV_TYPE_ARG4 unsigned int
 
 /* Define to the function return type for recv. */
-#ifdef __aarch64__
+#if defined(__aarch64__) || defined(__x86_64__) || defined(__amd64__)
 #define RECV_TYPE_RETV ssize_t
 #else
 #define RECV_TYPE_RETV int
@@ -913,7 +911,7 @@
 #define SEND_TYPE_ARG4 unsigned int
 
 /* Define to the function return type for send. */
-#ifdef __aarch64__
+#if defined(__aarch64__) || defined(__x86_64__) || defined(__amd64__)
 #define SEND_TYPE_RETV size_t
 #else
 #define SEND_TYPE_RETV int
@@ -923,7 +921,7 @@
 #define SIZEOF_INT 4
 
 /* The size of `long', as computed by sizeof. */
-#ifdef __aarch64__
+#if defined(__aarch64__) || defined(__x86_64__) || defined(__amd64__)
 #define SIZEOF_LONG 8
 #else
 #define SIZEOF_LONG 4
@@ -933,7 +931,7 @@
 /* #undef SIZEOF_LONG_LONG */
 
 /* The size of `off_t', as computed by sizeof. */
-#ifdef __aarch64__
+#if defined(__aarch64__) || defined(__x86_64__) || defined(__amd64__)
 #define SIZEOF_OFF_T 8
 #else
 #define SIZEOF_OFF_T 4
@@ -943,21 +941,21 @@
 #define SIZEOF_SHORT 2
 
 /* The size of `size_t', as computed by sizeof. */
-#ifdef __aarch64__
+#if defined(__aarch64__) || defined(__x86_64__) || defined(__amd64__)
 #define SIZEOF_SIZE_T 8
 #else
 #define SIZEOF_SIZE_T 4
 #endif
 
 /* The size of `time_t', as computed by sizeof. */
-#ifdef __aarch64__
+#if defined(__aarch64__) || defined(__x86_64__) || defined(__amd64__)
 #define SIZEOF_TIME_T 8
 #else
 #define SIZEOF_TIME_T 4
 #endif
 
 /* The size of `void*', as computed by sizeof. */
-#ifdef __aarch64__
+#if defined(__aarch64__) || defined(__x86_64__) || defined(__amd64__)
 #define SIZEOF_VOIDP 8
 #else
 #define SIZEOF_VOIDP 4
@@ -1097,7 +1095,8 @@
 
 /* RHO BEGIN */
 //#if defined(OS_IPHONE) || defined(OS_ANDROID) || defined(OS_WP8)
-#if defined(OS_IPHONE) || defined(OS_MACOSX) || defined(OS_ANDROID) || defined(OS_WP8) || defined(OS_UWP)
+#if defined(OS_IPHONE) || defined(OS_MACOSX) || defined(OS_ANDROID) || defined(OS_WP8) || defined(OS_UWP) || defined(OS_LINUX)
 #define USE_RHOSSL
+//#define USE_OPENSSL
 #endif
 /* RHO END */

data/platform/shared/curl/lib/curl_setup.h

@@ -519,6 +519,9 @@
 #  undef USE_THREADS_WIN32
 #endif
 
+#if defined (OS_LINUX)
+#define USE_THREADS_POSIX
+#endif
 /*
  * MSVC threads support requires a multi-threaded runtime library.
  * _beginthreadex() is not available in single-threaded ones.
@@ -547,6 +550,7 @@
 #  define CURLRES_SYNCH
 #endif
 
+
 #ifdef ENABLE_IPV6
 #  define CURLRES_IPV6
 #else

data/platform/shared/curl/lib/multi.c

@@ -2155,7 +2155,6 @@ CURLMcode curl_multi_perform(struct Curl_multi *multi, int *running_handles)
   while(data) {
     CURLMcode result;
     SIGPIPE_VARIABLE(pipe_st);
-
     sigpipe_ignore(data, &pipe_st);
     result = multi_runsingle(multi, now, data);
     sigpipe_restore(&pipe_st);

data/platform/shared/curl/lib/transfer.c

@@ -109,8 +109,27 @@ CURLcode Curl_fillreadbuffer(struct connectdata *conn, int bytes, int *nreadp)
 
   /* this function returns a size_t, so we typecast to int to prevent warnings
      with picky compilers */
-  nread = (int)data->state.fread_func(data->req.upload_fromhere, 1,
-                                      buffersize, data->state.in);
+  //RHO: fixing curl problems on std input instead of socket input
+#ifndef OS_LINUX
+  nread = (int)data->state.fread_func(data->req.upload_fromhere, 1, buffersize, data->state.in);
+#else
+  nread = 0;
+//#define READ_FROM_SOCK
+#ifdef READ_FROM_SOCK
+  int i = 0;
+  for(; i < buffersize;){
+      nread = read(conn->sockfd, data->req.upload_fromhere + i, 1);
+      if (nread < 0) {
+          printf("socket error");
+      }else if (nread == 0) {
+        printf("socket closed");
+        break;
+      }else{
+          i++;
+      }
+  }
+#endif
+#endif
 
   if(nread == CURL_READFUNC_ABORT) {
     failf(data, "operation aborted by callback");

data/platform/shared/curl/lib/vtls/vtls.h

@@ -33,7 +33,10 @@
 #include "schannel.h"       /* Schannel SSPI version */
 #include "darwinssl.h"      /* SecureTransport (Darwin) version */
 #include "mbedtls.h"        /* mbedTLS versions */
+
+//RHO
 #include "rhossl.h"         /* Rhodes versions */
+//RHO
 
 #ifndef MAX_PINNED_PUBKEY_SIZE
 #define MAX_PINNED_PUBKEY_SIZE 1048576 /* 1MB */

data/platform/shared/db/CMakeLists.txt.erb

@@ -5,12 +5,7 @@ project(rhodb)
 add_definitions(-DOS_ANDROID)
 
 set(SOURCE_LIB
-<%= @rhoRoot %>/platform/shared/db/DBAdapter.cpp
-<%= @rhoRoot %>/platform/shared/db/DBAttrManager.cpp
-<%= @rhoRoot %>/platform/shared/db/DBResult.cpp
-<%= @rhoRoot %>/platform/shared/db/DBImportTransaction.cpp
-<%= @rhoRoot %>/platform/shared/db/DBRequestHelper.cpp
-<%= @rhoRoot %>/platform/shared/db/DBLock.cpp
+<%= @sourceList %>
 )
 
 include_directories(<%= @rhoRoot %>/platform/shared/db)

data/platform/shared/db/DBAdapter.cpp

@@ -42,8 +42,11 @@
 #endif //RHO_NO_RUBY
 
 #include <sstream>
-
-
+#ifdef WINCE
+#include <errno.h>
+#include <stdio.h>
+#define strerror(n) _T("some error")
+#endif
 #undef DEBUG_SQL_TRACE
 
 int rho_sys_zip_files_with_path_array_ptr(const char* szZipFilePath, const char *base_path, const rho::Vector<rho::String>& arFiles, const char* psw);
@@ -983,7 +986,7 @@ String CDBAdapter::tauDecryptTextFile(const String fullPath){
     char* decrypedFileBuff = new char [encrytedFileSize*2];
     
     size_t loaded = fread(encryptedFileBuff, 1, encrytedFileSize, fp);
-    if (loaded < encrytedFileSize) {
+    if ((int)loaded < encrytedFileSize) {
         if (ferror(fp) ) {
             RAWLOG_ERROR2("Can not read part of file (at position %lu): %s", (unsigned long)0, strerror(errno));
         } else if ( feof(fp) ) {
@@ -1001,8 +1004,11 @@ String CDBAdapter::tauDecryptTextFile(const String fullPath){
     delete[] encryptedFileBuff;
     String result = String(const_cast< const char * > (decrypedFileBuff), decrytedFileSize);
     delete[] decrypedFileBuff;
-
+    #ifndef WINCE
     return std::move(result);
+    #else
+    return result;
+    #endif
 }
 
 void CDBAdapter::createSchema()

data/platform/shared/json/RJSONTokener.c

@@ -27,13 +27,6 @@
 # define strncasecmp _strnicmp
 #endif
 
-#ifdef POSIXNAME
-#define fpstrdup _strdup
-#else
-#define fpstrdup strdup
-#endif // POSIXNAME
-
-
 #ifdef _MSC_VER
 // warning C4018: '<' : signed/unsigned mismatch
 #pragma warning ( disable : 4018 )
@@ -512,7 +505,7 @@ struct json_object* rjson_tokener_parse_ex(struct json_tokener *tok,
 
     case json_tokener_state_object_field:
       if(c == tok->quote_char) {
-	obj_field_name = fpstrdup(tok->pb->buf);
+	obj_field_name = strdup(tok->pb->buf);
     saved_state = c == ':' ? json_tokener_state_object_value : json_tokener_state_object_field_end;
 	state = json_tokener_state_eatws;
       } else if(c == '\\') {

data/platform/shared/json/json_object.c

@@ -271,7 +271,7 @@ void json_object_object_add(struct json_object* this, char *key,
 			    struct json_object *val)
 {
   lh_table_delete(this->o.c_object, key);
-  lh_table_insert(this->o.c_object, fpstrdup(key), val);
+  lh_table_insert(this->o.c_object, strdup(key), val);
 }
 
 struct json_object* json_object_object_get(struct json_object* this, char *key)
@@ -418,7 +418,7 @@ struct json_object* json_object_new_string(char *s)
   if(!this) return NULL;
   this->_delete = &json_object_string_delete;
   this->_to_json_string = &json_object_string_to_json_string;
-  this->o.c_string = fpstrdup(s);
+  this->o.c_string = strdup(s);
   this->str_len = strlen(s);
 
   return this;

data/platform/shared/json/json_tokener.c

@@ -477,7 +477,7 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
 
     case json_tokener_state_object_field:
       if(c == tok->quote_char) {
-	obj_field_name = fpstrdup(tok->pb->buf);
+	obj_field_name = strdup(tok->pb->buf);
     saved_state = c == ':' ? json_tokener_state_object_value : json_tokener_state_object_field_end;
 	state = json_tokener_state_eatws;
       } else if(c == '\\') {

data/platform/shared/json.new/CMakeLists.txt.erb

@@ -5,21 +5,7 @@ project(json)
 add_definitions(-DOS_ANDROID)   
 
 set(SOURCE_LIB
-<%= @rhoRoot %>/platform/shared/json.new/JSONIterator.cpp
-<%= @rhoRoot %>/platform/shared/json.new/RJSONTokener.c
-<%= @rhoRoot %>/platform/shared/json.new/arraylist.c
-<%= @rhoRoot %>/platform/shared/json.new/json_object.c
-<%= @rhoRoot %>/platform/shared/json.new/json_tokener.c
-<%= @rhoRoot %>/platform/shared/json.new/json_util.c
-<%= @rhoRoot %>/platform/shared/json.new/linkhash.c
-<%= @rhoRoot %>/platform/shared/json.new/printbuf.c
-<%= @rhoRoot %>/platform/shared/json.new/debug.c
-<%= @rhoRoot %>/platform/shared/json.new/json_c_version.c
-<%= @rhoRoot %>/platform/shared/json.new/json_object_iterator.c
-<%= @rhoRoot %>/platform/shared/json.new/json_pointer.c
-<%= @rhoRoot %>/platform/shared/json.new/json_visit.c
-<%= @rhoRoot %>/platform/shared/json.new/random_seed.c
-<%= @rhoRoot %>/platform/shared/json.new/strerror_override.c
+<%= @sourceList %>
 )
 
 include_directories(<%= @rhoRoot %>/platform/shared)

data/platform/shared/json.new/RJSONTokener.c

@@ -27,13 +27,6 @@
 # define strncasecmp _strnicmp
 #endif
 
-#ifdef POSIXNAME
-#define fpstrdup _strdup
-#else
-#define fpstrdup strdup
-#endif // POSIXNAME
-
-
 #ifdef _MSC_VER
 // warning C4018: '<' : signed/unsigned mismatch
 #pragma warning ( disable : 4018 )

data/platform/shared/json.new/json_object.c

@@ -484,7 +484,7 @@ int json_object_object_add_ex(struct json_object* jso,
 	if (!existing_entry)
 	{
 		const void *const k = (opts & JSON_C_OBJECT_KEY_IS_CONSTANT) ?
-					(const void *)key : fpstrdup(key);
+					(const void *)key : strdup(key);
 		if (k == NULL)
 			return -1;
 		return lh_table_insert_w_hash(jso->o.c_object, k, val, hash, opts);
@@ -745,7 +745,7 @@ int json_c_set_serialization_double_format(const char *double_format, int global
 #endif
 		if (global_serialization_float_format)
 			free(global_serialization_float_format);
-		global_serialization_float_format = double_format ? fpstrdup(double_format) : NULL;
+		global_serialization_float_format = double_format ? strdup(double_format) : NULL;
 	}
 	else if (global_or_thread == JSON_C_OPTION_THREAD)
 	{
@@ -879,7 +879,7 @@ struct json_object* json_object_new_double_s(double d, const char *ds)
 	if (!jso)
 		return NULL;
 
-	new_ds = fpstrdup(ds);
+	new_ds = strdup(ds);
 	if (!new_ds)
 	{
 		json_object_generic_delete(jso);
@@ -991,7 +991,7 @@ struct json_object* json_object_new_string(const char *s)
 	if(jso->o.c_string.len < LEN_DIRECT_STRING_DATA) {
 		memcpy(jso->o.c_string.str.data, s, jso->o.c_string.len);
 	} else {
-		jso->o.c_string.str.ptr = fpstrdup(s);
+		jso->o.c_string.str.ptr = strdup(s);
 		if (!jso->o.c_string.str.ptr)
 		{
 			json_object_generic_delete(jso);
@@ -1307,7 +1307,7 @@ static int json_object_copy_serializer_data(struct json_object *src, struct json
 
 	if (dst->_to_json_string == json_object_userdata_to_json_string)
 	{
-		dst->_userdata = fpstrdup(src->_userdata);
+		dst->_userdata = strdup(src->_userdata);
 	}
 	// else if ... other supported serializers ...
 	else

data/platform/shared/json.new/json_pointer.c

@@ -186,7 +186,7 @@ int json_pointer_get(struct json_object *obj, const char *path, struct json_obje
 	}
 
 	/* pass a working copy to the recursive call */
-	if (!(path_copy = fpstrdup(path))) {
+	if (!(path_copy = strdup(path))) {
 		errno = ENOMEM;
 		return -1;
 	}
@@ -257,7 +257,7 @@ int json_pointer_set(struct json_object **obj, const char *path, struct json_obj
 	}
 
 	/* pass a working copy to the recursive call */
-	if (!(path_copy = fpstrdup(path))) {
+	if (!(path_copy = strdup(path))) {
 		errno = ENOMEM;
 		return -1;
 	}

data/platform/shared/json.new/json_tokener.c

@@ -892,7 +892,7 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
 	while(1) {
 	  if(c == tok->quote_char) {
 	    printbuf_memappend_fast(tok->pb, case_start, str-case_start);
-	    obj_field_name = fpstrdup(tok->pb->buf);
+	    obj_field_name = strdup(tok->pb->buf);
 	    saved_state = json_tokener_state_object_field_end;
 	    state = json_tokener_state_eatws;
 	    break;

data/platform/shared/logging/CMakeLists.txt.erb

@@ -5,11 +5,7 @@ project(rholog)
 add_definitions(-DOS_ANDROID)
 
 set(SOURCE_LIB
-<%= @rhoRoot %>/platform/shared/logging/RhoLogConf.cpp
-<%= @rhoRoot %>/platform/shared/logging/RhoLogConf.cpp
-<%= @rhoRoot %>/platform/shared/logging/RhoLog.cpp
-<%= @rhoRoot %>/platform/shared/logging/RhoLogSink.cpp
-<%= @rhoRoot %>/platform/shared/logging/RhoPlainLog.cpp
+<%= @sourceList %>
 )
 
 include_directories(<%= @rhoRoot %>/platform/shared)

data/platform/shared/logging/RhoLogConf.cpp

@@ -34,6 +34,85 @@
 #include "common/app_build_capabilities.h"
 #include "ruby/ext/rho/rhoruby.h"
 
+static rho::String correct_string_for_utf8(rho::String *str)
+{
+    int i,f_size=(int)str->size();
+    unsigned char c,c2,c3,c4;
+    rho::String to;
+    to.reserve(f_size+(f_size/10));
+
+    for(i=0 ; i<f_size ; i++){
+        c=(unsigned char)(*str)[i];
+        if(c<32){//control char
+            if(c==9 || c==10 || c==13){//allow only \t \n \r
+                to.append(1,c);
+            }
+            continue;
+        }else if(c<127){//normal ASCII
+            to.append(1,c);
+            continue;
+        }else if(c<160){//control char (nothing should be defined here either ASCI, ISO_8859-1 or UTF8, so skipping)
+            if(c2==128){//fix microsoft mess, add euro
+                to.append(1,226);
+                to.append(1,130);
+                to.append(1,172);
+            }
+            if(c2==133){//fix IBM mess, add NEL = \n\r
+                to.append(1,10);
+                to.append(1,13);
+            }
+            continue;
+        }else if(c<192){//invalid for UTF8, converting ASCII
+            to.append(1,(unsigned char)194);
+            to.append(1,c);
+            continue;
+        }else if(c<194){//invalid for UTF8, converting ASCII
+            to.append(1,(unsigned char)195);
+            to.append(1,c-64);
+            continue;
+        }else if(c<224 && i+1<f_size){//possibly 2byte UTF8
+            c2=(unsigned char)(*str)[i+1];
+            if(c2>127 && c2<192){//valid 2byte UTF8
+                if(c==194 && c2<160){//control char, skipping
+                    ;
+                }else{
+                    to.append(1,c);
+                    to.append(1,c2);
+                }
+                i++;
+                continue;
+            }
+        }else if(c<240 && i+2<f_size){//possibly 3byte UTF8
+            c2=(unsigned char)(*str)[i+1];
+            c3=(unsigned char)(*str)[i+2];
+            if(c2>127 && c2<192 && c3>127 && c3<192){//valid 3byte UTF8
+                to.append(1,c);
+                to.append(1,c2);
+                to.append(1,c3);
+                i+=2;
+                continue;
+            }
+        }else if(c<245 && i+3<f_size){//possibly 4byte UTF8
+            c2=(unsigned char)(*str)[i+1];
+            c3=(unsigned char)(*str)[i+2];
+            c4=(unsigned char)(*str)[i+3];
+            if(c2>127 && c2<192 && c3>127 && c3<192 && c4>127 && c4<192){//valid 4byte UTF8
+                to.append(1,c);
+                to.append(1,c2);
+                to.append(1,c3);
+                to.append(1,c4);
+                i+=3;
+                continue;
+            }
+        }
+        //invalid UTF8, converting ASCII (c>245 || string too short for multi-byte))
+        //to.append(1,(unsigned char)195);
+        //to.append(1,c-64);
+    }
+    return to;
+}
+
+
 namespace rho{
 #ifdef mutexSmartPointer
 mutexSmartPointer LogSettings::m_FlushLock = mutexSmartPointer(new common::CMutex);
@@ -393,8 +472,8 @@ void LogSettings::sinkLogMessage( String& strMsg ){
 	if (logMemory.length() > 0)
 		internalSinkLogMessage(logMemory);
     */
-
-	internalSinkLogMessage(strMsg);
+    String fixedStr = ::correct_string_for_utf8(&strMsg);
+	internalSinkLogMessage(fixedStr);
 }
     
 void LogSettings::addAuxSink( ILogSink* sink )
@@ -427,7 +506,7 @@ void LogSettings::internalSinkLogMessage( String& strMsg ){
 
 	if (m_bLogToSocket && m_pSocketSink)
         m_pSocketSink->writeLogMessage(strMsg);
-    
+
     if (m_pAuxSinks.size() > 0)
     {
         for (Hashtable<ILogSink*, bool>::const_iterator it = m_pAuxSinks.begin(); it != m_pAuxSinks.end(); it++) {

data/platform/shared/net/CURLNetRequest.cpp

@@ -752,7 +752,7 @@ curl_slist *CURLNetRequest::CURLHolder::set_options(const char *method, const St
         curl_easy_setopt(m_curl,CURLOPT_NOPROXY,"127.0.0.1,localhost");
     }
     
-#if defined(OS_WP8) || defined(OS_UWP)
+#if defined(OS_WP8) || defined(OS_UWP) || defined(OS_LINUX)
 		if(strcasecmp(method, "POST") == 0 && strBody.length() == 0)
 		{
 			mStrBody = " ";
@@ -841,7 +841,6 @@ CURLcode CURLNetRequest::CURLHolder::perform()
     int const CHUNK = 1;
     
     long noactivity = 0;
-    
     CURLcode result;
     for(;;)
     {
@@ -907,11 +906,11 @@ CURLcode CURLNetRequest::CURLHolder::perform()
         result = CURLE_OK;
         if (msg && msg->msg == CURLMSG_DONE)
             result = msg->data.result;
-        if (result == CURLE_OK && noactivity >= timeout)
-            result = CURLE_OPERATION_TIMEDOUT;
-        if (result == CURLE_OK || result == CURLE_PARTIAL_FILE) {
-            RAWTRACE2("Operation completed successfully with result %d: %s", (int)result, curl_easy_strerror(result));
-        }
+            if (result == CURLE_OK && noactivity >= timeout)
+                result = CURLE_OPERATION_TIMEDOUT;
+            if (result == CURLE_OK || result == CURLE_PARTIAL_FILE) {
+                RAWTRACE2("Operation completed successfully with result %d: %s", (int)result, curl_easy_strerror(result));
+            }
         else {
             RAWLOG_ERROR2("Operation finished with error %d: %s", (int)result, curl_easy_strerror(result));