Merge remote-tracking branch 'upstream/master'

libmisc/Makefile.am

@@ -44,7 +44,7 @@ libmisc_a_SOURCES = \
 	myname.c \
 	obscure.c \
 	pam_pass.c \
-	pam_pass_non_interractive.c \
+	pam_pass_non_interactive.c \
 	prefix_flag.c \
 	pwd2spwd.c \
 	pwdcheck.c \

libmisc/failure.h

@@ -69,7 +69,7 @@ extern int failcheck (uid_t uid, struct faillog *fl, bool failed);
 extern void failprint (const struct faillog *);
 
 /*
- * failtmp - update the cummulative failure log
+ * failtmp - update the cumulative failure log
  *
  *	failtmp updates the (struct utmp) formatted failure log which
  *	maintains a record of all login failures.

libmisc/getdate.y

@@ -66,7 +66,7 @@
 #endif
 
 /* Remap normal yacc parser interface names (yyparse, yylex, yyerror, etc),
-   as well as gratuitiously global symbol names, so we can have multiple
+   as well as gratuitously global symbol names, so we can have multiple
    yacc generated parsers in the same program.  Note that these are only
    the variables produced by yacc.  If other parser generators (bison,
    byacc, etc) produce additional global names that conflict at link time,

libmisc/idmapping.c

@@ -148,7 +148,7 @@ void write_mapping(int proc_dir_fd, int ranges, struct map_range *mappings,
 		pos += written;
 	}
 
-	/* Write the mapping to the maping file */
+	/* Write the mapping to the mapping file */
 	fd = openat(proc_dir_fd, map_file, O_WRONLY);
 	if (fd < 0) {
 		fprintf(stderr, _("%s: open of %s failed: %s\n"),

libmisc/pam_pass_non_interactive.c

@@ -134,7 +134,7 @@ failed_conversation:
  *
  * Return 0 on success, 1 on failure.
  */
-int do_pam_passwd_non_interractive (const char *pam_service,
+int do_pam_passwd_non_interactive (const char *pam_service,
                                     const char *username,
                                     const char* password)
 {

libmisc/setupenv.c

@@ -171,7 +171,7 @@ static void read_env_file (const char *filename)
 				cp++;
 			goto d_quote;
 		}
-		eise if (*cp == '\0') {
+		else if (*cp == '\0') {
 			/* end of string */
 			goto finished;
 		} else {

libmisc/strtoday.c

@@ -126,7 +126,7 @@ static char *date_formats[] = {
 #else
 /*
  * days and juldays are used to compute the number of days in the
- * current month, and the cummulative number of days in the preceding
+ * current month, and the cumulative number of days in the preceding
  * months.  they are declared so that january is 1, not 0.
  */
 static short days[13] = { 0,

libmisc/utmp.c

@@ -88,7 +88,7 @@ static bool is_my_tty (const char *tty)
  *                    session
  *
  *	The utmp file is scanned for an entry with the same process ID.
- *	The line enterred by the *getty / telnetd, etc. should also match
+ *	The line entered by the *getty / telnetd, etc. should also match
  *	the current terminal.
  *
  *	When an entry is returned by get_current_utmp, and if the utmp