From: Graham Percival Date: Tue, 24 Dec 2024 23:25:53 +0000 (-0800) Subject: Fix CRLF line endings in source files (#2449) X-Git-Tag: v3.8.0~101 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=e99c6d69f165a2920123c56a04d58d9420347ef9;p=thirdparty%2Flibarchive.git Fix CRLF line endings in source files (#2449) --- diff --git a/libarchive/test/test_7zip_filename_encoding.c b/libarchive/test/test_7zip_filename_encoding.c index b423e0ecc..e51b7d430 100644 --- a/libarchive/test/test_7zip_filename_encoding.c +++ b/libarchive/test/test_7zip_filename_encoding.c @@ -1,100 +1,100 @@ -/* - * Copyright (c) 2003-2018 - * 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 - * in this position and unchanged. - * 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" - -DEFINE_TEST(test_7zip_filename_encoding_UTF16_win) -{ -#if !defined(_WIN32) || defined(__CYGWIN__) - skipping("This test is meant to verify unicode string handling" - " on Windows with UTF-16 names"); - return; -#else - struct archive *a; - struct archive_entry *entry; - char buff[4096]; - size_t used; - - /* - * Don't call setlocale because we're verifying that the '_w' functions - * work as expected - */ - - a = archive_write_new(); - assertEqualInt(ARCHIVE_OK, archive_write_set_format_7zip(a)); - assertEqualInt(ARCHIVE_OK, - archive_write_open_memory(a, buff, sizeof(buff), &used)); - - /* Part 1: file */ - entry = archive_entry_new2(a); - archive_entry_copy_pathname_w(entry, L"\u8868.txt"); - archive_entry_set_filetype(entry, AE_IFREG); - archive_entry_set_size(entry, 0); - assertEqualInt(ARCHIVE_OK, archive_write_header(a, entry)); - - /* Part 2: directory */ - archive_entry_clear(entry); - archive_entry_copy_pathname_w(entry, L"\u8868"); - archive_entry_set_filetype(entry, AE_IFDIR); - archive_entry_set_size(entry, 0); - assertEqualInt(ARCHIVE_OK, archive_write_header(a, entry)); - - /* Part 3: symlink */ - archive_entry_clear(entry); - archive_entry_set_pathname(entry, "link.txt"); - archive_entry_copy_symlink_w(entry, L"\u8868.txt"); - archive_entry_set_filetype(entry, AE_IFLNK); - archive_entry_set_symlink_type(entry, AE_SYMLINK_TYPE_FILE); - archive_entry_set_size(entry, 0); - assertEqualInt(ARCHIVE_OK, archive_write_header(a, entry)); - - /* NOTE: 7zip does not support hardlinks */ - - archive_entry_free(entry); - assertEqualInt(ARCHIVE_OK, archive_write_free(a)); - - /* Ensure that the archive contents can be read properly */ - /* NOTE: 7zip file contents are not in the order we wrote them! */ - a = archive_read_new(); - archive_read_support_format_all(a); - archive_read_support_filter_all(a); - assertEqualIntA(a, ARCHIVE_OK, read_open_memory_seek(a, buff, used, 7)); - - /* Read part 3: symlink */ - assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &entry)); - assertEqualWString(L"\u8868.txt", archive_entry_symlink_w(entry)); - - /* Read part 1: file */ - assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &entry)); - assertEqualWString(L"\u8868.txt", archive_entry_pathname_w(entry)); - - /* Read part 2: directory */ - assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &entry)); - /* NOTE: Trailing slash added automatically for us */ - assertEqualWString(L"\u8868/", archive_entry_pathname_w(entry)); - - archive_read_free(a); -#endif -} +/* + * Copyright (c) 2003-2018 + * 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 + * in this position and unchanged. + * 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" + +DEFINE_TEST(test_7zip_filename_encoding_UTF16_win) +{ +#if !defined(_WIN32) || defined(__CYGWIN__) + skipping("This test is meant to verify unicode string handling" + " on Windows with UTF-16 names"); + return; +#else + struct archive *a; + struct archive_entry *entry; + char buff[4096]; + size_t used; + + /* + * Don't call setlocale because we're verifying that the '_w' functions + * work as expected + */ + + a = archive_write_new(); + assertEqualInt(ARCHIVE_OK, archive_write_set_format_7zip(a)); + assertEqualInt(ARCHIVE_OK, + archive_write_open_memory(a, buff, sizeof(buff), &used)); + + /* Part 1: file */ + entry = archive_entry_new2(a); + archive_entry_copy_pathname_w(entry, L"\u8868.txt"); + archive_entry_set_filetype(entry, AE_IFREG); + archive_entry_set_size(entry, 0); + assertEqualInt(ARCHIVE_OK, archive_write_header(a, entry)); + + /* Part 2: directory */ + archive_entry_clear(entry); + archive_entry_copy_pathname_w(entry, L"\u8868"); + archive_entry_set_filetype(entry, AE_IFDIR); + archive_entry_set_size(entry, 0); + assertEqualInt(ARCHIVE_OK, archive_write_header(a, entry)); + + /* Part 3: symlink */ + archive_entry_clear(entry); + archive_entry_set_pathname(entry, "link.txt"); + archive_entry_copy_symlink_w(entry, L"\u8868.txt"); + archive_entry_set_filetype(entry, AE_IFLNK); + archive_entry_set_symlink_type(entry, AE_SYMLINK_TYPE_FILE); + archive_entry_set_size(entry, 0); + assertEqualInt(ARCHIVE_OK, archive_write_header(a, entry)); + + /* NOTE: 7zip does not support hardlinks */ + + archive_entry_free(entry); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); + + /* Ensure that the archive contents can be read properly */ + /* NOTE: 7zip file contents are not in the order we wrote them! */ + a = archive_read_new(); + archive_read_support_format_all(a); + archive_read_support_filter_all(a); + assertEqualIntA(a, ARCHIVE_OK, read_open_memory_seek(a, buff, used, 7)); + + /* Read part 3: symlink */ + assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &entry)); + assertEqualWString(L"\u8868.txt", archive_entry_symlink_w(entry)); + + /* Read part 1: file */ + assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &entry)); + assertEqualWString(L"\u8868.txt", archive_entry_pathname_w(entry)); + + /* Read part 2: directory */ + assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &entry)); + /* NOTE: Trailing slash added automatically for us */ + assertEqualWString(L"\u8868/", archive_entry_pathname_w(entry)); + + archive_read_free(a); +#endif +} diff --git a/libarchive/test/test_read_format_7zip_extract_second.7z.uu b/libarchive/test/test_read_format_7zip_extract_second.7z.uu index aa3d6e235..8ffcda09b 100644 --- a/libarchive/test/test_read_format_7zip_extract_second.7z.uu +++ b/libarchive/test/test_read_format_7zip_extract_second.7z.uu @@ -1,11 +1,11 @@ -begin 644 test_read_format_7zip_extract_second.7z -M-WJ\KR<<``-N%=VX!@$````````B`````````*R\U.<`&`Q"DFIGO`[1,RO\ -MN,RA7-QU1L&_]O_/$0MMLIEBUR3'BDX@M2C-5'VG./-4,5@W3Q@*__^7_,[H -MEO`DB'[ZI>@H2_E>/W.2G$$.P01-X!YN5";SS[3#7Z4Q1G/EF.0'^D*[S8&8 -M[FV9DYX7,SA%^.Q\'?__P!@`````@3,'K@_4WV/Q0A7VLXG$X?GH4=5W^`UM -M$N_EX$)LE*?K$W5?WLP:X0T[Q%V^?A!0E\VZRBB,)(MO`C`LO[O!3(1YL)<: -MJ."`';WU;>GP5',%Z=6?*/H9*Z)&\*!2^,RV`R30UOBH8+5.;;2IKF -M0W://&'?"L?0L2!)`*]F30B0&/_'<4``%P9Z`0F`C``'"P$``2,#`0$%70`` --@``,@*@*`6]FB2D````` -` -end +begin 644 test_read_format_7zip_extract_second.7z +M-WJ\KR<<``-N%=VX!@$````````B`````````*R\U.<`&`Q"DFIGO`[1,RO\ +MN,RA7-QU1L&_]O_/$0MMLIEBUR3'BDX@M2C-5'VG./-4,5@W3Q@*__^7_,[H +MEO`DB'[ZI>@H2_E>/W.2G$$.P01-X!YN5";SS[3#7Z4Q1G/EF.0'^D*[S8&8 +M[FV9DYX7,SA%^.Q\'?__P!@`````@3,'K@_4WV/Q0A7VLXG$X?GH4=5W^`UM +M$N_EX$)LE*?K$W5?WLP:X0T[Q%V^?A!0E\VZRBB,)(MO`C`LO[O!3(1YL)<: +MJ."`';WU;>GP5',%Z=6?*/H9*Z)&\*!2^,RV`R30UOBH8+5.;;2IKF +M0W://&'?"L?0L2!)`*]F30B0&/_'<4``%P9Z`0F`C``'"P$``2,#`0$%70`` +-@``,@*@*`6]FB2D````` +` +end diff --git a/libarchive/test/test_read_format_rar5_unicode.rar.uu b/libarchive/test/test_read_format_rar5_unicode.rar.uu index e011ab64e..515b8657f 100644 --- a/libarchive/test/test_read_format_rar5_unicode.rar.uu +++ b/libarchive/test/test_read_format_rar5_unicode.rar.uu @@ -1,9 +1,9 @@ -begin 0744 test_read_format_rar5_unicode.rar -M4F%R(1H'`0#SX8+K"P$%!P`&`0&`@(``//TR$"@"`PN-``2-`"#FQN;K@``` -M#/"?D8OPGXR.+G1X=`H#`D:)>%;RZ]D!2&5L;&\L('=O*3F.*3G>*3FBYT>'0*`P)& -MB7A6\NO9`1`%!``,\)^1B_"?C(XN='ATD-'.1V$"`QP`!`"@"`````"````U -M\)V2KO"=DX[PG9."\)V2M_"=D9SPG9.!\)V2OO"=DK@@\)V0O_"=DK[PG9.# -L\)V3@"YT>'0*`P(>7'J>!.S9`1`%`@`,\)^1B_"?C(XN='AT'7=640,%!``` -` -end +begin 0744 test_read_format_rar5_unicode.rar +M4F%R(1H'`0#SX8+K"P$%!P`&`0&`@(``//TR$"@"`PN-``2-`"#FQN;K@``` +M#/"?D8OPGXR.+G1X=`H#`D:)>%;RZ]D!2&5L;&\L('=O*3F.*3G>*3FBYT>'0*`P)& +MB7A6\NO9`1`%!``,\)^1B_"?C(XN='ATD-'.1V$"`QP`!`"@"`````"````U +M\)V2KO"=DX[PG9."\)V2M_"=D9SPG9.!\)V2OO"=DK@@\)V0O_"=DK[PG9.# +L\)V3@"YT>'0*`P(>7'J>!.S9`1`%`@`,\)^1B_"?C(XN='AT'7=640,%!``` +` +end