From: Graham Percival <gperciva@tarsnap.com>
Date: Mon, 6 Feb 2017 23:07:58 +0000 (-0800)
Subject: Spelling fixes
X-Git-Tag: v3.3.0~11^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2bda2a49842eec39d605a8631e3a056b3d715eaa;p=thirdparty%2Flibarchive.git

Spelling fixes

Sponsored by:	Tarsnap Backup Inc.
---

diff --git a/libarchive/archive_read_disk_entry_from_file.c b/libarchive/archive_read_disk_entry_from_file.c
index 8fb969a65..91975ced9 100644
--- a/libarchive/archive_read_disk_entry_from_file.c
+++ b/libarchive/archive_read_disk_entry_from_file.c
@@ -882,7 +882,7 @@ sun_acl_is_trivial(acl_t *acl, mode_t mode, int *trivialp)
 	/*
 	 * POSIX.1e ACLs marked with ACL_IS_TRIVIAL are compatible with
 	 * FreeBSD acl_is_trivial_np(). On Solaris they have 4 entries,
-	 * incuding mask.
+	 * including mask.
 	 */
 	if (acl->acl_type == ACLENT_T) {
 		if (acl->acl_cnt == 4)
diff --git a/libarchive/archive_write_disk_acl.c b/libarchive/archive_write_disk_acl.c
index 311aebf03..014339092 100644
--- a/libarchive/archive_write_disk_acl.c
+++ b/libarchive/archive_write_disk_acl.c
@@ -101,7 +101,7 @@ archive_write_disk_set_acls(struct archive *a, int fd, const char *name,
 			    ACL_TYPE_DEFAULT, ARCHIVE_ENTRY_ACL_TYPE_DEFAULT,
 			    "default");
 #endif	/* !HAVE_SUN_ACL */
-		/* Simultaeous POSIX.1e and NFSv4 is not supported */
+		/* Simultaneous POSIX.1e and NFSv4 is not supported */
 		return (ret);
 	}
 #endif	/* !HAVE_DARWIN_ACL */
diff --git a/libarchive/test/test_acl_platform_posix1e.c b/libarchive/test/test_acl_platform_posix1e.c
index f3e1722f7..1d55a33eb 100644
--- a/libarchive/test/test_acl_platform_posix1e.c
+++ b/libarchive/test/test_acl_platform_posix1e.c
@@ -472,7 +472,7 @@ DEFINE_TEST(test_acl_platform_posix1e_read)
 		return;
 	}
 #if HAVE_SUN_ACL
-	/* Check if Solars filesystem supports POSIX.1e ACLs */
+	/* Check if Solaris filesystem supports POSIX.1e ACLs */
 	n = facl_get(fd, 0, &acl);
 	if (n != 0)
 		close(fd);