Merge branch 'gawk-4.2-stable'

6 files changed, 23 insertions, 18 deletions

diff --git a/extension/ChangeLog b/extension/ChangeLog
index 1abe1b1c..0b09032d 100644
--- a/extension/ChangeLog
+++ b/extension/ChangeLog
@@ -1,3 +1,8 @@
+2018-02-17         Michal Jaegermann     <michal.jnn@gmail.com>.
+
+	* filefuncs.3am, filefuncs.c, fnmatch.3am, revoutput.3am,
+	revtwoway.3am: Spelling and typo fixes.
+
 2018-02-14         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* configure.ac: Add stuff for finding gettext. Helps in
diff --git a/extension/filefuncs.3am b/extension/filefuncs.3am
index e033f918..fb2db37d 100644
--- a/extension/filefuncs.3am
+++ b/extension/filefuncs.3am
@@ -173,10 +173,10 @@ The
 .B fts()
 function provides a hook to the
 .IR fts (3)
-set of routines for traversing file heirarchies.
+set of routines for traversing file hierarchies.
 Instead of returning data about one file at a time in a stream,
 it fills in a multi-dimensional array with data about each file and
-directory encountered in the requested heirarchies.
+directory encountered in the requested hierarchies.
 .PP
 The arguments are as follows:
 .TP
@@ -211,11 +211,11 @@ This flag is mutually exclusive with
 .B FTS_NOCHDIR
 As a performance optimization, the
 .IR fts (3)
-routines change directory as they traverse a file heirarchy.
+routines change directory as they traverse a file hierarchy.
 This flag disables that optimization.
 .TP
 .B FTS_COMFOLLOW
-Immediatly follow a symbolic link named in
+Immediately follow a symbolic link named in
 .BR pathlist ,
 whether or not
 .B FTS_LOGICAL
@@ -314,7 +314,7 @@ already provides powerful array sorting facilities.  While an
 .IR fts_read() \-like
 interface could have been provided, this felt less natural than
 simply creating a multi-dimensional array to represent the file
-heirarchy and its information.
+hierarchy and its information.
 .PP
 Nothing prevents AWK code from changing the predefined
 .BI FTS_ xx
diff --git a/extension/filefuncs.c b/extension/filefuncs.c
index 15f15473..1ea25dbc 100644
--- a/extension/filefuncs.c
+++ b/extension/filefuncs.c
@@ -592,7 +592,7 @@ init_filefuncs(void)
 }
 
 #ifdef __MINGW32__
-/*  do_fts --- walk a heirarchy and fill in an array */
+/*  do_fts --- walk a hierarchy and fill in an array */
 
 /*
  * Usage from awk:
@@ -688,10 +688,10 @@ fill_default_elements(awk_array_t element_array, const FTSENT *const fentry, awk
 	}
 }
 
-/* process --- process the heirarchy */
+/* process --- process the hierarchy */
 
 static void
-process(FTS *heirarchy, awk_array_t destarray, int seedot, int skipset)
+process(FTS *hierarchy, awk_array_t destarray, int seedot, int skipset)
 {
 	FTSENT *fentry;
 	awk_value_t index, value;
@@ -700,7 +700,7 @@ process(FTS *heirarchy, awk_array_t destarray, int seedot, int skipset)
 
 	/* path is full path,  pathlen is length thereof */
 	/* name is name in directory, namelen is length thereof */
-	while ((fentry = fts_read(heirarchy)) != NULL) {
+	while ((fentry = fts_read(hierarchy)) != NULL) {
 		bad_ret = awk_false;
 
 		switch (fentry->fts_info) {
@@ -708,7 +708,7 @@ process(FTS *heirarchy, awk_array_t destarray, int seedot, int skipset)
 			/* directory */
 
 			if (skipset && fentry->fts_level == 0)
-				fts_set(heirarchy, fentry, FTS_SKIP);
+				fts_set(hierarchy, fentry, FTS_SKIP);
 
 			/* create array to hold entries */
 			/* this will be empty if doing FTS_SKIP */
@@ -812,7 +812,7 @@ process(FTS *heirarchy, awk_array_t destarray, int seedot, int skipset)
 	}
 }
 
-/*  do_fts --- walk a heirarchy and fill in an array */
+/*  do_fts --- walk a hierarchy and fill in an array */
 
 /*
  * Usage from awk:
@@ -826,7 +826,7 @@ do_fts(int nargs, awk_value_t *result, struct awk_ext_func *unused)
 	awk_value_t pathlist, flagval, dest;
 	awk_flat_array_t *path_array = NULL;
 	char **pathvector = NULL;
-	FTS *heirarchy;
+	FTS *hierarchy;
 	int flags;
 	size_t i, count;
 	int ret = -1;
@@ -899,9 +899,9 @@ do_fts(int nargs, awk_value_t *result, struct awk_ext_func *unused)
 	}
 
 	/* let's do it! */
-	if ((heirarchy = fts_open(pathvector, flags, NULL)) != NULL) {
-		process(heirarchy, dest.array_cookie, (flags & FTS_SEEDOT) != 0, (flags & FTS_SKIP) != 0);
-		fts_close(heirarchy);
+	if ((hierarchy = fts_open(pathvector, flags, NULL)) != NULL) {
+		process(hierarchy, dest.array_cookie, (flags & FTS_SEEDOT) != 0, (flags & FTS_SKIP) != 0);
+		fts_close(hierarchy);
 
 		if (fts_errors == 0)
 			ret = 0;
diff --git a/extension/fnmatch.3am b/extension/fnmatch.3am
index 47a97d11..d82a154d 100644
--- a/extension/fnmatch.3am
+++ b/extension/fnmatch.3am
@@ -70,7 +70,7 @@ flag as defined in
 .PP
 .SH NOTES
 Nothing prevents AWK code from changing the predefined
-variabale
+variable
 .BR FNM_NOMATCH ,
 but doing so may cause strange results.
 .\" .SH BUGS
diff --git a/extension/revoutput.3am b/extension/revoutput.3am
index 58ac1b09..fbf33dbe 100644
--- a/extension/revoutput.3am
+++ b/extension/revoutput.3am
@@ -14,7 +14,7 @@ extension
 adds a simple output wrapper that reverses the characters in each output
 line.
 It's main purpose is to show how to write an output wrapper, although
-it may be mildy amusing for the unwary.
+it may be mildly amusing for the unwary.
 .\" .SH BUGS
 .SH EXAMPLE
 .ft CW
diff --git a/extension/revtwoway.3am b/extension/revtwoway.3am
index 09bfe32d..4aa71f7f 100644
--- a/extension/revtwoway.3am
+++ b/extension/revtwoway.3am
@@ -22,7 +22,7 @@ extension
 adds a simple two-way processor that reverses the characters
 in each line sent to it for reading back by the AWK program.
 It's main purpose is to show how to write a two-way extension, although
-it may also be mildy amusing.
+it may also be mildly amusing.
 .\" .SH BUGS
 .SH "SEE ALSO"
 .IR "GAWK: Effective AWK Programming" ,