summaryrefslogtreecommitdiff
path: root/ext/zip/lib/zip_file_rename.c
diff options
context:
space:
mode:
authorRemi Collet <remi@fedoraproject.org>2015-05-06 14:36:18 +0200
committerRemi Collet <remi@php.net>2015-05-06 15:16:43 +0200
commit9e0cc7a1d926c1364a834177cadea431cd8b39a7 (patch)
treef63c505073d6aa0b74bde71eb6a67e6e4c23d8bd /ext/zip/lib/zip_file_rename.c
parent31f516b4888fcf096fe0912828948bed84f2ad1c (diff)
downloadphp-git-9e0cc7a1d926c1364a834177cadea431cd8b39a7.tar.gz
update libzip to version 1.0.1
Diffstat (limited to 'ext/zip/lib/zip_file_rename.c')
-rw-r--r--ext/zip/lib/zip_file_rename.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/ext/zip/lib/zip_file_rename.c b/ext/zip/lib/zip_file_rename.c
index dd4f253457..4400938ab5 100644
--- a/ext/zip/lib/zip_file_rename.c
+++ b/ext/zip/lib/zip_file_rename.c
@@ -1,6 +1,6 @@
/*
zip_file_rename.c -- rename file in zip archive
- Copyright (C) 1999-2012 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,37 +32,35 @@
*/
-
#include <string.h>
#include "zipint.h"
-
ZIP_EXTERN int
-zip_file_rename(struct zip *za, zip_uint64_t idx, const char *name, zip_flags_t flags)
+zip_file_rename(zip_t *za, zip_uint64_t idx, const char *name, zip_flags_t flags)
{
const char *old_name;
int old_is_dir, new_is_dir;
-
+
if (idx >= za->nentry || (name != NULL && strlen(name) > ZIP_UINT16_MAX)) {
- _zip_error_set(&za->error, ZIP_ER_INVAL, 0);
+ zip_error_set(&za->error, ZIP_ER_INVAL, 0);
return -1;
}
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 ((old_name=zip_get_name(za, idx, 0)) == NULL)
return -1;
-
+
new_is_dir = (name != NULL && name[strlen(name)-1] == '/');
old_is_dir = (old_name[strlen(old_name)-1] == '/');
if (new_is_dir != old_is_dir) {
- _zip_error_set(&za->error, ZIP_ER_INVAL, 0);
+ zip_error_set(&za->error, ZIP_ER_INVAL, 0);
return -1;
}