rhodes 7.1.17 → 7.4.1

data/platform/shared/ruby/ext/rho/rhoruby.c

@@ -93,6 +93,8 @@ extern void Init_date_core(void);
 extern void Init_RubyNative_extension(void);
 
 
+extern void InitRhoRuby_fromRubyThread();
+
 //RhoSupport extension
 extern void Init_RhoSupport(void);
 extern VALUE require_compiled(VALUE fname, VALUE* result);
@@ -111,6 +113,7 @@ static ID onConfigConflicts_mid;
 static ID activateApp_mid;
 static ID deactivateApp_mid;
 static ID uiCreated_mid;
+static ID uiCloseRequest_mid;
 static ID uiDestroyed_mid;
 static ID loadServerSources_mid;
 static ID loadAllSyncSources_mid;
@@ -175,7 +178,7 @@ char *tzname[2];
 
 void RhoModifyRubyLoadPath( const char* );
 
-#if defined(OS_MACOSX) || defined(OS_ANDROID)
+#if defined(OS_MACOSX) || defined(OS_ANDROID) || ( defined(OS_LINUX) && !defined(OS_SAILFISH) )
 
 void Init_trans_utf_16_32();
 void Init_trans_single_byte();
@@ -191,14 +194,16 @@ void Init_transcoders() {
 
 void RhoRubyStart()
 {
-#ifndef RHO_RUBY_COMPILER
-    s_ruby_gc_lock = rho_mutex_create();
-#endif
-    const char* szRoot = rho_native_rhopath();
 //RHO
+    const char* szRoot = rho_native_rhopath();
 #if defined(_WIN32)
     char* av[] = { "" };
 #endif
+
+#ifndef RHO_RUBY_COMPILER
+    s_ruby_gc_lock = rho_mutex_create();
+#endif
+//RHO
 #ifdef HAVE_LOCALE_H
     setlocale(LC_CTYPE, "");
 #endif
@@ -216,9 +221,10 @@ void RhoRubyStart()
     ruby_init();
 
     Init_IO();
+#ifndef WINCE
     Init_wait();
     Init_nonblock();
-
+#endif
     Init_encdb();
 #if defined(OS_MACOSX) || defined(OS_ANDROID)
     Init_transcode();
@@ -251,6 +257,10 @@ void RhoRubyStart()
     Init_RhoConf(); //+
 #endif
 
+// init rho ruby API
+#if defined(OS_MACOSX) || defined(OS_ANDROID)
+    InitRhoRuby_fromRubyThread();
+#endif
 	Init_RhodesNativeViewManager();
 #if !defined(OS_MACOSX) && !defined(OS_ANDROID)
     Init_RhoBluetooth();
@@ -265,9 +275,9 @@ void RhoRubyStart()
     Init_socket(); //+
     Init_RhoEvent();
     Init_Calendar();
-        
+    #ifndef WINCE
     Init_date_core();
-
+    #endif
     Init_Extensions();
 
 #else // OS_WP8 is set
@@ -281,8 +291,9 @@ void RhoRubyStart()
 
 	Init_socket();
 	Init_stringio();
-        
+    #ifndef WINCE
     Init_date_core();
+    #endif
 
 	Init_Extensions();
 #endif //OS_WP8
@@ -352,6 +363,7 @@ void RhoRubyStart()
     CONST_ID(activateApp_mid, "activate_app");
     CONST_ID(deactivateApp_mid, "deactivate_app");
     CONST_ID(uiCreated_mid, "ui_created");
+    CONST_ID(uiCloseRequest_mid, "ui_close_request");    
     CONST_ID(uiDestroyed_mid, "ui_destroyed");
     CONST_ID(loadServerSources_mid,"load_server_sources");
     CONST_ID(loadAllSyncSources_mid,"load_all_sync_sources");
@@ -495,6 +507,11 @@ void rho_ruby_uiCreated()
     rb_funcall(framework, uiCreated_mid, 0);
 }
 
+void rho_ruby_uiCloseRequest()
+{
+    rb_funcall(framework, uiCloseRequest_mid, 0);
+}
+
 void rho_ruby_uiDestroyed()
 {
     rb_funcall(framework, uiDestroyed_mid, 0);
@@ -965,7 +982,7 @@ rho_param *rho_param_fromvalue(VALUE v)
             for (i = 0; i < size; ++i) {
                 VALUE key = rb_ary_entry(keys, i);
                 VALUE value = rb_hash_aref(v, key);
-                p->v.hash->name[i] = fpstrdup(RSTRING_PTR(rb_String(key)));
+                p->v.hash->name[i] = strdup(RSTRING_PTR(rb_String(key)));
                 p->v.hash->value[i] = rho_param_fromvalue(value);
             }
             return p;
@@ -1034,12 +1051,16 @@ void rho_ruby_holdValue(VALUE val)
 
 void rho_ruby_releaseValue(VALUE val)
 {
+    //RHO
+    VALUE ary_ary;
+    int bucket;
+    int done = 0;
+    
     rho_ruby_gc_lock();
+    ary_ary = GET_VM()->mark_object_ary;
+    bucket = RARRAY_LEN(ary_ary)-1;
+    //RHO
 
-    VALUE ary_ary = GET_VM()->mark_object_ary;
-
-    int bucket = RARRAY_LEN(ary_ary)-1;
-    int done = 0;
     for ( ; bucket >= 0; bucket-- ) {
         VALUE ary = rb_ary_at( ary_ary, INT2NUM(bucket) );
 

data/platform/shared/ruby/ext/rho/rhoruby.h

@@ -62,6 +62,7 @@ void rho_ruby_call_config_conflicts();
 void rho_ruby_activateApp();
 void rho_ruby_deactivateApp();
 void rho_ruby_uiCreated();
+void rho_ruby_uiCloseRequest();
 void rho_ruby_uiDestroyed();
 void rho_ruby_loadserversources(const char* szData);
 void rho_ruby_loadallsyncsources();

data/platform/shared/ruby/ext/socket/addrinfo.h

@@ -128,7 +128,7 @@
 #define	NI_DGRAM	0x00000010
 
 #ifndef HAVE_TYPE_STRUCT_ADDRINFO
-struct addrinfo {
+struct addrinfo_backup {
 	int	ai_flags;	/* AI_PASSIVE, AI_CANONNAME */
 	int	ai_family;	/* PF_xxx */
 	int	ai_socktype;	/* SOCK_xxx */
@@ -138,6 +138,7 @@ struct addrinfo {
 	struct sockaddr *ai_addr;	/* binary address */
 	struct addrinfo *ai_next;	/* next structure in linked list */
 };
+
 #endif
 
 #ifndef HAVE_GETADDRINFO

data/platform/shared/ruby/ext/socket/ipsocket.c

@@ -34,7 +34,7 @@ inetsock_cleanup(struct inetsock_arg *arg)
 	arg->local.res = 0;
     }
     if (arg->fd >= 0) {
-	fpclose(arg->fd);
+	close(arg->fd);
     }
     return Qnil;
 }
@@ -114,7 +114,7 @@ init_inetsock_internal(struct inetsock_arg *arg)
 
 	if (status < 0) {
 	    error = errno;
-	    fpclose(fd);
+	    close(fd);
 	    arg->fd = fd = -1;
 	    continue;
 	} else
@@ -140,7 +140,7 @@ init_inetsock_internal(struct inetsock_arg *arg)
 	status = listen(fd, SOMAXCONN);
 	if (status < 0) {
 	    error = errno;
-	    fpclose(fd);
+	    close(fd);
 	    rb_syserr_fail(error, "listen(2)");
 	}
     }

data/platform/shared/ruby/file.c

@@ -2962,11 +2962,11 @@ rb_file_s_umask(int argc, VALUE *argv)
     int omask = 0;
 
     if (argc == 0) {
-	omask = fpumask(0);
-	fpumask(omask);
+	omask = umask(0);
+	umask(omask);
     }
     else if (argc == 1) {
-	omask = fpumask(NUM2INT(argv[0]));
+	omask = umask(NUM2INT(argv[0]));
     }
     else {
 	rb_check_arity(argc, 0, 1);

data/platform/shared/ruby/io.c

@@ -338,10 +338,10 @@ rb_cloexec_dup2(int oldfd, int newfd)
             }
         }
         else {
-            ret = fpdup2(oldfd, newfd);
+            ret = dup2(oldfd, newfd);
         }
 #else
-        ret = fpdup2(oldfd, newfd);
+        ret = dup2(oldfd, newfd);
 #endif
         if (ret == -1) return -1;
     }
@@ -490,16 +490,16 @@ static rb_io_t *flush_before_seek(rb_io_t *fptr);
  */
 #define NEED_READCONV(fptr) ((fptr)->encs.enc2 != NULL || (fptr)->encs.ecflags & ~ECONV_CRLF_NEWLINE_DECORATOR)
 #define NEED_WRITECONV(fptr) (((fptr)->encs.enc != NULL && (fptr)->encs.enc != rb_ascii8bit_encoding()) || ((fptr)->encs.ecflags & ((ECONV_DECORATOR_MASK & ~ECONV_CRLF_NEWLINE_DECORATOR)|ECONV_STATEFUL_DECORATOR_MASK)))
-#define SET_BINARY_MODE(fptr) fpsetmode((fptr)->fd, O_BINARY)
+#define SET_BINARY_MODE(fptr) setmode((fptr)->fd, O_BINARY)
 
 #define NEED_NEWLINE_DECORATOR_ON_READ_CHECK(fptr) do {\
     if (NEED_NEWLINE_DECORATOR_ON_READ(fptr)) {\
 	if (((fptr)->mode & FMODE_READABLE) &&\
 	    !((fptr)->encs.ecflags & ECONV_NEWLINE_DECORATOR_MASK)) {\
-	    fpsetmode((fptr)->fd, O_BINARY);\
+	    setmode((fptr)->fd, O_BINARY);\
 	}\
 	else {\
-	    fpsetmode((fptr)->fd, O_TEXT);\
+	    setmode((fptr)->fd, O_TEXT);\
 	}\
     }\
 } while(0)
@@ -607,10 +607,10 @@ set_binary_mode_with_seek_cur(rb_io_t *fptr)
     if (!rb_w32_fd_is_text(fptr->fd)) return O_BINARY;
 #endif
     if (fptr->rbuf.len == 0 || fptr->mode & FMODE_DUPLEX) {
-	return fpsetmode(fptr->fd, O_BINARY);
+	return setmode(fptr->fd, O_BINARY);
     }
     flush_before_seek(fptr);
-    return fpsetmode(fptr->fd, O_BINARY);
+    return setmode(fptr->fd, O_BINARY);
 }
 #define SET_BINARY_MODE_WITH_SEEK_CUR(fptr) set_binary_mode_with_seek_cur(fptr)
 
@@ -1450,10 +1450,10 @@ do_writeconv(VALUE str, rb_io_t *fptr, int *converted)
     else if (MODE_BTMODE(DEFAULT_TEXTMODE,0,1)) {
 	if ((fptr->mode & FMODE_READABLE) &&
 	    !(fptr->encs.ecflags & ECONV_NEWLINE_DECORATOR_MASK)) {
-	    fpsetmode(fptr->fd, O_BINARY);
+	    setmode(fptr->fd, O_BINARY);
 	}
 	else {
-	    fpsetmode(fptr->fd, O_TEXT);
+	    setmode(fptr->fd, O_TEXT);
 	}
 	if (!rb_enc_asciicompat(rb_enc_get(str))) {
 	    rb_raise(rb_eArgError, "ASCII incompatible string written for text mode IO without encoding conversion: %s",
@@ -1879,7 +1879,7 @@ rb_io_eof(VALUE io)
 //RHO
 #if !defined(OS_WINCE) && (defined(RUBY_TEST_CRLF_ENVIRONMENT) || defined(_WIN32))
     if (!NEED_READCONV(fptr) && NEED_NEWLINE_DECORATOR_ON_READ(fptr)) {
-	return fpeof(fptr->fd) ? Qtrue : Qfalse;
+	return eof(fptr->fd) ? Qtrue : Qfalse;
     }
 #endif
     if (io_fillbuf(fptr) < 0) {
@@ -2881,7 +2881,7 @@ io_read(int argc, VALUE *argv, VALUE io)
     io_set_read_length(str, n);
 #if defined(RUBY_TEST_CRLF_ENVIRONMENT) || defined(_WIN32)
     if (previous_mode == O_TEXT) {
-	fpsetmode(fptr->fd, O_TEXT);
+	setmode(fptr->fd, O_TEXT);
     }
 #endif
     if (n == 0) return Qnil;
@@ -4208,14 +4208,14 @@ nogvl_close(void *ptr)
 {
     int *fd = ptr;
 
-    return (void*)(intptr_t)fpclose(*fd);
+    return (void*)(intptr_t)close(*fd);
 }
 
 static int
 maygvl_close(int fd, int keepgvl)
 {
     if (keepgvl)
-	return fpclose(fd);
+	return close(fd);
 
     /*
      * close() may block for certain file types (NFS, SO_LINGER sockets,
@@ -4821,7 +4821,7 @@ rb_io_binmode(VALUE io)
 	SET_BINARY_MODE_WITH_SEEK_CUR(fptr);
     }
     else {
-	fpsetmode(fptr->fd, O_BINARY);
+	setmode(fptr->fd, O_BINARY);
     }
 #endif
     return io;
@@ -5511,18 +5511,18 @@ rb_fdopen(int fd, const char *modestr)
 #if defined(__sun)
     errno = 0;
 #endif
-    file = fpfdopen(fd, modestr);
+    file = fdopen(fd, modestr);
     if (!file) {
 #if defined(__sun)
 	if (errno == 0) {
 	    rb_gc();
 	    errno = 0;
-	    file = fpopen(fd, modestr);
+	    file = fdopen(fd, modestr);
 	}
 	else
 #endif
 	if (rb_gc_for_fd(errno)) {
-	    file = fpopen(fd, modestr);
+	    file = fdopen(fd, modestr);
 	}
 	if (!file) {
 	    int e = errno;
@@ -6015,8 +6015,8 @@ pipe_open(VALUE execarg_obj, const char *modestr, int fmode, convconfig_t *convc
             rb_sys_fail_str(prog);
         if (rb_pipe(arg.pair) < 0) {
             e = errno;
-            fpclose(arg.write_pair[0]);
-            fpclose(arg.write_pair[1]);
+            close(arg.write_pair[0]);
+            close(arg.write_pair[1]);
             rb_syserr_fail_str(e, prog);
         }
         if (eargp) {
@@ -6042,10 +6042,10 @@ pipe_open(VALUE execarg_obj, const char *modestr, int fmode, convconfig_t *convc
     if (!NIL_P(execarg_obj)) {
         rb_protect(rb_execarg_fixup_v, execarg_obj, &state);
         if (state) {
-            if (0 <= arg.write_pair[0]) fpclose(arg.write_pair[0]);
-            if (0 <= arg.write_pair[1]) fpclose(arg.write_pair[1]);
-            if (0 <= arg.pair[0]) fpclose(arg.pair[0]);
-            if (0 <= arg.pair[1]) fpclose(arg.pair[1]);
+            if (0 <= arg.write_pair[0]) close(arg.write_pair[0]);
+            if (0 <= arg.write_pair[1]) close(arg.write_pair[1]);
+            if (0 <= arg.pair[0]) close(arg.pair[0]);
+            if (0 <= arg.pair[1]) close(arg.pair[1]);
             rb_execarg_parent_end(execarg_obj);
             rb_jump_tag(state);
         }
@@ -6094,11 +6094,11 @@ pipe_open(VALUE execarg_obj, const char *modestr, int fmode, convconfig_t *convc
 # if defined(HAVE_WORKING_FORK)
 	e = errno;
 # endif
-	fpclose(arg.pair[0]);
-	fpclose(arg.pair[1]);
+	close(arg.pair[0]);
+	close(arg.pair[1]);
         if ((fmode & (FMODE_READABLE|FMODE_WRITABLE)) == (FMODE_READABLE|FMODE_WRITABLE)) {
-            fpclose(arg.write_pair[0]);
-            fpclose(arg.write_pair[1]);
+            close(arg.write_pair[0]);
+            close(arg.write_pair[1]);
         }
 # if defined(HAVE_WORKING_FORK)
         if (errmsg[0])
@@ -6107,17 +6107,17 @@ pipe_open(VALUE execarg_obj, const char *modestr, int fmode, convconfig_t *convc
 	rb_syserr_fail_str(e, prog);
     }
     if ((fmode & FMODE_READABLE) && (fmode & FMODE_WRITABLE)) {
-        fpclose(arg.pair[1]);
+        close(arg.pair[1]);
         fd = arg.pair[0];
-        fpclose(arg.write_pair[0]);
+        close(arg.write_pair[0]);
         write_fd = arg.write_pair[1];
     }
     else if (fmode & FMODE_READABLE) {
-        fpclose(arg.pair[1]);
+        close(arg.pair[1]);
         fd = arg.pair[0];
     }
     else {
-        fpclose(arg.pair[0]);
+        close(arg.pair[0]);
         fd = arg.pair[1];
     }
 #else
@@ -6847,7 +6847,7 @@ rb_io_reopen(int argc, VALUE *argv, VALUE file)
 			   rb_io_oflags_modestr(oflags),
 			   fptr->stdio_file);
 	if (e) rb_syserr_fail_path(e, fptr->pathv);
-        fptr->fd = fpfileno(fptr->stdio_file);
+        fptr->fd = fileno(fptr->stdio_file);
         rb_fd_fix_cloexec(fptr->fd);
 #ifdef USE_SETVBUF
         if (setvbuf(fptr->stdio_file, NULL, _IOFBF, 0) != 0)
@@ -6867,7 +6867,7 @@ rb_io_reopen(int argc, VALUE *argv, VALUE file)
 	int err = 0;
 	if (rb_cloexec_dup2(tmpfd, fptr->fd) < 0)
 	    err = errno;
-	(void)fpclose(tmpfd);
+	(void)close(tmpfd);
 	if (err) {
 	    rb_syserr_fail_path(err, fptr->pathv);
 	}
@@ -7356,8 +7356,8 @@ rb_write_error_str(VALUE mesg)
 	size_t len = (size_t)RSTRING_LEN(mesg);
 //RHO
 #if defined(_WIN32) && !defined(OS_WINCE) && !defined(OS_UWP)
-	if (isatty(fpfileno(stderr))) {
-	    if (rb_w32_write_console(mesg, fpfileno(stderr)) > 0) return;
+	if (isatty(fileno(stderr))) {
+	    if (rb_w32_write_console(mesg, fileno(stderr)) > 0) return;
 	}
 #endif
 	if (fwrite(RSTRING_PTR(mesg), sizeof(char), len, stderr) < len) {
@@ -7428,7 +7428,7 @@ prep_stdio(FILE *f, int fmode, VALUE klass, const char *path)
 #ifdef WINCE
     int fn = -1;
 #else
-    int fn = fpfileno(f);
+    int fn = fileno(f);
 #endif
     VALUE io = prep_io(fn, fmode|FMODE_PREP|DEFAULT_TEXTMODE, klass, path);
 //RHO
@@ -7709,11 +7709,11 @@ rb_io_initialize(int argc, VALUE *argv, VALUE io)
     fp->encs = convconfig;
     clear_codeconv(fp);
     io_check_tty(fp);
-    if (fpfileno(stdin) == fd)
+    if (fileno(stdin) == fd)
 	fp->stdio_file = stdin;
-    else if (fpfileno(stdout) == fd)
+    else if (fileno(stdout) == fd)
 	fp->stdio_file = stdout;
-    else if (fpfileno(stderr) == fd)
+    else if (fileno(stderr) == fd)
 	fp->stdio_file = stderr;
 
     if (fmode & FMODE_SETENC_BY_BOM) io_set_encoding_by_bom(io);
@@ -8057,7 +8057,7 @@ argf_next_argv(VALUE argf)
 			rb_str_cat2(str, ARGF.inplace);
 			/* TODO: encoding of ARGF.inplace */
 #ifdef NO_SAFE_RENAME
-			(void)fpclose(fr);
+			(void)close(fr);
 			(void)unlink(RSTRING_PTR(str));
 			if (rename(fn, RSTRING_PTR(str)) < 0) {
 			    rb_warn("Can't rename %"PRIsVALUE" to %"PRIsVALUE": %s, skipping file",
@@ -9696,8 +9696,8 @@ rb_io_s_pipe(int argc, VALUE *argv, VALUE klass)
     args[2] = INT2FIX(O_RDONLY);
     r = rb_protect(io_new_instance, (VALUE)args, &state);
     if (state) {
-	fpclose(pipes[0]);
-	fpclose(pipes[1]);
+	close(pipes[0]);
+	close(pipes[1]);
 	rb_jump_tag(state);
     }
     GetOpenFile(r, fptr);
@@ -9708,7 +9708,7 @@ rb_io_s_pipe(int argc, VALUE *argv, VALUE klass)
     ies_args.opt = opt;
     rb_protect(io_encoding_set_v, (VALUE)&ies_args, &state);
     if (state) {
-	fpclose(pipes[1]);
+	close(pipes[1]);
         io_close(r);
 	rb_jump_tag(state);
     }
@@ -9717,7 +9717,7 @@ rb_io_s_pipe(int argc, VALUE *argv, VALUE klass)
     args[2] = INT2FIX(O_WRONLY);
     w = rb_protect(io_new_instance, (VALUE)args, &state);
     if (state) {
-	fpclose(pipes[1]);
+	close(pipes[1]);
 	if (!NIL_P(r)) rb_io_close(r);
 	rb_jump_tag(state);
     }
@@ -9728,7 +9728,7 @@ rb_io_s_pipe(int argc, VALUE *argv, VALUE klass)
 #if DEFAULT_TEXTMODE
     if ((fptr->mode & FMODE_TEXTMODE) && (fmode & FMODE_BINMODE)) {
 	fptr->mode &= ~FMODE_TEXTMODE;
-	fpsetmode(fptr->fd, O_BINARY);
+	setmode(fptr->fd, O_BINARY);
     }
 #if defined(RUBY_TEST_CRLF_ENVIRONMENT) || defined(_WIN32)
     if (fptr->encs.ecflags & ECONV_DEFAULT_NEWLINE_DECORATOR) {
@@ -9740,7 +9740,7 @@ rb_io_s_pipe(int argc, VALUE *argv, VALUE klass)
 #if DEFAULT_TEXTMODE
     if ((fptr2->mode & FMODE_TEXTMODE) && (fmode & FMODE_BINMODE)) {
 	fptr2->mode &= ~FMODE_TEXTMODE;
-	fpsetmode(fptr2->fd, O_BINARY);
+	setmode(fptr2->fd, O_BINARY);
     }
 #endif
     fptr2->mode |= fmode;