diff --git a/Bindings/LibZip.hsc b/Bindings/LibZip.hsc --- a/Bindings/LibZip.hsc +++ b/Bindings/LibZip.hsc @@ -2,7 +2,7 @@ #include -- | This module provides automatic low-level bindings to @libzip@ --- library, version 0.10. See also: +-- library, version 0.11. See also: -- -- * @libzip@ documention: and @zip.h@ -- @@ -21,12 +21,14 @@ #opaque_t zip #opaque_t zip_file #opaque_t zip_source +#integral_t zip_flags_t -- flags for zip_open #num ZIP_CREATE #num ZIP_EXCL #num ZIP_CHECKCONS +#num ZIP_TRUNCATE -- flags for zip_name_locate, zip_fopen, zip_stat, ... @@ -36,14 +38,29 @@ #num ZIP_FL_UNCHANGED #num ZIP_FL_RECOMPRESS #num ZIP_FL_ENCRYPTED +#num ZIP_FL_ENC_GUESS +#num ZIP_FL_ENC_RAW +#num ZIP_FL_ENC_STRICT +#num ZIP_FL_LOCAL +#num ZIP_FL_CENTRAL +#num ZIP_FL_ENC_UTF_8 +#num ZIP_FL_ENC_CP437 +#num ZIP_FL_OVERWRITE + -- archive global flags flags #num ZIP_AFL_TORRENT #num ZIP_AFL_RDONLY +-- new extra field + +#num ZIP_EXTRA_FIELD_ALL +#num ZIP_EXTRA_FIELD_NEW + -- flags for compression and encryption sources +#num ZIP_CODEC_DECODE #num ZIP_CODEC_ENCODE -- libzip error codes @@ -117,6 +134,8 @@ #num ZIP_SOURCE_ERROR #num ZIP_SOURCE_FREE + + -- typedef zip_int64_t (*zip_source_callback)(void *, void *, zip_uint64_t, enum zip_source_cmd); #callback zip_source_callback , Ptr () -> Ptr () -> CULLong -> -> IO CULLong @@ -161,22 +180,46 @@ -- make every declaration one-line, and replace -- ZIP_EXTERN -> +-- \/\*.*$ -> -- const char * -> CString -- char * -> Ptr CChar --- struct foo * -> Ptr -- with regexps +-- struct foo * -> Ptr +-- (with regexp: struct \([a-z0-9_]*\) \* -> Ptr <\1> ) -- FILE -> CFile -- int -> CInt +-- zip_uint8_t -> CUChar +-- zip_int16_t -> CShort +-- zip_uint16_t -> CUShort +-- zip_int32_t -> CInt +-- zip_uint32_t -> CUInt -- zip_int64_t -> CLLong -- zip_uint64_t -> CULLong -- void -> () +-- const -> -- zip_source_callback -> -- foo * -> Ptr foo -- with regexps -- regexp-replace "\(.*\)\(zip_[a-z0-9_]+\)(\(.*\));" "#ccall \2 , \3 -> IO (\1)" +-- deprecated API + #ccall zip_add , Ptr -> CString -> Ptr -> IO (CLLong) #ccall zip_add_dir , Ptr -> CString -> IO (CLLong) +#ccall zip_get_file_comment , Ptr -> CULLong -> Ptr CInt -> CInt -> IO (CString) +#ccall zip_get_num_files , Ptr -> IO (CInt) +#ccall zip_rename , Ptr -> CULLong -> CString -> IO (CInt) +#ccall zip_replace , Ptr -> CULLong -> Ptr -> IO (CInt) +#ccall zip_set_file_comment , Ptr -> CULLong -> CString -> CInt -> IO (CInt) + +-- the rest of the API + +#ccall zip_archive_set_tempdir , Ptr -> CString -> IO (CInt) +#ccall zip_file_add , Ptr -> CString -> Ptr -> -> IO (CLLong) +#ccall zip_dir_add , Ptr -> CString -> -> IO (CLLong) #ccall zip_close , Ptr -> IO (CInt) +#ccall zip_discard , Ptr -> IO () #ccall zip_delete , Ptr -> CULLong -> IO (CInt) +#ccall zip_file_extra_field_delete , Ptr -> CULLong -> CUShort -> -> IO (CInt) +#ccall zip_file_extra_field_delete_by_id , Ptr -> CULLong -> CUShort -> CUShort -> -> IO (CInt) #ccall zip_error_clear , Ptr -> IO () #ccall zip_error_get , Ptr -> Ptr CInt -> Ptr CInt -> IO () #ccall zip_error_get_sys_type , CInt -> IO (CInt) @@ -186,35 +229,38 @@ #ccall zip_file_error_clear , Ptr -> IO () #ccall zip_file_error_get , Ptr -> Ptr CInt -> Ptr CInt -> IO () #ccall zip_file_strerror , Ptr -> IO (CString) -#ccall zip_fopen , Ptr -> CString -> CInt -> IO (Ptr ) -#ccall zip_fopen_encrypted , Ptr -> CString -> CInt -> CString -> IO (Ptr ) -#ccall zip_fopen_index , Ptr -> CULLong -> CInt -> IO (Ptr ) -#ccall zip_fopen_index_encrypted , Ptr -> CULLong -> CInt -> CString -> IO (Ptr ) +#ccall zip_fopen , Ptr -> CString -> -> IO (Ptr ) +#ccall zip_fopen_encrypted , Ptr -> CString -> -> CString -> IO (Ptr ) +#ccall zip_fopen_index , Ptr -> CULLong -> -> IO (Ptr ) +#ccall zip_fopen_index_encrypted , Ptr -> CULLong -> -> CString -> IO (Ptr ) #ccall zip_fread , Ptr -> Ptr () -> CULLong -> IO (CLLong) -#ccall zip_get_archive_comment , Ptr -> Ptr CInt -> CInt -> IO (CString) -#ccall zip_get_archive_flag , Ptr -> CInt -> CInt -> IO (CInt) -#ccall zip_get_file_comment , Ptr -> CULLong -> Ptr CInt -> CInt -> IO (CString) -#ccall zip_get_file_extra , Ptr -> CULLong -> Ptr CInt -> CInt -> IO (CString) -#ccall zip_get_name , Ptr -> CULLong -> CInt -> IO (CString) -#ccall zip_get_num_entries , Ptr -> CInt -> IO (CULLong) -#ccall zip_get_num_files , Ptr -> IO (CInt) -#ccall zip_name_locate , Ptr -> CString -> CInt -> IO (CInt) +#ccall zip_get_archive_comment , Ptr -> Ptr CInt -> -> IO (CString) +#ccall zip_get_archive_flag , Ptr -> -> -> IO (CInt) +#ccall zip_file_get_comment , Ptr -> CULLong -> Ptr CUInt -> -> IO (CString) +#ccall zip_file_extra_field_get , Ptr -> CULLong -> CUShort -> Ptr CUShort -> Ptr CUShort -> -> IO (Ptr CUChar) +#ccall zip_file_extra_field_get_by_id , Ptr -> CULLong -> CUShort -> CUShort -> Ptr CUShort -> -> IO (Ptr CUChar) +#ccall zip_file_extra_fields_count , Ptr -> CULLong -> -> IO (CShort) +#ccall zip_file_extra_fields_count_by_id , Ptr -> CULLong -> CUShort -> -> IO (CShort) +#ccall zip_get_name , Ptr -> CULLong -> -> IO (CString) +#ccall zip_get_num_entries , Ptr -> -> IO (CLLong) +#ccall zip_name_locate , Ptr -> CString -> -> IO (CLLong) #ccall zip_open , CString -> CInt -> Ptr CInt -> IO (Ptr ) -#ccall zip_rename , Ptr -> CULLong -> CString -> IO (CInt) -#ccall zip_replace , Ptr -> CULLong -> Ptr -> IO (CInt) -#ccall zip_set_archive_comment , Ptr -> CString -> CInt -> IO (CInt) -#ccall zip_set_archive_flag , Ptr -> CInt -> CInt -> IO (CInt) +#ccall zip_file_rename , Ptr -> CULLong -> CString -> -> IO (CInt) +#ccall zip_file_replace , Ptr -> CULLong -> Ptr -> -> IO (CInt) +#ccall zip_set_archive_comment , Ptr -> CString -> CUShort -> IO (CInt) +#ccall zip_set_archive_flag , Ptr -> -> CInt -> IO (CInt) #ccall zip_set_default_password , Ptr -> CString -> IO (CInt) -#ccall zip_set_file_comment , Ptr -> CULLong -> CString -> CInt -> IO (CInt) -#ccall zip_set_file_extra , Ptr -> CULLong -> CString -> CInt -> IO (CInt) +#ccall zip_file_set_comment , Ptr -> CULLong -> CString -> CUShort -> -> IO (CInt) +#ccall zip_set_file_compression , Ptr -> CULLong -> CInt -> CUInt -> IO (CInt) +#ccall zip_file_extra_field_set , Ptr -> CULLong -> CUShort -> CUShort -> Ptr CUChar -> CUShort -> -> IO (CInt) #ccall zip_source_buffer , Ptr -> Ptr () -> CULLong -> CInt -> IO (Ptr ) #ccall zip_source_file , Ptr -> CString -> CULLong -> CLLong -> IO (Ptr ) #ccall zip_source_filep , Ptr -> Ptr CFile -> CULLong -> CLLong -> IO (Ptr ) #ccall zip_source_free , Ptr -> IO () #ccall zip_source_function , Ptr -> -> Ptr () -> IO (Ptr ) -#ccall zip_source_zip , Ptr -> Ptr -> CULLong -> CInt -> CULLong -> CLLong -> IO (Ptr ) -#ccall zip_stat , Ptr -> CString -> CInt -> Ptr -> IO (CInt) -#ccall zip_stat_index , Ptr -> CULLong -> CInt -> Ptr -> IO (CInt) +#ccall zip_source_zip , Ptr -> Ptr -> CULLong -> -> CULLong -> CLLong -> IO (Ptr ) +#ccall zip_stat , Ptr -> CString -> -> Ptr -> IO (CInt) +#ccall zip_stat_index , Ptr -> CULLong -> -> Ptr -> IO (CInt) #ccall zip_stat_init , Ptr -> IO () #ccall zip_strerror , Ptr -> IO (CString) #ccall zip_unchange , Ptr -> CULLong -> IO (CInt) diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright Sergey Astanin 2010 +Copyright Sergey Astanin 2010-2013 All rights reserved. diff --git a/bindings-libzip.cabal b/bindings-libzip.cabal --- a/bindings-libzip.cabal +++ b/bindings-libzip.cabal @@ -1,8 +1,8 @@ Name: bindings-libzip -Version: 0.10.2 +Version: 0.11 Synopsis: Low level bindings to libzip. Description: - This package provides low-level bindings to libzip (v0.10) library. + This package provides low-level bindings to libzip (v0.11) library. For higher-level interface please use LibZip package: @@ -16,7 +16,6 @@ Build-type: Simple Cabal-version: >=1.2.3 -Tested-with: GHC == 7.4.1, GHC == 7.6.1 Flag NoPkgConfig Description: Do not use pkg-config to check for library dependencies. @@ -30,14 +29,14 @@ Bindings.LibZip Build-Depends: - base >= 4.0 && < 5 + base >= 4.0 && < 5.0 , bindings-DSL >= 1.0 && < 1.1 if flag(NoPkgConfig) Includes: zip.h Extra-Libraries: zip z else - PkgConfig-Depends: libzip == 0.10.* + PkgConfig-Depends: libzip == 0.11.* GHC-Options: -Wall -fno-warn-unused-imports