update libzip to version 1.0.1

1 files changed, 19 insertions, 15 deletions

diff --git a/ext/zip/lib/zip_source_close.c b/ext/zip/lib/zip_source_close.c
index a8e91daf5c..36bc84235e 100644
--- a/ext/zip/lib/zip_source_close.c
+++ b/ext/zip/lib/zip_source_close.c
@@ -1,6 +1,6 @@
 /*
   zip_source_close.c -- close zip_source (stop reading)
-  Copyright (C) 2009 Dieter Baron and Thomas Klausner
+  Copyright (C) 2009-2014 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
   The authors can be contacted at <libzip@nih.at>
@@ -17,7 +17,7 @@
   3. The names of the authors may not be used to endorse or promote
      products derived from this software without specific prior
      written permission.
-
+ 
   THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS
   OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
   WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -32,23 +32,27 @@
 */
 
 
-
 #include "zipint.h"
 
 
-
-void
-zip_source_close(struct zip_source *src)
+int
+zip_source_close(zip_source_t *src)
 {
-    if (!src->is_open)
-	return;
-
-    if (src->src == NULL)
-	(void)src->cb.f(src->ud, NULL, 0, ZIP_SOURCE_CLOSE);
-    else {
-	(void)src->cb.l(src->src, src->ud, NULL, 0, ZIP_SOURCE_CLOSE);
-	zip_source_close(src->src);
+    if (!ZIP_SOURCE_IS_OPEN_READING(src)) {
+        zip_error_set(&src->error, ZIP_ER_INVAL, 0);
+        return -1;
+    }
+    
+    src->open_count--;
+    if (src->open_count == 0) {
+	_zip_source_call(src, NULL, 0, ZIP_SOURCE_CLOSE);
+
+	if (ZIP_SOURCE_IS_LAYERED(src)) {
+	    if (zip_source_close(src->src) < 0) {
+		zip_error_set(&src->error, ZIP_ER_INTERNAL, 0);
+	    }
+	}
     }
 
-    src->is_open = 0;
+    return 0;
 }