Implement zip_get_num_entries.

--HG--
branch : HEAD

lib/Makefile.am

diff --git a/lib/Makefile.am b/lib/Makefile.am
index b12e83c..a5860c7 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -43,6 +43,7 @@
 	zip_get_encryption_implementation.c \
 	zip_get_file_comment.c \
 	zip_get_file_extra.c \
+	zip_get_num_entries.c \
 	zip_get_num_files.c \
 	zip_get_name.c \
 	zip_memdup.c \

lib/zip.h

diff --git a/lib/zip.h b/lib/zip.h
index 261e550..af8d76a 100644
--- a/lib/zip.h
+++ b/lib/zip.h
@@ -233,7 +233,8 @@
 ZIP_EXTERN const char *zip_get_file_extra(struct zip *, zip_uint64_t,
 					  int *, int);
 ZIP_EXTERN const char *zip_get_name(struct zip *, zip_uint64_t, int);
-ZIP_EXTERN int zip_get_num_files(struct zip *);
+ZIP_EXTERN zip_uint64_t zip_get_num_entries(struct zip *, int);
+ZIP_EXTERN int zip_get_num_files(struct zip *);  /* deprecated, use zip_get_num_entries instead */
 ZIP_EXTERN int zip_name_locate(struct zip *, const char *, int);
 ZIP_EXTERN struct zip *zip_open(const char *, int, int *);
 ZIP_EXTERN int zip_rename(struct zip *, zip_uint64_t, const char *);

lib/zip_get_num_entries.c

diff --git a/lib/zip_get_num_entries.c b/lib/zip_get_num_entries.c
new file mode 100644
index 0000000..83293e9
--- /dev/null
+++ b/lib/zip_get_num_entries.c
@@ -0,0 +1,52 @@
+/*
+  zip_get_num_entries.c -- get number of entries in archive
+  Copyright (C) 1999-2011 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>
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in
+     the documentation and/or other materials provided with the
+     distribution.
+  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
+  ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+  IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+  IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+
+
+#include "zipint.h"
+
+
+
+ZIP_EXTERN zip_uint64_t
+zip_get_num_entries(struct zip *za, int flags)
+{
+    if (za == NULL)
+	return -1;
+
+    if (flags & ZIP_FL_UNCHANGED) {
+      if (za->cdir == NULL)
+	return 0;
+      return za->cdir->nentry;
+    }
+    return za->nentry;
+}