Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add support for charset option to cab format reader.
SVN-Revision: 3033
- Loading branch information
Showing
6 changed files
with
202 additions
and
29 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| begin 644 test_read_format_cab_cp932.cab | ||
| M35-#1@````"4`````````"P``````````P$!``(````(_@``;@````$``Q(% | ||
| M````````````=#ZO5"``E5R"OH+F7(J_CIHN='AT``4````%``````!T/KM4 | ||
| M(`"57(*^@N9<B.J7EY5<+G1X=``I]2&+'@`*`%N`@(T`,*```0````$````! | ||
| -````:V%N:FE(96QL;P`` | ||
| ` | ||
| end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| /*- | ||
| * Copyright (c) 2011 Michihiro NAKAJIMA | ||
| * All rights reserved. | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions | ||
| * are met: | ||
| * 1. Redistributions of source code must retain the above copyright | ||
| * notice, this list of conditions and the following disclaimer. | ||
| * 2. Redistributions in binary form must reproduce the above copyright | ||
| * notice, this list of conditions and the following disclaimer in the | ||
| * documentation and/or other materials provided with the distribution. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR | ||
| * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | ||
| * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | ||
| * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
| * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
| * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
| * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
| * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
| * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| */ | ||
| #include "test.h" | ||
| __FBSDID("$FreeBSD"); | ||
|
|
||
| #include <locale.h> | ||
|
|
||
| DEFINE_TEST(test_read_format_cab_filename) | ||
| { | ||
| struct archive *a; | ||
| struct archive_entry *ae; | ||
| const char *refname = "test_read_format_cab_cp932.cab"; | ||
|
|
||
| /* | ||
| * Read CAB filename in ja_JP.eucJP with "charset=CP932" option. | ||
| */ | ||
| if (NULL == setlocale(LC_ALL, "ja_JP.eucJP")) { | ||
| skipping("ja_JP.eucJP locale not available on this system."); | ||
| return; | ||
| } | ||
|
|
||
| extract_reference_file(refname); | ||
| assert((a = archive_read_new()) != NULL); | ||
| assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); | ||
| assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); | ||
| assertEqualIntA(a, ARCHIVE_OK, | ||
| archive_read_set_options(a, "charset=CP932")); | ||
| assertEqualIntA(a, ARCHIVE_OK, | ||
| archive_read_open_filename(a, refname, 10240)); | ||
|
|
||
| /* Verify regular file. */ | ||
| assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); | ||
| assertEqualString( | ||
| "\xc9\xbd\xa4\xc0\xa4\xe8\x2f\xb4\xc1\xbb\xfa\x2e\x74\x78\x74", | ||
| archive_entry_pathname(ae)); | ||
| assertEqualInt(5, archive_entry_size(ae)); | ||
|
|
||
| /* Verify regular file. */ | ||
| assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); | ||
| assertEqualString( | ||
| "\xc9\xbd\xa4\xc0\xa4\xe8\x2f\xb0\xec\xcd\xf7\xc9\xbd\x2e\x74\x78\x74", | ||
| archive_entry_pathname(ae)); | ||
| assertEqualInt(5, archive_entry_size(ae)); | ||
|
|
||
|
|
||
| /* End of archive. */ | ||
| assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); | ||
|
|
||
| /* Verify archive format. */ | ||
| assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_compression(a)); | ||
| assertEqualIntA(a, ARCHIVE_FORMAT_CAB, archive_format(a)); | ||
|
|
||
| /* Close the archive. */ | ||
| assertEqualInt(ARCHIVE_OK, archive_read_close(a)); | ||
| assertEqualInt(ARCHIVE_OK, archive_read_free(a)); | ||
|
|
||
|
|
||
| /* | ||
| * Read CAB filename in ja_JP.UTF-8 with "charset=CP932" option. | ||
| */ | ||
| if (NULL == setlocale(LC_ALL, "ja_JP.UTF-8")) { | ||
| skipping("ja_JP.UTF-8 locale not available on this system."); | ||
| return; | ||
| } | ||
|
|
||
| assert((a = archive_read_new()) != NULL); | ||
| assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); | ||
| assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); | ||
| assertEqualIntA(a, ARCHIVE_OK, | ||
| archive_read_set_options(a, "charset=CP932")); | ||
| assertEqualIntA(a, ARCHIVE_OK, | ||
| archive_read_open_filename(a, refname, 10240)); | ||
|
|
||
| /* Verify regular file. */ | ||
| assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); | ||
| assertEqualString("\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)); | ||
|
|
||
| /* Verify regular file. */ | ||
| assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); | ||
| assertEqualString("\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)); | ||
| assertEqualInt(5, archive_entry_size(ae)); | ||
|
|
||
|
|
||
| /* End of archive. */ | ||
| assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); | ||
|
|
||
| /* Verify archive format. */ | ||
| assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_compression(a)); | ||
| assertEqualIntA(a, ARCHIVE_FORMAT_CAB, archive_format(a)); | ||
|
|
||
| /* Close the archive. */ | ||
| assertEqualInt(ARCHIVE_OK, archive_read_close(a)); | ||
| assertEqualInt(ARCHIVE_OK, archive_read_free(a)); | ||
| } | ||
|
|