Skip to content

Commit

Permalink
7812 Remove gender specific language
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
djhoffma authored and ahrens committed Feb 22, 2017
1 parent e40108f commit 48bbca8
Show file tree
Hide file tree
Showing 251 changed files with 1,682 additions and 1,426 deletions.
24 changes: 13 additions & 11 deletions usr/src/cmd/bnu/ct.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@

/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
/* All Rights Reserved */

/*
* Copyright (c) 2016 by Delphix. All rights reserved.
*/
#pragma ident "%Z%%M% %I% %E% SMI"

/*
Expand Down Expand Up @@ -75,7 +77,7 @@ extern int dkminor();
#define TRUE 1
#define FALSE 0

static
static
int _Status; /* exit status of child */

static
Expand All @@ -92,11 +94,11 @@ char
*_Num, /* pointer to a phone number */
*_Flds[7]; /* Filled in as if finds() in uucp did it */

static
static
time_t _Log_on,
_Log_elpsd;

static
static
FILE *_Fdl;

extern int optind;
Expand Down Expand Up @@ -175,15 +177,15 @@ char *argv[];

while ((c = getopt (argc, argv, "hvw:s:x:")) != EOF) {
switch (c) {
case 'h':
case 'h':
hangup = 0;
break;

case 'v':
case 'v':
Verbose = 1;
break;

case 'w':
case 'w':
minutes = atoi (optarg);
if (minutes < 1) {
(void) fprintf(stderr,
Expand All @@ -194,7 +196,7 @@ char *argv[];
}
break;

case 's':
case 's':
_Flds[F_CLASS] = optarg;
break;

Expand All @@ -209,7 +211,7 @@ char *argv[];
}
break;

case '?':
case '?':
(void) fprintf(stderr, "\tusage: %s %s\n", Progname, USAGE);
cleanup(101);
/* NOTREACHED */
Expand Down Expand Up @@ -254,7 +256,7 @@ char *argv[];
fdig(_Flds[F_CLASS]) );
cleanup(101);
}

if (!first) { /* not the first time in loop */
VERBOSE("%s busy", (found == -1) ? "Dialer is" : "Dialers are");
VERBOSE(" (%d minute(s))\n", count);
Expand Down Expand Up @@ -283,7 +285,7 @@ char *argv[];
cleanup(101);
}

/* Ask user if she/he wants to wait */
/* Ask user if they want to wait */
(void) fputs("Do you want to wait for dialer? (y for yes): ", stdout);
if ((c = getchar ()) == EOF || tolower (c) != 'y')
cleanup(101);
Expand Down
21 changes: 12 additions & 9 deletions usr/src/cmd/bnu/permission.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@

/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
/* All Rights Reserved */
/*
* Copyright (c) 2016 by Delphix. All rights reserved.
*/

#pragma ident "%Z%%M% %I% %E% SMI"

Expand Down Expand Up @@ -205,7 +208,7 @@ char *name;
* this function will find a login name in the LOGNAME
* field.
* input:
* name -> who the remote says he/she is
* name -> who the remote says they are
* return:
* SUCCESS -> found
* FAIL -> not found
Expand Down Expand Up @@ -336,7 +339,7 @@ char *list[];
while (*p && num < maxlist) {
list[num] = p;
if (*p == ':') { /* null path */
*p++ = NULLCHAR;
*p++ = NULLCHAR;
continue;
}
while (*p && *p != ':')
Expand Down Expand Up @@ -442,7 +445,7 @@ int type;
continue;

case U_LOGNAME:
if (EQUALS(arg, name))
if (EQUALS(arg, name))
break;
continue;

Expand Down Expand Up @@ -481,7 +484,7 @@ static int
validateFind(name)
char *name;
{

if ( (Fp = fopen(PERMISSIONS, "r")) == NULL) {
DEBUG(5, "can't open %s\n", PERMISSIONS);
return(FAIL);
Expand Down Expand Up @@ -554,7 +557,7 @@ char *name;
*
* return:
* 0 - OK
* EOF - at end of file
* EOF - at end of file
*/
int
parse_tokens(flds, buf)
Expand Down Expand Up @@ -626,7 +629,7 @@ struct name_value *pair;
string++;
if (*string)
*string++ = NULLCHAR;

pair->value = string;
while ((*string) && (*string != '\t') && (*string != ' ')
&& (*string != '\n'))
Expand Down Expand Up @@ -654,7 +657,7 @@ char *line;
{
char *p, *c;
char buf[BUFSIZ];

p = line;
for (;fgets(buf, BUFSIZ, fp) != NULL;) {
/* remove trailing white space */
Expand Down Expand Up @@ -764,7 +767,7 @@ switchRole()
* rmail
* Note that the PERMISSIONS file is read once for each system
* at the time the Rmtname is set in xprocess().
* Return codes:
* Return codes:
* ok: TRUE
* fail: FALSE
*/
Expand Down Expand Up @@ -813,7 +816,7 @@ char *name, *list[];
}
}
if ( _dev[i] == statbuf.st_dev
&& _ino[i] == statbuf.st_ino ) {
&& _ino[i] == statbuf.st_ino ) {
free(temp);
return(TRUE);
}
Expand Down
11 changes: 7 additions & 4 deletions usr/src/cmd/bnu/xqt.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@

/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
/* All Rights Reserved */
/*
* Copyright (c) 2016 by Delphix. All rights reserved.
*/


#pragma ident "%Z%%M% %I% %E% SMI"
Expand All @@ -48,8 +51,8 @@ char *rmtname;
*/
if (fork() == 0) { /* can't vfork() */
/*
* hide the uid of the initiator of this job so that he
* doesn't get notified about things that don't concern him.
* hide the uid of the initiator of this job so that it
* doesn't get notified about things that don't concern it.
*/
(void) setuid(geteuid());
euucico(rmtname);
Expand Down Expand Up @@ -124,8 +127,8 @@ char *rmtname;
for (i = 3; i < maxfiles; i++)
(void) close(i);
/*
* hide the uid of the initiator of this job so that he
* doesn't get notified about things that don't concern him.
* hide the uid of the initiator of this job so that it
* doesn't get notified about things that don't concern it.
*/
(void) setuid(geteuid());
(void) execle(UUXQT, "UUXQT", opt, (char *) 0, Env);
Expand Down
15 changes: 9 additions & 6 deletions usr/src/cmd/cmd-inet/usr.bin/pppd/ccp.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
* OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
* OR MODIFICATIONS.
*/
/*
* Copyright (c) 2016 by Delphix. All rights reserved.
*/

#pragma ident "%Z%%M% %I% %E% SMI"
#define RCSID "$Id: ccp.c,v 1.30 2000/04/15 01:27:11 masputra Exp $"
Expand Down Expand Up @@ -277,7 +280,7 @@ setdeflate(argv, opt)
if ((rbits != 0 && (rbits <= DEFLATE_MIN_SIZE || rbits > def_rmax))
|| (abits != 0 && (abits <= DEFLATE_MIN_SIZE || abits > def_amax))) {
option_error("deflate option values must be 0 or {%d,%d} .. {%d,%d}",
DEFLATE_MIN_SIZE+1, DEFLATE_MIN_SIZE+1,
DEFLATE_MIN_SIZE+1, DEFLATE_MIN_SIZE+1,
def_rmax, def_amax);
return 0;
}
Expand Down Expand Up @@ -489,9 +492,9 @@ ccp_codereject(f, code, id, inp, len)

case CCP_RESETACK:
/*
* Peer must have sent us CCP Reset-Request but then code-rejected
* when we sent CCP Reset-Ack. He's a moron, be we have to obey
* his wishes.
* Peer must have sent us CCP Reset-Request but then code-rejected when
* we sent CCP Reset-Ack. It seems to have changed its mind, and we

This comment has been minimized.

Copy link
@alis0nc

alis0nc Aug 24, 2017

Contributor

I like that you've amended the hostile "he's a moron" language.

* have to obey its wishes.
*/
ccp_localstate[f->unit] |= RACK_REJECTED;
notice("peer has erroneously rejected CCP Reset-Ack");
Expand Down Expand Up @@ -786,7 +789,7 @@ ccp_nakci(f, p, len)
no.deflate = 1;
/*
* Peer wants us to use a different code size or something.
* Stop asking for Deflate if we don't understand his suggestion.
* Stop asking for Deflate if we don't understand its suggestion.
*/
if (p[1] != CILEN_DEFLATE
|| DEFLATE_METHOD(p[2]) != DEFLATE_METHOD_VAL
Expand All @@ -805,7 +808,7 @@ ccp_nakci(f, p, len)
/*
* Peer wants us to use a different code size or something.
* Stop asking for Deflate using the old algorithm number if
* we don't understand his suggestion. (Note that this will
* we don't understand its suggestion. (Note that this will
* happen if the peer is running Magnalink instead of
* old-style Deflate.)
*/
Expand Down
27 changes: 15 additions & 12 deletions usr/src/cmd/cmd-inet/usr.bin/pppd/ipcp.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
/*
* Copyright (c) 2016 by Delphix. All rights reserved.
*/

#define RCSID "$Id: ipcp.c,v 1.54 2000/04/15 01:27:11 masputra Exp $"

Expand Down Expand Up @@ -768,14 +771,14 @@ ipcp_nakci(f, p, len)
}

/*
* Accept the peer's idea of {our,his} address, if different
* Accept the peer's idea of {our,its} address, if different
* from our idea, only if the accept_{local,remote} flag is set.
*/
NAKCIADDRS(CI_ADDRS, !go->neg_addr && go->old_addrs,
if (go->accept_local && ciaddr1) { /* Do we know our address? */
try.ouraddr = ciaddr1;
}
if (go->accept_remote && ciaddr2) { /* Does he know his? */
if (go->accept_remote && ciaddr2) { /* Does it know its? */
try.hisaddr = ciaddr2;
}
);
Expand Down Expand Up @@ -1026,12 +1029,12 @@ ipcp_reqci(f, p, lenp, dont_nak)
nakp = nak_buffer;

/*
* Reset all his options.
* Reset all its options.
*/
BZERO(ho, sizeof(*ho));

/*
* Process all his options.
* Process all its options.
*/
for (len = *lenp; len > 0; len -= cilen, p = prev + cilen) {
if ((len < 2) || p[1] > len) {
Expand Down Expand Up @@ -1065,10 +1068,10 @@ ipcp_reqci(f, p, lenp, dont_nak)
} else {

/*
* If he has no address, or if we both have his
* If it has no address, or if we both have its
* address but disagree about it, then NAK it with our
* idea. In particular, if we don't know his address,
* but he does, then accept it.
* idea. In particular, if we don't know its address,
* but it does, then accept it.
*/
GETNLONG(ciaddr1, p);
if (ciaddr1 != wo->hisaddr &&
Expand Down Expand Up @@ -1146,7 +1149,7 @@ ipcp_reqci(f, p, lenp, dont_nak)
newret = CODE_CONFNAK;
/*
* If this is a dialup line (default_route is
* set), and neither side knows about his address,
* set), and neither side knows about its address,
* suggest an arbitrary rfc1918 address.
*/
ciaddr1 = htonl(0xc0a80101 + ifunit);
Expand Down Expand Up @@ -1225,7 +1228,7 @@ ipcp_reqci(f, p, lenp, dont_nak)
PUTNLONG(ao->winsaddr[d], nakp);
}
break;

case CI_COMPRESSTYPE:
if (!ao->neg_vj) {
newret = CODE_CONFREJ;
Expand Down Expand Up @@ -1334,7 +1337,7 @@ ipcp_reqci(f, p, lenp, dont_nak)
switch (ret) {
case CODE_CONFACK:
*lenp = p - p0;
sys_block_proto(PPP_IP);
sys_block_proto(PPP_IP);
break;
case CODE_CONFNAK:
*lenp = nakp - nak_buffer;
Expand Down Expand Up @@ -1518,7 +1521,7 @@ ipcp_up(f)
}

/* assign a default route through the interface if required */
if (wo->default_route)
if (wo->default_route)
if (sifdefaultroute(f->unit, go->ouraddr, ho->hisaddr))
default_route_set[f->unit] = 1;

Expand Down Expand Up @@ -1570,7 +1573,7 @@ ipcp_up(f)
}

/* assign a default route through the interface if required */
if (wo->default_route)
if (wo->default_route)
if (sifdefaultroute(f->unit, go->ouraddr, ho->hisaddr))
default_route_set[f->unit] = 1;

Expand Down

0 comments on commit 48bbca8

Please sign in to comment.