1 files changed, 62 insertions, 63 deletions
diff --git a/src/Common/libzip/zip_set_name.c b/src/Common/libzip/zip_set_name.c
index 34b76154..f1bf703e 100644
--- a/src/Common/libzip/zip_set_name.c
+++ b/src/Common/libzip/zip_set_name.c
@@ -1,9 +1,9 @@
 /*
   zip_set_name.c -- rename helper function
-  Copyright (C) 1999-2016 Dieter Baron and Thomas Klausner
+  Copyright (C) 1999-2021 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>
+  The authors can be contacted at <info@libzip.org>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
@@ -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
@@ -39,8 +39,7 @@
 
 
 int
-_zip_set_name(zip_t *za, zip_uint64_t idx, const char *name, zip_flags_t flags)
-{
+_zip_set_name(zip_t *za, zip_uint64_t idx, const char *name, zip_flags_t flags) {
     zip_entry_t *e;
     zip_string_t *str;
     bool same_as_orig;
@@ -49,109 +48,109 @@ _zip_set_name(zip_t *za, zip_uint64_t idx, const char *name, zip_flags_t flags)
     zip_string_t *old_str;
 
     if (idx >= za->nentry) {
-	zip_error_set(&za->error, ZIP_ER_INVAL, 0);
-	return -1;
+        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);
-	return -1;
+        zip_error_set(&za->error, ZIP_ER_RDONLY, 0);
+        return -1;
     }
 
     if (name && name[0] != '\0') {
         /* TODO: check for string too long */
-	if ((str=_zip_string_new((const zip_uint8_t *)name, (zip_uint16_t)strlen(name), flags, &za->error)) == NULL)
-	    return -1;
-	if ((flags & ZIP_FL_ENCODING_ALL) == ZIP_FL_ENC_GUESS && _zip_guess_encoding(str, ZIP_ENCODING_UNKNOWN) == ZIP_ENCODING_UTF8_GUESSED)
-	    str->encoding = ZIP_ENCODING_UTF8_KNOWN;
+        if ((str = _zip_string_new((const zip_uint8_t *)name, (zip_uint16_t)strlen(name), flags, &za->error)) == NULL)
+            return -1;
+        if ((flags & ZIP_FL_ENCODING_ALL) == ZIP_FL_ENC_GUESS && _zip_guess_encoding(str, ZIP_ENCODING_UNKNOWN) == ZIP_ENCODING_UTF8_GUESSED)
+            str->encoding = ZIP_ENCODING_UTF8_KNOWN;
     }
     else
-	str = NULL;
+        str = NULL;
 
     /* TODO: encoding flags needed for CP437? */
-    if ((i=_zip_name_locate(za, name, 0, NULL)) >= 0 && (zip_uint64_t)i != idx) {
-	_zip_string_free(str);
-	zip_error_set(&za->error, ZIP_ER_EXISTS, 0);
-	return -1;
+    if ((i = _zip_name_locate(za, name, 0, NULL)) >= 0 && (zip_uint64_t)i != idx) {
+        _zip_string_free(str);
+        zip_error_set(&za->error, ZIP_ER_EXISTS, 0);
+        return -1;
     }
 
     /* no effective name change */
-    if (i>=0 && (zip_uint64_t)i == idx) {
-	_zip_string_free(str);
-	return 0;
+    if (i >= 0 && (zip_uint64_t)i == idx) {
+        _zip_string_free(str);
+        return 0;
     }
 
-    e = za->entry+idx;
+    e = za->entry + idx;
 
     if (e->orig)
-	same_as_orig = _zip_string_equal(e->orig->filename, str);
+        same_as_orig = _zip_string_equal(e->orig->filename, str);
     else
-	same_as_orig = false;
+        same_as_orig = false;
 
     if (!same_as_orig && e->changes == NULL) {
-	if ((e->changes=_zip_dirent_clone(e->orig)) == NULL) {
-	    zip_error_set(&za->error, ZIP_ER_MEMORY, 0);
-	    _zip_string_free(str);
-	    return -1;
-	}
+        if ((e->changes = _zip_dirent_clone(e->orig)) == NULL) {
+            zip_error_set(&za->error, ZIP_ER_MEMORY, 0);
+            _zip_string_free(str);
+            return -1;
+        }
     }
 
     if ((new_name = _zip_string_get(same_as_orig ? e->orig->filename : str, NULL, 0, &za->error)) == NULL) {
-	_zip_string_free(str);
-	return -1;
+        _zip_string_free(str);
+        return -1;
     }
 
     if (e->changes) {
-	old_str = e->changes->filename;
+        old_str = e->changes->filename;
     }
     else if (e->orig) {
-	old_str = e->orig->filename;
+        old_str = e->orig->filename;
     }
     else {
-	old_str = NULL;
+        old_str = NULL;
     }
-    
+
     if (old_str) {
-	if ((old_name = _zip_string_get(old_str, NULL, 0, &za->error)) == NULL) {
-	    _zip_string_free(str);
-	    return -1;
-	}
+        if ((old_name = _zip_string_get(old_str, NULL, 0, &za->error)) == NULL) {
+            _zip_string_free(str);
+            return -1;
+        }
     }
     else {
-	old_name = NULL;
+        old_name = NULL;
     }
 
     if (_zip_hash_add(za->names, new_name, idx, 0, &za->error) == false) {
-	_zip_string_free(str);
-	return -1;
+        _zip_string_free(str);
+        return -1;
     }
     if (old_name) {
-	_zip_hash_delete(za->names, old_name, NULL);
+        _zip_hash_delete(za->names, old_name, NULL);
     }
 
     if (same_as_orig) {
-	if (e->changes) {
-	    if (e->changes->changed & ZIP_DIRENT_FILENAME) {
-		_zip_string_free(e->changes->filename);
-		e->changes->changed &= ~ZIP_DIRENT_FILENAME;
-		if (e->changes->changed == 0) {
-		    _zip_dirent_free(e->changes);
-		    e->changes = NULL;
-		}
-		else {
-		    /* TODO: what if not cloned? can that happen? */
-		    e->changes->filename = e->orig->filename;
-		}
-	    }
-	}
-	_zip_string_free(str);
+        if (e->changes) {
+            if (e->changes->changed & ZIP_DIRENT_FILENAME) {
+                _zip_string_free(e->changes->filename);
+                e->changes->changed &= ~ZIP_DIRENT_FILENAME;
+                if (e->changes->changed == 0) {
+                    _zip_dirent_free(e->changes);
+                    e->changes = NULL;
+                }
+                else {
+                    /* TODO: what if not cloned? can that happen? */
+                    e->changes->filename = e->orig->filename;
+                }
+            }
+        }
+        _zip_string_free(str);
     }
     else {
-	if (e->changes->changed & ZIP_DIRENT_FILENAME) {
-	    _zip_string_free(e->changes->filename);
-	}
-	e->changes->changed |= ZIP_DIRENT_FILENAME;
-	e->changes->filename = str;
+        if (e->changes->changed & ZIP_DIRENT_FILENAME) {
+            _zip_string_free(e->changes->filename);
+        }
+        e->changes->changed |= ZIP_DIRENT_FILENAME;
+        e->changes->filename = str;
     }
 
     return 0;