archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-17 22:48:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

update libzip to version 1.0.1

Browse source
This commit is contained in:
Remi Collet 2015-05-06 14:36:18 +02:00 • committed by Remi Collet
parent 31f516b488
commit 9e0cc7a1d9
113 changed files with 5883 additions and 3154 deletions
Download patch file Download diff file Expand all files Collapse all files

18
ext/zip/lib/zip_dir_add.c
View file

@ -1,6 +1,6 @@
/*
zip_dir_add.c -- add directory
Copyright (C) 1999-2015 Dieter Baron and Thomas Klausner
Copyright (C) 1999-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,31 +32,29 @@
*/
#include <stdlib.h>
#include <string.h>
#include "zipint.h"
/* NOTE: Signed due to -1 on error. See zip_add.c for more details. */
ZIP_EXTERN zip_int64_t
zip_dir_add(struct zip *za, const char *name, zip_flags_t flags)
zip_dir_add(zip_t *za, const char *name, zip_flags_t flags)
{
size_t len;
zip_int64_t idx;
char *s;
struct zip_source *source;
zip_source_t *source;
if (ZIP_IS_RDONLY(za)) {
_zip_error_set(&za->error, ZIP_ER_RDONLY, 0);
zip_error_set(&za->error, ZIP_ER_RDONLY, 0);
return -1;
}
if (name == NULL) {
_zip_error_set(&za->error, ZIP_ER_INVAL, 0);
zip_error_set(&za->error, ZIP_ER_INVAL, 0);
return -1;
}
@ -65,7 +63,7 @@ zip_dir_add(struct zip *za, const char *name, zip_flags_t flags)
if (name[len-1] != '/') {
if ((s=(char *)malloc(len+2)) == NULL) {
_zip_error_set(&za->error, ZIP_ER_MEMORY, 0);
zip_error_set(&za->error, ZIP_ER_MEMORY, 0);
return -1;
}
strcpy(s, name);
@ -77,7 +75,7 @@ zip_dir_add(struct zip *za, const char *name, zip_flags_t flags)
free(s);
return -1;
}
idx = _zip_file_replace(za, ZIP_UINT64_MAX, s ? s : name, source, flags);
free(s);