X-Git-Url: http://git.code-monkey.de/?p=ruby-eet.git;a=blobdiff_plain;f=ext%2Fext.c;h=e99d41ccf618604a1d9b40413abc1c8d79bf45f4;hp=e36442f9501e5025132db4e71bf8a282017773f5;hb=HEAD;hpb=b0bad9534611464914a7d7f5563b515e180e1f20

diff --git a/ext/ext.c b/ext/ext.c
index e36442f..e99d41c 100644
--- a/ext/ext.c
+++ b/ext/ext.c
@@ -1,7 +1,5 @@
 /*
- * $Id: ext.c 63 2005-06-09 17:47:46Z tilman $
- *
- * Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
+ * Copyright (c) 2005-2007 Tilman Sauerbeck (tilman at code-monkey de)
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -28,14 +26,23 @@
 #include <st.h>
 #include <locale.h>
 
-#define CHECK_KEY(key) \
+#define CHECK_NO_BIN0(key) \
 	if (rb_funcall (key, id_include, 1, INT2FIX (0)) == Qtrue) \
-		rb_raise (rb_eArgError, "key must not contain binary zeroes");
+		rb_raise (rb_eArgError, #key " must not contain binary zeroes");
 
 #define CHECK_CLOSED(ef) \
 	if (!*(ef)) \
 		rb_raise (rb_eIOError, "closed stream");
 
+#define CHECK_READABLE(ef) \
+	switch (eet_mode_get (*ef)) { \
+		case EET_FILE_MODE_READ: \
+		case EET_FILE_MODE_READ_WRITE: \
+			break; \
+		default: \
+			rb_raise (rb_eIOError, "permission denied"); \
+	}
+
 #ifdef WORDS_BIGENDIAN
 # define BSWAP32(x) \
 	((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | \
@@ -47,11 +54,10 @@
 static VALUE c_close (VALUE self);
 
 static VALUE cStream, cChunk,
-             eEetError, eNameError, ePropError, eStreamError,
-             eBadElementError,
+             eEetError, eNameError, ePropError,
              sym_lossy, sym_level, sym_quality, sym_char, sym_short,
              sym_long_long, sym_double;
-static ID id_include, id_serialize, id_keys,
+static ID id_include, id_to_s, id_keys, id_pack,
           id_to_eet_chunks, id_to_eet_name, id_to_eet_properties,
           id_tag, id_data;
 
@@ -180,47 +186,61 @@ c_close (VALUE self)
 	return self;
 }
 
+static VALUE
+get_keys (Eet_File *ef, const char *glob)
+{
+	VALUE ret;
+	char **keys;
+	int i, count = 0;
+
+	keys = eet_list (ef, glob, &count);
+	ret = rb_ary_new2 (count);
+
+	for (i = 0; i < count; i++)
+		rb_ary_store (ret, i, rb_str_new2 (keys[i]));
+
+	free (keys);
+
+	return ret;
+}
+
 /*
  * call-seq:
- *  ef.list([glob]) -> array
+ *  ef.entries -> array
  *
- * Returns an Array of entries in _ef_ that match the shell glob
- * _glob_ (defaulting to "*").
+ * Returns an Array with the keys of the entries in _ef_.
+ * If the keys cannot be retrieved, an +IOError+ is raised.
  */
 static VALUE
-c_list (int argc, VALUE *argv, VALUE self)
+c_entries (VALUE self)
 {
-	VALUE glob = Qnil, ret;
 	Eet_File **ef = NULL;
-	char **entries, *tmp = "*";
-	int i, count = 0;
 
 	Data_Get_Struct (self, Eet_File *, ef);
 	CHECK_CLOSED (ef);
+	CHECK_READABLE (ef);
 
-	switch (eet_mode_get (*ef)) {
-		case EET_FILE_MODE_READ:
-		case EET_FILE_MODE_READ_WRITE:
-			break;
-		default:
-			rb_raise (rb_eIOError, "cannot list entries");
-	}
-
-	rb_scan_args (argc, argv, "01", &glob);
-
-	if (!NIL_P (glob))
-		tmp = StringValuePtr (glob);
-
-	ret = rb_ary_new ();
-
-	entries = eet_list (*ef, tmp, &count);
+	return get_keys (*ef, "*");
+}
 
-	for (i = 0; i < count; i++)
-		rb_ary_push (ret, rb_str_new2 (entries[i]));
+/*
+ * call-seq:
+ *  ef[glob] -> array
+ *
+ * Returns an Array with the keys of entries in _ef_ that match the
+ * shell glob _glob_.
+ * If the keys cannot be retrieved, an +IOError+ is raised.
+ */
+static VALUE
+c_glob (VALUE self, VALUE glob)
+{
+	Eet_File **ef = NULL;
 
-	free (entries);
+	Data_Get_Struct (self, Eet_File *, ef);
+	CHECK_CLOSED (ef);
+	CHECK_READABLE (ef);
 
-	return ret;
+	return get_keys (*ef, StringValuePtr (glob));
 }
 
 /*
@@ -241,7 +261,7 @@ c_delete (VALUE self, VALUE key)
 	CHECK_CLOSED (ef);
 
 	ckey = StringValuePtr (key);
-	CHECK_KEY (key);
+	CHECK_NO_BIN0 (key);
 
 	if (!eet_delete (*ef, ckey))
 		rb_raise (rb_eIOError, "cannot delete entry - %s", ckey);
@@ -270,7 +290,7 @@ c_read (VALUE self, VALUE key)
 	CHECK_CLOSED (ef);
 
 	ckey = StringValuePtr (key);
-	CHECK_KEY (key);
+	CHECK_NO_BIN0 (key);
 
 	data = eet_read (*ef, ckey, &size);
 	if (!data)
@@ -310,7 +330,7 @@ c_write (int argc, VALUE *argv, VALUE self)
 		comp = Qtrue;
 
 	ckey = StringValuePtr (key);
-	CHECK_KEY (key);
+	CHECK_NO_BIN0 (key);
 	cbuf = StringValuePtr (buf);
 
 	n = eet_write (*ef, ckey,
@@ -341,13 +361,14 @@ c_read_image (VALUE self, VALUE key)
 	Eet_File **ef = NULL;
 	void *data;
 	char *ckey;
-	int w = 0, h = 0, has_alpha = 0, level = 0, quality = 0, lossy = 0;
+	unsigned int w = 0, h = 0;
+	int has_alpha = 0, level = 0, quality = 0, lossy = 0;
 
 	Data_Get_Struct (self, Eet_File *, ef);
 	CHECK_CLOSED (ef);
 
 	ckey = StringValuePtr (key);
-	CHECK_KEY (key);
+	CHECK_NO_BIN0 (key);
 
 	data = eet_data_image_read (*ef, ckey, &w, &h,
 	                            &has_alpha, &level, &quality,
@@ -403,7 +424,7 @@ c_write_image (int argc, VALUE *argv, VALUE self)
 		has_alpha = Qfalse;
 
 	ckey = StringValuePtr (key);
-	CHECK_KEY (key);
+	CHECK_NO_BIN0 (key);
 	cbuf = StringValuePtr (buf);
 	Check_Type (w, T_FIXNUM);
 	Check_Type (h, T_FIXNUM);
@@ -437,49 +458,24 @@ c_write_image (int argc, VALUE *argv, VALUE self)
 		return INT2FIX (n);
 }
 
-static VALUE
-stream_serialize (VALUE self)
-{
-	VALUE ret;
-	struct RArray *stream;
-	long i;
-
-	ret = rb_str_new2 ("");
-
-	stream = RARRAY (self);
-	if (!stream->len)
-		return ret;
-
-	for (i = 0; i < stream->len; i++) {
-		VALUE str;
-
-		if (rb_obj_is_kind_of (stream->ptr[i], cChunk) == Qfalse)
-			rb_raise (eBadElementError, "stream member is not a Chunk");
-
-		str = rb_funcall (stream->ptr[i], id_serialize, 0, NULL);
-
-		rb_str_append (ret, str);
-	}
-
-	return ret;
-}
-
 static VALUE
 chunk_init (VALUE self, VALUE tag, VALUE data)
 {
-	unsigned long len;
+	long tag_len, data_len, tmp;
 
 	StringValue (tag);
 	StringValue (data);
 
-	if (rb_funcall (tag, id_include, 1, INT2FIX (0)) == Qtrue) \
-		rb_raise (rb_eArgError, "tag must not contain binary zeroes");
+	CHECK_NO_BIN0 (tag);
 
 	/* libeet uses a signed 32bit integer to store the
 	 * chunk size, so make sure we don't overflow it
 	 */
-	len = RSTRING (tag)->len + 1 + RSTRING (data)->len;
-	if (len < 0 || len >= 2147483647L)
+	tag_len = RSTRING (tag)->len;
+	data_len = RSTRING (data)->len;
+	tmp = tag_len + 1 + data_len;
+
+	if (tmp < tag_len || tmp < data_len || tmp < 1 || tmp >= 2147483647L)
 		rb_raise (rb_eArgError, "tag or data too long");
 
 	rb_ivar_set (self, id_tag, rb_str_dup_frozen (tag));
@@ -489,7 +485,7 @@ chunk_init (VALUE self, VALUE tag, VALUE data)
 }
 
 static VALUE
-chunk_serialize (VALUE self)
+chunk_to_s (VALUE self)
 {
 	VALUE tmp, ret;
 	unsigned int size, buf_len;
@@ -497,17 +493,15 @@ chunk_serialize (VALUE self)
 	struct RString *tag, *data;
 
 	tmp = rb_ivar_get (self, id_tag);
-	StringValue (tmp);
 	tag = RSTRING (tmp);
 
 	tmp = rb_ivar_get (self, id_data);
-	StringValue (tmp);
 	data = RSTRING (tmp);
 
 	buf_len = 9 + tag->len + data->len;
 	ret = rb_str_buf_new (buf_len);
 
-	buf = RSTRING (ret)->ptr;
+	buf = (unsigned char *) RSTRING (ret)->ptr;
 	RSTRING (ret)->len = buf_len;
 
 	memcpy (buf, "CHnK", 4);
@@ -532,8 +526,6 @@ static int
 for_each_prop (VALUE tag, VALUE arg, VALUE stream)
 {
 	VALUE value, type, tmp;
-	struct RArray *chunks;
-	long i;
 
 	if (rb_obj_is_kind_of (arg, rb_cArray) == Qfalse)
 		rb_raise (ePropError, "hash value is not an array");
@@ -545,11 +537,7 @@ for_each_prop (VALUE tag, VALUE arg, VALUE stream)
 	type = rb_ary_entry (arg, 1);
 	tmp = rb_funcall (value, id_to_eet_chunks, 2, tag, type);
 
-	Check_Type (tmp, T_ARRAY);
-	chunks = RARRAY (tmp);
-
-	for (i = 0; i < chunks->len; i++)
-		rb_ary_push (stream, chunks->ptr[i]);
+	rb_ary_concat (stream, tmp);
 
 	return ST_CONTINUE;
 }
@@ -569,13 +557,13 @@ c_to_eet (VALUE self)
 	long i;
 #endif
 
-	props = rb_funcall (self, id_to_eet_properties, 0);
+	props = rb_funcall2 (self, id_to_eet_properties, 0, NULL);
 
 	if (rb_obj_is_kind_of (props, rb_cHash) == Qfalse ||
 	    !RHASH (props)->tbl->num_entries)
 		rb_raise (ePropError, "invalid EET properties");
 
-	name = rb_funcall (self, id_to_eet_name, 0);
+	name = rb_funcall2 (self, id_to_eet_name, 0, NULL);
 	StringValue (name);
 
 	if (!RSTRING (name)->len ||
@@ -587,7 +575,7 @@ c_to_eet (VALUE self)
 #ifdef HAVE_RB_HASH_FOREACH
 	rb_hash_foreach (props, for_each_prop, stream);
 #else
-	keys = RARRAY (rb_funcall (props, id_keys, 0));
+	keys = RARRAY (rb_funcall2 (props, id_keys, 0, NULL));
 
 	for (i = 0; i < keys->len; i++)
 		for_each_prop (keys->ptr[i],
@@ -596,21 +584,24 @@ c_to_eet (VALUE self)
 #endif
 
 	args[0] = name;
-	args[1] = rb_funcall (stream, id_serialize, 0);
+	args[1] = rb_ary_to_s (stream);
+
+	rb_ary_clear (stream); /* give the GC a hand... */
+
 	chunk = rb_class_new_instance (2, args, cChunk);
 
-	return rb_funcall (chunk, id_serialize, 0);
+	return rb_funcall2 (chunk, id_to_s, 0, NULL);
 }
 
 static VALUE
 int_to_eet_chunks (int argc, VALUE *argv, VALUE self)
 {
 	VALUE tag, type = Qnil, ary, args[2], chunk;
-	char *cfmt = "V";
+	const char *cfmt = "V";
 
 	rb_scan_args (argc, argv, "11", &tag, &type);
 
-	ary = rb_ary_new3 (1, self);
+	ary = rb_ary_new4 (1, &self);
 
 	if (type == sym_char)
 		cfmt = "c";
@@ -620,10 +611,10 @@ int_to_eet_chunks (int argc, VALUE *argv, VALUE self)
 		cfmt = "q";
 
 	args[0] = tag;
-	args[1] = rb_funcall (ary, rb_intern ("pack"), 1, rb_str_new2 (cfmt));
+	args[1] = rb_funcall (ary, id_pack, 1, rb_str_new2 (cfmt));
 	chunk = rb_class_new_instance (2, args, cChunk);
 
-	return rb_ary_new3 (1, chunk);
+	return rb_ary_new4 (1, &chunk);
 }
 
 static VALUE
@@ -653,7 +644,7 @@ float_to_eet_chunks (int argc, VALUE *argv, VALUE self)
 	args[1] = rb_str_new (buf, len);
 	chunk = rb_class_new_instance (2, args, cChunk);
 
-	return rb_ary_new3 (1, chunk);
+	return rb_ary_new4 (1, &chunk);
 }
 
 void
@@ -668,7 +659,8 @@ Init_eet_ext ()
 	rb_define_singleton_method (c, "open", c_open, -1);
 	rb_define_method (c, "initialize", c_init, -1);
 	rb_define_method (c, "close", c_close, 0);
-	rb_define_method (c, "list", c_list, -1);
+	rb_define_method (c, "entries", c_entries, 0);
+	rb_define_method (c, "[]", c_glob, 1);
 	rb_define_method (c, "delete", c_delete, 1);
 	rb_define_method (c, "read", c_read, 1);
 	rb_define_method (c, "write", c_write, -1);
@@ -676,11 +668,10 @@ Init_eet_ext ()
 	rb_define_method (c, "write_image", c_write_image, -1);
 
 	cStream = rb_define_class_under (m, "Stream", rb_cArray);
-	rb_define_method (cStream, "serialize", stream_serialize, 0);
 
 	cChunk = rb_define_class_under (m, "Chunk", rb_cObject);
 	rb_define_method (cChunk, "initialize", chunk_init, 2);
-	rb_define_method (cChunk, "serialize", chunk_serialize, 0);
+	rb_define_method (cChunk, "to_s", chunk_to_s, 0);
 
 	rb_define_attr (cChunk, "tag", 1, 0);
 	rb_define_attr (cChunk, "data", 1, 0);
@@ -693,13 +684,11 @@ Init_eet_ext ()
 	eEetError = rb_define_class_under (m, "EetError", rb_eStandardError);
 	eNameError = rb_define_class_under (m, "NameError", eEetError);
 	ePropError = rb_define_class_under (m, "PropertyError", eEetError);
-	eStreamError = rb_define_class_under (m, "StreamError", eEetError);
-	eBadElementError = rb_define_class_under (m, "BadElementError",
-	                                          eStreamError);
 
 	id_include = rb_intern ("include?");
-	id_serialize = rb_intern ("serialize");
+	id_to_s = rb_intern ("to_s");
 	id_keys = rb_intern ("keys");
+	id_pack = rb_intern ("pack");
 	id_to_eet_chunks = rb_intern ("to_eet_chunks");
 	id_to_eet_name = rb_intern ("to_eet_name");
 	id_to_eet_properties = rb_intern ("to_eet_properties");