[xar commit] r219 - in trunk/xar: . lib

[codesite...@google.com]

Author: bbraun
Date: Fri Aug 15 17:08:16 2008
New Revision: 219

Modified:
trunk/xar/ChangeLog
trunk/xar/lib/io.c

Log:
lib/io.c: Fix seeking on a pipe

Modified: trunk/xar/ChangeLog
==============================================================================
--- trunk/xar/ChangeLog (original)
+++ trunk/xar/ChangeLog Fri Aug 15 17:08:16 2008
@@ -2,6 +2,7 @@
2008-08-15 Rob Braun bbr...@synack.net
* lib/Makefile.inc.in: Add the $(LDFLAGS) variable when creating libxar
* src/xar.c: Fix a typo in the usage statement.
+ * lib/io.c: Fix seeking on a pipe
2008-08-14 Rob Braun bbr...@synack.net
* lib/bzxar.c: if bzip2 compression is specified but not compiled in,
throw an error.
* src/xar.c src/xar.1: Add -C to chdir before extraction.

Modified: trunk/xar/lib/io.c
==============================================================================
--- trunk/xar/lib/io.c (original)
+++ trunk/xar/lib/io.c Fri Aug 15 17:08:16 2008
@@ -62,6 +62,7 @@
#include "hash.h"
#include "script.h"
#include "macho.h"
+#include "util.h"

#if !defined(LLONG_MAX) && defined(LONG_LONG_MAX)
#define LLONG_MAX LONG_LONG_MAX
@@ -175,7 +176,7 @@
static void xar_io_seek(xar_t x, xar_file_t f, off_t seekoff) {
int r;

- if( XAR(x)->fd > 1 ) {
+ if( XAR(x)->fd >= 0 ) {
r = lseek(XAR(x)->fd, seekoff, SEEK_SET);
if( r == -1 ) {
if( errno == ESPIPE ) {
@@ -194,13 +195,14 @@
len -= XAR(x)->heap_offset;
buf = malloc(len);
assert(buf);
- rr = read(XAR(x)->fd, buf, len);
+ rr = xar_read_fd(XAR(x)->fd, buf, len);
if( rr < len ) {
xar_err_new(x);
xar_err_set_file(x, f);
xar_err_set_string(x, "Unable to seek");
xar_err_callback(x, XAR_SEVERITY_NONFATAL,
XAR_ERR_ARCHIVE_EXTRACTION);
}
+ XAR(x)->heap_offset += rr;
free(buf);
}
} else {