tarruby 0.1.2 → 0.1.3

data/ext/libtar/Copyright.txt

@@ -0,0 +1,50 @@
+CMake was initially developed by Kitware with the following sponsorship:
+
+ * National Library of Medicine at the National Institutes of Health
+   as part of the Insight Segmentation and Registration Toolkit (ITK).
+
+ * US National Labs (Los Alamos, Livermore, Sandia) ASC Parallel 
+   Visualization Initiative.
+
+ * National Alliance for Medical Image Computing (NAMIC) is funded by the
+   National Institutes of Health through the NIH Roadmap for Medical Research,
+   Grant U54 EB005149.
+
+ * Kitware, Inc.
+
+The CMake copyright is as follows:
+
+Copyright (c) 2002 Kitware, Inc., Insight Consortium
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+ * Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+ * The names of Kitware, Inc., the Insight Consortium, or the names of
+   any consortium members, or of any contributors, may not be used to
+   endorse or promote products derived from this software without
+   specific prior written permission.
+
+ * Modified source versions must be plainly marked as such, and must
+   not be misrepresented as being the original software.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS ``AS IS''
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+See also the CMake web site: http://www.cmake.org for more information.

data/ext/libtar/compat/basename.c

@@ -50,7 +50,7 @@ openbsd_basename(path)
 
 	/* Strip trailing slashes */
 	endp = path + strlen(path) - 1;
-#ifndef _WIN32 // modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+#ifndef _WIN32
 	while (endp > path && *endp == '/')
 		endp--;
 #else
@@ -60,7 +60,7 @@ openbsd_basename(path)
 #endif
 
 	/* All slashes becomes "/" */
-#ifndef _WIN32 // modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+#ifndef _WIN32
 	if (endp == path && *endp == '/') {
 		(void)strcpy(bname, "/");
 		return(bname);
@@ -73,7 +73,7 @@ openbsd_basename(path)
 #endif
 	/* Find the start of the base */
 	startp = endp;
-#ifndef _WIN32 // modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+#ifndef _WIN32
 	while (startp > path && *(startp - 1) != '/')
 		startp--;
 #else

data/ext/libtar/compat/dirname.c

@@ -50,7 +50,7 @@ openbsd_dirname(path)
 
 	/* Strip trailing slashes */
 	endp = path + strlen(path) - 1;
-#ifndef _WIN32 // modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+#ifndef _WIN32
 	while (endp > path && *endp == '/')
 		endp--;
 #else
@@ -60,7 +60,7 @@ openbsd_dirname(path)
 #endif
 
 	/* Find the start of the dir */
-#ifndef _WIN32 // modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+#ifndef _WIN32
 	while (endp > path && *endp != '/')
 		endp--;
 #else
@@ -71,14 +71,14 @@ openbsd_dirname(path)
 
 	/* Either the dir is "/" or there are no slashes */
 	if (endp == path) {
-#ifndef _WIN32 // modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+#ifndef _WIN32
 		(void)strcpy(bname, *endp == '/' ? "/" : ".");
 #else
 		(void)strcpy(bname, (*endp == '/' || *endp == '\\') ? "/" : ".");
 #endif
 		return(bname);
 	} else {
-#ifndef _WIN32 // modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+#ifndef _WIN32
 		do {
 			endp--;
 		} while (endp > path && *endp == '/');

data/ext/libtar/compat/glob.c

@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  */
 
-// modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
 #ifdef _WIN32
 #pragma warning(disable:4101)
 #pragma warning(disable:4244)
@@ -144,7 +143,6 @@ typedef char Char;
 #define	M_SET		META('[')
 #define	ismeta(c)	(((c)&M_QUOTE) != 0)
 
-// modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
 #ifdef _WIN32
 #define __P(protos) protos
 #define S_ISDIR(m)  (((m) & (_S_IFMT)) == (_S_IFDIR))
@@ -386,7 +384,7 @@ globtilde(pattern, patbuf, patbuf_len, pglob)
 #ifdef HAVE_ISSETUGID
 		if (issetugid() != 0 || (h = getenv("HOME")) == NULL) {
 #endif
-#ifndef _WIN32 // modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+#ifndef _WIN32
 			if ((pwd = getpwuid(getuid())) == NULL)
 				return pattern;
 			else
@@ -404,7 +402,7 @@ globtilde(pattern, patbuf, patbuf_len, pglob)
 		/*
 		 * Expand a ~user
 		 */
-#ifndef _WIN32 // modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+#ifndef _WIN32
 		if ((pwd = getpwnam((char*) patbuf)) == NULL)
 			return pattern;
 		else

data/ext/libtar/compat/strmode.c

@@ -39,7 +39,6 @@ static char *rcsid = "$OpenBSD: strmode.c,v 1.3 1997/06/13 13:57:20 deraadt Exp
 #include <sys/stat.h>
 #include <string.h>
 
-// modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
 #ifdef _WIN32
 #include "win32/types.h"
 #endif
@@ -57,7 +56,7 @@ strmode(mode, p)
 	case S_IFCHR:			/* character special */
 		*p++ = 'c';
 		break;
-#ifndef _WIN32 // modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+#ifndef _WIN32
 	case S_IFBLK:			/* block special */
 		*p++ = 'b';
 		break;
@@ -65,12 +64,12 @@ strmode(mode, p)
 	case S_IFREG:			/* regular */
 		*p++ = '-';
 		break;
-#ifndef _WIN32 // modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+#ifndef _WIN32
 	case S_IFLNK:			/* symbolic link */
 		*p++ = 'l';
 		break;
 #endif
-#ifndef _WIN32 // modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+#ifndef _WIN32
 	case S_IFSOCK:			/* socket */
 		*p++ = 's';
 		break;
@@ -90,7 +89,7 @@ strmode(mode, p)
 		break;
 	}
 	/* usr */
-#ifndef _WIN32 // modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+#ifndef _WIN32
 	if (mode & S_IRUSR)
 		*p++ = 'r';
 	else
@@ -98,7 +97,7 @@ strmode(mode, p)
 #else
 	*p++ = '-';
 #endif
-#ifndef _WIN32 // modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+#ifndef _WIN32
 	if (mode & S_IWUSR)
 		*p++ = 'w';
 	else
@@ -106,7 +105,7 @@ strmode(mode, p)
 #else
 	*p++ = '-';
 #endif
-#ifndef _WIN32 // modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+#ifndef _WIN32
 	switch (mode & (S_IXUSR | S_ISUID)) {
 	case 0:
 		*p++ = '-';
@@ -125,7 +124,7 @@ strmode(mode, p)
 	*p++ = '-';
 #endif
 	/* group */
-#ifndef _WIN32 // modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+#ifndef _WIN32
 	if (mode & S_IRGRP)
 		*p++ = 'r';
 	else
@@ -133,7 +132,7 @@ strmode(mode, p)
 #else
 	*p++ = '-';
 #endif
-#ifndef _WIN32 // modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+#ifndef _WIN32
 	if (mode & S_IWGRP)
 		*p++ = 'w';
 	else
@@ -141,7 +140,7 @@ strmode(mode, p)
 #else
 	*p++ = '-';
 #endif
-#ifndef _WIN32 // modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+#ifndef _WIN32
 	switch (mode & (S_IXGRP | S_ISGID)) {
 	case 0:
 		*p++ = '-';
@@ -160,7 +159,7 @@ strmode(mode, p)
 	*p++ = '-';
 #endif
 	/* other */
-#ifndef _WIN32 // modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+#ifndef _WIN32
 	if (mode & S_IROTH)
 		*p++ = 'r';
 	else
@@ -168,7 +167,7 @@ strmode(mode, p)
 #else
 	*p++ = '-';
 #endif
-#ifndef _WIN32 // modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+#ifndef _WIN32
 	if (mode & S_IWOTH)
 		*p++ = 'w';
 	else
@@ -176,7 +175,7 @@ strmode(mode, p)
 #else
 	*p++ = '-';
 #endif
-#ifndef _WIN32 // modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+#ifndef _WIN32
 	switch (mode & (S_IXOTH | S_ISVTX)) {
 	case 0:
 		*p++ = '-';

data/ext/libtar/lib/append.c

@@ -10,7 +10,6 @@
 **  University of Illinois at Urbana-Champaign
 */
 
-// modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
 #ifdef _WIN32
 #pragma warning(disable:4101)
 #endif
@@ -117,7 +116,7 @@ tar_append_file(TAR *t, char *realname, char *savename)
 		if (libtar_hash_add(t->h, td) == -1)
 			return -1;
 	}
-#ifndef _WIN32 // modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+#ifndef _WIN32
 	libtar_hashptr_reset(&hp);
 	if (libtar_hash_getkey(td->td_h, &hp, &(s.st_ino),
 			       (libtar_matchfunc_t)ino_match) != 0)
@@ -147,7 +146,7 @@ tar_append_file(TAR *t, char *realname, char *savename)
 	}
 #endif /* #ifndef _WIN32 */
 
-#ifndef _WIN32 // modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+#ifndef _WIN32
 	/* check if it's a symlink */
 	if (TH_ISSYM(t))
 	{
@@ -224,8 +223,6 @@ tar_append_regfile(TAR *t, char *realname)
 	int i, j;
 	size_t size;
 
-	// modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
-	//filefd = open(realname, O_RDONLY);
 	filefd = open(realname, O_RDONLY
 #ifdef O_BINARY
 			| O_BINARY

data/ext/libtar/lib/decode.c

@@ -47,7 +47,7 @@ uid_t
 th_get_uid(TAR *t)
 {
 	int uid;
-#ifndef _WIN32 // modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+#ifndef _WIN32
 	struct passwd *pw;
 
 	pw = getpwnam(t->th_buf.uname);
@@ -65,7 +65,7 @@ gid_t
 th_get_gid(TAR *t)
 {
 	int gid;
-#ifndef _WIN32 // modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+#ifndef _WIN32
 	struct group *gr;
 
 	gr = getgrnam(t->th_buf.gname);
@@ -89,7 +89,7 @@ th_get_mode(TAR *t)
 	{
 		switch (t->th_buf.typeflag)
 		{
-#ifndef _WIN32 // modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+#ifndef _WIN32
 		case SYMTYPE:
 			mode |= S_IFLNK;
 			break;
@@ -97,7 +97,7 @@ th_get_mode(TAR *t)
 		case CHRTYPE:
 			mode |= S_IFCHR;
 			break;
-#ifndef _WIN32 // modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+#ifndef _WIN32
 		case BLKTYPE:
 			mode |= S_IFBLK;
 			break;
@@ -105,7 +105,7 @@ th_get_mode(TAR *t)
 		case DIRTYPE:
 			mode |= S_IFDIR;
 			break;
-#ifndef _WIN32 // modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+#ifndef _WIN32
 		case FIFOTYPE:
 			mode |= S_IFIFO;
 			break;

data/ext/libtar/lib/encode.c

@@ -10,7 +10,6 @@
 **  University of Illinois at Urbana-Champaign
 */
 
-// modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
 #ifdef _WIN32
 #pragma warning(disable:4244)
 #endif
@@ -42,15 +41,11 @@ th_finish(TAR *t)
 		strncpy(t->th_buf.magic, TMAGIC, TMAGLEN);
 	}
 
-	// modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
 	for (i = 0; i < T_BLOCKSIZE; i++) {
-		//sum += ((char *)(&(t->th_buf)))[i];
 		sum += ((unsigned char *)(&(t->th_buf)))[i];
 	}
 	for (i = 0; i < 8; i++)
 		sum += (' ' - t->th_buf.chksum[i]);
-	// modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
-	//int_to_oct(sum, t->th_buf.chksum, 8);
 	snprintf(t->th_buf.chksum, 8, "%06lo", (unsigned long)(sum));
 	t->th_buf.chksum[6] = 0;
 	t->th_buf.chksum[7] = ' ';
@@ -69,7 +64,7 @@ th_set_type(TAR *t, mode_t mode)
 		t->th_buf.typeflag = DIRTYPE;
 	if (S_ISCHR(mode))
 		t->th_buf.typeflag = CHRTYPE;
-#ifndef _WIN32 // modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+#ifndef _WIN32
 	if (S_ISBLK(mode))
 		t->th_buf.typeflag = BLKTYPE;
 #endif
@@ -130,7 +125,7 @@ th_set_path(TAR *t, char *pathname)
 void
 th_set_link(TAR *t, char *linkname)
 {
-#ifndef _WIN32 // modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+#ifndef _WIN32
 #ifdef DEBUG
 	printf("==> th_set_link(th, linkname=\"%s\")\n", linkname);
 #endif
@@ -158,7 +153,7 @@ th_set_link(TAR *t, char *linkname)
 void
 th_set_device(TAR *t, dev_t device)
 {
-#ifndef _WIN32 // modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+#ifndef _WIN32
 #ifdef DEBUG
 	printf("th_set_device(): major = %d, minor = %d\n",
 	       major(device), minor(device));
@@ -173,7 +168,7 @@ th_set_device(TAR *t, dev_t device)
 void
 th_set_user(TAR *t, uid_t uid)
 {
-#ifndef _WIN32 // modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+#ifndef _WIN32
 	struct passwd *pw;
 
 	pw = getpwuid(uid);
@@ -189,7 +184,7 @@ th_set_user(TAR *t, uid_t uid)
 void
 th_set_group(TAR *t, gid_t gid)
 {
-#ifndef _WIN32 // modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+#ifndef _WIN32
 	struct group *gr;
 
 	gr = getgrgid(gid);
@@ -205,15 +200,13 @@ th_set_group(TAR *t, gid_t gid)
 void
 th_set_mode(TAR *t, mode_t fmode)
 {
-#ifndef _WIN32 // modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+#ifndef _WIN32
 	if (S_ISSOCK(fmode))
 	{
 		fmode &= ~S_IFSOCK;
 		fmode |= S_IFIFO;
 	}
 #endif
-	// modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
-	//int_to_oct(fmode, (t)->th_buf.mode, 8);
 	int_to_oct((fmode & 0xFFF), (t)->th_buf.mode, 8);
 }
 

data/ext/libtar/lib/extract.c

@@ -125,17 +125,17 @@ tar_extract_file(TAR *t, char *realname)
 		if (i == 1)
 			i = 0;
 	}
-#ifndef _WIN32 // modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+#ifndef _WIN32
 	else if (TH_ISLNK(t))
 		i = tar_extract_hardlink(t, realname);
 #endif
-#ifndef _WIN32 // modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+#ifndef _WIN32
 	else if (TH_ISSYM(t))
 		i = tar_extract_symlink(t, realname);
 #endif
 	else if (TH_ISCHR(t))
 		i = tar_extract_chardev(t, realname);
-#ifndef _WIN32 // modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+#ifndef _WIN32
 	else if (TH_ISBLK(t))
 		i = tar_extract_blockdev(t, realname);
 #endif
@@ -281,7 +281,6 @@ tar_extract_regfile(TAR *t, char *realname)
 	return 0;
 }
 
-// modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
 int tar_extract_function(TAR *t, void *data, int (*f)(char *b, int l, void *d)) {
   size_t size;
   int i, k;
@@ -343,7 +342,7 @@ tar_skip_regfile(TAR *t)
 int
 tar_extract_hardlink(TAR * t, char *realname)
 {
-#ifndef _WIN32 // modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+#ifndef _WIN32
 	char *filename;
 	char *linktgt = NULL;
 	linkname_t *lnp;
@@ -399,7 +398,7 @@ tar_extract_hardlink(TAR * t, char *realname)
 int
 tar_extract_symlink(TAR *t, char *realname)
 {
-#ifndef _WIN32 // modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+#ifndef _WIN32
 	char *filename;
 	char buf[T_BLOCKSIZE];
 
@@ -498,7 +497,7 @@ tar_extract_chardev(TAR *t, char *realname)
 int
 tar_extract_blockdev(TAR *t, char *realname)
 {
-#ifndef _WIN32 // modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+#ifndef _WIN32
 	mode_t mode;
 	unsigned long devmaj, devmin;
 	char *filename;

data/ext/libtar/lib/handle.c

@@ -31,7 +31,7 @@ static long libtar_open(const char *pathname, int oflags, int mode) {
 	return open(pathname, oflags, mode);
 }
 
-static long libtar_close(long fd) {
+static int libtar_close(long fd) {
 	return close((int) fd);
 }
 

data/ext/libtar/lib/internal.h

@@ -15,7 +15,6 @@
 
 #include <libtar.h>
 
-// modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
 #ifdef _WIN32
 
 #include <direct.h>
@@ -42,6 +41,4 @@
 #define mkfifo(p, m)           (0)
 #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/libtar.h

@@ -19,7 +19,6 @@
 
 #include <libtar_listhash.h>
 
-// modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
 #ifdef _WIN32
 #include "win32/types.h"
 #define S_ISDIR(m)  (((m) & (_S_IFMT)) == (_S_IFDIR))
@@ -230,7 +229,6 @@ void th_finish(TAR *t);
 /* sequentially extract next file from t */
 int tar_extract_file(TAR *t, char *realname);
 
-// modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
 int tar_extract_function(TAR *t, void *data, int (*f)(char *b, int l, void *d));
 
 /* extract different file types */
@@ -283,9 +281,6 @@ int th_crc_calc(TAR *t);
 int oct_to_int(char *oct);
 
 /* integer to NULL-terminated string-octal conversion */
-// modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
-//#define int_to_oct(num, oct, octlen) \
-//	snprintf((oct), (octlen), "%*lo ", (octlen) - 2, (unsigned long)(num))
 #define int_to_oct(num, oct, octlen) \
 	snprintf((oct), (octlen), "%0*lo", (octlen) - 1, (unsigned long)(num))
 

data/ext/libtar/lib/output.c

@@ -64,7 +64,7 @@ th_print_long_ls(TAR *t)
 {
 	char *filename;
 	char modestring[12];
-#ifndef _WIN32 // modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+#ifndef _WIN32
 	struct passwd *pw;
 	struct group *gr;
 #endif
@@ -85,7 +85,7 @@ th_print_long_ls(TAR *t)
 #endif
 
 	uid = th_get_uid(t);
-#ifndef _WIN32 // modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+#ifndef _WIN32
 	pw = getpwuid(uid);
 	if (pw == NULL)
 		snprintf(username, sizeof(username), "%d", uid);
@@ -96,7 +96,7 @@ th_print_long_ls(TAR *t)
 #endif
 
 	gid = th_get_gid(t);
-#ifndef _WIN32 // modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+#ifndef _WIN32
 	gr = getgrgid(gid);
 	if (gr == NULL)
 		snprintf(groupname, sizeof(groupname), "%d", gid);

data/ext/libtar/lib/util.c

@@ -150,9 +150,6 @@ oct_to_int(char *oct)
 void
 int_to_oct_nonull(int num, char *oct, size_t octlen)
 {
-	// modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
-	//snprintf(oct, octlen, "%*lo", octlen - 1, (unsigned long)num);
-	//oct[octlen - 1] = ' ';
 	snprintf(oct, octlen, "%0*lo", octlen - 1, (unsigned long)num);
 	oct[octlen - 1] = 0;
 }

data/ext/libtar/lib/wrapper.c

@@ -21,7 +21,6 @@
 # include <string.h>
 #endif
 
-
 int
 tar_extract_glob(TAR *t, char *globname, char *prefix)
 {
@@ -46,8 +45,6 @@ tar_extract_glob(TAR *t, char *globname, char *prefix)
 			snprintf(buf, sizeof(buf), "%s/%s", prefix, filename);
 		else
 			strlcpy(buf, filename, sizeof(buf));
-		// modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
-		//if (tar_extract_file(t, filename) != 0)
 		if (tar_extract_file(t, buf) != 0) {
 			free(filename);
 			return -1;
@@ -106,8 +103,8 @@ tar_append_tree(TAR *t, char *realdir, char *savedir)
 	struct dirent *dent;
 	DIR *dp;
 	struct stat s;
-#ifdef _WIN32 // modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
-    int errorp = 0;
+#if defined(_WIN32)
+	int errorp = 0;
 #endif
 
 #ifdef DEBUG
@@ -122,14 +119,14 @@ tar_append_tree(TAR *t, char *realdir, char *savedir)
 	puts("    tar_append_tree(): done with tar_append_file()...");
 #endif
 
-#ifndef _WIN32 // modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+#ifndef _WIN32
 	dp = opendir(realdir);
 #else
 	dp = opendir0(realdir, &errorp);
 #endif
 	if (dp == NULL)
 	{
-#ifndef _WIN32 // modified by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+#ifndef _WIN32
 		if (errno == ENOTDIR)
 			return 0;
 #else

data/ext/tarruby.c

@@ -8,6 +8,7 @@
 #endif
 #include "libtar.h"
 #include "ruby.h"
+#include "rubysig.h"
 
 #ifndef RSTRING_PTR
 #define RSTRING_PTR(s) (RSTRING(s)->ptr)
@@ -32,7 +33,7 @@
 
 #define INT2TIME(i) rb_funcall(rb_cTime, rb_intern("at"), 1, INT2NUM(i))
 
-#define VERSION "0.1.2"
+#define VERSION "0.1.3"
 
 static VALUE Tar;
 static VALUE Error;
@@ -275,6 +276,7 @@ static VALUE tarruby_append_tree(int argc, VALUE *argv, VALUE self) {
   VALUE realdir, savedir;
   struct tarruby_tar *p_tar;
   char *s_realdir, *s_savedir = NULL;
+  int result = -1;
 
   rb_scan_args(argc, argv, "11", &realdir, &savedir);
   Check_Type(realdir, T_STRING);
@@ -289,7 +291,11 @@ static VALUE tarruby_append_tree(int argc, VALUE *argv, VALUE self) {
 
   Data_Get_Struct(self, struct tarruby_tar, p_tar);
 
-  if (tar_append_tree(p_tar->tar, s_realdir, s_savedir) != 0) {
+  TRAP_BEG;
+  result = tar_append_tree(p_tar->tar, s_realdir, s_savedir);
+  TRAP_END;
+
+  if (result != 0) {
     rb_raise(Error, "Append tree failed: %s", strerror(errno));
   }
 
@@ -343,6 +349,7 @@ static VALUE tarruby_extract_glob(int argc, VALUE *argv, VALUE self) {
   VALUE globname, prefix;
   struct tarruby_tar *p_tar;
   char *s_globname, *s_prefix = NULL;
+  int result = -1;
 
   rb_scan_args(argc, argv, "11", &globname, &prefix);
   Check_Type(globname, T_STRING);
@@ -355,7 +362,11 @@ static VALUE tarruby_extract_glob(int argc, VALUE *argv, VALUE self) {
 
   Data_Get_Struct(self, struct tarruby_tar, p_tar);
 
-  if (tar_extract_glob(p_tar->tar, s_globname, s_prefix) != 0) {
+  TRAP_BEG;
+  result = tar_extract_glob(p_tar->tar, s_globname, s_prefix);
+  TRAP_END;
+
+  if (result != 0) {
     rb_raise(Error, "Extract archive failed: %s", strerror(errno));
   }
 
@@ -369,6 +380,7 @@ static VALUE tarruby_extract_all(int argc, VALUE *argv, VALUE self) {
   VALUE prefix;
   struct tarruby_tar *p_tar;
   char *s_prefix = NULL;
+  int result = -1;
 
   rb_scan_args(argc, argv, "01", &prefix);
 
@@ -379,7 +391,11 @@ static VALUE tarruby_extract_all(int argc, VALUE *argv, VALUE self) {
 
   Data_Get_Struct(self, struct tarruby_tar, p_tar);
 
-  if (tar_extract_all(p_tar->tar, s_prefix) != 0) {
+  TRAP_BEG;
+  result = tar_extract_all(p_tar->tar, s_prefix);
+  TRAP_END;
+
+  if (result != 0) {
     rb_raise(Error, "Extract archive failed: %s", strerror(errno));
   }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tarruby
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - winebarrel
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-13 00:00:00 +09:00
+date: 2008-09-14 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -61,6 +61,7 @@ files:
 - ext/libtar/configure
 - ext/libtar/configure.ac
 - ext/libtar/COPYRIGHT
+- ext/libtar/Copyright.txt
 - ext/libtar/doc
 - ext/libtar/doc/Makefile.in
 - ext/libtar/doc/tar_append_file.3