intersys 0.2 → 0.2.1

data/lib/Makefile

@@ -75,8 +75,8 @@ extout_prefix =
 target_prefix = 
 LOCAL_LIBS = 
 LIBS = $(LIBRUBYARG_SHARED)  -lpthread -ldl -lobjc  
-SRCS = common.c database.c definition.c intersys.c object.c query.c
-OBJS = common.o database.o definition.o intersys.o object.o query.o
+SRCS = common.c database.c definition.c global.c intersys.c object.c query.c
+OBJS = common.o database.o definition.o global.o intersys.o object.o query.o
 TARGET = intersys_cache
 DLLIB = $(TARGET).bundle
 STATIC_LIB = 

data/lib/common.c

@@ -1,22 +1,23 @@
 #include "intersys.h"
 
 VALUE string_to_wchar(VALUE self) {
-	wchar_t w_chars[LEN(self) + 1];
+	VALUE result;
 	int size;
-	RUN(cbind_utf8_to_uni(STR(self), (byte_size_t)LEN(self), w_chars, (char_size_t)sizeof(w_chars), &size));
-	w_chars[size] = 0;
-	return rb_str_new((char *)w_chars, (size+1)*sizeof(wchar_t));
+	result = rb_str_buf_new((LEN(self)+1)*sizeof(wchar_t));
+	RUN(cbind_utf8_to_uni(STR(self), (byte_size_t)LEN(self), WCHARSTR(result), (char_size_t)sizeof(wchar_t)*LEN(self), &size));
+	WCHARSTR(result)[size] = 0;
+	return result;
 }
 
 VALUE string_from_wchar(VALUE self) {
-	char chars[LEN(self) + 1];
-	bzero(chars, sizeof(chars));
+	VALUE result;
 	int size;
 	if(LEN(self) == 0 || !STR(self)) {
 		return rb_str_new2("");
 	}
-    RUN(cbind_uni_to_utf8(WCHARSTR(self), wcslen(WCHARSTR(self)), chars, sizeof(chars), &size));
-	return rb_str_new(chars, size);
+	result = rb_str_buf_new(LEN(self));
+    RUN(cbind_uni_to_utf8(WCHARSTR(self), wcslen(WCHARSTR(self)), STR(result), LEN(result), &size));
+	return result;
 }
 
 
@@ -37,7 +38,7 @@ VALUE wcstr_new(const wchar_t *w_str, const char_size_t len) {
 	capa = (int)(len + 1)*sizeof(wchar_t);
 	
     result = rb_str_buf_new(capa);
-	bzero(STR(result) + size, capa-size);
+	memset(STR(result) + size, 0, capa-size);
 	rb_str_buf_cat(result, (char *)w_str, size);
 
 	rb_str_freeze(result);
@@ -58,7 +59,7 @@ static void intersys_status_mark(struct rbStatus* status) {
 
 VALUE intersys_status_s_allocate(VALUE klass) {
 	struct rbStatus* status = ALLOC(struct rbStatus);
-	bzero(status, sizeof(struct rbStatus));
+	memset(status, 0, sizeof(struct rbStatus));
 	return Data_Wrap_Struct(klass, intersys_status_mark, 0, status);
 }
 

data/lib/database.c

@@ -15,7 +15,7 @@ void intersys_base_free(struct rbDatabase* base) {
 
 VALUE intersys_base_s_allocate(VALUE klass) {
 	struct rbDatabase* intersys_base = ALLOC(struct rbDatabase);
-	bzero(intersys_base, sizeof(struct rbDatabase));
+	memset(intersys_base, 0, sizeof(struct rbDatabase));
 	return Data_Wrap_Struct(klass, 0, intersys_base_free, intersys_base);
 }
 

data/lib/definition.c

@@ -28,7 +28,7 @@ static void intersys_definition_mark(struct rbDefinition* definition) {
 
 VALUE intersys_definition_s_allocate(VALUE klass) {
 	struct rbDefinition* definition = ALLOC(struct rbDefinition);
-	bzero(definition, sizeof(struct rbDefinition));
+	memset(definition, 0, sizeof(struct rbDefinition));
 	definition->object = Qnil;
 	return Data_Wrap_Struct(klass, intersys_definition_mark, intersys_definition_free, definition);
 }
@@ -243,14 +243,15 @@ static VALUE extract_next_dlist_elem(char *dlist, int* elem_size) {
 VALUE intersys_method_call(VALUE self, VALUE args) {
 	struct rbDefinition* method;
 	int i;
+	VALUE database = rb_iv_get(self, "@database");
+	VALUE class_name = rb_iv_get(self, "@class_name");
+	VALUE name = rb_iv_get(self, "@name");
+
 	Check_Type(args, T_ARRAY);
 	Data_Get_Struct(self, struct rbDefinition, method);
 	if(RARRAY(args)->len > method->num_args) {
 		rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)", RARRAY(args)->len, method->num_args);
 	}
-	VALUE database = rb_iv_get(self, "@database");
-	VALUE class_name = rb_iv_get(self, "@class_name");
-	VALUE name = rb_iv_get(self, "@name");
 	
 	RUN(cbind_reset_args(method->database));
 	RUN(cbind_mtd_rewind_args(method->def));
@@ -447,7 +448,7 @@ VALUE intersys_method_extract_retval(VALUE self) {
 			//It is important to add wchar_t to end, because for wcslen we need more than 1 terminating zero.
 			//I don't know exactly, how works wcslen, but I add 4 (sizeof wchar_t) terminating zeroes
 			result = rb_str_buf_new(size + sizeof(wchar_t));
-			bzero(STR(result) + size, sizeof(wchar_t));
+			memset(STR(result) + size, 0, sizeof(wchar_t));
             RUN(cbind_get_arg_as_str(method->database, method->passed_args, STR(result), size, CPP_UNICODE, &size, &is_null));
 			LEN(result) = size;
 			return FROMWCHAR(result);
@@ -495,8 +496,8 @@ VALUE intersys_method_extract_retval(VALUE self) {
 
 VALUE intersys_argument_marshall_dlist_elem(VALUE self, VALUE elem) {
 	struct rbDefinition* argument;
-	Data_Get_Struct(self, struct rbDefinition, argument);
 	int elem_size;
+	Data_Get_Struct(self, struct rbDefinition, argument);
 	
 	switch(TYPE(elem)) {
 		case T_NIL: {

data/lib/extconf.rb

@@ -18,7 +18,8 @@ MACOS = RUBY_PLATFORM.match(/darwin/)
 @cache_placements = ["/home/max/cache", "/Applications/Cache", "/cygdrive/c/Progra~1/Cache", "/cygdrive/c/Cachesys", "C:/Cachesys"]
 
 def locations(suffix)
-  @cache_placements.map {|place| place + suffix}.map{|place| place.split("/").join(WIN32 ? "\\" : "/") }
+  # .map{|place| place.split("/").join(WIN32 ? "\\" : "/")}
+  @cache_placements.map {|place| place + suffix }
 end                                                                                             
 
 def include_locations
@@ -35,23 +36,27 @@ def include_flags
 end
 
 if WIN32
-  $CFLAGS << ' -I"C:\\Program Files\\Microsoft Visual Studio .NET 2003\\Vc7\\PlatformSDK\\Include" '
-  $CFLAGS << ' -I"C:\\Program Files\\Microsoft Visual Studio .NET 2003\\Vc7\\include" '
-  $LDFLAGS << ' -libpath:"C:\\CacheSys\\dev\\cpp\\lib" '
-  $LDFLAGS << ' -libpath:"C:\\Program Files\\Microsoft Visual Studio .NET 2003\\Vc7\\lib" '
-  $LDFLAGS << ' -libpath:"C:\\Program Files\\Microsoft Visual Studio .NET 2003\\Vc7\PlatformSDK\\Lib" '
+  $CFLAGS << ' -I"C:\\Program Files\\Microsoft Platform SDK\\Include\\crt" '
+  $CFLAGS << ' -I"C:\\Program Files\\Microsoft Platform SDK\\Include" '
+  $CFLAGS << ' -I"C:\\Program Files\\Microsoft Visual Studio 8\\VC\\include" -D_WIN32 '
+  $LDFLAGS << ' /link -libpath:"C:/CacheSys/dev/cpp/lib" '
+  $LDFLAGS << ' -libpath:"C:/Program Files/Microsoft Visual Studio 8/VC/lib" '
+  $LDFLAGS << ' -libpath:"C:/Program Files/Microsoft Platform SDK/Lib" '
 end
 
 
 def link_flags
-  " "+(library_locations.map { |place| "-L"+place} + ["-Wall"]).join(" ")
+  " "+(library_locations.map { |place| WIN32 ? "-libpath:\"#{place}\"" :  ("-L"+place)} + ["-Wall"]).join(" ")
 end
 
 $CFLAGS << include_flags
 $LDFLAGS << link_flags
 
 have_header "c_api.h"
-have_header "sql.h"
+unless have_header "sql.h" 
+  $CFLAGS << ' -Isql_include '
+  have_header "sql.h"
+end
 have_header "sqlext.h"
 
 unless MACOS
@@ -61,3 +66,4 @@ end
 
 create_makefile 'intersys_cache'
 
+

data/lib/intersys.h

@@ -7,6 +7,13 @@
 #include <time.h>
 #include <c_api.h>
 
+#ifdef _WIN32
+#ifndef _WCHAR_T_DEFINED
+typedef unsigned short wchar_t;
+#define _WCHAR_T_DEFINED
+#endif
+#endif /* WIN32 */
+
 struct rbDatabase {
 	h_connection connection;
 	h_database database;

data/lib/object.c

@@ -15,7 +15,7 @@ static void intersys_object_mark(struct rbObject* object) {
 
 VALUE intersys_object_s_allocate(VALUE klass) {
 	struct rbObject* object = ALLOC(struct rbObject);
-	bzero(object, sizeof(struct rbObject));
+	memset(object, 0, sizeof(struct rbObject));
 	return Data_Wrap_Struct(klass, intersys_object_mark, intersys_object_free, object);
 }
 

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: intersys
 version: !ruby/object:Gem::Version 
-  version: "0.2"
+  version: 0.2.1
 date: 2006-09-16 00:00:00 +04:00
 summary: Intersystems Cache ruby driver
 require_paths: 
@@ -47,6 +47,8 @@ files:
 - lib/Makefile
 - lib/object.c
 - lib/object.rb
+- lib/poppack.h
+- lib/pshpack1.h
 - lib/query.c
 - lib/reflection.rb
 - lib/sql_include