From 1fc4168b81f565feab409b92ccb61c57a1c550eb Mon Sep 17 00:00:00 2001
From: DLL125 <134442578+DLL125@users.noreply.github.com>
Date: Thu, 25 May 2023 12:52:53 +0200
Subject: Update Libzip to latest 1.9.2 (#1071)

* Libzip 1.9.2

Updated Libzip to latest version 1.9.2 and changed version number in the config.h from 1.7.3 to 1.9.2. Not sure if anything else needs to be tweaked :)

* Modified Libzip to work with Visual studio

* Update README.md

Update libzip copyright.

* Added the missing files.

I've added the missing files zipconf.h and config.h, I've missed those sorry for that!
---
 src/Common/libzip/zip_name_locate.c | 75 ++++++++++++++++++++++---------------
 1 file changed, 45 insertions(+), 30 deletions(-)

(limited to 'src/Common/libzip/zip_name_locate.c')

diff --git a/src/Common/libzip/zip_name_locate.c b/src/Common/libzip/zip_name_locate.c
index f7318ece..806053cc 100644
--- a/src/Common/libzip/zip_name_locate.c
+++ b/src/Common/libzip/zip_name_locate.c
@@ -1,9 +1,9 @@
 /*
   zip_name_locate.c -- get index by name
-  Copyright (C) 1999-2019 Dieter Baron and Thomas Klausner
+  Copyright (C) 1999-2022 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
@@ -49,44 +49,59 @@ zip_name_locate(zip_t *za, const char *fname, zip_flags_t flags) {
 zip_int64_t
 _zip_name_locate(zip_t *za, const char *fname, zip_flags_t flags, zip_error_t *error) {
     int (*cmp)(const char *, const char *);
+    zip_string_t *str = NULL;
     const char *fn, *p;
     zip_uint64_t i;
 
     if (za == NULL)
-	return -1;
+        return -1;
 
     if (fname == NULL) {
-	zip_error_set(error, ZIP_ER_INVAL, 0);
-	return -1;
+        zip_error_set(error, ZIP_ER_INVAL, 0);
+        return -1;
     }
 
-    if (flags & (ZIP_FL_NOCASE | ZIP_FL_NODIR | ZIP_FL_ENC_CP437)) {
-	/* can't use hash table */
-	cmp = (flags & ZIP_FL_NOCASE) ? strcasecmp : strcmp;
-
-	for (i = 0; i < za->nentry; i++) {
-	    fn = _zip_get_name(za, i, flags, error);
-
-	    /* newly added (partially filled) entry or error */
-	    if (fn == NULL)
-		continue;
-
-	    if (flags & ZIP_FL_NODIR) {
-		p = strrchr(fn, '/');
-		if (p)
-		    fn = p + 1;
-	    }
-
-	    if (cmp(fname, fn) == 0) {
-		_zip_error_clear(error);
-		return (zip_int64_t)i;
-	    }
-	}
+    if ((flags & (ZIP_FL_ENC_UTF_8 | ZIP_FL_ENC_RAW)) == 0 && fname[0] != '\0') {
+        if ((str = _zip_string_new((const zip_uint8_t *)fname, strlen(fname), flags, error)) == NULL) {
+            return -1;
+        }
+        if ((fname = (const char *)_zip_string_get(str, NULL, 0, error)) == NULL) {
+            _zip_string_free(str);
+            return -1;
+        }
+    }
 
-	zip_error_set(error, ZIP_ER_NOENT, 0);
-	return -1;
+    if (flags & (ZIP_FL_NOCASE | ZIP_FL_NODIR | ZIP_FL_ENC_RAW | ZIP_FL_ENC_STRICT)) {
+        /* can't use hash table */
+        cmp = (flags & ZIP_FL_NOCASE) ? strcasecmp : strcmp;
+
+        for (i = 0; i < za->nentry; i++) {
+            fn = _zip_get_name(za, i, flags, error);
+
+            /* newly added (partially filled) entry or error */
+            if (fn == NULL)
+                continue;
+
+            if (flags & ZIP_FL_NODIR) {
+                p = strrchr(fn, '/');
+                if (p)
+                    fn = p + 1;
+            }
+
+            if (cmp(fname, fn) == 0) {
+                _zip_error_clear(error);
+                _zip_string_free(str);
+                return (zip_int64_t)i;
+            }
+        }
+
+        zip_error_set(error, ZIP_ER_NOENT, 0);
+        _zip_string_free(str);
+        return -1;
     }
     else {
-	return _zip_hash_lookup(za->names, (const zip_uint8_t *)fname, flags, error);
+        zip_int64_t ret = _zip_hash_lookup(za->names, (const zip_uint8_t *)fname, flags, error);
+        _zip_string_free(str);
+        return ret;
     }
 }
-- 
cgit v1.2.3