commit 3efab998504df66ded99591713529ad8de583676
author Dieter Baron <dillo@nih.at> Fri May 04 09:29:29 2012 +0200
committer Dieter Baron <dillo@nih.at> Fri May 04 09:29:29 2012 +0200
tree c77089f6beebc38be91472251e3fb553e449a777
parent d04dec9715660e7052c10159cb1aaeb4152cf391

Zip64 write support; zipcmp -p compares comments.

lib/zip_extra_field.c

diff --git a/lib/zip_extra_field.c b/lib/zip_extra_field.c
index 1c5a414..9799880 100644
--- a/lib/zip_extra_field.c
+++ b/lib/zip_extra_field.c
@@ -41,6 +41,45 @@
 
 
 
+struct zip_extra_field *
+_zip_ef_delete_by_id(struct zip_extra_field *ef, zip_uint16_t id, zip_uint16_t id_idx, zip_flags_t flags)
+{
+    struct zip_extra_field *head, *prev;
+    int i;
+
+    i = 0;
+    head = ef;
+    prev = NULL;
+    for (; ef; ef=(prev ? prev->next : head)) {
+	if ((ef->flags & flags & ZIP_EF_BOTH) && ef->id == id) {
+	    if (id_idx == ZIP_EXTRA_FIELD_ALL || i == id_idx) {
+		ef->flags &= ~(flags & ZIP_EF_BOTH);
+		if ((ef->flags & ZIP_EF_BOTH) == 0) {
+		    if (prev)
+			prev->next = ef->next;
+		    else
+			head = ef->next;
+		    ef->next = NULL;
+		    _zip_ef_free(ef);
+
+		    if (id_idx == ZIP_EXTRA_FIELD_ALL)
+			continue;
+		}
+	    }
+	    
+	    i++;
+	    if (i > id_idx)
+		break;
+	}
+	prev = ef;
+    }
+
+    return head;
+}
+
+
+
+
 void
 _zip_ef_free(struct zip_extra_field *ef)
 {
@@ -57,7 +96,7 @@
 
 
 const zip_uint8_t *
-_zip_ef_get_by_id(struct zip_extra_field *ef, zip_uint16_t *lenp, zip_uint16_t id, zip_uint16_t id_idx, zip_uint16_t flags, struct zip_error *error)
+_zip_ef_get_by_id(struct zip_extra_field *ef, zip_uint16_t *lenp, zip_uint16_t id, zip_uint16_t id_idx, zip_flags_t flags, struct zip_error *error)
 {
     static const zip_uint8_t empty[1];
     
@@ -123,7 +162,7 @@
 
 
 struct zip_extra_field *
-_zip_ef_new(zip_uint16_t id, zip_uint16_t size, const zip_uint8_t *data, zip_uint16_t flags)
+_zip_ef_new(zip_uint16_t id, zip_uint16_t size, const zip_uint8_t *data, zip_flags_t flags)
 {
     struct zip_extra_field *ef;
 
@@ -149,7 +188,7 @@
 
 
 struct zip_extra_field *
-_zip_ef_parse(const zip_uint8_t *data, zip_uint16_t len, zip_uint16_t flags, struct zip_error *error)
+_zip_ef_parse(const zip_uint8_t *data, zip_uint16_t len, zip_flags_t flags, struct zip_error *error)
 {
     struct zip_extra_field *ef, *ef2, *ef_head;
     int i;
@@ -194,7 +233,7 @@
 
 
 zip_uint16_t
-_zip_ef_size(struct zip_extra_field *ef, zip_uint16_t flags)
+_zip_ef_size(struct zip_extra_field *ef, zip_flags_t flags)
 {
     zip_uint16_t size;
 
@@ -210,7 +249,7 @@
 
 
 void
-_zip_ef_write(struct zip_extra_field *ef, zip_uint16_t flags, FILE *f)
+_zip_ef_write(struct zip_extra_field *ef, zip_flags_t flags, FILE *f)
 {
     for (; ef; ef=ef->next) {
 	if (ef->flags & flags & ZIP_EF_BOTH) {