tarruby 0.1.3 → 0.1.4

data/README.txt

@@ -48,11 +48,16 @@ gem install tarruby
 
     require 'tarruby'
     
+    buf = 'ABCDEFG'
+    
     Tar.open('bar.tar', File::CREAT | File::WRONLY, 0644, Tar::GNU | Tar::VERBOSE) do |tar|
       Dir.glob('**/*.c').each do |filename|
         tar.append_file(filename)
       end
       
+      # append from buffer
+      tar.append_buffer('zoo.txt, buf)
+      
       ##if append directory
       #tar.append_tree('dirname')
     end

data/ext/libtar/lib/append.c

@@ -21,6 +21,7 @@
 #include <fcntl.h>
 #include <sys/param.h>
 #include <sys/types.h>
+#include <time.h>
 
 #ifdef STDC_HEADERS
 # include <stdlib.h>
@@ -266,4 +267,69 @@ tar_append_regfile(TAR *t, char *realname)
 	return 0;
 }
 
+static int
+tar_append_function0(TAR *t, void *data, int (*f)(char *b, int l, void *d))
+{
+	char block[T_BLOCKSIZE];
+	int filefd;
+	int i, j;
+	size_t size;
+
+	size = th_get_size(t);
+	for (i = size; i > T_BLOCKSIZE; i -= T_BLOCKSIZE)
+	{
+		j = f(block, T_BLOCKSIZE, data);
+		if (j != T_BLOCKSIZE)
+		{
+			if (j != -1)
+				errno = EINVAL;
+			return -1;
+		}
+		if (tar_block_write(t, &block) == -1)
+			return -1;
+	}
+
+	if (i > 0)
+	{
+		j = f(block, i, data);
+		if (j == -1)
+			return -1;
+		memset(&(block[i]), 0, T_BLOCKSIZE - i);
+		if (tar_block_write(t, &block) == -1)
+			return -1;
+	}
+
+	return 0;
+}
+
+int
+tar_append_function(TAR *t, char *savename, int size, void *data, int (*f)(char *b, int l, void *d))
+{
+	/* set header block */
+	memset(&(t->th_buf), 0, sizeof(struct tar_header));
+	t->th_buf.typeflag = REGTYPE;
+	th_set_user(t, 0);
+	th_set_group(t, 0);
+	th_set_mode(t, 0644);
+	th_set_mtime(t, (int) time(NULL));
+	th_set_size(t, size);
+
+	/* set the header path */
+	th_set_path(t, savename);
+
+	/* print file info */
+	if (t->options & TAR_VERBOSE)
+		th_print_long_ls(t);
 
+	/* write header */
+	if (th_write(t) != 0)
+	{
+		return -1;
+	}
+
+	/* if it's a regular file, write the contents as well */
+	if (tar_append_function0(t, data, f) != 0)
+		return -1;
+
+	return 0;
+}

data/ext/libtar/lib/libtar.h

@@ -149,6 +149,7 @@ int tar_append_eof(TAR *t);
 /* add file contents to a tarchive */
 int tar_append_regfile(TAR *t, char *realname);
 
+int tar_append_function(TAR *t, char *savename, int size, void *data, int (*f)(char *b, int l, void *d));
 
 /***** block.c *************************************************************/
 

data/ext/tarruby.c

@@ -33,7 +33,7 @@
 
 #define INT2TIME(i) rb_funcall(rb_cTime, rb_intern("at"), 1, INT2NUM(i))
 
-#define VERSION "0.1.3"
+#define VERSION "0.1.4"
 
 static VALUE Tar;
 static VALUE Error;
@@ -271,6 +271,35 @@ static VALUE tarruby_append_file(int argc, VALUE *argv, VALUE self) {
   return Qnil;
 }
 
+static int tarruby_append_buffer0(char *buf, int len, void *data) {
+  char **p_buffer = (char **) data;
+  memcpy(buf, *p_buffer, len);
+  p_buffer += len;
+  return len;
+}
+
+/* */
+static VALUE tarruby_append_buffer(VALUE self, VALUE savename, VALUE buffer) {
+  struct tarruby_tar *p_tar;
+  char *s_savename, *s_buffer;
+  int i_size;
+
+  Check_Type(savename, T_STRING);
+  Check_Type(buffer, T_STRING);
+  s_savename = RSTRING_PTR(savename);
+  strip_sep(s_savename);
+  s_buffer = RSTRING_PTR(buffer);
+  i_size = RSTRING_LEN(buffer);
+
+  Data_Get_Struct(self, struct tarruby_tar, p_tar);
+
+  if (tar_append_function(p_tar->tar, s_savename, i_size, (void *) &s_buffer, tarruby_append_buffer0) != 0) {
+    rb_raise(Error, "Append buffer failed: %s", strerror(errno));
+  }
+
+  return Qnil;
+}
+
 /* */
 static VALUE tarruby_append_tree(int argc, VALUE *argv, VALUE self) {
   VALUE realdir, savedir;
@@ -323,7 +352,7 @@ static VALUE tarruby_extract_file(VALUE self, VALUE realname) {
 static int tarruby_extract_buffer0(char *buf, int len, void *data) {
   VALUE buffer = (VALUE) data;
   rb_str_buf_cat(buffer, buf, len);
-  return 0;
+  return len;
 }
 
 /* */
@@ -650,6 +679,7 @@ void DLLEXPORT Init_tarruby() {
 #endif
   rb_define_method(Tar, "close", tarruby_close, 0);
   rb_define_method(Tar, "append_file", tarruby_append_file, -1);
+  rb_define_method(Tar, "append_buffer", tarruby_append_buffer, 2);
   rb_define_method(Tar, "append_tree", tarruby_append_tree, -1);
   rb_define_method(Tar, "extract_file", tarruby_extract_file, 1);
   rb_define_method(Tar, "extract_buffer", tarruby_extract_buffer, 0);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tarruby
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - winebarrel
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-14 00:00:00 +09:00
+date: 2008-09-16 00:00:00 +09:00
 default_executable: 
 dependencies: []