7812 Remove gender specific language

Reviewed by: Matt Ahrens <mahrens@delphix.com>
Reviewed by: Prakash Surya <prakash.surya@delphix.com>
Reviewed by: Steve Gonczi <steve.gonczi@delphix.com>
Reviewed by: Chris Williamson <chris.williamson@delphix.com>
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Igor Kozhukhov <igor@dilos.org>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Richard Lowe <richlowe@richlowe.net>

6 files changed, 34 insertions, 27 deletions

diff --git a/usr/src/cmd/mailx/hdr/def.h b/usr/src/cmd/mailx/hdr/def.h
index 7453b24f97..2480cb84da 100644
--- a/usr/src/cmd/mailx/hdr/def.h
+++ b/usr/src/cmd/mailx/hdr/def.h
@@ -25,6 +25,7 @@
 
 /*
  * Copyright (c) 1985, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016 by Delphix. All rights reserved.
  */
 
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
@@ -211,7 +212,7 @@ struct cmd {
 
 typedef struct headline {
 	custr_t	*hl_from;	/* The name of the sender */
-	custr_t	*hl_tty;	/* His tty string (if any) */
+	custr_t	*hl_tty;	/* Its tty string (if any) */
 	custr_t	*hl_date;	/* The entire date string */
 } headline_t;
 
diff --git a/usr/src/cmd/mailx/lex.c b/usr/src/cmd/mailx/lex.c
index d231a8412d..b6df22b060 100644
--- a/usr/src/cmd/mailx/lex.c
+++ b/usr/src/cmd/mailx/lex.c
@@ -22,6 +22,7 @@
 /*
  * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
+ * Copyright (c) 2016 by Delphix. All rights reserved.
  */
 
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
@@ -443,7 +444,7 @@ more:;
 /*
  * Execute a single command.  If the command executed
  * is "quit," then return non-zero so that the caller
- * will know to return back to main, if he cares.
+ * will know to return back to main, if it cares.
  * Contxt is non-zero if called while composing mail.
  */
 
@@ -529,7 +530,7 @@ execute(char linebuf[], int contxt)
 
 	/*
 	 * Process the arguments to the command, depending
-	 * on the type he expects.  Default to an error.
+	 * on the type it expects.  Default to an error.
 	 * If we are sourcing an interactive command, it's
 	 * an error.
 	 */
diff --git a/usr/src/cmd/mailx/main.c b/usr/src/cmd/mailx/main.c
index 0271552bea..f9819ca4a0 100644
--- a/usr/src/cmd/mailx/main.c
+++ b/usr/src/cmd/mailx/main.c
@@ -22,6 +22,7 @@
 /*
  * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
+ * Copyright (c) 2016 by Delphix. All rights reserved.
  */
 
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
@@ -56,7 +57,7 @@ static jmp_buf	hdrjmp;
 const char *const version = "mailx version 5.0";
 
 /*
- * Find out who the user is, copy his mail file (if exists) into
+ * Find out who the user is, copy their mail file (if exists) into
  * /tmp/Rxxxxx and set up the message pointers.  Then, print out the
  * message headers and read user commands.
  *
@@ -68,7 +69,7 @@ const char *const version = "mailx version 5.0";
  * and a bunch of other options.
  */
 
-int 
+int
 main(int argc, char **argv)
 {
 	register char *ef;
@@ -244,8 +245,8 @@ main(int argc, char **argv)
 			/*
 			 * User is specifying file to "edit" with mailx,
 			 * as opposed to reading system mailbox.
-			 * If no argument is given after -f, we read his/her
-			 * $MBOX file or mbox in his/her home directory.
+			 * If no argument is given after -f, we read their
+			 * $MBOX file or mbox in their home directory.
 			 */
 			ef = (argc == optind || *argv[optind] == '-')
 				? "" : argv[optind++];
@@ -444,7 +445,7 @@ gettext("Usage: %s -eiIUdFntBNHvV~ -T FILE -u USER -h hops -r address\n"),
 /*
  * Interrupt printing of the headers.
  */
-static void 
+static void
 #ifdef	__cplusplus
 hdrstop(int)
 #else
diff --git a/usr/src/cmd/mailx/names.c b/usr/src/cmd/mailx/names.c
index 886eb2dbc5..a590e14b08 100644
--- a/usr/src/cmd/mailx/names.c
+++ b/usr/src/cmd/mailx/names.c
@@ -23,6 +23,7 @@
 /*
  * Copyright 2001 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
+ * Copyright (c) 2016 by Delphix. All rights reserved.
  */
 
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
@@ -654,9 +655,9 @@ unpack(struct name *np)
 }
 
 /*
- * See if the user named himself as a destination
- * for outgoing mail.  If so, set the global flag
- * selfsent so that we avoid removing his mailbox.
+ * See if the user named themself as a destination
+ * for outgoing mail. If so, set the global flag
+ * selfsent so that we avoid removing their mailbox.
  */
 
 void
diff --git a/usr/src/cmd/mailx/quit.c b/usr/src/cmd/mailx/quit.c
index 80fe5b6f5e..d418c035d1 100644
--- a/usr/src/cmd/mailx/quit.c
+++ b/usr/src/cmd/mailx/quit.c
@@ -21,7 +21,9 @@
  */
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
 /*	  All Rights Reserved  	*/
-
+/*
+ * Copyright (c) 2016 by Delphix. All rights reserved.
+ */
 
 /*
  * University Copyright- Copyright (c) 1982, 1986, 1988
@@ -57,7 +59,7 @@ static void		writeback(int noremove);
  * Remove the system mailbox, if none saved there.
  */
 
-void 
+void
 quit(
     int noremove	/* don't remove system mailbox, trunc it instead */
 )
@@ -163,7 +165,7 @@ quit(
 	/*
 	 * Create another temporary file and copy user's mbox file
 	 * therein.  If there is no mbox, copy nothing.
-	 * If s/he has specified "append" don't copy the mailbox,
+	 * If they have specified "append" don't copy the mailbox,
 	 * just copy saveable entries at the end.
 	 */
 
@@ -267,7 +269,7 @@ quit(
  * mailbox, and print a nice message indicating how many were
  * saved.  Incorporate any new mail that we found.
  */
-static void 
+static void
 writeback(int noremove)
 {
 	register struct message *mp;
@@ -379,7 +381,7 @@ die:
 		fclose(rbuf);
 		PRIV(removefile(tempResid));
 	}
-	if (obuf)	
+	if (obuf)
 		fclose(obuf);
 	if (issysmbox)
 		unlockmail();
@@ -388,13 +390,13 @@ die:
 	sigset(SIGQUIT, fquit);
 }
 
-void 
+void
 lockmail(void)
 {
     PRIV(maillock(lockname,10));
 }
 
-void 
+void
 unlockmail(void)
 {
     PRIV(mailunlock());
diff --git a/usr/src/cmd/mailx/send.c b/usr/src/cmd/mailx/send.c
index ca2b6a3b93..e4a0b6c6b2 100644
--- a/usr/src/cmd/mailx/send.c
+++ b/usr/src/cmd/mailx/send.c
@@ -21,6 +21,7 @@
 
 /*
  * Copyright (c) 1985, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016 by Delphix. All rights reserved.
  */
 
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
@@ -234,7 +235,7 @@ writeit:
 /*
  * Test if the passed line is a header line, RFC 822 style.
  */
-int 
+int
 headerp(register char *line)
 {
 	register char *cp = line;
@@ -275,7 +276,7 @@ statusput(
  * which does all the dirty work.
  */
 
-int 
+int
 mail(char **people)
 {
 	register char *cp2, *cp3;
@@ -309,7 +310,7 @@ mail(char **people)
 	return(0);
 }
 
-int 
+int
 sendm(char *str)
 {
 	if (value("flipm") != NOSTR)
@@ -317,7 +318,7 @@ sendm(char *str)
 	else return(sendmail(str));
 }
 
-int 
+int
 Sendm(char *str)
 {
 	if (value("flipm") != NOSTR)
@@ -329,7 +330,7 @@ Sendm(char *str)
  * Interface to the mail1 routine for the -t flag
  * (read headers from text).
  */
-int 
+int
 tmail(void)
 {
 	struct header head;
@@ -346,7 +347,7 @@ tmail(void)
  * Send mail to a bunch of user names.  The interface is through
  * the mail routine below.
  */
-static int 
+static int
 sendmail(char *str)
 {
 	struct header head;
@@ -367,7 +368,7 @@ sendmail(char *str)
  * the mail routine below.
  * save a copy of the letter
  */
-static int 
+static int
 Sendmail(char *str)
 {
 	struct header head;
@@ -398,7 +399,7 @@ closefd_walk(void *special_fd, int fd)
  * Mail a message on standard input to the people indicated
  * in the passed header.  (Internal interface).
  */
-void 
+void
 mail1(struct header *hp, int use_to, char *orig_to)
 {
 	pid_t p, pid;
@@ -508,7 +509,7 @@ mail1(struct header *hp, int use_to, char *orig_to)
 	 * Wait, to absorb a potential zombie, then
 	 * fork, set up the temporary mail file as standard
 	 * input for "mail" and exec with the user list we generated
-	 * far above. Return the process id to caller in case he
+	 * far above. Return the process id to caller in case it
 	 * wants to await the completion of mail.
 	 */