From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Thu, 12 May 2011 08:34:19 +0000 (-0400)
Subject: On Mac OS, compare NFD string instead of NFC string
X-Git-Tag: v3.0.0a~369
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0bc478b1bdbec2a41b81b3b1ab14cb5ca085fb39;p=thirdparty%2Flibarchive.git

On Mac OS, compare NFD string instead of NFC string
at test_read_format_zip_filename and test_read_format_cab_filename.

SVN-Revision: 3317
---

diff --git a/libarchive/test/test_read_format_cab_filename.c b/libarchive/test/test_read_format_cab_filename.c
index 5ea4bc5be..3e5deb00d 100644
--- a/libarchive/test/test_read_format_cab_filename.c
+++ b/libarchive/test/test_read_format_cab_filename.c
@@ -107,16 +107,37 @@ test_read_format_cab_filename_CP932_UTF8(const char *refname)
 
 	/* Verify regular file. */
 	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
-	assertEqualUTF8String("\xe8\xa1\xa8\xe3\x81\xa0\xe3\x82\x88\x2f"
+#if defined(__APPLE__)
+	/* Compare NFD string. */
+	assertEqualUTF8String(
+	    "\xe8\xa1\xa8\xe3\x81\x9f\xe3\x82\x99\xe3\x82\x88\x2f"
 	    "\xe6\xbc\xa2\xe5\xad\x97\x2e\x74\x78\x74",
 	    archive_entry_pathname(ae));
 	assertEqualInt(5, archive_entry_size(ae));
+#else
+	/* Compare NFC string. */
+	assertEqualUTF8String(
+	    "\xe8\xa1\xa8\xe3\x81\xa0\xe3\x82\x88\x2f"
+	    "\xe6\xbc\xa2\xe5\xad\x97\x2e\x74\x78\x74",
+	    archive_entry_pathname(ae));
+	assertEqualInt(5, archive_entry_size(ae));
+#endif
 
 	/* Verify regular file. */
 	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
-	assertEqualUTF8String("\xe8\xa1\xa8\xe3\x81\xa0\xe3\x82\x88\x2f"
+#if defined(__APPLE__)
+	/* Compare NFD string. */
+	assertEqualUTF8String(
+	    "\xe8\xa1\xa8\xe3\x81\x9f\xe3\x82\x99\xe3\x82\x88\x2f"
+	    "\xe4\xb8\x80\xe8\xa6\xa7\xe8\xa1\xa8\x2e\x74\x78\x74",
+	    archive_entry_pathname(ae));
+#else
+	/* Compare NFC string. */
+	assertEqualUTF8String(
+	    "\xe8\xa1\xa8\xe3\x81\xa0\xe3\x82\x88\x2f"
 	    "\xe4\xb8\x80\xe8\xa6\xa7\xe8\xa1\xa8\x2e\x74\x78\x74",
 	    archive_entry_pathname(ae));
+#endif
 	assertEqualInt(5, archive_entry_size(ae));
 
 
diff --git a/libarchive/test/test_read_format_zip_filename.c b/libarchive/test/test_read_format_zip_filename.c
index 111b71dfa..9d2c98981 100644
--- a/libarchive/test/test_read_format_zip_filename.c
+++ b/libarchive/test/test_read_format_zip_filename.c
@@ -107,16 +107,36 @@ test_read_format_zip_filename_CP932_UTF8(const char *refname)
 
 	/* Verify regular file. */
 	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
-	assertEqualUTF8String("\xe8\xa1\xa8\xe3\x81\xa0\xe3\x82\x88\x2f"
+#if defined(__APPLE__)
+	/* Compare NFD string. */
+	assertEqualUTF8String(
+	    "\xe8\xa1\xa8\xe3\x81\x9f\xe3\x82\x99\xe3\x82\x88\x2f"
 	    "\xe4\xb8\x80\xe8\xa6\xa7\xe8\xa1\xa8\x2e\x74\x78\x74",
 	    archive_entry_pathname(ae));
+#else
+	/* Compare NFC string. */
+	assertEqualUTF8String(
+	    "\xe8\xa1\xa8\xe3\x81\xa0\xe3\x82\x88\x2f"
+	    "\xe4\xb8\x80\xe8\xa6\xa7\xe8\xa1\xa8\x2e\x74\x78\x74",
+	    archive_entry_pathname(ae));
+#endif
 	assertEqualInt(5, archive_entry_size(ae));
 
 	/* Verify regular file. */
 	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
-	assertEqualUTF8String("\xe8\xa1\xa8\xe3\x81\xa0\xe3\x82\x88\x2f"
+#if defined(__APPLE__)
+	/* Compare NFD string. */
+	assertEqualUTF8String(
+	    "\xe8\xa1\xa8\xe3\x81\x9f\xe3\x82\x99\xe3\x82\x88\x2f"
+	    "\xe6\xbc\xa2\xe5\xad\x97\x2e\x74\x78\x74",
+	    archive_entry_pathname(ae));
+#else
+	/* Compare NFC string. */
+	assertEqualUTF8String(
+	    "\xe8\xa1\xa8\xe3\x81\xa0\xe3\x82\x88\x2f"
 	    "\xe6\xbc\xa2\xe5\xad\x97\x2e\x74\x78\x74",
 	    archive_entry_pathname(ae));
+#endif
 	assertEqualInt(5, archive_entry_size(ae));