libzip: repository: 7ffa0b250c68

Navigation

Views: changesets, files, tags, branches

Formats: changeset, raw, files

Download: bz2 zip gz

changeset 1264:7ffa0b250c68

merge
author Dieter Baron <dillo@nih.at>
date Sat, 13 Oct 2012 18:35:14 +0200
parents e4cb7184bd61 e189add142d2
children fd8755a9273c
files TODO
diffstat 4 files changed, 137 insertions(+), 1 deletions(-) [+]
line diff
     1.1 --- a/TODO	Sat Oct 13 18:32:44 2012 +0200
     1.2 +++ b/TODO	Sat Oct 13 18:35:14 2012 +0200
     1.3 @@ -53,7 +53,6 @@
     1.4  ====
     1.5  ! D check for off_t overflow
     1.6  ! D fix OpenSUSE i686 regression failures
     1.7 -! D readd zip_get_num_files man page
     1.8  * fix open_filename_duplicate_consistency.test to fail
     1.9  * split zip archive torrentzip state from user requested torrentzip state
    1.10  * check for limits imposed by format (central dir size, file size, extra fields, ...)
     2.1 --- a/man/Makefile.am	Sat Oct 13 18:32:44 2012 +0200
     2.2 +++ b/man/Makefile.am	Sat Oct 13 18:35:14 2012 +0200
     2.3 @@ -37,6 +37,7 @@
     2.4  	zip_get_file_comment.mdoc \
     2.5  	zip_get_name.mdoc \
     2.6  	zip_get_num_entries.mdoc \
     2.7 +	zip_get_num_files.mdoc \
     2.8  	zip_name_locate.mdoc \
     2.9  	zip_open.mdoc \
    2.10  	zip_rename.mdoc \
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/man/zip_get_num_files.man	Sat Oct 13 18:35:14 2012 +0200
     3.3 @@ -0,0 +1,67 @@
     3.4 +.\" zip_get_num_files.mdoc \-- get number of files in archive
     3.5 +.\" Copyright (C) 2003-2011 Dieter Baron and Thomas Klausner
     3.6 +.\"
     3.7 +.\" This file is part of libzip, a library to manipulate ZIP archives.
     3.8 +.\" The authors can be contacted at <libzip@nih.at>
     3.9 +.\"
    3.10 +.\" Redistribution and use in source and binary forms, with or without
    3.11 +.\" modification, are permitted provided that the following conditions
    3.12 +.\" are met:
    3.13 +.\" 1. Redistributions of source code must retain the above copyright
    3.14 +.\"    notice, this list of conditions and the following disclaimer.
    3.15 +.\" 2. Redistributions in binary form must reproduce the above copyright
    3.16 +.\"    notice, this list of conditions and the following disclaimer in
    3.17 +.\"    the documentation and/or other materials provided with the
    3.18 +.\"    distribution.
    3.19 +.\" 3. The names of the authors may not be used to endorse or promote
    3.20 +.\"    products derived from this software without specific prior
    3.21 +.\"    written permission.
    3.22 +.\"
    3.23 +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS
    3.24 +.\" OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
    3.25 +.\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
    3.26 +.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
    3.27 +.\" DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
    3.28 +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
    3.29 +.\" GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
    3.30 +.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
    3.31 +.\" IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
    3.32 +.\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
    3.33 +.\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    3.34 +.\"
    3.35 +.TH ZIP_GET_NUM_FILES 3 "February 14, 2011" NiH
    3.36 +.SH "NAME"
    3.37 +zip_get_num_files \- get number of files in archive
    3.38 +.SH "LIBRARY"
    3.39 +libzip (-lzip)
    3.40 +.SH "SYNOPSIS"
    3.41 +#include <zip.h>
    3.42 +.PP
    3.43 +int
    3.44 +zip_get_num_files(struct zip *archive);
    3.45 +.SH "DESCRIPTION"
    3.46 +.I This function is deprecated.
    3.47 +.I Use
    3.48 +zip_get_num_entries(3)
    3.49 +.I instead.
    3.50 +.PP
    3.51 +The
    3.52 +zip_get_num_files
    3.53 +function returns the number of files in
    3.54 +\fBarchive.\fR
    3.55 +.SH "RETURN VALUES"
    3.56 +zip_get_num_files
    3.57 +returns the number of files in the zip archive,
    3.58 +or \-1 if
    3.59 +\fBarchive\fR
    3.60 +is
    3.61 +\fBNULL.\fR
    3.62 +.SH "SEE ALSO"
    3.63 +libzip(3),
    3.64 +zip_fopen_index(3),
    3.65 +zip_stat_index(3)
    3.66 +.SH "AUTHORS"
    3.67 +
    3.68 +Dieter Baron <dillo@nih.at>
    3.69 +and
    3.70 +Thomas Klausner <tk@giga.or.at>
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/man/zip_get_num_files.mdoc	Sat Oct 13 18:35:14 2012 +0200
     4.3 @@ -0,0 +1,69 @@
     4.4 +.\" zip_get_num_files.mdoc -- get number of files in archive
     4.5 +.\" Copyright (C) 2003-2011 Dieter Baron and Thomas Klausner
     4.6 +.\"
     4.7 +.\" This file is part of libzip, a library to manipulate ZIP archives.
     4.8 +.\" The authors can be contacted at <libzip@nih.at>
     4.9 +.\"
    4.10 +.\" Redistribution and use in source and binary forms, with or without
    4.11 +.\" modification, are permitted provided that the following conditions
    4.12 +.\" are met:
    4.13 +.\" 1. Redistributions of source code must retain the above copyright
    4.14 +.\"    notice, this list of conditions and the following disclaimer.
    4.15 +.\" 2. Redistributions in binary form must reproduce the above copyright
    4.16 +.\"    notice, this list of conditions and the following disclaimer in
    4.17 +.\"    the documentation and/or other materials provided with the
    4.18 +.\"    distribution.
    4.19 +.\" 3. The names of the authors may not be used to endorse or promote
    4.20 +.\"    products derived from this software without specific prior
    4.21 +.\"    written permission.
    4.22 +.\"
    4.23 +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS
    4.24 +.\" OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
    4.25 +.\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
    4.26 +.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
    4.27 +.\" DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
    4.28 +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
    4.29 +.\" GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
    4.30 +.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
    4.31 +.\" IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
    4.32 +.\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
    4.33 +.\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    4.34 +.\"
    4.35 +.Dd February 14, 2011
    4.36 +.Dt ZIP_GET_NUM_FILES 3
    4.37 +.Os
    4.38 +.Sh NAME
    4.39 +.Nm zip_get_num_files
    4.40 +.Nd get number of files in archive
    4.41 +.Sh LIBRARY
    4.42 +libzip (-lzip)
    4.43 +.Sh SYNOPSIS
    4.44 +.In zip.h
    4.45 +.Ft int
    4.46 +.Fn zip_get_num_files "struct zip *archive"
    4.47 +.Sh DESCRIPTION
    4.48 +.Em This function is deprecated.
    4.49 +.Em Use
    4.50 +.Xr zip_get_num_entries 3
    4.51 +.Em instead.
    4.52 +.Pp
    4.53 +The
    4.54 +.Fn zip_get_num_files
    4.55 +function returns the number of files in
    4.56 +.Ar archive .
    4.57 +.Sh RETURN VALUES
    4.58 +.Fn zip_get_num_files
    4.59 +returns the number of files in the zip archive,
    4.60 +or \-1 if
    4.61 +.Ar archive
    4.62 +is
    4.63 +.Dv NULL .
    4.64 +.Sh SEE ALSO
    4.65 +.Xr libzip 3 ,
    4.66 +.Xr zip_fopen_index 3 ,
    4.67 +.Xr zip_stat_index 3
    4.68 +.Sh AUTHORS
    4.69 +.An -nosplit
    4.70 +.An Dieter Baron Aq dillo@nih.at
    4.71 +and
    4.72 +.An Thomas Klausner Aq tk@giga.or.at