commit cf1bbe837a3bf2ae4dbf6d1f8c8bc642041a6d13
author Thomas Klausner <wiz@danbala.tuwien.ac.at> Thu Jun 09 19:27:16 2005 +0000
committer Thomas Klausner <wiz@danbala.tuwien.ac.at> Thu Jun 09 19:27:16 2005 +0000
tree 7869a24d25eb9c7513a81040300e966147ff79e6
parent f577d5fc1561eaf19754405b1e78e2051c439d49

When unchanging a file before deleting it, allow duplicate
file names (because the file will be removed anyway).

--HG--
branch : HEAD

lib/zip_delete.c

diff --git a/lib/zip_delete.c b/lib/zip_delete.c
index a234ed2..28e9f95 100644
--- a/lib/zip_delete.c
+++ b/lib/zip_delete.c
@@ -1,5 +1,5 @@
 /*
-  $NiH: zip_delete.c,v 1.14 2004/11/17 21:55:10 wiz Exp $
+  $NiH: zip_delete.c,v 1.15 2004/11/18 17:11:20 wiz Exp $
 
   zip_delete.c -- delete file from zip archive
   Copyright (C) 1999, 2004 Dieter Baron and Thomas Klausner
@@ -48,7 +48,9 @@
 	return -1;
     }
 
-    if (zip_unchange(za, idx) != 0)
+    /* allow duplicate file names, because the file will
+     * be removed directly afterwards */
+    if (_zip_unchange(za, idx, 1) != 0)
 	return -1;
 
     za->entry[idx].state = ZIP_ST_DELETED;