You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
119 lines
3.7 KiB
119 lines
3.7 KiB
Index: include/xar.h.in |
|
--- include/xar.h.in.orig 2007-12-29 19:49:57 +0100 |
|
+++ include/xar.h.in 2008-01-05 10:12:25 +0100 |
|
@@ -138,7 +138,7 @@ |
|
int32_t xar_prop_create(xar_file_t f, const char *key, const char *value); |
|
int32_t xar_prop_get(xar_file_t f, const char *key, const char **value); |
|
|
|
-xar_iter_t xar_iter_new(); |
|
+xar_iter_t xar_iter_new(void); |
|
void xar_iter_free(xar_iter_t i); |
|
|
|
const char *xar_prop_first(xar_file_t f, xar_iter_t i); |
|
Index: lib/Makefile.inc.in |
|
--- lib/Makefile.inc.in.orig 2007-12-29 19:49:57 +0100 |
|
+++ lib/Makefile.inc.in 2008-01-05 10:12:25 +0100 |
|
@@ -24,32 +24,14 @@ |
|
# Libraries. librxar is created such that it's possible to run xar without |
|
# first installing libxar. |
|
|
|
+LIBRXAR_SNAME := librxar.a |
|
+LIBRXAR_LNAME := librxar.a.1 |
|
LIBXAR_LANAME := libxar.la |
|
LIBXAR_ANAME := libxar.a |
|
-ifeq (elf, @abi@) |
|
-LIBRXAR_SNAME := librxar.so.@LIB_REV@ |
|
-LIBRXAR_LNAME := librxar.so |
|
+LIBXAR_SNAME := libxar.a |
|
+LIBXAR_LNAME := libxar.a.1 |
|
LIBRXAR_L := @objroot@lib/$(LIBRXAR_LNAME) |
|
-LIBXAR_SNAME := libxar.so.@LIB_REV@ |
|
-LIBXAR_LNAME := libxar.so |
|
LIBXAR_L := @objroot@lib/$(LIBXAR_LNAME) |
|
-endif |
|
-ifeq (macho, @abi@) |
|
-LIBRXAR_SNAME := librxar.@LIB_REV@.dylib |
|
-LIBRXAR_LNAME := librxar.dylib |
|
-LIBRXAR_L := @objroot@lib/$(LIBRXAR_LNAME) |
|
-LIBXAR_SNAME := libxar.@LIB_REV@.dylib |
|
-LIBXAR_LNAME := libxar.dylib |
|
-LIBXAR_L := @objroot@lib/$(LIBXAR_LNAME) |
|
-endif |
|
-ifeq (aout, @abi@) |
|
-LIBRXAR_SNAME := librxar.so.@LIB_REV@.0 |
|
-LIBRXAR_LNAME := |
|
-LIBRXAR_L := |
|
-LIBXAR_SNAME := libxar.so.@LIB_REV@.0 |
|
-LIBXAR_LNAME := |
|
-LIBXAR_L := |
|
-endif |
|
LIBXAR_LA := @objroot@lib/$(LIBXAR_LANAME) |
|
LIBXAR_A := @objroot@lib/$(LIBXAR_ANAME) |
|
LIBRXAR_S := @objroot@lib/$(LIBRXAR_SNAME) |
|
@@ -133,15 +115,7 @@ |
|
# installing libxar. |
|
$(LIBRXAR_S) : $(LIBXAR_SRCS:@srcroot@%.c=@objroot@%.o) |
|
@mkdir -p $(@D) |
|
-ifeq (elf, @abi@) |
|
- $(CC) -shared -Wl,-soname,$(LIBXAR_SNAME) -o $@ $+ @LIBS@ |
|
-endif |
|
-ifeq (macho, @abi@) |
|
- $(CC) -dynamiclib -compatibility_version @LIB_REV@ -current_version @LIB_REV@ -install_name @abs_objroot@$(LIBRXAR_S) -o $@ $+ $(LDFLAGS) @LIBS@ |
|
-endif |
|
-ifeq (aout, @abi@) |
|
- $(CC) -shared -o $@ $+ |
|
-endif |
|
+ ar cvr $@ $+ |
|
ifneq ($(words "" $(LIBRXAR_L)), 1) |
|
rm -f $(LIBRXAR_L) |
|
ln -s $(LIBRXAR_SNAME) $(LIBRXAR_L) |
|
@@ -149,15 +123,7 @@ |
|
|
|
$(LIBXAR_S) : $(LIBXAR_SRCS:@srcroot@%.c=@objroot@%.o) |
|
@mkdir -p $(@D) |
|
-ifeq (elf, @abi@) |
|
- $(CC) -shared -Wl,-soname,$(LIBXAR_SNAME) -o $@ $+ @LIBS@ |
|
-endif |
|
-ifeq (macho, @abi@) |
|
- $(CC) -dynamiclib -compatibility_version @LIB_REV@ -current_version @LIB_REV@ -install_name $(LIBDIR)/$(LIBXAR_SNAME) -o $@ $+ $(LDFLAGS) @LIBS@ |
|
-endif |
|
-ifeq (aout, @abi@) |
|
- $(CC) -shared -o $@ $+ |
|
-endif |
|
+ ar cvr $@ $+ |
|
ifneq ($(words "" $(LIBXAR_L)), 1) |
|
rm -f $(LIBXAR_L) |
|
ln -s $(LIBXAR_SNAME) $(LIBXAR_L) |
|
Index: lib/filetree.c |
|
--- lib/filetree.c.orig 2007-12-29 19:49:57 +0100 |
|
+++ lib/filetree.c 2008-01-05 10:12:25 +0100 |
|
@@ -263,7 +263,7 @@ |
|
* Returns a newly allocated iterator for use on files, properties, or |
|
* attributes. |
|
*/ |
|
-xar_iter_t xar_iter_new() { |
|
+xar_iter_t xar_iter_new(void) { |
|
xar_iter_t ret = malloc(sizeof(struct __xar_iter_t)); |
|
if(!ret) return NULL; |
|
|
|
Index: lib/stat.c |
|
--- lib/stat.c.orig 2007-12-29 19:49:57 +0100 |
|
+++ lib/stat.c 2008-01-05 10:12:25 +0100 |
|
@@ -724,7 +724,7 @@ |
|
if( errno == ENOENT ) { |
|
xar_iter_t i; |
|
const char *ptr; |
|
- i = xar_iter_new(x); |
|
+ i = xar_iter_new(); |
|
for(ptr = xar_prop_first(tmpf, i); ptr; ptr = xar_prop_next(i)) { |
|
xar_iter_t a; |
|
const char *val = NULL; |
|
@@ -736,7 +736,7 @@ |
|
continue; |
|
|
|
xar_prop_set(f, ptr, val); |
|
- a = xar_iter_new(x); |
|
+ a = xar_iter_new(); |
|
for(akey = xar_attr_first(tmpf, ptr, a); akey; akey = xar_attr_next(a)) { |
|
aval = xar_attr_get(tmpf, ptr, akey); |
|
xar_attr_set(f, ptr, akey, aval);
|
|
|