Spelling fixes (#846)

Sponsored by:	Tarsnap Backup Inc.

diff --git a/cpio/test/test_owner_parse.c b/cpio/test/test_owner_parse.c
index a9f605398e362fc1cd4066e8875a04429c2bf191..bef02da7badf0f1174ccab3484f29ff9607f467c 100644 (file)
--- a/cpio/test/test_owner_parse.c
+++ b/cpio/test/test_owner_parse.c
@@ -38,7 +38,7 @@ static const int root_gids[] = { 0, 1 };
  * its primary group membership depends on how the user set up
  * their /etc/passwd. Likely values are 513 (None), 545 (Users),
  * or 544 (Administrators). Just check for one of those...
- * TODO: Handle non-English localizations...e.g. French 'Administrateur'
+ * TODO: Handle non-English localizations... e.g. French 'Administrateur'
  *       Use CreateWellKnownSID() and LookupAccountName()?
  */
 #define ROOT "Administrator"

diff --git a/libarchive/archive_read.c b/libarchive/archive_read.c
index d490d7b41e82cbb70b648504920e329070a30b94..d1fecebfd09f2929f981ed0216e192aa39932144 100644 (file)
--- a/libarchive/archive_read.c
+++ b/libarchive/archive_read.c
@@ -764,7 +764,7 @@ archive_read_header_position(struct archive *_a)
  * we cannot say whether there are encrypted entries, then
  * ARCHIVE_READ_FORMAT_ENCRYPTION_DONT_KNOW is returned.
  * In general, this function will return values below zero when the
- * reader is uncertain or totally uncapable of encryption support.
+ * reader is uncertain or totally incapable of encryption support.
  * When this function returns 0 you can be sure that the reader
  * supports encryption detection but no encrypted entries have
  * been found yet.

diff --git a/libarchive/archive_read_disk_posix.c b/libarchive/archive_read_disk_posix.c
index 3cc5168e491b4fbc8ddb9a003d3547bfacae3e90..bc7fad1d9d2e1caca0817c153a7e14fd8bb5a40e 100644 (file)
--- a/libarchive/archive_read_disk_posix.c
+++ b/libarchive/archive_read_disk_posix.c
@@ -1026,7 +1026,7 @@ next_entry(struct archive_read_disk *a, struct tree *t,
 
        /* Save the times to be restored. This must be in before
         * calling archive_read_disk_descend() or any chance of it,
-        * especially, invokng a callback. */
+        * especially, invoking a callback. */
        t->restore_time.mtime = archive_entry_mtime(entry);
        t->restore_time.mtime_nsec = archive_entry_mtime_nsec(entry);
        t->restore_time.atime = archive_entry_atime(entry);

diff --git a/libarchive/archive_read_disk_windows.c b/libarchive/archive_read_disk_windows.c
index 993a1dc40dc26917fc0a2c36ab2e8626c503cf4c..6791b2c136200ca2e4cc48039af002bcd5ff6a02 100644 (file)
--- a/libarchive/archive_read_disk_windows.c
+++ b/libarchive/archive_read_disk_windows.c
@@ -862,7 +862,7 @@ next_entry(struct archive_read_disk *a, struct tree *t,
 
        /* Save the times to be restored. This must be in before
         * calling archive_read_disk_descend() or any chance of it,
-        * especially, invokng a callback. */
+        * especially, invoking a callback. */
        t->restore_time.lastWriteTime = st->ftLastWriteTime;
        t->restore_time.lastAccessTime = st->ftLastAccessTime;
        t->restore_time.filetype = archive_entry_filetype(entry);

diff --git a/libarchive/archive_read_support_filter_xz.c b/libarchive/archive_read_support_filter_xz.c
index 023c349d81f0af258330c05f04742fb0d9431b94..63037a57a89b3e4a85c9290fdee7e35969e39f25 100644 (file)
--- a/libarchive/archive_read_support_filter_xz.c
+++ b/libarchive/archive_read_support_filter_xz.c
@@ -293,7 +293,7 @@ lzma_bidder_bid(struct archive_read_filter_bidder *self,
        /* Second through fifth bytes are dictionary size, stored in
         * little-endian order. The minimum dictionary size is
         * 1 << 12(4KiB) which the lzma of LZMA SDK uses with option
-        * -d12 and the maxinam dictionary size is 1 << 27(128MiB)
+        * -d12 and the maximum dictionary size is 1 << 27(128MiB)
         * which the one uses with option -d27.
         * NOTE: A comment of LZMA SDK source code says this dictionary
         * range is from 1 << 12 to 1 << 30. */

diff --git a/libarchive/archive_read_support_format_7zip.c b/libarchive/archive_read_support_format_7zip.c
index 268daa20106b1f1ee9dfbd06aff366c514db29f4..78b4bcc245c4a1a3a0e86c843a9b737dbb54df2a 100644 (file)
--- a/libarchive/archive_read_support_format_7zip.c
+++ b/libarchive/archive_read_support_format_7zip.c
@@ -263,22 +263,22 @@ struct _7zip {
        /*
         * Decompressor controllers.
         */
-       /* Decording LZMA1 and LZMA2 data. */
+       /* Decoding LZMA1 and LZMA2 data. */
 #ifdef HAVE_LZMA_H
        lzma_stream              lzstream;
        int                      lzstream_valid;
 #endif
-       /* Decording bzip2 data. */
+       /* Decoding bzip2 data. */
 #if defined(HAVE_BZLIB_H) && defined(BZ_CONFIG_ERROR)
        bz_stream                bzstream;
        int                      bzstream_valid;
 #endif
-       /* Decording deflate data. */
+       /* Decoding deflate data. */
 #ifdef HAVE_ZLIB_H
        z_stream                 stream;
        int                      stream_valid;
 #endif
-       /* Decording PPMd data. */
+       /* Decoding PPMd data. */
        int                      ppmd7_stat;
        CPpmd7                   ppmd7_context;
        CPpmd7z_RangeDec         range_dec;

diff --git a/libarchive/archive_read_support_format_cpio.c b/libarchive/archive_read_support_format_cpio.c
index 7438babb60d15ef2cbffdfa965a4ed593790fff7..89f9188cd1042f10c4b88f69c5072dc163f82df2 100644 (file)
--- a/libarchive/archive_read_support_format_cpio.c
+++ b/libarchive/archive_read_support_format_cpio.c
@@ -326,7 +326,7 @@ archive_read_format_cpio_options(struct archive_read *a,
 
        cpio = (struct cpio *)(a->format->data);
        if (strcmp(key, "compat-2x")  == 0) {
-               /* Handle filnames as libarchive 2.x */
+               /* Handle filenames as libarchive 2.x */
                cpio->init_default_conversion = (val != NULL)?1:0;
                return (ARCHIVE_OK);
        } else if (strcmp(key, "hdrcharset")  == 0) {

diff --git a/libarchive/archive_string.c b/libarchive/archive_string.c
index aa57f01549f57cb3842bc842440e8526927d5492..645570b21c07d81908c956414c30a6be6e1a1822 100644 (file)
--- a/libarchive/archive_string.c
+++ b/libarchive/archive_string.c
@@ -1827,7 +1827,7 @@ archive_string_conversion_set_opt(struct archive_string_conv *sc, int opt)
         * A filename in UTF-8 was made with libarchive 2.x in a wrong
         * assumption that wchar_t was Unicode.
         * This option enables simulating the assumption in order to read
-        * that filname correctly.
+        * that filename correctly.
         */
        case SCONV_SET_OPT_UTF8_LIBARCHIVE2X:
 #if (defined(_WIN32) && !defined(__CYGWIN__)) \

diff --git a/libarchive/archive_write_set_format_iso9660.c b/libarchive/archive_write_set_format_iso9660.c
index 591105e65b0e7d18ca18cd0523c542654d077b50..bf69c3e2ee1df609914f09d48fb55ede4e6753e2 100644 (file)
--- a/libarchive/archive_write_set_format_iso9660.c
+++ b/libarchive/archive_write_set_format_iso9660.c
@@ -680,7 +680,7 @@ struct iso9660 {
        /* The creation time of ISO image. */
        time_t                   birth_time;
        /* A file stream of a temporary file, which file contents
-        * save to until ISO iamge can be created. */
+        * save to until ISO image can be created. */
        int                      temp_fd;
 
        struct isofile          *cur_file;
@@ -1995,7 +1995,7 @@ iso9660_close(struct archive_write *a)
         * Write an ISO 9660 image.
         */
 
-       /* Switc to start using wbuff as file buffer. */
+       /* Switch to start using wbuff as file buffer. */
        iso9660->wbuff_remaining = wb_buffmax();
        iso9660->wbuff_type = WB_TO_STREAM;
        iso9660->wbuff_offset = 0;
@@ -4558,7 +4558,7 @@ write_file_descriptors(struct archive_write *a)
                file->cur_content = &(file->content);
                do {
                        blocks += file->cur_content->blocks;
-                       /* Next fragument */
+                       /* Next fragment */
                        file->cur_content = file->cur_content->next;
                } while (file->cur_content != NULL);
        }
@@ -4748,7 +4748,7 @@ isofile_gen_utility_names(struct archive_write *a, struct isofile *file)
                }
 
                /*
-                * Converte a filename to UTF-16BE.
+                * Convert a filename to UTF-16BE.
                 */
                if (0 > archive_entry_pathname_l(file->entry, &u16, &u16len,
                    iso9660->sconv_to_utf16be)) {
@@ -5512,7 +5512,7 @@ isoent_setup_file_location(struct iso9660 *iso9660, int location)
                        file->cur_content->location = location;
                        location += file->cur_content->blocks;
                        total_block += file->cur_content->blocks;
-                       /* Next fragument */
+                       /* Next fragment */
                        file->cur_content = file->cur_content->next;
                } while (file->cur_content != NULL);
        }
@@ -6164,7 +6164,7 @@ isoent_gen_iso9660_identifier(struct archive_write *a, struct isoent *isoent,
                np->id_len = l = ext_off + np->ext_len;
 
                /* Make an offset of the number which is used to be set
-                * hexadecimal number to avoid duplicate identififier. */
+                * hexadecimal number to avoid duplicate identifier. */
                if (iso9660->opt.iso_level == 1) {
                        if (ext_off >= 5)
                                noff = 5;
@@ -6742,7 +6742,7 @@ isoent_rr_move(struct archive_write *a)
        int r;
 
        pt = &(iso9660->primary.pathtbl[MAX_DEPTH-1]);
-       /* Theare aren't level 8 directories reaching a deepr level. */
+       /* There aren't level 8 directories reaching a deeper level. */
        if (pt->cnt == 0)
                return (ARCHIVE_OK);
 
@@ -6813,7 +6813,7 @@ _compare_path_table(const void *v1, const void *v2)
        if (cmp != 0)
                return (cmp);
 
-       /* Compare indetifier */
+       /* Compare identifier */
        s1 = p1->identifier;
        s2 = p2->identifier;
        l = p1->ext_off;
@@ -6855,7 +6855,7 @@ _compare_path_table_joliet(const void *v1, const void *v2)
        if (cmp != 0)
                return (cmp);
 
-       /* Compare indetifier */
+       /* Compare identifier */
        s1 = (const unsigned char *)p1->identifier;
        s2 = (const unsigned char *)p2->identifier;
        l = p1->ext_off;

diff --git a/libarchive/test/test_read_disk_directory_traversals.c b/libarchive/test/test_read_disk_directory_traversals.c
index 0a81e1ee434e1febfa46102957241e6bf6ac8c99..31eb76b93123cb2b37592b325978ddc773e3e07c 100644 (file)
--- a/libarchive/test/test_read_disk_directory_traversals.c
+++ b/libarchive/test/test_read_disk_directory_traversals.c
@@ -500,8 +500,8 @@ test_basic(void)
 
        /*
         * We should be on the initial directory where we performed
-        * archive_read_disk_new() after we perfome archive_read_free()
-        *  even if we broke off the directory traversals.
+        * archive_read_disk_new() after we perform archive_read_free()
+        * even if we broke off the directory traversals.
         */
 
        /* Save current working directory. */
@@ -1565,11 +1565,11 @@ DEFINE_TEST(test_read_disk_directory_traversals)
 {
        /* Basic test. */
        test_basic();
-       /* Test hybird mode; follow symlink initially, then not. */
+       /* Test hybrid mode; follow symlink initially, then not. */
        test_symlink_hybrid();
-       /* Test logcal mode; follow all symlinks. */
+       /* Test logical mode; follow all symlinks. */
        test_symlink_logical();
-       /* Test logcal mode; prevent loop in symlinks. */ 
+       /* Test logical mode; prevent loop in symlinks. */
        test_symlink_logical_loop();
        /* Test to restore atime. */
        test_restore_atime();

diff --git a/libarchive/test/test_write_disk_appledouble.c b/libarchive/test/test_write_disk_appledouble.c
index 81032fca9cd077b7085ebb48a16346aefece7b4a..706794ab95bf5e79d03ff9491d139fe8168923da 100644 (file)
--- a/libarchive/test/test_write_disk_appledouble.c
+++ b/libarchive/test/test_write_disk_appledouble.c
@@ -144,7 +144,7 @@ DEFINE_TEST(test_write_disk_appledouble)
        assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
        assertEqualString("./file3", archive_entry_pathname(ae));
        assertEqualIntA(a, ARCHIVE_OK, archive_read_extract2(a, ae, ad));
-       /* Extract ._file3 which will be merged into file3 as medtadata. */
+       /* Extract ._file3 which will be merged into file3 as metadata. */
        assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
        assertEqualString("./._file3", archive_entry_pathname(ae));
        assertEqualIntA(a, ARCHIVE_OK, archive_read_extract2(a, ae, ad));
@@ -203,7 +203,7 @@ DEFINE_TEST(test_write_disk_appledouble)
        assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
        assertEqualString("./file3", archive_entry_pathname(ae));
        assertEqualIntA(a, ARCHIVE_OK, archive_read_extract2(a, ae, ad));
-       /* Extract ._file3 which will be merged into file3 as medtadata. */
+       /* Extract ._file3 which will be merged into file3 as metadata. */
        assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
        assertEqualString("./._file3", archive_entry_pathname(ae));
        assertEqualIntA(a, ARCHIVE_OK, archive_read_extract2(a, ae, ad));

diff --git a/libarchive/test/test_write_format_xar_empty.c b/libarchive/test/test_write_format_xar_empty.c
index aa26d5d151c9231fbe1d87d567ef4da21672bf6f..97c080887e40061ea10f3f55e4fc0aef591fd398 100644 (file)
--- a/libarchive/test/test_write_format_xar_empty.c
+++ b/libarchive/test/test_write_format_xar_empty.c
@@ -115,6 +115,6 @@ DEFINE_TEST(test_write_format_xar_empty)
        assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
-       /* Verify the correct format for an empy Xar archive. */
+       /* Verify the correct format for an empty Xar archive. */
        assertEqualInt(used, 0);
 }

diff --git a/libarchive/test/test_write_format_zip_empty.c b/libarchive/test/test_write_format_zip_empty.c
index 2e3afec71fd33cc607ee556196c2a07c1a3b0a31..73a55731261ed4ea52a50ed12c4e8347357796fb 100644 (file)
--- a/libarchive/test/test_write_format_zip_empty.c
+++ b/libarchive/test/test_write_format_zip_empty.c
@@ -49,7 +49,7 @@ DEFINE_TEST(test_write_format_zip_empty)
        assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
-       /* Verify the correct format for an empy Zip archive. */
+       /* Verify the correct format for an empty Zip archive. */
        assertEqualInt(used, 22);
        assertEqualMem(buff,
            "PK\005\006\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",

diff --git a/libarchive/test/test_write_format_zip_empty_zip64.c b/libarchive/test/test_write_format_zip_empty_zip64.c
index 3efdf62e8f41f1b245cfdc4b35741b3b2a5db304..8f9975b2102ce2d75735fd82ca247eec3891075c 100644 (file)
--- a/libarchive/test/test_write_format_zip_empty_zip64.c
+++ b/libarchive/test/test_write_format_zip_empty_zip64.c
@@ -51,7 +51,7 @@ DEFINE_TEST(test_write_format_zip_empty_zip64)
        assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
-       /* Verify the correct format for an empy Zip archive with Zip64 extensions forced. */
+       /* Verify the correct format for an empty Zip archive with Zip64 extensions forced. */
        assertEqualInt(used, 98);
        assertEqualMem(buff,
            "PK\006\006" /* Zip64 end-of-central-directory record */