]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
Fix CRLF line endings in source files (#2449)
authorGraham Percival <gperciva@tarsnap.com>
Tue, 24 Dec 2024 23:25:53 +0000 (15:25 -0800)
committerGitHub <noreply@github.com>
Tue, 24 Dec 2024 23:25:53 +0000 (15:25 -0800)
libarchive/test/test_7zip_filename_encoding.c
libarchive/test/test_read_format_7zip_extract_second.7z.uu
libarchive/test/test_read_format_rar5_unicode.rar.uu

index b423e0eccadf2832538adf704bfd49d0ae4f688f..e51b7d430e2b43e777ce6dc6a81f1ee9c410223c 100644 (file)
-/*\r
- * Copyright (c) 2003-2018\r
- * All rights reserved.\r
- *\r
- * Redistribution and use in source and binary forms, with or without\r
- * modification, are permitted provided that the following conditions\r
- * are met:\r
- * 1. Redistributions of source code must retain the above copyright\r
- *    notice, this list of conditions and the following disclaimer\r
- *    in this position and unchanged.\r
- * 2. Redistributions in binary form must reproduce the above copyright\r
- *    notice, this list of conditions and the following disclaimer in the\r
- *    documentation and/or other materials provided with the distribution.\r
- *\r
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR\r
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES\r
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.\r
- * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,\r
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT\r
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\r
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\r
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\r
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF\r
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\r
- */\r
-#include "test.h"\r
-\r
-DEFINE_TEST(test_7zip_filename_encoding_UTF16_win)\r
-{\r
-#if !defined(_WIN32) || defined(__CYGWIN__)\r
-       skipping("This test is meant to verify unicode string handling"\r
-               " on Windows with UTF-16 names");\r
-       return;\r
-#else\r
-       struct archive *a;\r
-       struct archive_entry *entry;\r
-       char buff[4096];\r
-       size_t used;\r
-\r
-       /*\r
-        * Don't call setlocale because we're verifying that the '_w' functions\r
-        * work as expected\r
-        */\r
-\r
-       a = archive_write_new();\r
-       assertEqualInt(ARCHIVE_OK, archive_write_set_format_7zip(a));\r
-       assertEqualInt(ARCHIVE_OK,\r
-           archive_write_open_memory(a, buff, sizeof(buff), &used));\r
-\r
-       /* Part 1: file */\r
-       entry = archive_entry_new2(a);\r
-       archive_entry_copy_pathname_w(entry, L"\u8868.txt");\r
-       archive_entry_set_filetype(entry, AE_IFREG);\r
-       archive_entry_set_size(entry, 0);\r
-       assertEqualInt(ARCHIVE_OK, archive_write_header(a, entry));\r
-\r
-       /* Part 2: directory */\r
-       archive_entry_clear(entry);\r
-       archive_entry_copy_pathname_w(entry, L"\u8868");\r
-       archive_entry_set_filetype(entry, AE_IFDIR);\r
-       archive_entry_set_size(entry, 0);\r
-       assertEqualInt(ARCHIVE_OK, archive_write_header(a, entry));\r
-\r
-       /* Part 3: symlink */\r
-       archive_entry_clear(entry);\r
-       archive_entry_set_pathname(entry, "link.txt");\r
-       archive_entry_copy_symlink_w(entry, L"\u8868.txt");\r
-       archive_entry_set_filetype(entry, AE_IFLNK);\r
-       archive_entry_set_symlink_type(entry, AE_SYMLINK_TYPE_FILE);\r
-       archive_entry_set_size(entry, 0);\r
-       assertEqualInt(ARCHIVE_OK, archive_write_header(a, entry));\r
-\r
-       /* NOTE: 7zip does not support hardlinks */\r
-\r
-       archive_entry_free(entry);\r
-       assertEqualInt(ARCHIVE_OK, archive_write_free(a));\r
-\r
-       /* Ensure that the archive contents can be read properly */\r
-       /* NOTE: 7zip file contents are not in the order we wrote them! */\r
-       a = archive_read_new();\r
-       archive_read_support_format_all(a);\r
-       archive_read_support_filter_all(a);\r
-       assertEqualIntA(a, ARCHIVE_OK, read_open_memory_seek(a, buff, used, 7));\r
-\r
-       /* Read part 3: symlink */\r
-       assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &entry));\r
-       assertEqualWString(L"\u8868.txt", archive_entry_symlink_w(entry));\r
-\r
-       /* Read part 1: file */\r
-       assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &entry));\r
-       assertEqualWString(L"\u8868.txt", archive_entry_pathname_w(entry));\r
-\r
-       /* Read part 2: directory */\r
-       assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &entry));\r
-       /* NOTE: Trailing slash added automatically for us */\r
-       assertEqualWString(L"\u8868/", archive_entry_pathname_w(entry));\r
-\r
-       archive_read_free(a);\r
-#endif\r
-}\r
+/*
+ * 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
+}
index aa3d6e2357841e7c85eb57690f129cf7c05124ec..8ffcda09b3b728096b171f22809e5658df93fa80 100644 (file)
@@ -1,11 +1,11 @@
-begin 644 test_read_format_7zip_extract_second.7z\r
-M-WJ\KR<<``-N%=VX!@$````````B`````````*R\U.<`&`Q"DFIGO`[1,RO\\r
-MN,RA7-QU1L&_]O_/$0MMLIEBUR3'BDX@M2C-5'VG./-4,5@W3Q@*__^7_,[H\r
-MEO`DB'[ZI>@H2_E>/W.2G$$.P01-X!YN5";SS[3#7Z4Q1G/EF.0'^D*[S8&8\r
-M[FV9DYX7,SA%^.Q\'?__P!@`````@3,'K@_4WV/Q0A7VLXG$X?GH4=5W^`UM\r
-M$N_EX$)LE*?K$W5?WLP:X0T[Q%V^?A!0E\VZRBB,)(MO`C`LO[O!3(1YL)<:\r
-MJ."`';WU;>GP5',%Z=6?*/H9*Z)&\*!2^<F\P&>,RV`R30UOBH8+5.;;2IKF\r
-M0W://&'?"L?0L2!)`*]F30B0&/_'<4``%P9Z`0F`C``'"P$``2,#`0$%70``\r
--@``,@*@*`6]FB2D`````\r
-`\r
-end\r
+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^<F\P&>,RV`R30UOBH8+5.;;2IKF
+M0W://&'?"L?0L2!)`*]F30B0&/_'<4``%P9Z`0F`C``'"P$``2,#`0$%70``
+-@``,@*@*`6]FB2D`````
+`
+end
index e011ab64e689950ebd40e2b7d030776912b57b79..515b8657fba24e7a3461b00ab454ca8b748e812d 100644 (file)
@@ -1,9 +1,9 @@
-begin 0744 test_read_format_rar5_unicode.rar\r
-M4F%R(1H'`0#SX8+K"P$%!P`&`0&`@(``//TR$"@"`PN-``2-`"#FQN;K@```\r
-M#/"?D8OPGXR.+G1X=`H#`D:)>%;RZ]D!2&5L;&\L('=O<FQD(2/9BPA(`@,<\r
-M``0-(`````"````=XI*]XI.0XI.AXI.3(.*3@>*3F.*3G>*3FBYT>'0*`P)&\r
-MB7A6\NO9`1`%!``,\)^1B_"?C(XN='ATD-'.1V$"`QP`!`"@"`````"````U\r
-M\)V2KO"=DX[PG9."\)V2M_"=D9SPG9.!\)V2OO"=DK@@\)V0O_"=DK[PG9.#\r
-L\)V3@"YT>'0*`P(>7'J>!.S9`1`%`@`,\)^1B_"?C(XN='AT'7=640,%!```\r
-`\r
-end\r
+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<FQD(2/9BPA(`@,<
+M``0-(`````"````=XI*]XI.0XI.AXI.3(.*3@>*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