From 69dc231f72d28052e8fdffe18538f778bebb2ad2 Mon Sep 17 00:00:00 2001
From: Dave Vasilevsky <djvasi@gmail.com>
Date: Tue, 29 Dec 2009 01:48:51 -0500
Subject: [PATCH] Meant to add everything

---
 .gitignore |  1 +
 Makefile   | 22 ++++++++++------------
 TODO       |  6 +++---
 pixz.c     | 11 -----------
 pixzlist.c | 12 ------------
 5 files changed, 14 insertions(+), 38 deletions(-)

diff --git a/.gitignore b/.gitignore
index 98d0109..6f0ad5b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 pixz
 pixzlist
+pixztar
 *.o
 test.out
 test.base
diff --git a/Makefile b/Makefile
index bc50bfd..efc3f8a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,26 +1,24 @@
-LDFLAGS = -L/Library/Fink/sl64/lib -llzma -Wall
+LDFLAGS = -L/Library/Fink/sl64/lib -g -Wall
 CFLAGS = -I/Library/Fink/sl64/include -g -O0 -std=c99 -Wall
 
 CC = gcc $(CFLAGS) -c -o
 LD = gcc $(LDFLAGS) -o
 
+all: pixz pixzlist pixztar
 
-PIXZ_OBJS = pixz.o encode.o block.o
 
-all: pixz
-
-pixz: $(PIXZ_OBJS)
-	$(LD) $@ $^
-
-$(PIXZ_OBJS): %.o: %.c pixz.h
+%.o: %.c pixz.h
 	$(CC) $@ $<
 
+pixz: pixz.o encode.o block.o util.o
+	$(LD) $@ $^ -llzma
 
 pixzlist: pixzlist.o
-	$(LD) $@ $^
+	$(LD) $@ $^ -llzma
+	
+pixztar: tar.o util.o
+	$(LD) $@ $^ -larchive
 
-pixzlist.o: pixzlist.c
-	$(CC) $@ $<
 
 
 run: pixz
@@ -29,6 +27,6 @@ run: pixz
 	@xz -d < test.out | md5sum
 
 clean:
-	rm -f *.o pixz test.out
+	rm -f *.o pixz pixzlist pixztar test.out
 
 .PHONY: all run clean
diff --git a/TODO b/TODO
index 3c272fb..631c995 100644
--- a/TODO
+++ b/TODO
@@ -1,11 +1,11 @@
-* subblock filter!?!
-
-* multi-block
 * thread
 * index tarballs
 	* just a list of files?
 	* sorted?
 	* ranges?
+	* reading tars
+		* libarchive?
+		* copyfile/multi-header aware
 
 * sane, safe errors
 	* signal safe?
diff --git a/pixz.c b/pixz.c
index b27fb18..8121d5e 100644
--- a/pixz.c
+++ b/pixz.c
@@ -1,7 +1,5 @@
 #include "pixz.h"
 
-#include <stdarg.h>
-
 int main(void) {
     pixz_encode_options *opts = pixz_encode_options_new();
     pixz_encode_options_default(opts);
@@ -12,12 +10,3 @@ int main(void) {
         
     return 0;
 }
-
-void pixz_die(const char *fmt, ...) {
-    va_list args;
-    va_start(args, fmt);
-    vfprintf(stderr, fmt, args);
-    fflush(stderr);
-    va_end(args);
-    exit(1);
-}
diff --git a/pixzlist.c b/pixzlist.c
index d8e6553..7534336 100644
--- a/pixzlist.c
+++ b/pixzlist.c
@@ -4,18 +4,6 @@
 #include <string.h>
 #include <sys/errno.h>
 
-#define Err(fmt, ...)   fprintf(stderr, fmt ".\n", ##__VA_ARGS__)
-#define fErr(fmt, ...)  Err(fmt, fname, ##__VA_ARGS__)
-#define feErr(fmt, ...) fErr(fmt ": %s", strerror(errno), ##__VA_ARGS__)
-#define cfErr(code, fmt, ...) Err(fmt, code, fname, ##__VA_ARGS__)
-
-#define R(ret, ...)     ({ __VA_ARGS__; return ret; }) 
-#define P(pred, ...)    ({ if (pred) { __VA_ARGS__; } })
-
-#define feRErr(ret, ...)        R(ret, feErr(__VA_ARGS__))
-#define fPRErr(pred, ret, ...)  P(pred, R(ret, fErr(__VA_ARGS__)))
-#define cfPRErr(code, ret, ...)  P(code != LZMA_OK, R(ret, cfErr(code, __VA_ARGS__)))
-
 #define CHUNKSIZE 4096
 #define MEMLIMIT (32 * 1024 * 1204)