tarruby 0.1.1 → 0.1.2

data/README.txt

@@ -21,7 +21,7 @@ gem install tarruby
 
     require 'tarruby'
     
-    Tar.open('foo.tar', File::RDONLY, Tar::GNU) do |tar|
+    Tar.open('foo.tar', File::RDONLY, 0644, Tar::GNU | Tar::VERBOSE) do |tar|
       while tar.read # or 'tar.each do ...'
         puts tar.pathname
         tar.print_long_ls
@@ -48,7 +48,7 @@ gem install tarruby
 
     require 'tarruby'
     
-    Tar.open('bar.tar', File::CREAT | File::WRONLY, Tar::GNU) do |tar|
+    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

data/ext/libtar/compat/compat.h

@@ -16,7 +16,6 @@
 # include <libgen.h>
 #endif
 
-
 #if defined(NEED_BASENAME) && !defined(HAVE_BASENAME)
 
 # ifdef basename

data/ext/libtar/compat/dirname.c

@@ -83,6 +83,9 @@ openbsd_dirname(path)
 			endp--;
 		} while (endp > path && *endp == '/');
 #else
+		do {
+			endp--;
+		} while (endp > path && (*endp == '/' || *endp == '\\'));
 #endif
 	}
 

data/ext/libtar/lib/extract.c

@@ -52,6 +52,7 @@ tar_set_file_perms(TAR *t, char *realname)
 	gid = th_get_gid(t);
 	ut.modtime = ut.actime = th_get_mtime(t);
 
+#ifndef _WIN32
 	/* change owner/group */
 	if (geteuid() == 0)
 #ifdef HAVE_LCHOWN
@@ -92,6 +93,7 @@ tar_set_file_perms(TAR *t, char *realname)
 		if (!realname) free(filename);
 		return -1;
 	}
+#endif
 
 	if (!realname) free(filename);
 	return 0;

data/ext/libtar/lib/internal.h

@@ -43,4 +43,5 @@
 #define mknod(p, m, d)         (0)
 #define snprintf(s, n, f, ...) do { _snprintf((s), (n), (f), __VA_ARGS__); (s)[(n) - 1] = '\0'; } while(0)
 
+int tarruby_stat(const char *path, struct stat *buf);
 #endif

data/ext/libtar/lib/util.c

@@ -95,6 +95,13 @@ mkdirhier(char *path)
 		if (*dirp == '\0')
 			continue;
 
+		/*
+		 * Don't try to build current or parent dir. It doesn't make sense anyhow,
+		 *  but it also returns EINVAL instead of EEXIST on BeOS!
+		 */
+		if ((strcmp(dirp, ".") == 0) || (strcmp(dirp, "..") == 0)) 
+			continue;
+
 		if (dst[0] != '\0')
 			strcat(dst, "/");
 		strcat(dst, dirp);

data/ext/tarruby.c

@@ -32,7 +32,7 @@
 
 #define INT2TIME(i) rb_funcall(rb_cTime, rb_intern("at"), 1, INT2NUM(i))
 
-#define VERSION "0.1.1"
+#define VERSION "0.1.2"
 
 static VALUE Tar;
 static VALUE Error;
@@ -153,6 +153,14 @@ static tartype_t bztype = {
 };
 #endif
 
+static void strip_sep(char *path) {
+  int len = strlen(path);
+
+  if (path[len - 1] == '/' || path[len - 1] == '\\') {
+    path[len - 1] = '\0';
+  }
+}
+
 static VALUE tarruby_tar_alloc(VALUE klass) {
   struct tarruby_tar *p = ALLOC(struct tarruby_tar);
 
@@ -163,18 +171,23 @@ static VALUE tarruby_tar_alloc(VALUE klass) {
 }
 
 /* */
-static VALUE tarruby_close(VALUE self) {
+static VALUE tarruby_close0(VALUE self, int abort) {
   struct tarruby_tar *p_tar;
 
   Data_Get_Struct(self, struct tarruby_tar, p_tar);
 
-  if(tar_close(p_tar->tar) != 0) {
+  if(tar_close(p_tar->tar) != 0 && abort) {
     rb_raise(Error, "Close archive failed: %s", strerror(errno));
   }
 
   return Qnil;
 }
 
+/* */
+static VALUE tarruby_close(VALUE self) {
+  return tarruby_close0(self, 1);
+}
+
 static VALUE tarruby_s_open0(int argc, VALUE *argv, VALUE self, tartype_t *tartype) {
   VALUE tar, pathname, oflags, mode, options;
   struct tarruby_tar *p_tar;
@@ -200,7 +213,7 @@ static VALUE tarruby_s_open0(int argc, VALUE *argv, VALUE self, tartype_t *tarty
     int status;
 
     retval = rb_protect(rb_yield, tar, &status);
-    tarruby_close(tar);
+    tarruby_close0(tar, 0);
 
     if (status != 0) {
       rb_jump_tag(status);
@@ -240,10 +253,12 @@ static VALUE tarruby_append_file(int argc, VALUE *argv, VALUE self) {
   rb_scan_args(argc, argv, "11", &realname, &savename);
   Check_Type(realname, T_STRING);
   s_realname = RSTRING_PTR(realname);
+  strip_sep(s_realname);
 
   if (!NIL_P(savename)) {
     Check_Type(savename, T_STRING);
     s_savename = RSTRING_PTR(savename);
+    strip_sep(s_savename);
   }
 
   Data_Get_Struct(self, struct tarruby_tar, p_tar);
@@ -264,10 +279,12 @@ static VALUE tarruby_append_tree(int argc, VALUE *argv, VALUE self) {
   rb_scan_args(argc, argv, "11", &realdir, &savedir);
   Check_Type(realdir, T_STRING);
   s_realdir = RSTRING_PTR(realdir);
+  strip_sep(s_realdir);
 
   if (!NIL_P(savedir)) {
     Check_Type(savedir, T_STRING);
     s_savedir = RSTRING_PTR(savedir);
+    strip_sep(s_savedir);
   }
 
   Data_Get_Struct(self, struct tarruby_tar, p_tar);

metadata

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