8 files changed, 11 insertions, 11 deletions

diff --git a/lib/libarchive/archive.h.in b/lib/libarchive/archive.h.in
index 2ff9a3a3b6e8..85bb6e5cbfc1 100644
--- a/lib/libarchive/archive.h.in
+++ b/lib/libarchive/archive.h.in
@@ -82,7 +82,7 @@ struct archive_entry;
 #define	ARCHIVE_EOF	  1	/* Found end of archive. */
 #define	ARCHIVE_OK	  0	/* Operation was successful. */
 #define	ARCHIVE_RETRY	(-10)	/* Retry might succeed. */
-#define	ARCHIVE_WARN	(-20)	/* Partial sucess. */
+#define	ARCHIVE_WARN	(-20)	/* Partial success. */
 #define	ARCHIVE_FATAL	(-30)	/* No more operations are possible. */
 
 /*
@@ -220,7 +220,7 @@ ssize_t		 archive_read_data(struct archive *, void *, size_t);
 /*
  * A zero-copy version of archive_read_data that also exposes the file offset
  * of each returned block.  Note that the client has no way to specify
- * the desired size of the block.  The API does gaurantee that offsets will
+ * the desired size of the block.  The API does guarantee that offsets will
  * be strictly increasing and that returned blocks will not overlap.
  */
 int		 archive_read_data_block(struct archive *a,
diff --git a/lib/libarchive/archive_private.h b/lib/libarchive/archive_private.h
index 419e0f72e155..11782acf3363 100644
--- a/lib/libarchive/archive_private.h
+++ b/lib/libarchive/archive_private.h
@@ -39,7 +39,7 @@ struct archive {
 	/*
 	 * The magic/state values are used to sanity-check the
 	 * client's usage.  If an API function is called at a
-	 * rediculous time, or the client passes us an invalid
+	 * ridiculous time, or the client passes us an invalid
 	 * pointer, these values allow me to catch that.
 	 */
 	unsigned	  magic;
@@ -167,7 +167,7 @@ struct archive {
 	 * multiple format readers active at one time, so we need to
 	 * allow for multiple format readers to have their data
 	 * available.  The pformat_data slot here is the solution: on
-	 * read, it is gauranteed to always point to a void* variable
+	 * read, it is guaranteed to always point to a void* variable
 	 * that the format can use.
 	 */
 	void	**pformat_data;		/* Pointer to current format_data. */
diff --git a/lib/libarchive/archive_read.c b/lib/libarchive/archive_read.c
index 46ccb59cb0e6..ee768972ead7 100644
--- a/lib/libarchive/archive_read.c
+++ b/lib/libarchive/archive_read.c
@@ -293,7 +293,7 @@ archive_read_next_header(struct archive *a, struct archive_entry **entryp)
 
 	/*
 	 * EOF and FATAL are persistent at this layer.  By
-	 * modifying the state, we gaurantee that future calls to
+	 * modifying the state, we guarantee that future calls to
 	 * read a header or read data will fail.
 	 */
 	switch (ret) {
diff --git a/lib/libarchive/archive_read_support_compression_bzip2.c b/lib/libarchive/archive_read_support_compression_bzip2.c
index 79742e884419..c8b4fcd9d872 100644
--- a/lib/libarchive/archive_read_support_compression_bzip2.c
+++ b/lib/libarchive/archive_read_support_compression_bzip2.c
@@ -112,7 +112,7 @@ bid(const void *buff, size_t len)
 	 * thorough check.  It's especially troubling that the BZip2
 	 * signature begins with all ASCII characters; a tar archive
 	 * whose first filename begins with 'BZh3' would potentially
-	 * fool this logic.  (It may also be possible to gaurd against
+	 * fool this logic.  (It may also be possible to guard against
 	 * such anomalies in archive_read_support_compression_none.)
 	 */
 
diff --git a/lib/libarchive/archive_read_support_compression_none.c b/lib/libarchive/archive_read_support_compression_none.c
index 26e9d07ebf9e..369e432aa6c1 100644
--- a/lib/libarchive/archive_read_support_compression_none.c
+++ b/lib/libarchive/archive_read_support_compression_none.c
@@ -259,7 +259,7 @@ archive_decompressor_none_read_consume(struct archive *a, size_t request)
 /*
  * Skip forward by exactly the requested bytes or else return
  * ARCHIVE_FATAL.  Note that this differs from the contract for
- * read_ahead, which does not gaurantee a minimum count.
+ * read_ahead, which does not guarantee a minimum count.
  */
 static ssize_t
 archive_decompressor_none_skip(struct archive *a, size_t request)
diff --git a/lib/libarchive/archive_read_support_format_cpio.c b/lib/libarchive/archive_read_support_format_cpio.c
index 57ea7a5efa0c..910564a3e8f1 100644
--- a/lib/libarchive/archive_read_support_format_cpio.c
+++ b/lib/libarchive/archive_read_support_format_cpio.c
@@ -357,7 +357,7 @@ header_newc(struct archive *a, struct cpio *cpio, struct stat *st,
 
 	/*
 	 * Note: entry_bytes_remaining is at least 64 bits and
-	 * therefore gauranteed to be big enough for a 33-bit file
+	 * therefore guaranteed to be big enough for a 33-bit file
 	 * size.  struct stat.st_size may only be 32 bits, so
 	 * assigning there first could lose information.
 	 */
@@ -402,7 +402,7 @@ header_odc(struct archive *a, struct cpio *cpio, struct stat *st,
 
 	/*
 	 * Note: entry_bytes_remaining is at least 64 bits and
-	 * therefore gauranteed to be big enough for a 33-bit file
+	 * therefore guaranteed to be big enough for a 33-bit file
 	 * size.  struct stat.st_size may only be 32 bits, so
 	 * assigning there first could lose information.
 	 */
diff --git a/lib/libarchive/archive_write.3 b/lib/libarchive/archive_write.3
index f32bfcb877e0..bb767d235d20 100644
--- a/lib/libarchive/archive_write.3
+++ b/lib/libarchive/archive_write.3
@@ -260,7 +260,7 @@ on success.
 On failure, the callback should invoke
 .Fn archive_set_error
 to register an error code and message and
-regurn
+return
 .Cm ARCHIVE_FATAL.
 .Sh EXAMPLE
 The following sketch illustrates basic usage of the library.
diff --git a/lib/libarchive/libarchive.3 b/lib/libarchive/libarchive.3
index 5c8976d06873..cfacf93b63c6 100644
--- a/lib/libarchive/libarchive.3
+++ b/lib/libarchive/libarchive.3
@@ -241,7 +241,7 @@ Users familiar with historic formats should be aware that the newer
 variants have eliminated most restrictions on the length of textual fields.
 Clients should not assume that filenames, link names, user names, or
 group names are limited in length.
-In particular, pax interchange format can easily accomodate pathnames
+In particular, pax interchange format can easily accommodate pathnames
 in arbitrary character sets that exceed
 .Va PATH_MAX .
 .Sh RETURN VALUES