Spelling fixes from Ulrich Spoerlein.

SVN-Revision: 4092

27 files changed, 73 insertions, 73 deletions

diff --git a/cpio/test/main.c b/cpio/test/main.c
index 6d0d7589..8234eaff 100644
--- a/cpio/test/main.c
+++ b/cpio/test/main.c
@@ -283,7 +283,7 @@ failure(const char *fmt, ...)
  * pass __FILE__, __LINE__ directly into the function instead of using
  * this hook.  I suspect this machinery is used so rarely that we
  * would be better off just removing it entirely.  That would simplify
- * the code here noticably.
+ * the code here noticeably.
  */
 static const char *skipping_filename;
 static int skipping_line;
diff --git a/cpio/test/test_0.c b/cpio/test/test_0.c
index e9164535..fa52def7 100644
--- a/cpio/test/test_0.c
+++ b/cpio/test/test_0.c
@@ -56,7 +56,7 @@ DEFINE_TEST(test_0)
 	}
 
 	/*
-	 * Try to succesfully run the program; this requires that
+	 * Try to successfully run the program; this requires that
 	 * we know some option that will succeed.
 	 */
 	if (0 == systemf("%s --version >" DEV_NULL, testprog)) {
diff --git a/cpio/test/test_option_c.c b/cpio/test/test_option_c.c
index 617b93c2..a634be10 100644
--- a/cpio/test/test_option_c.c
+++ b/cpio/test/test_option_c.c
@@ -191,7 +191,7 @@ DEFINE_TEST(test_option_c)
 	/* Group members bits and others bits do not work. */
 	assertEqualMem(e + 18, "040777", 6); /* Mode */
 #else
-	/* Accept 042775 to accomodate systems where sgid bit propagates. */
+	/* Accept 042775 to accommodate systems where sgid bit propagates. */
 	if (memcmp(e + 18, "042775", 6) != 0)
 		assertEqualMem(e + 18, "040775", 6); /* Mode */
 #endif
diff --git a/libarchive/archive_entry_acl.3 b/libarchive/archive_entry_acl.3
index 93906e79..8c4f0cd6 100644
--- a/libarchive/archive_entry_acl.3
+++ b/libarchive/archive_entry_acl.3
@@ -132,7 +132,7 @@ All files have an access ACL
 This specifies the permissions required for access to the file itself.
 Directories have an additional ACL
 .Pq Dv ARCHIVE_ENTRY_ACL_TYPE_DEFAULT ,
-which controlls the initial access ACL for newly created directory entries.
+which controls the initial access ACL for newly created directory entries.
 .Pp
 .Fn archive_entry_acl_add_entry
 and
diff --git a/libarchive/archive_entry_stat.c b/libarchive/archive_entry_stat.c
index d5ed1cb1..65ff1cf9 100644
--- a/libarchive/archive_entry_stat.c
+++ b/libarchive/archive_entry_stat.c
@@ -110,7 +110,7 @@ archive_entry_stat(struct archive_entry *entry)
 	/*
 	 * TODO: On Linux, store 32 or 64 here depending on whether
 	 * the cached stat structure is a stat32 or a stat64.  This
-	 * will allow us to support both variants interchangably.
+	 * will allow us to support both variants interchangeably.
 	 */
 	entry->stat_valid = 1;
 
diff --git a/libarchive/archive_rb.c b/libarchive/archive_rb.c
index f8035d9d..fa307be2 100644
--- a/libarchive/archive_rb.c
+++ b/libarchive/archive_rb.c
@@ -377,13 +377,13 @@ __archive_rb_tree_swap_prune_and_rebalance(struct archive_rb_tree *rbt,
 
 	if (standin_father == self) {
 		/*
-		 * As a child of self, any childen would be opposite of
+		 * As a child of self, any children would be opposite of
 		 * our parent.
 		 */
 		standin_son = standin->rb_nodes[standin_which];
 	} else {
 		/*
-		 * Since we aren't a child of self, any childen would be
+		 * Since we aren't a child of self, any children would be
 		 * on the same side as our parent.
 		 */
 		standin_son = standin->rb_nodes[standin_other];
@@ -410,7 +410,7 @@ __archive_rb_tree_swap_prune_and_rebalance(struct archive_rb_tree *rbt,
 		/*
 		 * If we are about to delete the standin's father, then when
 		 * we call rebalance, we need to use ourselves as our father.
-		 * Otherwise remember our original father.  Also, sincef we are
+		 * Otherwise remember our original father.  Also, since we are
 		 * our standin's father we only need to reparent the standin's
 		 * brother.
 		 *
@@ -466,7 +466,7 @@ __archive_rb_tree_swap_prune_and_rebalance(struct archive_rb_tree *rbt,
  *	__archive_rb_tree_node_swap(rbt, self, which);
  *	__archive_rb_tree_prune_node(rbt, self, F);
  *
- * But it's more efficient to just evalate and recolor the child.
+ * But it's more efficient to just evaluate and recolor the child.
  */
 static void
 __archive_rb_tree_prune_blackred_branch(
@@ -505,7 +505,7 @@ __archive_rb_tree_remove_node(struct archive_rb_tree *rbt,
 	 * red-black tree.  So if we must remove a node, attempt to rearrange
 	 * the tree so we can remove a red node.
 	 *
-	 * The simpliest case is a childless red node or a childless root node:
+	 * The simplest case is a childless red node or a childless root node:
 	 *
 	 * |    T  -->    T  |    or    |  R  -->  *  |
 	 * |  s    -->  *    |
@@ -517,7 +517,7 @@ __archive_rb_tree_remove_node(struct archive_rb_tree *rbt,
 	}
 	if (!RB_TWOCHILDREN_P(self)) {
 		/*
-		 * The next simpliest case is the node we are deleting is
+		 * The next simplest case is the node we are deleting is
 		 * black and has one red child.
 		 *
 		 * |      T  -->      T  -->      T  |
diff --git a/libarchive/archive_read_support_format_7zip.c b/libarchive/archive_read_support_format_7zip.c
index 2ffd0c60..e211e67b 100644
--- a/libarchive/archive_read_support_format_7zip.c
+++ b/libarchive/archive_read_support_format_7zip.c
@@ -318,7 +318,7 @@ struct _7zip {
 	uint32_t		 bcj2_code;
 	uint64_t		 bcj2_outPos;
 
-	/* Filename character-set convertion data. */
+	/* Filename character-set conversion data. */
 	struct archive_string_conv *sconv;
 
 	char			 format_name[64];
diff --git a/libarchive/archive_read_support_format_lha.c b/libarchive/archive_read_support_format_lha.c
index 50256b16..f3c7d282 100644
--- a/libarchive/archive_read_support_format_lha.c
+++ b/libarchive/archive_read_support_format_lha.c
@@ -696,7 +696,7 @@ archive_read_format_lha_read_header(struct archive_read *a,
 		archive_entry_set_symlink(entry, NULL);
 	archive_string_free(&linkname);
 	/*
-	 * When a header level is 0, there is a possibilty that
+	 * When a header level is 0, there is a possibility that
 	 * a pathname and a symlink has '\' character, a directory
 	 * separator in DOS/Windows. So we should convert it to '/'.
 	 */
diff --git a/libarchive/archive_read_support_format_mtree.c b/libarchive/archive_read_support_format_mtree.c
index 6ac7db80..3ba4be00 100644
--- a/libarchive/archive_read_support_format_mtree.c
+++ b/libarchive/archive_read_support_format_mtree.c
@@ -407,7 +407,7 @@ bid_keyword(const char *p,  ssize_t len)
 		if (l > 0)
 			return (l);
 	}
-	return (0);/* Unkown key */
+	return (0);/* Unknown key */
 }
 
 /*
diff --git a/libarchive/archive_read_support_format_rar.c b/libarchive/archive_read_support_format_rar.c
index a5f20417..c70e0e5b 100644
--- a/libarchive/archive_read_support_format_rar.c
+++ b/libarchive/archive_read_support_format_rar.c
@@ -136,7 +136,7 @@
 #define MAX_SYMBOLS       20
 
 /*
- * Considering L1,L2 cache miss and a calling of write sytem-call,
+ * Considering L1,L2 cache miss and a calling of write system-call,
  * the best size of the output buffer(uncompressed buffer) is 128K.
  * If the structure of extracting process is changed, this value
  * might be researched again.
diff --git a/libarchive/archive_read_support_format_tar.c b/libarchive/archive_read_support_format_tar.c
index 89a1d4f2..42412880 100644
--- a/libarchive/archive_read_support_format_tar.c
+++ b/libarchive/archive_read_support_format_tar.c
@@ -2321,7 +2321,7 @@ gnu_sparse_10_read(struct archive_read *a, struct tar *tar, size_t *unconsumed)
 
 /*
  * Solaris pax extension for a sparse file. This is recorded with the
- * data and hole pairs. The way recording sparse infomation by Solaris'
+ * data and hole pairs. The way recording sparse information by Solaris'
  * pax simply indicates where data and sparse are, so the stored contents
  * consist of both data and hole.
  */
diff --git a/libarchive/archive_string.c b/libarchive/archive_string.c
index 4dec82d6..550d7e7e 100644
--- a/libarchive/archive_string.c
+++ b/libarchive/archive_string.c
@@ -3250,8 +3250,8 @@ archive_string_normalize_C(struct archive_string *as, const void *_p,
 
 				/*
 				 * Remove ucx[i] by shifting
-				 * follwoing code points.
-				 */ 
+				 * following code points.
+				 */
 				for (j = i; j+1 < ucx_size; j++) {
 					ucx[j] = ucx[j+1];
 					ccx[j] = ccx[j+1];
@@ -3424,7 +3424,7 @@ archive_string_normalize_D(struct archive_string *as, const void *_p,
 
 return_no_changed_data:
 	/*
-	 * Something conversion error happend, so we return a no normalized
+	 * Something conversion error happened, so we return a no normalized
 	 * string with an error.
 	 */
 	(void)archive_string_append_unicode(as, _p, len, sc);
@@ -3434,8 +3434,8 @@ return_no_changed_data:
 #endif /* __APPLE__ */
 
 /*
- * libarchive 2.x made incorrect UTF-8 strings in the wrong assumuption
- * that WCS is Unicode. it is true for servel platforms but some are false.
+ * libarchive 2.x made incorrect UTF-8 strings in the wrong assumption
+ * that WCS is Unicode. It is true for several platforms but some are false.
  * And then people who did not use UTF-8 locale on the non Unicode WCS
  * platform and made a tar file with libarchive(mostly bsdtar) 2.x. Those
  * now cannot get right filename from libarchive 3.x and later since we
diff --git a/libarchive/archive_windows.c b/libarchive/archive_windows.c
index 0bb2a809..4d37a9c2 100644
--- a/libarchive/archive_windows.c
+++ b/libarchive/archive_windows.c
@@ -136,7 +136,7 @@ __la_win_permissive_name_w(const wchar_t *wname)
 	if (l == 0)
 		return (NULL);
 	/* NOTE: GetFullPathNameW has a bug that if the length of the file
-	 * name is just one that return imcomplete buffer size. Thus, we 
+	 * name is just 1 then it returns incomplete buffer size. Thus, we
 	 * have to add three to the size to allocate a sufficient buffer
 	 * size for the full-pathname of the file name. */
 	l += 3;
diff --git a/libarchive/archive_write_disk_posix.c b/libarchive/archive_write_disk_posix.c
index 99afab2f..9937930d 100644
--- a/libarchive/archive_write_disk_posix.c
+++ b/libarchive/archive_write_disk_posix.c
@@ -1223,7 +1223,7 @@ create_filesystem_object(struct archive_write_disk *a)
 		 *
 		 * If the hardlink was successfully created and
 		 * the archive doesn't have carry data for it,
-		 * consider it to be non-authoritive for meta data.
+		 * consider it to be non-authoritative for meta data.
 		 * This is consistent with GNU tar and BSD pax.
 		 * If the hardlink does carry data, let the last
 		 * archive entry decide ownership.
diff --git a/libarchive/archive_write_disk_windows.c b/libarchive/archive_write_disk_windows.c
index 64018458..2da2084e 100644
--- a/libarchive/archive_write_disk_windows.c
+++ b/libarchive/archive_write_disk_windows.c
@@ -605,7 +605,7 @@ lazy_stat(struct archive_write_disk *a)
 
 	/*
 	 * XXX At this point, symlinks should not be hit, otherwise
-	 * XXX a race occured.  Do we want to check explicitly for that?
+	 * XXX a race occurred.  Do we want to check explicitly for that?
 	 */
 	if (file_information(a, a->name, &a->st, NULL, 1) == 0) {
 		a->pst = &a->st;
@@ -1467,7 +1467,7 @@ create_filesystem_object(struct archive_write_disk *a)
 		 *
 		 * If the hardlink was successfully created and
 		 * the archive doesn't have carry data for it,
-		 * consider it to be non-authoritive for meta data.
+		 * consider it to be non-authoritative for meta data.
 		 * This is consistent with GNU tar and BSD pax.
 		 * If the hardlink does carry data, let the last
 		 * archive entry decide ownership.
diff --git a/libarchive/archive_write_set_format_gnutar.c b/libarchive/archive_write_set_format_gnutar.c
index e091ed23..dea46b05 100644
--- a/libarchive/archive_write_set_format_gnutar.c
+++ b/libarchive/archive_write_set_format_gnutar.c
@@ -400,7 +400,7 @@ archive_write_gnutar_header(struct archive_write *a,
 		size_t todo = gnutar->linkname_length;
 		struct archive_entry *temp = archive_entry_new2(&a->archive);
 
-		/* Uname/gname here don't really matter since noone reads them;
+		/* Uname/gname here don't really matter since no one reads them;
 		 * these are the values that GNU tar happens to use on FreeBSD. */
 		archive_entry_set_uname(temp, "root");
 		archive_entry_set_gname(temp, "wheel");
@@ -429,7 +429,7 @@ archive_write_gnutar_header(struct archive_write *a,
 		size_t todo = gnutar->pathname_length;
 		struct archive_entry *temp = archive_entry_new2(&a->archive);
 
-		/* Uname/gname here don't really matter since noone reads them;
+		/* Uname/gname here don't really matter since no one reads them;
 		 * these are the values that GNU tar happens to use on FreeBSD. */
 		archive_entry_set_uname(temp, "root");
 		archive_entry_set_gname(temp, "wheel");
diff --git a/libarchive/archive_write_set_format_iso9660.c b/libarchive/archive_write_set_format_iso9660.c
index e62a5ece..8e1c0183 100644
--- a/libarchive/archive_write_set_format_iso9660.c
+++ b/libarchive/archive_write_set_format_iso9660.c
@@ -1852,7 +1852,7 @@ iso9660_close(struct archive_write *a)
 	iso9660 = a->format_data;
 
 	/*
-	 * Write remaining data out to the temprary file.
+	 * Write remaining data out to the temporary file.
 	 */
 	if (wb_remaining(a) > 0) {
 		ret = wb_write_out(a);
@@ -1881,7 +1881,7 @@ iso9660_close(struct archive_write *a)
 		ret = zisofs_rewind_boot_file(a);
 		if (ret < 0)
 			return (ret);
-		/* Write remaining data out to the temprary file. */
+		/* Write remaining data out to the temporary file. */
 		if (wb_remaining(a) > 0) {
 			ret = wb_write_out(a);
 			if (ret < 0)
@@ -6280,7 +6280,7 @@ isoent_gen_joliet_identifier(struct archive_write *a, struct isoent *isoent,
 		}
 
 		/* 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 ((int)l == ffmax)
 			noff = ext_off - 6;
 		else if ((int)l == ffmax-2)
@@ -6300,7 +6300,7 @@ isoent_gen_joliet_identifier(struct archive_write *a, struct isoent *isoent,
 }
 
 /*
- * This comparing rule is acording to ISO9660 Standard 9.3
+ * This comparing rule is according to ISO9660 Standard 9.3
  */
 static int
 isoent_cmp_iso9660_identifier(const struct isoent *p1, const struct isoent *p2)
diff --git a/libarchive/archive_write_set_format_pax.c b/libarchive/archive_write_set_format_pax.c
index 8affb2c1..3d6b6aa1 100644
--- a/libarchive/archive_write_set_format_pax.c
+++ b/libarchive/archive_write_set_format_pax.c
@@ -576,7 +576,7 @@ archive_write_pax_header(struct archive_write *a,
 
 	/*
 	 * If Mac OS metadata blob is here, recurse to write that
-	 * as a separate entry.  This is realy a pretty poor design:
+	 * as a separate entry.  This is really a pretty poor design:
 	 * In particular, it doubles the overhead for long filenames.
 	 * TODO: Help Apple folks design something better and figure
 	 * out how to transition from this legacy format.
@@ -1439,7 +1439,7 @@ build_ustar_entry_name(char *dest, const char *src, size_t src_length,
  *
  * Joerg Schilling has argued that this is unnecessary because, in
  * practice, if the pax extended attributes get extracted as regular
- * files, noone is going to bother reading those attributes to
+ * files, no one is going to bother reading those attributes to
  * manually restore them.  Based on this, 'star' uses
  * /tmp/PaxHeader/'basename' as the ustar header name.  This is a
  * tempting argument, in part because it's simpler than the SUSv3
diff --git a/libarchive/filter_fork_windows.c b/libarchive/filter_fork_windows.c
index 272e56c6..8d8beb01 100644
--- a/libarchive/filter_fork_windows.c
+++ b/libarchive/filter_fork_windows.c
@@ -109,8 +109,8 @@ fail:
 void
 __archive_check_child(int in, int out)
 {
-	(void)in; /* UNSED */
-	(void)out; /* UNSED */
+	(void)in; /* UNUSED */
+	(void)out; /* UNUSED */
 	Sleep(100);
 }
 
diff --git a/libarchive/test/main.c b/libarchive/test/main.c
index 4b11454e..dc38c5a6 100644
--- a/libarchive/test/main.c
+++ b/libarchive/test/main.c
@@ -281,7 +281,7 @@ failure(const char *fmt, ...)
  * pass __FILE__, __LINE__ directly into the function instead of using
  * this hook.  I suspect this machinery is used so rarely that we
  * would be better off just removing it entirely.  That would simplify
- * the code here noticably.
+ * the code here noticeably.
  */
 static const char *skipping_filename;
 static int skipping_line;
diff --git a/libarchive/test/test_read_format_cab.c b/libarchive/test/test_read_format_cab.c
index 0a94865d..4e8607ec 100644
--- a/libarchive/test/test_read_format_cab.c
+++ b/libarchive/test/test_read_format_cab.c
@@ -42,7 +42,7 @@ And following works are:
 5. Then you will see that there is a cabinet file, test.cab
 6. Move test.cab to posix platform
 7. Extract test.cab with this version of bsdtar
-8. Excecute the following command to make uuencoded files.
+8. Execute the following command to make uuencoded files.
  uuencode test_read_format_cab_1.cab test_read_format_cab_1.cab > test_read_format_cab_1.cab.uu
  uuencode test_read_format_cab_2.cab test_read_format_cab_2.cab > test_read_format_cab_2.cab.uu
  uuencode test_read_format_cab_3.cab test_read_format_cab_3.cab > test_read_format_cab_3.cab.uu
diff --git a/libarchive/test/test_write_disk_hardlink.c b/libarchive/test/test_write_disk_hardlink.c
index c52dc67b..f80821c7 100644
--- a/libarchive/test/test_write_disk_hardlink.c
+++ b/libarchive/test/test_write_disk_hardlink.c
@@ -37,8 +37,8 @@ __FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_disk_hardlink.c 201247 2
 /*
  * Exercise hardlink recreation.
  *
- * File permissions are chosen so that the authoritive entry
- * has the correct permission and the non-authoritive versions
+ * File permissions are chosen so that the authoritative entry
+ * has the correct permission and the non-authoritative versions
  * are just writeable files.
  */
 DEFINE_TEST(test_write_disk_hardlink)
@@ -181,7 +181,7 @@ DEFINE_TEST(test_write_disk_hardlink)
 	/* Test #1 */
 	/* If the hardlink was successfully created and the archive
 	 * doesn't carry data for it, we consider it to be
-	 * non-authoritive for meta data as well.  This is consistent
+	 * non-authoritative for meta data as well.  This is consistent
 	 * with GNU tar and BSD pax.  */
 	assertIsReg("link1a", 0755 & ~UMASK);
 	assertFileSize("link1a", sizeof(data));
diff --git a/libarchive/test/test_zip_filename_encoding.c b/libarchive/test/test_zip_filename_encoding.c
index d2a81541..7ee17196 100644
--- a/libarchive/test/test_zip_filename_encoding.c
+++ b/libarchive/test/test_zip_filename_encoding.c
@@ -64,7 +64,7 @@ test_zip_filename_encoding_UTF8(void)
 	archive_entry_free(entry);
 	assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
-	/* A bit 11 of general purpos flag should be 0x08,
+	/* A bit 11 of general purpose flag should be 0x08,
 	 * which indicates the filename charset is UTF-8. */
 	assertEqualInt(0x08, buff[7]);
 	assertEqualMem(buff + 30, "\xD0\xBF\xD1\x80\xD0\xB8", 6);
@@ -87,13 +87,13 @@ test_zip_filename_encoding_UTF8(void)
 	archive_entry_free(entry);
 	assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
-	/* A bit 11 of general purpos flag should be 0x08,
+	/* A bit 11 of general purpose flag should be 0x08,
 	 * which indicates the filename charset is UTF-8. */
 	assertEqualInt(0x08, buff[7]);
 	assertEqualMem(buff + 30, "\xD0\xBF\xD1\x80\xD0\xB8", 6);
 
 	/*
-	 * Verify that A bit 11 of general purpos flag is not set
+	 * Verify that A bit 11 of general purpose flag is not set
 	 * when ASCII filenames are stored.
 	 */
 	a = archive_write_new();
@@ -110,8 +110,8 @@ test_zip_filename_encoding_UTF8(void)
 	archive_entry_free(entry);
 	assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
-	/* A bit 11 of general purpos flag should be 0,
-	 * which indicates the filename charset is unkown. */
+	/* A bit 11 of general purpose flag should be 0,
+	 * which indicates the filename charset is unknown. */
 	assertEqualInt(0, buff[7]);
 	assertEqualMem(buff + 30, "abcABC", 6);
 }
@@ -152,7 +152,7 @@ test_zip_filename_encoding_KOI8R(void)
 	archive_entry_free(entry);
 	assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
-	/* A bit 11 of general purpos flag should be 0x08,
+	/* A bit 11 of general purpose flag should be 0x08,
 	 * which indicates the filename charset is UTF-8. */
 	assertEqualInt(0x08, buff[7]);
 	/* Above three characters in KOI8-R should translate to the following
@@ -176,15 +176,15 @@ test_zip_filename_encoding_KOI8R(void)
 	archive_entry_free(entry);
 	assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
-	/* A bit 11 of general purpos flag should be 0,
-	 * which indicates the filename charset is unkown. */
+	/* A bit 11 of general purpose flag should be 0,
+	 * which indicates the filename charset is unknown. */
 	assertEqualInt(0, buff[7]);
 	/* Above three characters in KOI8-R should not translate to
 	 * any character-set. */
 	assertEqualMem(buff + 30, "\xD0\xD2\xC9", 3);
 
 	/*
-	 * Verify that A bit 11 of general purpos flag is not set
+	 * Verify that A bit 11 of general purpose flag is not set
 	 * when ASCII filenames are stored even if hdrcharset=UTF-8
 	 * is specified.
 	 */
@@ -208,8 +208,8 @@ test_zip_filename_encoding_KOI8R(void)
 	archive_entry_free(entry);
 	assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
-	/* A bit 11 of general purpos flag should be 0,
-	 * which indicates the filename charset is unkown. */
+	/* A bit 11 of general purpose flag should be 0,
+	 * which indicates the filename charset is unknown. */
 	assertEqualInt(0, buff[7]);
 	assertEqualMem(buff + 30, "abcABC", 6);
 }
@@ -248,8 +248,8 @@ test_zip_filename_encoding_ru_RU_CP1251(void)
 	archive_entry_free(entry);
 	assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
-	/* A bit 11 of general purpos flag should be 0,
-	 * which indicates the filename charset is unkown. */
+	/* A bit 11 of general purpose flag should be 0,
+	 * which indicates the filename charset is unknown. */
 	assertEqualInt(0, buff[7]);
 	/* Above three characters in CP1251 should not translate into
 	 * any other character-set. */
@@ -298,7 +298,7 @@ test_zip_filename_encoding_Russian_Russia(void)
 	archive_entry_free(entry);
 	assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
-	/* A bit 11 of general purpos flag should be 0x08,
+	/* A bit 11 of general purpose flag should be 0x08,
 	 * which indicates the filename charset is UTF-8. */
 	assertEqualInt(0x08, buff[7]);
 	/* Above three characters in CP1251 should translate to the following
@@ -323,8 +323,8 @@ test_zip_filename_encoding_Russian_Russia(void)
 	archive_entry_free(entry);
 	assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
-	/* A bit 11 of general purpos flag should be 0,
-	 * which indicates the filename charset is unkown. */
+	/* A bit 11 of general purpose flag should be 0,
+	 * which indicates the filename charset is unknown. */
 	assertEqualInt(0, buff[7]);
 	/* Above three characters in CP1251 should translate to the following
 	 * three characters in CP866. */
@@ -368,7 +368,7 @@ test_zip_filename_encoding_EUCJP(void)
 	archive_entry_free(entry);
 	assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
-	/* A bit 11 of general purpos flag should be 0x08,
+	/* A bit 11 of general purpose flag should be 0x08,
 	 * which indicates the filename charset is UTF-8. */
 	assertEqualInt(0x08, buff[7]);
 	/* Check UTF-8 version. */
@@ -392,15 +392,15 @@ test_zip_filename_encoding_EUCJP(void)
 	archive_entry_free(entry);
 	assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
-	/* A bit 11 of general purpos flag should be 0,
-	 * which indicates the filename charset is unkown. */
+	/* A bit 11 of general purpose flag should be 0,
+	 * which indicates the filename charset is unknown. */
 	assertEqualInt(0, buff[7]);
 	/* Above three characters in EUC-JP should not translate to
 	 * any character-set. */
 	assertEqualMem(buff + 30, "\xC9\xBD.txt", 6);
 
 	/*
-	 * Verify that A bit 11 of general purpos flag is not set
+	 * Verify that A bit 11 of general purpose flag is not set
 	 * when ASCII filenames are stored even if hdrcharset=UTF-8
 	 * is specified.
 	 */
@@ -425,8 +425,8 @@ test_zip_filename_encoding_EUCJP(void)
 	archive_entry_free(entry);
 	assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
-	/* A bit 11 of general purpos flag should be 0,
-	 * which indicates the filename charset is unkown. */
+	/* A bit 11 of general purpose flag should be 0,
+	 * which indicates the filename charset is unknown. */
 	assertEqualInt(0, buff[7]);
 	assertEqualMem(buff + 30, "abcABC", 6);
 }
@@ -469,7 +469,7 @@ test_zip_filename_encoding_CP932(void)
 	archive_entry_free(entry);
 	assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
-	/* A bit 11 of general purpos flag should be 0x08,
+	/* A bit 11 of general purpose flag should be 0x08,
 	 * which indicates the filename charset is UTF-8. */
 	assertEqualInt(0x08, buff[7]);
 	/* Check UTF-8 version. */
@@ -493,15 +493,15 @@ test_zip_filename_encoding_CP932(void)
 	archive_entry_free(entry);
 	assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
-	/* A bit 11 of general purpos flag should be 0,
-	 * which indicates the filename charset is unkown. */
+	/* A bit 11 of general purpose flag should be 0,
+	 * which indicates the filename charset is unknown. */
 	assertEqualInt(0, buff[7]);
 	/* Above three characters in CP932/SJIS should not translate to
 	 * any character-set. */
 	assertEqualMem(buff + 30, "\x95\x5C.txt", 6);
 
 	/*
-	 * Verify that A bit 11 of general purpos flag is not set
+	 * Verify that A bit 11 of general purpose flag is not set
 	 * when ASCII filenames are stored even if hdrcharset=UTF-8
 	 * is specified.
 	 */
@@ -526,8 +526,8 @@ test_zip_filename_encoding_CP932(void)
 	archive_entry_free(entry);
 	assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
-	/* A bit 11 of general purpos flag should be 0,
-	 * which indicates the filename charset is unkown. */
+	/* A bit 11 of general purpose flag should be 0,
+	 * which indicates the filename charset is unknown. */
 	assertEqualInt(0, buff[7]);
 	assertEqualMem(buff + 30, "abcABC", 6);
 }
diff --git a/libarchive_fe/pathmatch.c b/libarchive_fe/pathmatch.c
index e2113620..ff8a1050 100644
--- a/libarchive_fe/pathmatch.c
+++ b/libarchive_fe/pathmatch.c
@@ -132,7 +132,7 @@ pm(const char *p, const char *s, int flags)
 			}
 			return (*s == '\0');
 		case '?':
-			/* ? always succeds, unless we hit end of 's' */
+			/* ? always succeeds, unless we hit end of 's' */
 			if (*s == '\0')
 				return (0);
 			break;
diff --git a/tar/bsdtar.c b/tar/bsdtar.c
index c477d197..5f89959c 100644
--- a/tar/bsdtar.c
+++ b/tar/bsdtar.c
@@ -338,8 +338,8 @@ main(int argc, char **argv)
 			break;
 		case OPTION_INCLUDE:
 			/*
-			 * Noone else has the @archive extension, so
-			 * noone else needs this to filter entries
+			 * No one else has the @archive extension, so
+			 * no one else needs this to filter entries
 			 * when transforming archives.
 			 */
 			if (lafe_include(&bsdtar->matching, bsdtar->argument))
diff --git a/tar/test/main.c b/tar/test/main.c
index 45a5f487..26b5ee3f 100644
--- a/tar/test/main.c
+++ b/tar/test/main.c
@@ -283,7 +283,7 @@ failure(const char *fmt, ...)
  * pass __FILE__, __LINE__ directly into the function instead of using
  * this hook.  I suspect this machinery is used so rarely that we
  * would be better off just removing it entirely.  That would simplify
- * the code here noticably.
+ * the code here noticeably.
  */
 static const char *skipping_filename;
 static int skipping_line;
diff --git a/tar/test/test_0.c b/tar/test/test_0.c
index e0ecca74..b73c7a3f 100644
--- a/tar/test/test_0.c
+++ b/tar/test/test_0.c
@@ -56,7 +56,7 @@ DEFINE_TEST(test_0)
 	}
 
 	/*
-	 * Try to succesfully run the program; this requires that
+	 * Try to successfully run the program; this requires that
 	 * we know some option that will succeed.
 	 */
 	if (0 == systemf("%s --version >" DEV_NULL, testprog)) {