diff options
| author | Daniel Hoffman <dj.hoffman@delphix.com> | 2017-02-17 11:48:20 -0800 |
|---|---|---|
| committer | Matthew Ahrens <mahrens@delphix.com> | 2017-02-22 11:43:07 -0800 |
| commit | 48bbca816818409505a6e214d0911fda44e622e3 (patch) | |
| tree | 7b823654982b246c7df6ae378d344139fde35b51 /usr/src/cmd | |
| parent | e40108ff341f07fe03e96c751c6cf2cb5867d1a8 (diff) | |
| download | illumos-gate-48bbca816818409505a6e214d0911fda44e622e3.tar.gz | |
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>
Diffstat (limited to 'usr/src/cmd')
88 files changed, 512 insertions, 404 deletions
diff --git a/usr/src/cmd/bnu/ct.c b/usr/src/cmd/bnu/ct.c index 5dffdc301e..e288464c34 100644 --- a/usr/src/cmd/bnu/ct.c +++ b/usr/src/cmd/bnu/ct.c @@ -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" /* @@ -75,7 +77,7 @@ extern int dkminor(); #define TRUE 1 #define FALSE 0 -static +static int _Status; /* exit status of child */ static @@ -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; @@ -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, @@ -194,7 +196,7 @@ char *argv[]; } break; - case 's': + case 's': _Flds[F_CLASS] = optarg; break; @@ -209,7 +211,7 @@ char *argv[]; } break; - case '?': + case '?': (void) fprintf(stderr, "\tusage: %s %s\n", Progname, USAGE); cleanup(101); /* NOTREACHED */ @@ -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); @@ -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); diff --git a/usr/src/cmd/bnu/permission.c b/usr/src/cmd/bnu/permission.c index e21989b8d5..d8454868a9 100644 --- a/usr/src/cmd/bnu/permission.c +++ b/usr/src/cmd/bnu/permission.c @@ -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" @@ -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 @@ -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 != ':') @@ -442,7 +445,7 @@ int type; continue; case U_LOGNAME: - if (EQUALS(arg, name)) + if (EQUALS(arg, name)) break; continue; @@ -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); @@ -554,7 +557,7 @@ char *name; * * return: * 0 - OK - * EOF - at end of file + * EOF - at end of file */ int parse_tokens(flds, buf) @@ -626,7 +629,7 @@ struct name_value *pair; string++; if (*string) *string++ = NULLCHAR; - + pair->value = string; while ((*string) && (*string != '\t') && (*string != ' ') && (*string != '\n')) @@ -654,7 +657,7 @@ char *line; { char *p, *c; char buf[BUFSIZ]; - + p = line; for (;fgets(buf, BUFSIZ, fp) != NULL;) { /* remove trailing white space */ @@ -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 */ @@ -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); } diff --git a/usr/src/cmd/bnu/xqt.c b/usr/src/cmd/bnu/xqt.c index cac7a7013b..91e9e78758 100644 --- a/usr/src/cmd/bnu/xqt.c +++ b/usr/src/cmd/bnu/xqt.c @@ -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" @@ -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); @@ -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); diff --git a/usr/src/cmd/cmd-inet/usr.bin/pppd/ccp.c b/usr/src/cmd/cmd-inet/usr.bin/pppd/ccp.c index 8bf5618136..b3bc84b0e1 100644 --- a/usr/src/cmd/cmd-inet/usr.bin/pppd/ccp.c +++ b/usr/src/cmd/cmd-inet/usr.bin/pppd/ccp.c @@ -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 $" @@ -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; } @@ -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 + * have to obey its wishes. */ ccp_localstate[f->unit] |= RACK_REJECTED; notice("peer has erroneously rejected CCP Reset-Ack"); @@ -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 @@ -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.) */ diff --git a/usr/src/cmd/cmd-inet/usr.bin/pppd/ipcp.c b/usr/src/cmd/cmd-inet/usr.bin/pppd/ipcp.c index 2e26afbf1e..897df43160 100644 --- a/usr/src/cmd/cmd-inet/usr.bin/pppd/ipcp.c +++ b/usr/src/cmd/cmd-inet/usr.bin/pppd/ipcp.c @@ -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 $" @@ -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; } ); @@ -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) { @@ -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 && @@ -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); @@ -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; @@ -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; @@ -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; @@ -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; diff --git a/usr/src/cmd/cmd-inet/usr.bin/pppd/ipv6cp.c b/usr/src/cmd/cmd-inet/usr.bin/pppd/ipv6cp.c index 9338b4f0b9..122f805147 100644 --- a/usr/src/cmd/cmd-inet/usr.bin/pppd/ipv6cp.c +++ b/usr/src/cmd/cmd-inet/usr.bin/pppd/ipv6cp.c @@ -1,6 +1,8 @@ /* * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright (c) 2016 by Delphix. All rights reserved. + * * ipv6cp.c - PPP IPV6 Control Protocol. Copyright (C) 1999 Tommi Komulainen <Tommi.Komulainen@iki.fi> @@ -54,7 +56,7 @@ between BULL S.A. and INRIA). This software is available with usual "research" terms - with the aim of retain credits of the software. + with the aim of retain credits of the software. Permission to use, copy, modify and distribute this software for any purpose and without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies, @@ -93,13 +95,13 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: ipv6cp.c,v 1.9 2000/04/15 01:27:11 masputra Exp $ + * $Id: ipv6cp.c,v 1.9 2000/04/15 01:27:11 masputra Exp $ */ #define RCSID "$Id: ipv6cp.c,v 1.9 2000/04/15 01:27:11 masputra Exp $" /* - * TODO: + * TODO: * * Proxy Neighbour Discovery. * @@ -284,16 +286,16 @@ setifaceid(argv, opt) char *comma, *arg; ipv6cp_options *wo = &ipv6cp_wantoptions[0]; struct in6_addr addr; - + #define VALIDID(a) ( (((a).s6_addr32[0] == 0) && ((a).s6_addr32[1] == 0)) && \ (((a).s6_addr32[2] != 0) || ((a).s6_addr32[3] != 0)) ) - + arg = *argv; comma = strchr(arg, ','); - - /* + + /* * If comma first character, then no local identifier */ if (comma != arg) { @@ -304,11 +306,11 @@ setifaceid(argv, opt) option_error("Illegal interface identifier (local): %s", arg); return 0; } - + eui64_copy(addr.s6_addr32[2], wo->ourid); wo->opt_local = 1; } - + /* * If comma last character, then no remote identifier */ @@ -459,11 +461,11 @@ ipv6cp_resetci(f) ipv6cp_options *go = &ipv6cp_gotoptions[f->unit]; wo->req_ifaceid = wo->neg_ifaceid && ipv6cp_allowoptions[f->unit].neg_ifaceid; - + if (!wo->opt_local) { eui64_magic_nz(wo->ourid); } - + *go = *wo; eui64_zero(go->hisid); /* last proposed interface identifier */ } @@ -654,12 +656,12 @@ ipv6cp_nakci(f, p, len) } /* - * Accept the peer's idea of {our,his} interface identifier, if different + * Accept the peer's idea of {our,its} interface identifier, if different * from our idea, only if the accept_{local,remote} flag is set. */ NAKCIIFACEID(CI_IFACEID, neg_ifaceid, if (go->accept_local) { - while (eui64_iszero(ifaceid) || + while (eui64_iszero(ifaceid) || eui64_equals(ifaceid, go->hisid)) /* bad luck */ eui64_magic(ifaceid); try.ourid = ifaceid; @@ -711,7 +713,7 @@ ipv6cp_nakci(f, p, len) try.neg_ifaceid = 1; eui64_get(ifaceid, p); if (go->accept_local) { - while (eui64_iszero(ifaceid) || + while (eui64_iszero(ifaceid) || eui64_equals(ifaceid, go->hisid)) /* bad luck */ eui64_magic(ifaceid); try.ourid = ifaceid; @@ -840,12 +842,12 @@ ipv6cp_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) { newret = CODE_CONFACK; @@ -881,10 +883,10 @@ ipv6cp_reqci(f, p, lenp, dont_nak) } else { /* - * If he has no interface identifier, or if we both + * If it has no interface identifier, or if we both * have same identifier then NAK it with new idea. In - * particular, if we don't know his identifier, but he - * does, then accept it. + * particular, if we don't know his identifier, but it + * does, then accept that identifier. */ eui64_get(ifaceid, p); IPV6CPDEBUG(("(%s)", llv6_ntoa(ifaceid))); @@ -892,9 +894,9 @@ ipv6cp_reqci(f, p, lenp, dont_nak) newret = CODE_CONFREJ; /* Reject CI */ break; } - /* If we don't like his ID, then nak it. */ - if (!eui64_iszero(wo->hisid) && - !eui64_equals(ifaceid, wo->hisid) && + /* If we don't like its ID, then nak that ID. */ + if (!eui64_iszero(wo->hisid) && + !eui64_equals(ifaceid, wo->hisid) && eui64_iszero(go->hisid)) { newret = CODE_CONFNAK; eui64_copy(wo->hisid, ifaceid); @@ -904,7 +906,7 @@ ipv6cp_reqci(f, p, lenp, dont_nak) /* first time, try option */ if (eui64_iszero(go->hisid)) eui64_copy(wo->hisid, ifaceid); - while (eui64_iszero(ifaceid) || + while (eui64_iszero(ifaceid) || eui64_equals(ifaceid, go->ourid)) /* bad luck */ eui64_magic(ifaceid); } @@ -1006,7 +1008,7 @@ ipv6cp_reqci(f, p, lenp, dont_nak) switch (ret) { case CODE_CONFACK: *lenp = p - p0; - sys_block_proto(PPP_IPV6); + sys_block_proto(PPP_IPV6); break; case CODE_CONFNAK: *lenp = nakp - nak_buffer; @@ -1038,7 +1040,7 @@ ipv6_check_options() */ if ((wo->use_persistent) && (!wo->opt_local) && (!wo->opt_remote)) { - /* + /* * On systems where there are no Ethernet interfaces used, there * may be other ways to obtain a persistent id. Right now, it * will fall back to using magic [see eui64_magic] below when @@ -1108,7 +1110,7 @@ ipv6_demand_conf(u) #if SIF6UPFIRST if (!sif6up(u)) return 0; -#endif +#endif if (!sif6addr(u, wo->ourid, wo->hisid)) return 0; #if !SIF6UPFIRST @@ -1432,7 +1434,7 @@ ipv6cp_printpkt(p, plen, printer, arg) if (len < HEADERLEN || len > plen) return 0; - + printer(arg, " %s id=0x%x", code_name(code, 1), id); len -= HEADERLEN; switch (code) { diff --git a/usr/src/cmd/cmd-inet/usr.bin/pppd/lcp.c b/usr/src/cmd/cmd-inet/usr.bin/pppd/lcp.c index 306dac1421..b4d653c06e 100644 --- a/usr/src/cmd/cmd-inet/usr.bin/pppd/lcp.c +++ b/usr/src/cmd/cmd-inet/usr.bin/pppd/lcp.c @@ -7,6 +7,8 @@ * Copyright (c) 1989 Carnegie Mellon University. * All rights reserved. * + * Copyright (c) 2016 by Delphix. All rights reserved. + * * Redistribution and use in source and binary forms are permitted * provided that the above copyright notice and this paragraph are * duplicated in all such forms and that any documentation, @@ -218,12 +220,12 @@ static option_t lcp_option_list[] = { "Set FCS type(s) desired; crc16, crc32, null, or number" }, #endif #ifdef MUX_FRAME - /* + /* * if pppmux option is turned on, then the parameter to this - * is time value in microseconds + * is time value in microseconds */ { "pppmux", o_int, &lcp_wantoptions[0].pppmux, - "Set PPP Multiplexing option timer", OPT_LLIMIT | OPT_A2COPY, + "Set PPP Multiplexing option timer", OPT_LLIMIT | OPT_A2COPY, &lcp_allowoptions[0].pppmux, 0, 0 }, #endif {NULL} @@ -685,7 +687,7 @@ lcp_extcode(f, code, id, inp, len) case CODE_PROTREJ: lcp_rprotrej(f, inp, len); break; - + case CODE_ECHOREQ: if (f->state != OPENED) break; @@ -693,7 +695,7 @@ lcp_extcode(f, code, id, inp, len) PUTLONG(lcp_gotoptions[f->unit].magicnumber, magp); fsm_sdata(f, CODE_ECHOREP, id, inp, len); break; - + case CODE_ECHOREP: if (!lcp_received_echo_reply(f, id, inp, len)) { lcp_echo_badreplies++; @@ -1162,7 +1164,7 @@ lcp_ackci(f, p, len) go->endpoint.value, go->endpoint.length); #ifdef MUX_FRAME ACKCIVOID(CI_MUXING, go->pppmux); - if (go->pppmux) + if (go->pppmux) go->pppmux = ao->pppmux; #endif ACKCISHORT(CI_MRRU, go->neg_mrru, go->mrru); @@ -1356,7 +1358,7 @@ lcp_nakci(f, p, len) if ((cichar == CHAP_DIGEST_MD5 && wo->neg_chap) || (cichar == CHAP_MICROSOFT && wo->neg_mschap) || (cichar == CHAP_MICROSOFT_V2 && wo->neg_mschapv2)) { - /* Try his requested algorithm. */ + /* Try its requested algorithm. */ try.chap_mdtype = cichar; } else { goto try_another; @@ -1399,11 +1401,11 @@ lcp_nakci(f, p, len) * to stop asking for LQR. We haven't got any other protocol. If * they Nak the reporting period, then the following logic * applies: - * If he suggests zero and go->neg_fcs is true and - * ao->lqr_period isn't zero, then take his suggestion. If he - * suggests zero otherwise, ignore it. If he suggests a nonzero - * value and wo->lqr_period is zero, then take his suggestion. If - * he suggests a nonzero value otherwise that's less than + * If it suggests zero and go->neg_fcs is true and + * ao->lqr_period isn't zero, then take its suggestion. If it + * suggests zero otherwise, ignore it. If it suggests a nonzero + * value and wo->lqr_period is zero, then take its suggestion. If + * it suggests a nonzero value otherwise that's less than * wo->lqr_period, then ignore it. */ NAKCILQR(CI_QUALITY, neg_lqr, @@ -1440,7 +1442,7 @@ lcp_nakci(f, p, len) NAKCIVOID(CI_ACCOMPRESSION, neg_accompression); /* - * Remove any FCS types he doesn't like from our (receive-side) + * Remove any FCS types it doesn't like from our (receive-side) * FCS list. */ NAKCICHAR(CI_FCSALTERN, neg_fcs, try.fcs_type = go->fcs_type & cichar;); @@ -1763,7 +1765,7 @@ lcp_rejci(f, p, len) /* Check rejected value. */ if (cishort != PPP_CHAP || cichar != go->chap_mdtype) goto bad; - /* Disable the one that he rejected */ + /* Disable the one that it rejected */ switch (cichar) { case CHAP_DIGEST_MD5: try.neg_chap = 0; @@ -1882,12 +1884,12 @@ lcp_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) { newret = CODE_CONFACK; /* Assume success */ @@ -1932,10 +1934,10 @@ lcp_reqci(f, p, lenp, dont_nak) if (newret == CODE_CONFNAK) { PUTCHAR(CI_MRU, nakp); PUTCHAR(CILEN_SHORT, nakp); - PUTSHORT(cishort, nakp); /* Give him a hint */ + PUTSHORT(cishort, nakp); /* Give it a hint */ } - ho->neg_mru = 1; /* Remember he sent MRU */ + ho->neg_mru = 1; /* Remember that it sent MRU */ ho->mru = cishort; /* And remember value */ break; @@ -1961,8 +1963,8 @@ lcp_reqci(f, p, lenp, dont_nak) /* * Workaround for common broken Microsoft software -- if - * the peer is sending us a nonzero ACCM, then he *needs* - * us to send the same to him. Adjust our Configure- + * the peer is sending us a nonzero ACCM, then it *needs* + * us to send the same to it. Adjust our Configure- * Request message and restart LCP. */ if (do_msft_workaround && (cilong & ~wo->asyncmap)) { @@ -2133,10 +2135,10 @@ lcp_reqci(f, p, lenp, dont_nak) if (cilen < CILEN_LONG) { /* * If we send Magic-Number, then we must not reject it - * when the peer sends it to us, even if his version - * looks odd to us. Ack if the cilen is wrong in this + * when the peer sends it to us, even if its version + * looks odd to us. Ack if the cilent is wrong in this * case. If we're not sending Magic-Number, then we don't - * much care what his value is anyway. + * much care what its value is anyway. */ break; } @@ -2147,8 +2149,8 @@ lcp_reqci(f, p, lenp, dont_nak) break; /* - * He must have a different magic number. Make sure we - * give him a good one to use. + * It must have a different magic number. Make sure we + * give it a good one to use. */ while (go->neg_magicnumber && cilong == go->magicnumber) { newret = CODE_CONFNAK; @@ -2204,7 +2206,7 @@ lcp_reqci(f, p, lenp, dont_nak) } else { GETCHAR(cichar, p); - /* If he has bits we don't like, tell him to stop. */ + /* If it has bits we don't like, tell it to stop. */ if (cichar & ~ao->fcs_type) { if ((cichar &= ao->fcs_type) == 0) { newret = CODE_CONFREJ; @@ -2295,7 +2297,7 @@ lcp_reqci(f, p, lenp, dont_nak) newret = CODE_CONFREJ; break; } - /* remember his option */ + /* remember its option */ ho->pppmux = ao->pppmux; break; #endif @@ -2341,7 +2343,7 @@ lcp_reqci(f, p, lenp, dont_nak) } /* - * If the peer hasn't negotiated his MRU, and we'd like an MTU + * If the peer hasn't negotiated its MRU, and we'd like an MTU * that's larger than the default, try sending an unsolicited * Nak for what we want. */ diff --git a/usr/src/cmd/cmd-inet/usr.bin/pppd/main.c b/usr/src/cmd/cmd-inet/usr.bin/pppd/main.c index 750dc72d93..4207ea1712 100644 --- a/usr/src/cmd/cmd-inet/usr.bin/pppd/main.c +++ b/usr/src/cmd/cmd-inet/usr.bin/pppd/main.c @@ -30,6 +30,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: main.c,v 1.97 2000/04/24 02:54:16 masputra Exp $" @@ -870,7 +873,7 @@ main(argc, argv) /* * If we are initiating this connection, wait for a short * time for something from the peer. This can avoid bouncing - * our packets off his tty before he has it set up. + * our packets off its tty before it has set up the tty. */ add_fd(fd_ppp); if (connect_delay != 0 && (connector != NULL || ptycommand != NULL)) { @@ -2092,7 +2095,7 @@ run_program(prog, args, must_exist, done, arg) #ifdef BSD /* Force the priority back to zero if pppd is running higher. */ if (setpriority (PRIO_PROCESS, 0, 0) < 0) - warn("can't reset priority to 0: %m"); + warn("can't reset priority to 0: %m"); #endif /* SysV recommends a second fork at this point. */ diff --git a/usr/src/cmd/cmd-inet/usr.bin/talk/invite.c b/usr/src/cmd/cmd-inet/usr.bin/talk/invite.c index 7b06de4b73..e8fa7f0813 100644 --- a/usr/src/cmd/cmd-inet/usr.bin/talk/invite.c +++ b/usr/src/cmd/cmd-inet/usr.bin/talk/invite.c @@ -36,6 +36,9 @@ * software developed by the University of California, Berkeley, and its * contributors. */ +/* + * Copyright (c) 2016 by Delphix. All rights reserved. + */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -50,9 +53,9 @@ #endif /* SYSV */ /* - * there wasn't an invitation waiting, so send a request containing - * our sockt address to the remote talk daemon so it can invite - * him + * There wasn't an invitation waiting, so send a request containing + * our socket address to the remote talk daemon so it can invite + * the remote. */ static int local_id, remote_id; diff --git a/usr/src/cmd/cmd-inet/usr.bin/telnet/enc_des.c b/usr/src/cmd/cmd-inet/usr.bin/telnet/enc_des.c index 78adc014cb..aa4621d53c 100644 --- a/usr/src/cmd/cmd-inet/usr.bin/telnet/enc_des.c +++ b/usr/src/cmd/cmd-inet/usr.bin/telnet/enc_des.c @@ -69,6 +69,9 @@ */ /* based on @(#)enc_des.c 8.1 (Berkeley) 6/4/93 */ +/* + * Copyright (c) 2016 by Delphix. All rights reserved. + */ #include <krb5.h> #include <stdio.h> @@ -170,7 +173,7 @@ cfb64_start(int dir) case TELNET_DIR_DECRYPT: /* * This is simply a request to have the other side - * start output (our input). He will negotiate an + * start output (our input). The other side will negotiate an * IV so we need not look for it. */ state = fbp->state[dir]; diff --git a/usr/src/cmd/cmd-inet/usr.lib/ilbd/ilbd_main.c b/usr/src/cmd/cmd-inet/usr.lib/ilbd/ilbd_main.c index 992d94c6ec..4fb8324f3b 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/ilbd/ilbd_main.c +++ b/usr/src/cmd/cmd-inet/usr.lib/ilbd/ilbd_main.c @@ -21,6 +21,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016 by Delphix. All rights reserved. */ /* @@ -71,7 +72,7 @@ * By default, an user-supplied health check probe process will * also run with the same set of privileges as ILB's built-in * probes. If the administrator has an user-supplied health check - * program that requires a larger privilege set, he/she will have + * program that requires a larger privilege set, they will have * to implement setuid program. * * Each health check will have a timeout, such that if the health diff --git a/usr/src/cmd/cmd-inet/usr.lib/ilbd/ilbd_sg.c b/usr/src/cmd/cmd-inet/usr.lib/ilbd/ilbd_sg.c index 73dfcd58f3..6372687041 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/ilbd/ilbd_sg.c +++ b/usr/src/cmd/cmd-inet/usr.lib/ilbd/ilbd_sg.c @@ -21,6 +21,7 @@ /* * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016 by Delphix. All rights reserved. */ #include <stdlib.h> @@ -742,7 +743,7 @@ ilbd_add_server_to_group(ilb_sg_info_t *sg_info, int ev_port, * serverid when processing the next add-server * command for this servergroup, while connection * draining is underway. We assume that the user - * will read the man page after he/she encounters + * will read the man page after they encounter * this failure, and learn to not add any server * to the servergroup until connection draining of * all servers in the servergroup is complete. diff --git a/usr/src/cmd/cmd-inet/usr.lib/mdnsd/DNSDigest.c b/usr/src/cmd/cmd-inet/usr.lib/mdnsd/DNSDigest.c index 57a4012034..e1aa82df11 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/mdnsd/DNSDigest.c +++ b/usr/src/cmd/cmd-inet/usr.lib/mdnsd/DNSDigest.c @@ -1,6 +1,7 @@ /* -*- Mode: C; tab-width: 4 -*- * * Copyright (c) 2002-2011 Apple Inc. All rights reserved. + * Copyright (c) 2016 by Delphix. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/usr/src/cmd/cmd-inet/usr.lib/pppoe/options.c b/usr/src/cmd/cmd-inet/usr.lib/pppoe/options.c index de1602ce6e..1ecdadfcd7 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/pppoe/options.c +++ b/usr/src/cmd/cmd-inet/usr.lib/pppoe/options.c @@ -23,6 +23,7 @@ * * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright (c) 2016 by Delphix. All rights reserved. */ #include <stdio.h> @@ -2213,7 +2214,7 @@ launch_service(int tunfd, poep_t *poep, void *srvp, struct ppptun_control *ptc) /* * Exec failure; attempt to log the problem and send a - * PADT to the client so that he knows the session + * PADT to the client so that it knows the session * went south. */ bail_out: diff --git a/usr/src/cmd/cmd-inet/usr.sbin/in.tftpd.c b/usr/src/cmd/cmd-inet/usr.sbin/in.tftpd.c index a515ab0c5f..fa79296469 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/in.tftpd.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/in.tftpd.c @@ -20,6 +20,7 @@ * * Copyright 2010 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright (c) 2016 by Delphix. All rights reserved. */ /* @@ -730,7 +731,7 @@ delay_exit(int ecode) /* * The most likely cause of an error here is that - * someone has broadcast an RRQ packet because s/he's + * something has broadcast an RRQ packet because it's * trying to boot and doesn't know who the server is. * Rather then sending an ERROR packet immediately, we * wait a while so that the real server has a better chance diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ipseckey.c b/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ipseckey.c index b0e4a38362..2b5a8e61fe 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ipseckey.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ipseckey.c @@ -20,6 +20,7 @@ */ /* * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016 by Delphix. All rights reserved. */ /* @@ -1727,7 +1728,7 @@ doaddup(int cmd, int satype, char *argv[], char *ebuf) switch (token) { case TOK_SPI: /* - * If some cretin types in "spi 0" then he/she + * If some cretin types in "spi 0" then they * can type in another SPI. */ if (assoc->sadb_sa_spi != 0) { diff --git a/usr/src/cmd/cron/at.c b/usr/src/cmd/cron/at.c index 68769c2f8a..128f041462 100644 --- a/usr/src/cmd/cron/at.c +++ b/usr/src/cmd/cron/at.c @@ -24,6 +24,7 @@ * * Copyright 2009 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 */ @@ -602,7 +603,7 @@ copy(char *jobfile, FILE *inputfile, int when) /* * Fix for 1053807: * Determine what shell we should use to run the job. If the user - * didn't explicitly request that his/her current shell be over- + * didn't explicitly request that their current shell be over- * ridden (shflag or cshflag), then we use the current shell. */ if (cshflag) diff --git a/usr/src/cmd/cron/atq.c b/usr/src/cmd/cron/atq.c index efa5ba4c34..34cfb9e98e 100644 --- a/usr/src/cmd/cron/atq.c +++ b/usr/src/cmd/cron/atq.c @@ -1,6 +1,7 @@ /* * Copyright 2009 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 */ @@ -229,7 +230,7 @@ countfiles(uid_t *uidlist, int nuids) * For each file in the queue, see if the user(s) own the file. We * have to use "entryfound" (rather than simply incrementing "numfiles") * so that if a person's name appears twice on the command line we - * don't double the number of files owned by him/her. + * don't double the number of files owned by that user. */ for (i = 0; i < numentries; i++) { if ((stat(queue[i]->d_name, &stbuf)) < 0) { @@ -276,7 +277,7 @@ printqueue(uid_t *uidlist, int nuids) * belonging to that person(s), otherwise print the entire queue. * Once again, we have to use "entryfound" (rather than simply * comparing each command line argument) so that if a person's name - * appears twice we don't print each file owned by him/her twice. + * appears twice we don't print each of their files twice. * * * "printrank", "printdate", and "printjobname" all take existing @@ -316,7 +317,7 @@ printqueue(uid_t *uidlist, int nuids) } /* - * Get the uid of a person using his/her login name. Return -1 if no + * Get the uid of a person using their login name. Return -1 if no * such account name exists. */ uid_t @@ -333,7 +334,7 @@ getid(char *name) } /* - * Get the full login name of a person using his/her user id. + * Get the full login name of a person using their user id. */ char * getname(uid_t uid) diff --git a/usr/src/cmd/cron/atrm.c b/usr/src/cmd/cron/atrm.c index d67d4d88c8..46e58fcf0f 100644 --- a/usr/src/cmd/cron/atrm.c +++ b/usr/src/cmd/cron/atrm.c @@ -1,6 +1,7 @@ /* * Copyright 2009 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 */ @@ -185,7 +186,7 @@ main(int argc, char **argv) continue; /* - * if argv is a username, compare his/her uid to + * if argv is a username, compare their uid to * the uid of the owner of the file...... */ if (pwd = getpwnam(*argv)) { @@ -240,7 +241,7 @@ usage(void) * print the job number that we are removing and the result of the access * check (either "permission denied" or "removed"). If we are running * interactively (iflag), prompt the user before we unlink the file. If - * the super-user is removing jobs, inform him/her who owns each file before + * the super-user is removing jobs, inform them who owns each file before * it is removed. Return TRUE if file removed, else FALSE. */ int @@ -370,7 +371,7 @@ getjoblist(struct dirent ***namelistp, struct stat ***statlistp, } /* - * Get the full login name of a person using his/her user id. + * Get the full login name of a person using their user id. */ char * getname(uid_t uid) diff --git a/usr/src/cmd/cron/cron.c b/usr/src/cmd/cron/cron.c index ab36d09037..55df389cd7 100644 --- a/usr/src/cmd/cron/cron.c +++ b/usr/src/cmd/cron/cron.c @@ -25,6 +25,7 @@ * Copyright 2013 Joshua M. Clulow <josh@sysmgr.org> * * Copyright (c) 2014 Gary Mills + * Copyright (c) 2016 by Delphix. All rights reserved. */ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ @@ -1452,7 +1453,7 @@ next_field(int lower, int upper) * if (numbers in this field are out of range (lower..upper), * or there is a syntax error) then * NULL is returned, and a mail message is sent to the - * user telling him which line the error was in. + * user telling them which line the error was in. */ char *s; @@ -2391,7 +2392,7 @@ ex(struct event *e) } /* - * set correct user identification and check his account + * set correct user identification and check their account */ r = set_user_cred(e->u, pproj); if (r == VUC_EXPIRED) { diff --git a/usr/src/cmd/csh/sh.c b/usr/src/cmd/csh/sh.c index 631a75d39d..3c7a898409 100644 --- a/usr/src/cmd/csh/sh.c +++ b/usr/src/cmd/csh/sh.c @@ -1,5 +1,6 @@ /* * Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016 by Delphix. All rights reserved. */ /* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ @@ -1080,8 +1081,8 @@ dosource(tchar **t) * If we are a login shell, then we don't want to tell * about any mail file unless its been modified * after the time we started. - * This prevents us from telling the user things he already - * knows, since the login program insists on saying + * This prevents us from telling the user things they already + * know, since the login program insists on saying * "You have mail." */ void diff --git a/usr/src/cmd/csh/sh.dir.c b/usr/src/cmd/csh/sh.dir.c index a7ee26fb4f..29031692f5 100644 --- a/usr/src/cmd/csh/sh.dir.c +++ b/usr/src/cmd/csh/sh.dir.c @@ -1,6 +1,7 @@ /* * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright (c) 2016 by Delphix. All rights reserved. */ /* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ @@ -49,7 +50,7 @@ dinit(tchar *hp) /* * If this is a login shell, we should have a home directory. But, * if we got here via 'su - <user>' where the user has no directory - * in his passwd file, then su has passed HOME=<nothing>, so hp is + * in their passwd file, then su has passed HOME=<nothing>, so hp is * non-null, but has zero length. Thus, we do not know the current * working directory based on the home directory. */ diff --git a/usr/src/cmd/eject/eject.c b/usr/src/cmd/eject/eject.c index e9ba98dc68..2b15707ea5 100644 --- a/usr/src/cmd/eject/eject.c +++ b/usr/src/cmd/eject/eject.c @@ -21,6 +21,7 @@ /* * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright (c) 2016 by Delphix. All rights reserved. */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -313,7 +314,7 @@ ejectit(char *name) /* * If volume management is either not running or not being managed by * vold, and the device is mounted, we try to umount the device. If we - * fail, we give up, unless he used the -f flag. + * fail, we give up, unless it used the -f flag. */ if (_dev_mounted(name)) { diff --git a/usr/src/cmd/expr/compile.c b/usr/src/cmd/expr/compile.c index cb619a5ff1..7dbb51dace 100644 --- a/usr/src/cmd/expr/compile.c +++ b/usr/src/cmd/expr/compile.c @@ -22,6 +22,7 @@ /* * Copyright 1995-2003 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright (c) 2016 by Delphix. All rights reserved. */ /* @@ -237,8 +238,8 @@ out: /* * Return code from libgen regcomp with mods. Note weird return * value - if space is malloc'd return pointer to start of space, - * if user provided his own space, return pointer to 1+last byte - * of his space. + * if user provided their own space, return pointer to 1+last byte + * of that space. */ if (regerrno != 0) { if (alloc) diff --git a/usr/src/cmd/filesync/action.c b/usr/src/cmd/filesync/action.c index 6f53ffd331..43d3557251 100644 --- a/usr/src/cmd/filesync/action.c +++ b/usr/src/cmd/filesync/action.c @@ -21,6 +21,7 @@ */ /* * Copyright (c) 1995 Sun Microsystems, Inc. All Rights Reserved + * Copyright (c) 2016 by Delphix. All rights reserved. * * module: * action.c @@ -625,7 +626,7 @@ do_copy(struct file *fp, side_t srcdst) * The first thing to do is ascertain whether or not * the alleged new copy might in fact be a new link. * We trust find_link to weigh all the various factors, - * so if he says make a link, we'll do it. + * so if it says make a link, we'll do it. */ lp = find_link(fp, srcdst); if (lp) { @@ -652,8 +653,8 @@ do_copy(struct file *fp, side_t srcdst) /* * if we couldn't do the unlink, we must * mark the linkee in conflict as well - * so his reference count remains the same - * in the baseline and he continues to show + * so its reference count remains the same + * in the baseline and it continues to show * up on the change list. */ if (rc != 0) { @@ -692,8 +693,8 @@ do_copy(struct file *fp, side_t srcdst) /* * if we failed to make a link, we want to * mark the linkee in conflict too, so that - * his reference count remains the same in - * the baseline, and he shows up on the change + * its reference count remains the same in + * the baseline, and it shows up on the change * list again next time. */ lp->f_flags |= F_CONFLICT; diff --git a/usr/src/cmd/filesync/filesync.h b/usr/src/cmd/filesync/filesync.h index 00d5957da1..ce88af0f5e 100644 --- a/usr/src/cmd/filesync/filesync.h +++ b/usr/src/cmd/filesync/filesync.h @@ -21,6 +21,7 @@ */ /* * Copyright (c) 1996 Sun Microsystems, Inc. All Rights Reserved + * Copyright (c) 2016 by Delphix. All rights reserved. * * module: * filesync.h @@ -142,7 +143,7 @@ extern uid_t my_uid; /* User ID for files I create */ extern gid_t my_gid; /* Group ID for files I create */ /* error and warning routines */ -void confirm(char *); /* ask user if he's sure */ +void confirm(char *); /* ask user if they're sure */ void nomem(char *); /* die from malloc failure */ /* routines for dealing with strings and file names */ diff --git a/usr/src/cmd/format/ctlr_scsi.c b/usr/src/cmd/format/ctlr_scsi.c index cb27deb78b..657be3f212 100644 --- a/usr/src/cmd/format/ctlr_scsi.c +++ b/usr/src/cmd/format/ctlr_scsi.c @@ -20,6 +20,7 @@ */ /* * Copyright (c) 1991, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016 by Delphix. All rights reserved. */ /* @@ -425,7 +426,7 @@ scsi_format(start, end, list) /* * Construct the uscsi format ioctl. The form depends - * upon the defect list the user extracted. If s/he + * upon the defect list the user extracted. If they * extracted the "original" list, we format with only * the P (manufacturer's defect) list. Otherwise, we * format with both the P and the G (grown) list. diff --git a/usr/src/cmd/format/hardware_structs.h b/usr/src/cmd/format/hardware_structs.h index 76e6472039..9ddda78a01 100644 --- a/usr/src/cmd/format/hardware_structs.h +++ b/usr/src/cmd/format/hardware_structs.h @@ -22,6 +22,7 @@ * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. * Copyright 2015 Nexenta Systems, Inc. All rights reserved. + * Copyright (c) 2016 by Delphix. All rights reserved. */ #ifndef _HARDWARE_STRUCTS_H @@ -175,7 +176,7 @@ struct ctlr_ops { /* * This structure describes a specific partition layout. It is malloc'd - * when the data file is read and whenever the user creates his own + * when the data file is read and whenever the user creates their own * partition layout. The link is used to make a list of possible * partition layouts for each drive type. */ diff --git a/usr/src/cmd/format/main.c b/usr/src/cmd/format/main.c index 5cdb72a825..4cc1105e0e 100644 --- a/usr/src/cmd/format/main.c +++ b/usr/src/cmd/format/main.c @@ -21,6 +21,7 @@ /* * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright (c) 2016 by Delphix. All rights reserved. */ /* @@ -444,7 +445,7 @@ init_globals(disk) pattern_buf = (void *) zalloc(BUF_SECTS * cur_blksz); /* - * Tell the user which disk (s)he selected. + * Tell the user which disk they selected. */ if (chk_volname(cur_disk)) { fmt_print("selecting %s: ", cur_disk->disk_name); @@ -490,7 +491,7 @@ init_globals(disk) } fmt_print("]"); /* - * Drive wasn't formatted. Tell the user in case he + * Drive wasn't formatted. Tell the user in case they * disagrees. */ } else if (EMBEDDED_SCSI) { diff --git a/usr/src/cmd/format/menu_command.c b/usr/src/cmd/format/menu_command.c index 142c4f119a..d288346d1a 100644 --- a/usr/src/cmd/format/menu_command.c +++ b/usr/src/cmd/format/menu_command.c @@ -24,6 +24,7 @@ * Copyright 2014 Toomas Soome <tsoome@me.com> * Copyright 2015 Nexenta Systems, Inc. All rights reserved. * Copyright 2016 Igor Kozhukhov <ikozhukhov@gmail.com> + * Copyright (c) 2016 by Delphix. All rights reserved. */ /* @@ -241,7 +242,7 @@ c_disk() } /* - * Determine total number of disks, and ask the user which disk he + * Determine total number of disks, and ask the user which disk they * would like to make current. */ @@ -415,7 +416,7 @@ c_type() index = input(FIO_INT, "Specify disk type (enter its number)", ':', &ioparam, defltptr, DATA_INPUT); /* - * Find the type s/he chose. + * Find the type they chose. */ if (index == auto_conf_choice) { float scaled; @@ -1095,7 +1096,7 @@ currently being used for swapping.\n"); * Print the time so that the user will know when format started. * Lock out interrupts. This could be a problem, since it could * cause the user to sit for quite awhile with no control, but we - * don't have any other good way of keeping his gun from going off. + * don't have any other good way of keeping their gun from going off. */ clock = time((time_t *)0); fmt_print("Beginning format. The current time is %s\n", @@ -1833,7 +1834,7 @@ c_defect() /* * If the user has modified the working list but not committed - * it, warn him that he is probably making a mistake. + * it, warn them that they are probably making a mistake. */ if (work_list.flags & LIST_DIRTY) { if (!EMBEDDED_SCSI) { diff --git a/usr/src/cmd/format/menu_defect.c b/usr/src/cmd/format/menu_defect.c index 55388253ae..2b6425b8cc 100644 --- a/usr/src/cmd/format/menu_defect.c +++ b/usr/src/cmd/format/menu_defect.c @@ -21,6 +21,7 @@ /* * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright (c) 2016 by Delphix. All rights reserved. */ /* @@ -37,7 +38,7 @@ /* * This is the working defect list. All the commands here operate on * the working list, except for 'commit'. This way the user can - * change his mind at any time without having mangled the current defect + * change their mind at any time without having mangled the current defect * list. */ struct defect_list work_list; @@ -199,7 +200,7 @@ d_extract() return (-1); /* - * If this takes a long time, let's ask the user if he + * If this takes a long time, let's ask the user if they * doesn't mind waiting. Note, for SCSI disks * this operation is instantaneous so we won't ask for * for confirmation. @@ -270,7 +271,7 @@ d_add() assert(!EMBEDDED_SCSI); /* - * Ask the user which mode of input he'd like to use. + * Ask the user which mode of input they'd like to use. */ fmt_print(" 0. bytes-from-index\n"); fmt_print(" 1. logical block\n"); diff --git a/usr/src/cmd/format/partition.c b/usr/src/cmd/format/partition.c index 3d06272904..80b4e964f0 100644 --- a/usr/src/cmd/format/partition.c +++ b/usr/src/cmd/format/partition.c @@ -21,6 +21,7 @@ /* * Copyright (c) 1991, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016 by Delphix. All rights reserved. */ /* @@ -197,7 +198,7 @@ change_partition(int num) return; } /* - * Print out the given partition so the user knows what he/she's + * Print out the given partition so the user knows what they're * getting into. */ print_partition(cur_parts, num, 1); diff --git a/usr/src/cmd/fs.d/pcfs/fsck/clusters.c b/usr/src/cmd/fs.d/pcfs/fsck/clusters.c index 07e6d4d4d2..43225fea91 100644 --- a/usr/src/cmd/fs.d/pcfs/fsck/clusters.c +++ b/usr/src/cmd/fs.d/pcfs/fsck/clusters.c @@ -22,6 +22,7 @@ /* * Copyright (c) 1999,2000 by Sun Microsystems, Inc. * All rights reserved. + * Copyright (c) 2016 by Delphix. All rights reserved. */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -307,8 +308,8 @@ seekCluster(int fd, int32_t clusterNum) /* * getcluster * Get cluster bytes off the disk. We always read those bytes into - * the same static buffer. If the caller wants his own copy of the - * data he'll have to make his own copy. We'll return all the data + * the same static buffer. If the caller wants its own copy of the + * data it'll have to make its own copy. We'll return all the data * read, even if it's short of a full cluster. This is for future use * when we might want to relocate any salvagable data from bad clusters. */ diff --git a/usr/src/cmd/fs.d/ufs/edquota/edquota.c b/usr/src/cmd/fs.d/ufs/edquota/edquota.c index daaab1fad8..385a75ea83 100644 --- a/usr/src/cmd/fs.d/ufs/edquota/edquota.c +++ b/usr/src/cmd/fs.d/ufs/edquota/edquota.c @@ -21,6 +21,7 @@ /* * Copyright 2008 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 */ @@ -282,7 +283,7 @@ editit(void) /* * Certain editors can exit with a non-zero status even * though everything is peachy. Best to ask the user what - * s/he really wants to do. (N.B.: if we're non-interactive + * they really wants to do. (N.B.: if we're non-interactive * we'll "break" the while loop before we get here.) */ if (WIFEXITED(status) && (WEXITSTATUS(status) != 0)) { diff --git a/usr/src/cmd/fs.d/ufs/fsck/utilities.c b/usr/src/cmd/fs.d/ufs/fsck/utilities.c index d87830669a..051979c81e 100644 --- a/usr/src/cmd/fs.d/ufs/fsck/utilities.c +++ b/usr/src/cmd/fs.d/ufs/fsck/utilities.c @@ -1,5 +1,6 @@ /* * Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016 by Delphix. All rights reserved. */ /* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ @@ -2314,7 +2315,7 @@ dirty(struct bufarea *bp) if (fswritefd < 0) { /* * No one should call dirty() in read only mode. - * But if one does, it's not fatal issue. Just warn him. + * But if one does, it's not fatal issue. Just warn them. */ pwarn("WON'T SET DIRTY FLAG IN READ_ONLY MODE\n"); } else { diff --git a/usr/src/cmd/ldap/common/common.c b/usr/src/cmd/ldap/common/common.c index 0f600d4301..dafdbb238f 100644 --- a/usr/src/cmd/ldap/common/common.c +++ b/usr/src/cmd/ldap/common/common.c @@ -8,21 +8,22 @@ * License Version 1.1 (the "License"); you may not use this file * except in compliance with the License. You may obtain a copy of * the License at http://www.mozilla.org/NPL/ - * + * * Software distributed under the License is distributed on an "AS * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is Mozilla Communicator client code, released * March 31, 1998. - * + * * The Initial Developer of the Original Code is Netscape * Communications Corporation. Portions created by Netscape are * Copyright (C) 1998-1999 Netscape Communications Corporation. All * Rights Reserved. - * - * Contributor(s): + * + * Contributor(s): + * Copyright (c) 2016 by Delphix. All rights reserved. */ /* @@ -75,7 +76,7 @@ static int wait4result( LDAP *ld, int msgid, struct berval **servercredp, static int parse_result( LDAP *ld, LDAPMessage *res, struct berval **servercredp, char *msg, int freeit ); -#ifdef LDAPTOOL_DEBUG_MEMORY +#ifdef LDAPTOOL_DEBUG_MEMORY static void *ldaptool_debug_malloc( size_t size ); static void *ldaptool_debug_calloc( size_t nelem, size_t elsize ); static void *ldaptool_debug_realloc( void *ptr, size_t size ); @@ -263,7 +264,7 @@ static char *ssl_donglefile = NULL; #if 0 static char *pkcs_pin = NULL; #endif -static struct ldapssl_pkcs_fns local_pkcs_fns = +static struct ldapssl_pkcs_fns local_pkcs_fns = {0,NULL,NULL,NULL,NULL,NULL,NULL,NULL, NULL }; #ifdef FORTEZZA @@ -582,15 +583,15 @@ ldaptool_process_args( int argc, char **argv, char *extra_opts, /* This option removed to prevent interference with the getEffectiveRights option, also -X case 'X': * path to FORTEZZA CKL file * - + fortezza_krlfile = strdup( optarg ); - - + + break; */ case 'I': /* FORTEZZA PIN (password file) */ ssl_donglefile = strdup( optarg ); - + break; #endif /* LDAP_TOOL_PKCS11 */ @@ -634,7 +635,7 @@ ldaptool_process_args( int argc, char **argv, char *extra_opts, perror( "malloc" ); exit( LDAP_NO_MEMORY ); } - + break; case 'k': /* conversion directory */ ldaptool_convdir = strdup( optarg ); @@ -672,9 +673,9 @@ ldaptool_process_args( int argc, char **argv, char *extra_opts, } ldctrl = calloc(1,sizeof(LDAPControl)); if (ctrl_value) { - rc = ldaptool_berval_from_ldif_value( ctrl_value, + rc = ldaptool_berval_from_ldif_value( ctrl_value, vlen, &(ldctrl->ldctl_value), - 1 /* recognize file URLs */, + 1 /* recognize file URLs */, 0 /* always try file */, 1 /* report errors */ ); if ((rc = ldaptool_fileurlerr2ldaperr( rc )) != LDAP_SUCCESS) { @@ -704,7 +705,7 @@ ldaptool_process_args( int argc, char **argv, char *extra_opts, /* If '-Z' is specified, check if '-P' is specified too. */ if ( isN || isW ) { if ( !isZ ) { - fprintf( stderr, gettext("%s: with -N, -W options, please specify -Z\n\n"), ldaptool_progname ); + fprintf( stderr, gettext("%s: with -N, -W options, please specify -Z\n\n"), ldaptool_progname ); return (-1); } } @@ -815,14 +816,14 @@ ldaptool_process_args( int argc, char **argv, char *extra_opts, #ifdef HAVE_SASL_OPTIONS if (ldapauth == LDAP_AUTH_SASL) { - /* BindDN not required for SASL */ + /* BindDN not required for SASL */ ldaptool_require_binddn = 0; } #endif /* HAVE_SASL_OPTIONS */ #ifdef NET_SSL if (secure == 1) { - /* BindDN not required for SSL */ + /* BindDN not required for SSL */ ldaptool_require_binddn = 0; } #endif /* NET_SSL */ @@ -853,7 +854,7 @@ ldaptool_process_args( int argc, char **argv, char *extra_opts, #ifdef LDAP_TOOL_PKCS11 if ((NULL != pkcs_token) && (NULL != ssl_certname)) { char *result; - + if ( (result = buildTokenCertName( pkcs_token, ssl_certname)) != NULL){ free( ssl_certname ); ssl_certname = result; @@ -889,15 +890,15 @@ ldaptool_process_args( int argc, char **argv, char *extra_opts, static void print_library_info( const LDAPAPIInfo *aip, FILE *fp ) { - int i; - LDAPAPIFeatureInfo fi; + int i; + LDAPAPIFeatureInfo fi; fprintf( fp, gettext("LDAP Library Information -\n" " Highest supported protocol version: %d\n" " LDAP API revision: %d\n" " API vendor name: %s\n" " Vendor-specific version: %.2f\n"), - aip->ldapai_protocol_version, aip->ldapai_api_version, + aip->ldapai_protocol_version, aip->ldapai_api_version, aip->ldapai_vendor_name, (float)aip->ldapai_vendor_version / 100.0 ); @@ -929,9 +930,9 @@ print_library_info( const LDAPAPIInfo *aip, FILE *fp ) #ifdef LDAP_TOOL_ARGPIN static int PinArgRegistration( void ) { - + /* pkcs_init was successful register the pin args */ - + SVRCOREArgPinObj *ArgPinObj; char *tokenName; #ifndef _WIN32 @@ -982,7 +983,7 @@ static int PinArgRegistration( void ) } SVRCORE_RegisterPinObj((SVRCOREPinObj *)ArgPinObj); - + } else { @@ -1015,7 +1016,7 @@ static int PinArgRegistration( void ) } #endif return LDAP_SUCCESS; - + } #endif /* LDAP_TOOL_ARGPIN */ @@ -1034,7 +1035,7 @@ ldaptool_ldap_init( int second_host ) if ( ldaptool_not ) { return( NULL ); } - + if ( second_host ) { host = ldaptool_host2; port = ldaptool_port2; @@ -1059,7 +1060,7 @@ ldaptool_ldap_init( int second_host ) #ifdef LDAP_TOOL_PKCS11 ldaptool_setcallbacks( &local_pkcs_fns ); - if ( !second_host && secure + if ( !second_host && secure &&(rc = ldapssl_pkcs_init( &local_pkcs_fns)) < 0) { /* secure connection requested -- fail if no SSL */ #ifndef SOLARIS_LDAP_CMD @@ -1079,7 +1080,7 @@ ldaptool_ldap_init( int second_host ) #endif /* LDAP_TOOL_ARGPIN */ #else /* LDAP_TOOL_PKCS11 */ - if ( !second_host && secure + if ( !second_host && secure &&(rc = ldapssl_client_init( ssl_certdbpath, NULL )) < 0) { /* secure connection requested -- fail if no SSL */ #ifndef SOLARIS_LDAP_CMD @@ -1102,7 +1103,7 @@ ldaptool_ldap_init( int second_host ) if ( !user_port ) { port = LDAPS_PORT; } - + if (( ld = ldapssl_init( host, port, secure )) != NULL && ssl_certname != NULL ) if (ldapssl_enable_clientauth( ld, ssl_keydbpath, ssl_passwd, @@ -1237,7 +1238,7 @@ ldaptool_bind( LDAP *ld ) return; } } - + defaults = ldaptool_set_sasl_defaults( ld, sasl_mech, sasl_authid, sasl_username, passwd, sasl_realm ); if (defaults == NULL) { perror ("malloc"); @@ -1636,14 +1637,14 @@ parse_result( LDAP *ld, LDAPMessage *res, struct berval **servercredp, if ( 0 == strcmp( ctrls[i]->ldctl_oid, LDAP_CONTROL_PWEXPIRING )) { - /* Warn the user his passwd is to expire */ - errno = 0; + /* Warn the user that their passwd is to expire */ + errno = 0; pw_secs = atoi(ctrls[i]->ldctl_value.bv_val); if ( pw_secs > 0 && errno != ERANGE ) { if ( pw_secs > 86400 ) { pw_days = ( pw_secs / 86400 ); pw_secs = ( pw_secs % 86400 ); - } + } if ( pw_secs > 3600 ) { pw_hrs = ( pw_secs / 3600 ); pw_secs = ( pw_secs % 3600 ); @@ -1664,7 +1665,7 @@ parse_result( LDAP *ld, LDAPMessage *res, struct berval **servercredp, printf (gettext("%d mins, "), pw_mins); } printf(gettext("%d seconds.\n"), pw_secs); - + } } } @@ -1727,7 +1728,7 @@ ldaptool_create_proxyauth_control( LDAP *ld ) { LDAPControl *ctl = NULL; int rc; - + if ( !proxyauth_id) return( NULL ); @@ -1737,7 +1738,7 @@ ldaptool_create_proxyauth_control( LDAP *ld ) } else { rc = ldap_create_proxyauth_control( ld, proxyauth_id, 1, &ctl); } - if ( rc != LDAP_SUCCESS) + if ( rc != LDAP_SUCCESS) { if (ctl) ldap_control_free( ctl); @@ -1753,11 +1754,11 @@ ldaptool_create_geteffectiveRights_control ( LDAP *ld, const char *authzid, { LDAPControl *ctl = NULL; int rc; - + rc = ldap_create_geteffectiveRights_control( ld, authzid, attrlist, 1, &ctl); - - if ( rc != LDAP_SUCCESS) + + if ( rc != LDAP_SUCCESS) { if (ctl) ldap_control_free( ctl); @@ -1771,7 +1772,7 @@ ldaptool_create_geteffectiveRights_control ( LDAP *ld, const char *authzid, void ldaptool_add_control_to_array( LDAPControl *ctrl, LDAPControl **array) { - + int i; for (i=0; i< CONTROL_REQUESTS; i++) { @@ -1822,7 +1823,7 @@ calculate_ctrl_value( const char *value, if ( b64 ) { if (( *vlen = ldif_base64_decode( (char *)value, (unsigned char *)value )) < 0 ) { - fprintf( stderr, + fprintf( stderr, gettext("Unable to decode base64 control value \"%s\"\n"), value); return( -1 ); } @@ -1834,7 +1835,7 @@ calculate_ctrl_value( const char *value, /* * Parse the optarg from -J option of ldapsearch - * and within LDIFfile for ldapmodify. Take ctrl_arg + * and within LDIFfile for ldapmodify. Take ctrl_arg * (the whole string) and divide it into oid, criticality * and value. This function breaks down original ctrl_arg * with '\0' in places. Also, calculate length of valuestring. @@ -1854,7 +1855,7 @@ ldaptool_parse_ctrl_arg(char *ctrl_arg, char sep, strict = (sep == ' ' ? 1 : 0); if(!(s=strchr(ctrl_arg, sep))) { - /* Possible values of ctrl_arg are + /* Possible values of ctrl_arg are * oid[:value|::b64value|:<fileurl] within LDIF, i.e. sep=' ' * oid from command line option, i.e. sep=':' */ @@ -1899,7 +1900,7 @@ ldaptool_parse_ctrl_arg(char *ctrl_arg, char sep, } } else { - if (*(s+1) == '\0') { + if (*(s+1) == '\0') { fprintf( stderr, gettext("missing value\n") ); return ( -1 ); } @@ -1996,7 +1997,7 @@ ldaptool_berval_is_ascii( const struct berval *bvp ) } -#ifdef LDAP_DEBUG_MEMORY +#ifdef LDAP_DEBUG_MEMORY #define LDAPTOOL_ALLOC_FREED 0xF001 #define LDAPTOOL_ALLOC_INUSE 0xF002 @@ -2139,7 +2140,7 @@ certpath2keypath( char *certdbpath ) strcasecmp( "cert.db", keydbpath + len - 7 ) == 0 ) { striplen = 7; appendstr = "key.db"; - + } else if ( len > 8 && strcasecmp( "cert5.db", keydbpath + len - 8 ) == 0 ) { striplen = 8; @@ -2163,15 +2164,15 @@ certpath2keypath( char *certdbpath ) } #ifdef LDAP_TOOL_PKCS11 -static -char * +static +char * buildTokenCertName( const char *tokenName, const char *certName) { - + int tokenlen = strlen(tokenName); int len = tokenlen + strlen(certName) +2; char *result; - + if (( result = malloc( len )) != NULL) { strcpy(result, tokenName); *(result+tokenlen) = ':'; @@ -2190,7 +2191,7 @@ static int ldaptool_getcertpath( void *context, char **certlocp ) { - + *certlocp = ssl_certdbpath; if ( ldaptool_verbose ) { if (ssl_certdbpath) @@ -2201,15 +2202,15 @@ ldaptool_getcertpath( void *context, char **certlocp ) { printf(gettext("ldaptool_getcertpath -- (null)\n")); } - + } return LDAP_SUCCESS; } int ldaptool_getcertname( void *context, char **certnamep ) -{ - +{ + *certnamep = ssl_certname; if ( ldaptool_verbose ) { if (ssl_certname) @@ -2238,14 +2239,14 @@ ldaptool_getkeypath(void *context, char **keylocp ) printf(gettext("ldaptool_getkeypath -- (null)\n")); } } - + return LDAP_SUCCESS; } int ldaptool_gettokenname( void *context, char **tokennamep ) { - + *tokennamep = pkcs_token; if ( ldaptool_verbose ) { if (pkcs_token) @@ -2263,19 +2264,19 @@ ldaptool_gettokenname( void *context, char **tokennamep ) int ldaptool_gettokenpin( void *context, const char *tokennamep, char **tokenpinp) { - + #if 0 char *localtoken; #endif -/* XXXceb this stuff is removed for the time being. +/* XXXceb this stuff is removed for the time being. * This function should return the pin from ssl_password */ *tokenpinp = ssl_passwd; return LDAP_SUCCESS; - + #if 0 ldaptool_gettokenname( NULL, &localtoken); @@ -2283,7 +2284,7 @@ ldaptool_gettokenpin( void *context, const char *tokennamep, char **tokenpinp) if (strcmp( localtoken, tokennamep)) *tokenpinp = pkcs_pin; - else + else *tokenpinp = NULL; if ( ldaptool_verbose ) { @@ -2314,7 +2315,7 @@ ldaptool_getmodpath( void *context, char **modulep ) printf(gettext("ldaptool_getmodpath -- (null)\n")); } } - + return LDAP_SUCCESS; } @@ -2331,9 +2332,9 @@ ldaptool_getdonglefilename( void *context, char **filename ) { printf(gettext("ldaptool_getdonglefilename -- (null)\n")); } - + } - + return LDAP_SUCCESS; } @@ -2469,11 +2470,11 @@ ldaptool_boolean_str2value ( const char *ptr, int strict ) !(strcmp(ptr, "0")) ) { return (0); } - else { + else { return (-1); - } + } } -} +} FILE * ldaptool_open_file(const char *filename, const char *mode) @@ -2559,7 +2560,7 @@ void L_Remove(Element *Node, Head *HeadNode) #endif #ifdef HAVE_SASL_OPTIONS -/* +/* * Function checks for valid args, returns an error if not found * and sets SASL params from command line */ @@ -2576,7 +2577,7 @@ saslSetParam(char *saslarg) } *attr = '\0'; attr++; - + if (!strcasecmp(saslarg, "secProp")) { if ( sasl_secprops != NULL ) { fprintf( stderr, gettext("secProp previously specified\n")); @@ -2625,7 +2626,7 @@ saslSetParam(char *saslarg) } else { fprintf (stderr, gettext("Invalid attribute name %s\n"), saslarg); return (-1); - } + } return 0; } #endif /* HAVE_SASL_OPTIONS */ diff --git a/usr/src/cmd/ldap/ns_ldap/ldapclient.c b/usr/src/cmd/ldap/ns_ldap/ldapclient.c index e0159ccbc3..937172feb2 100644 --- a/usr/src/cmd/ldap/ns_ldap/ldapclient.c +++ b/usr/src/cmd/ldap/ns_ldap/ldapclient.c @@ -22,6 +22,7 @@ * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. * Copyright 2012 Milan Jurik. All rights reserved. + * Copyright (c) 2016 by Delphix. All rights reserved. */ /* @@ -1523,7 +1524,7 @@ client_init(clientopts_t *arglist) cfg.SA_CRED = "proxy"; /* * We don't want to force users to always specify authentication - * method when we can infer it. If users want SSL, he/she would + * method when we can infer it. If users want SSL, they would * have to specify appropriate -a though. */ auth.type = NS_LDAP_AUTH_SIMPLE; diff --git a/usr/src/cmd/lp/cmd/lpadmin/do_align.c b/usr/src/cmd/lp/cmd/lpadmin/do_align.c index ed845761bf..8cf40b6f20 100644 --- a/usr/src/cmd/lp/cmd/lpadmin/do_align.c +++ b/usr/src/cmd/lp/cmd/lpadmin/do_align.c @@ -25,6 +25,7 @@ /* * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright (c) 2016 by Delphix. All rights reserved. */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -183,7 +184,7 @@ int do_align (printer, form, pwheel) * feature is likely to be used much, so why hassle the * administrator? #if defined(WARN_OF_TOO_MANY_LINES) - * However, do warn him or her. + * However, do warn them. #endif */ diff --git a/usr/src/cmd/lp/cmd/lpadmin/do_printer.c b/usr/src/cmd/lp/cmd/lpadmin/do_printer.c index 66ab3f2803..c1807965f7 100644 --- a/usr/src/cmd/lp/cmd/lpadmin/do_printer.c +++ b/usr/src/cmd/lp/cmd/lpadmin/do_printer.c @@ -25,6 +25,7 @@ /* * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright (c) 2016 by Delphix. All rights reserved. */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -185,7 +186,7 @@ void do_printer () /* * Mount or unmount form, print-wheel. */ - if (M) + if (M) do_mount(p, (f? f : (char *)0), (S? *S : (char *)0)); else if (t) do_max_trays(p); @@ -312,7 +313,7 @@ Done: if (r) { if (STREQU(r, NAME_ALL) || STREQU(r, NAME_ANY)) fromallclasses(p); - else + else fromclass(p, r); } @@ -382,7 +383,7 @@ static void configure_printer (list) /* * If we are making this a local printer, make * sure that some local-only attributes are set. - * (If the user has specified these as well, his/her + * (If the user has specified these as well, their * values will overwrite what we set here.) */ } else if (oldp->remote) { @@ -685,7 +686,7 @@ char *nameit (cmd) { register char *nm = getname(), *copy = malloc( - (unsigned) (strlen(cmd) + 1 + + (unsigned) (strlen(cmd) + 1 + strlen(nm) + 1) ); diff --git a/usr/src/cmd/lp/cmd/lpsched/disp1.c b/usr/src/cmd/lp/cmd/lpsched/disp1.c index d8e667550d..b3f96ccd21 100644 --- a/usr/src/cmd/lp/cmd/lpsched/disp1.c +++ b/usr/src/cmd/lp/cmd/lpsched/disp1.c @@ -20,6 +20,7 @@ */ /* * Copyright (c) 1989, 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 */ @@ -547,7 +548,7 @@ s_end_change_request(char *m, MESG *md) rp->request->outcome |= RS_HELD; /* * To be here means either the user owns - * the request or he or she is the + * the request or they are the * administrator. Since we don't want to * set the RS_ADMINHELD flag if the user * is the administrator, the following diff --git a/usr/src/cmd/lp/cmd/lpsched/exec.c b/usr/src/cmd/lp/cmd/lpsched/exec.c index df88c57f21..4bd1da4a91 100644 --- a/usr/src/cmd/lp/cmd/lpsched/exec.c +++ b/usr/src/cmd/lp/cmd/lpsched/exec.c @@ -21,6 +21,7 @@ /* * Copyright (c) 1989, 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 */ @@ -328,7 +329,7 @@ exec(int type, ...) request = printer->request; ep = printer->exec; break; - + case EX_FAULT_MESSAGE: printer = va_arg(args, PSTATUS *); request = va_arg(args, RSTATUS *); @@ -336,7 +337,7 @@ exec(int type, ...) return(0); } ep = printer->fault_exec; - printerName = (printer->printer && printer->printer->name + printerName = (printer->printer && printer->printer->name ? printer->printer->name : "??"); snprintf(nameBuf, sizeof (nameBuf), "%s (on %s)\n", printerName, Local_System); @@ -474,7 +475,7 @@ exec(int type, ...) * Open the standard input, standard output, and standard error. */ switch (type) { - + case EX_SLOWF: case EX_INTERF: /* @@ -584,7 +585,7 @@ exec(int type, ...) printer->printer->device); if (ret != 0) Done (ret, errno); - + if (!(request->request->outcome & RS_FILTERED)) file_list = request->request->file_list; @@ -718,7 +719,7 @@ exec(int type, ...) */ cp = strchr(request->secure->user, '@'); - allTraysWithForm(printer, request->form); + allTraysWithForm(printer, request->form); /* * Fix for 4137389 @@ -881,7 +882,7 @@ exec(int type, ...) */ argbuf[0] = '\0'; - + if (printer->printer->options) { char **tmp = printer->printer->options; while(*tmp != NULL) { @@ -959,8 +960,8 @@ exec(int type, ...) /* * Do the ``raw'' bit last, to ensure it gets - * done. If the user doesn't want this, then he or - * she can do the correct thing using -o stty= + * done. If the user doesn't want this, then they + * can do the correct thing using -o stty= * and leaving out the -r option. */ if (request->request->actions & ACT_RAW) { @@ -1179,7 +1180,7 @@ exec(int type, ...) } else if (initgroups(pwp->pw_name, procgid) < 0) { note("initgroups() call failed %d\n", errno); } - + setgid (procgid); setuid (procuid); @@ -1245,7 +1246,7 @@ Fork1(EXEC *ep) close(fds[1]); ep->md = 0; return (-1); - + case 0: ChildMd = mconnect(NULL, fds[1], fds[1]); return (0); @@ -1268,10 +1269,10 @@ Fork2(void) case -1: Done (EXEC_EXIT_NFORK, errno); /*NOTREACHED*/ - + case 0: return; - + default: /* * Delay calling "ignore_fault_signals()" as long @@ -1319,7 +1320,7 @@ cool_heels(void) WaitedChildPid = 0; while ((WaitedChildPid = wait(&status)) != ChildPid) ; - + if ( EXITED(status) > EXEC_EXIT_USER && EXITED(status) != EXEC_EXIT_FAULT diff --git a/usr/src/cmd/lp/cmd/lpsched/pickfilter.c b/usr/src/cmd/lp/cmd/lpsched/pickfilter.c index e5aa5b817b..29247b781f 100644 --- a/usr/src/cmd/lp/cmd/lpsched/pickfilter.c +++ b/usr/src/cmd/lp/cmd/lpsched/pickfilter.c @@ -22,6 +22,7 @@ /* * Copyright 1996 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 */ @@ -44,7 +45,7 @@ * BUT we'll leave LP_SEP inside single quotes alone! * * This is to allow the following case (and the like) to work correctly: - * prtitle='standard input' + * prtitle='standard input' */ void @@ -329,7 +330,7 @@ pickfilter(RSTATUS *prs, CANDIDATE *pc, FSTATUS *pfs) /* * Don't try using a filter if the user doesn't want - * a filter to be used! He or she would rather see an + * a filter to be used! They would rather see an * error message than (heaven forbid!) a filter being * used. */ diff --git a/usr/src/cmd/lp/cmd/lpsched/ports.c b/usr/src/cmd/lp/cmd/lpsched/ports.c index cf1e8a226f..e82198d02d 100644 --- a/usr/src/cmd/lp/cmd/lpsched/ports.c +++ b/usr/src/cmd/lp/cmd/lpsched/ports.c @@ -25,6 +25,7 @@ /* * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright (c) 2016 by Delphix. All rights reserved. */ #include "termio.h" @@ -118,7 +119,7 @@ open_dialup(char *ptype, PRINTER *pp) * override the default in the interface progam. * Putting the override in ".stty" allows the user * to override us (although it would be probably be - * silly for him or her to do so.) + * silly for them to do so.) */ if (ioctl(1, TCGETS, &tios) < 0) { ioctl(1, TCGETA, &tio); diff --git a/usr/src/cmd/lp/cmd/lpsched/validate.c b/usr/src/cmd/lp/cmd/lpsched/validate.c index 635220180f..377b0d67e1 100644 --- a/usr/src/cmd/lp/cmd/lpsched/validate.c +++ b/usr/src/cmd/lp/cmd/lpsched/validate.c @@ -21,6 +21,7 @@ /* * Copyright 2007 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 */ @@ -168,10 +169,10 @@ _validate(RSTATUS *prs, PSTATUS *pps, PSTATUS *stop_pps, char **prefixp, * the Spooler's job is SPOOLING, not PRINTING. That's right, * except that the Spooler will be making a choice of printers * so it has to evaluate carefully: E.g. user wants ANY printer, - * so we should pick one that can handle what he/she wants. - * + * so we should pick one that can handle what they want. + * * Parse out the important stuff here so we have it when we - * need it. + * need it. */ { register char **list, @@ -873,7 +874,7 @@ _chkopts(RSTATUS *prs, CANDIDATE *pc, FSTATUS *pfs) * character set. (Note: The check for the print wheel case * is done elsewhere.) */ - + if (pc->pps->printer->daisy || search_cslist(prs->request->charset, pc->pps->printer->char_sets)) charset = 0; diff --git a/usr/src/cmd/lp/filter/postscript/dpost/dpost.c b/usr/src/cmd/lp/filter/postscript/dpost/dpost.c index 28afb1db18..0aa8ae1b3b 100644 --- a/usr/src/cmd/lp/filter/postscript/dpost/dpost.c +++ b/usr/src/cmd/lp/filter/postscript/dpost/dpost.c @@ -22,6 +22,7 @@ /* * Copyright 2005 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 */ @@ -210,7 +211,7 @@ * of page independence. If you don't approve append *drawfile to *prologue and * make sure *drawfile can't be read when DPOST runs. * - * Many default values, like the magnification and orientation, are defined in + * Many default values, like the magnification and orientation, are defined in * the prologue, which is where they belong. If they're changed (by options), an * appropriate definition is made after the prologue is added to the output file. * The -P option passes arbitrary PostScript through to the output file. Among @@ -220,7 +221,7 @@ * * output language from troff: * all numbers are character strings - * + * * sn size in points * fn font as number from 1-n * cx ascii character x @@ -254,7 +255,7 @@ * x f n s font position n contains font s * x H n set character height to n * x S n set slant to N - * + * * Subcommands like "i" are often spelled out like "init". * */ @@ -1352,7 +1353,7 @@ fontinit(void) * font position, just to be sure device emulation works reasonably well - there's * no guarantee *devname's special fonts match what's needed when *realdev's tables * are used. - * + * */ @@ -1708,7 +1709,7 @@ resetpos(void) * done something that may have wiped it out, and we want to force dpost to set * the printer's position before printing text or whatever. For example stroke or * fill implicitly do a newpath, and that wipes out the current point, unless the - * calls were bracketed by a gsave/grestore pair. + * calls were bracketed by a gsave/grestore pair. * */ @@ -1779,7 +1780,7 @@ t_page(int pg) * restore so it can be easily redefined to have side-effects in the printer's VM. * Although it seems reasonable I haven't implemented it, because it makes other * things, like selectively setting manual feed or choosing an alternate paper - * tray, clumsy - at least on a per page basis. + * tray, clumsy - at least on a per page basis. * */ diff --git a/usr/src/cmd/lp/lib/access/bang.c b/usr/src/cmd/lp/lib/access/bang.c index 9e68839f78..642ca9e85b 100644 --- a/usr/src/cmd/lp/lib/access/bang.c +++ b/usr/src/cmd/lp/lib/access/bang.c @@ -22,6 +22,7 @@ /* * Copyright 1999 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 */ @@ -123,7 +124,7 @@ bangequ (char *user1p, char *user2p) (void) snprintf(sysname2, sizeof (sysname2), "%s", Nodenamep); (void) snprintf(username2, sizeof (username2), "%s", user1p); } - + sysname2_all = STREQU (NAME_ALL, sysname2); username2_all = STREQU (NAME_ALL, username2); @@ -193,16 +194,16 @@ bang_dellist(char ***plist, char *item) * ALL matching items in the list are deleted. * * Now suppose the list contains just the word ``all'', and - * the item to be deleted is the name ``fred''. What will + * the item to be deleted is the name ``foo''. What will * happen? The word ``all'' will be deleted, leaving the list * empty (null)! This may sound odd at first, but keep in mind * that this routine is paired with the regular "addlist()" - * routine; the item (``fred'') is ADDED to an opposite list + * routine; the item (``foo'') is ADDED to an opposite list * (we are either deleting from a deny list and adding to an allow * list or vice versa). So, to continue the example, if previously - * ``all'' were allowed, removing ``fred'' from the allow list - * does indeed empty that list, but then putting him in the deny - * list means only ``fred'' is denied, which is the effect we + * ``all'' were allowed, removing ``foo'' from the allow list + * does indeed empty that list, but then putting it in the deny + * list means only ``foo'' is denied, which is the effect we * want. */ diff --git a/usr/src/cmd/lp/lib/lp/alerts.c b/usr/src/cmd/lp/lib/lp/alerts.c index 34c8ac1160..85c8b03a23 100644 --- a/usr/src/cmd/lp/lib/lp/alerts.c +++ b/usr/src/cmd/lp/lib/lp/alerts.c @@ -22,6 +22,7 @@ /* * Copyright 1997 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 */ @@ -73,7 +74,7 @@ static struct { /* * These are used to bracket the administrator's command, so that * we can find it easily. We're out of luck if the administrator - * includes an identical phrase in his or her command. + * includes an identical phrase in their command. */ #define ALRT_CMDSTART "## YOUR COMMAND STARTS HERE -- DON'T TOUCH ABOVE!!" #define ALRT_CMDEND "## YOUR COMMAND ENDS HERE -- DON'T TOUCH BELOW!!" 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. */ diff --git a/usr/src/cmd/make/bin/doname.cc b/usr/src/cmd/make/bin/doname.cc index 85be203973..c97e1593a6 100644 --- a/usr/src/cmd/make/bin/doname.cc +++ b/usr/src/cmd/make/bin/doname.cc @@ -23,6 +23,7 @@ * Use is subject to license terms. * * Copyright 2016 RackTop Systems. + * Copyright (c) 2016 by Delphix. All rights reserved. */ /* @@ -463,7 +464,7 @@ recheck_target: /* * after making the call to dynamic_dependecies unconditional we can handle - * target names that are same as file name. In this case $$@ in the + * target names that are same as file name. In this case $$@ in the * dependencies did not mean anything. WIth this change it expands it * as expected. */ @@ -619,7 +620,7 @@ recheck_target: * Regression! See BugId 1255360 * If more than one percent rules are defined for the same target then * the behaviour of 'make' with my previous fix may be different from one - * of the 'old make'. + * of the 'old make'. * The global variable second_pass (maybe it should be an argument to doname()) * is intended to avoid this regression. It is set in doname_check(). * First, 'make' will work as it worked before. Only when it is @@ -722,7 +723,7 @@ r_command: if ((command != NULL) && (command->body.line.command_template != NULL)) { if (result != build_failed) { - result = run_command(command, + result = run_command(command, (Boolean) ((parallel || save_parallel) && !silent)); } switch (result) { @@ -902,7 +903,7 @@ r_command: * * Return value: * True returned if some dependencies left running - * + * * Parameters: * result Pointer to cell we update if build failed * line We get the dependencies from here @@ -1081,7 +1082,7 @@ check_dependencies(Doname *result, Property line, Boolean do_get, Name target, N true_target->stat.time = dependency->name->stat.time; true_target->stat.time.tv_sec--; } else { - /* Dina: + /* Dina: * The next statement is commented * out as a fix for bug #1051032. * if dependency hasn't changed @@ -1627,7 +1628,7 @@ run_command(register Property line, Boolean) keep_state && !remember_only) { (void) exists(make_state); - if((strlen(temp_file_directory) == 1) && + if((strlen(temp_file_directory) == 1) && (temp_file_directory[0] == '/')) { tmp_file_path[0] = '\0'; } else { @@ -1744,7 +1745,7 @@ run_command(register Property line, Boolean) * Return value: * The result of the command build * - * Parameters: + * Parameters: * line The command to execute * * Static variables used: @@ -1865,15 +1866,15 @@ execute_serial(Property line) if(spro) { char *val = spro->body.env_mem.value; if(val != NULL) { - /* + /* * Do not return memory allocated for SUNPRO_DEPENDENCIES - * It will be returned in setvar_daemon() in macro.cc + * It will be returned in setvar_daemon() in macro.cc */ // retmem_mb(val); spro->body.env_mem.value = NULL; } } - + return result; } @@ -1953,14 +1954,14 @@ check_state(Name temp_file_name) } /* - * Then read the temp file that now might - * contain dependency reports from utilities + * Then read the temp file that now might + * contain dependency reports from utilities */ read_dependency_file(temp_file_name); /* * And reread .make.state if it - * changed (the command ran recursive makes) + * changed (the command ran recursive makes) */ check_read_state_file(); if (temp_file_name != NULL) { @@ -2263,7 +2264,7 @@ build_command_strings(Name target, register Property line) Chain hat_list = NULL; Chain *hat_list_tail = &hat_list; - for (Dependency dependency = line->body.line.dependencies; + for (Dependency dependency = line->body.line.dependencies; dependency != NULL; dependency = dependency->next) { /* skip automatic dependencies */ @@ -2271,10 +2272,10 @@ build_command_strings(Name target, register Property line) if ((dependency->name != force) && (dependency->stale == false)) { *hat_list_tail = ALLOC(Chain); - + if (dependency->name->is_member && (get_prop(dependency->name->prop, member_prop) != NULL)) { - (*hat_list_tail)->name = + (*hat_list_tail)->name = get_prop(dependency->name->prop, member_prop)->body.member.member; } else { @@ -2592,14 +2593,14 @@ update_target(Property line, Doname result) /* * [tolik] Additional fix for bug 1063790. It was fixed * for serial make long ago, but DMake dumps core when - * target is a symlink and sccs file is newer then target. + * target is a symlink and sccs file is newer then target. * In this case, finish_children() calls update_target() * with line==NULL. */ if(line == NULL) { /* XXX. Should we do anything here? */ return; - } + } target = line->body.line.target; @@ -2778,7 +2779,7 @@ sccs_get(register Name target, register Property *command) (target->prop->body.sccs.file) && (target->prop->body.sccs.file->string_mb)) { if((strlen(target->prop->body.sccs.file->string_mb) == - strlen(target->string_mb) + 2) && + strlen(target->string_mb) + 2) && (target->prop->body.sccs.file->string_mb[0] == 's') && (target->prop->body.sccs.file->string_mb[1] == '.')) { @@ -3164,7 +3165,7 @@ target_can_be_built(register Name target) { if (result == build_dont_know) { result = find_percent_rule(target, NULL, false); } - + /* try to find double suffix rule */ if (result == build_dont_know) { if (target->is_member) { @@ -3178,17 +3179,17 @@ target_can_be_built(register Name target) { result = find_double_suffix_rule(target, NULL, false); } } - + /* try to find suffix rule */ if ((result == build_dont_know) && second_pass) { result = find_suffix_rule(target, target, empty_name, NULL, false); } - + /* check for sccs */ if (result == build_dont_know) { result = sccs_get(target, NULL); } - + /* try to find dyn target */ if (result == build_dont_know) { Name dtarg = find_dyntarget(target); @@ -3196,7 +3197,7 @@ target_can_be_built(register Name target) { result = target_can_be_built(dtarg); } } - + /* check whether target was mentioned in makefile */ if (result == build_dont_know) { if (target->colons != no_colon) { diff --git a/usr/src/cmd/mdb/common/kmdb/kctl/kctl_wr.c b/usr/src/cmd/mdb/common/kmdb/kctl/kctl_wr.c index b9d54edc02..b89950e20f 100644 --- a/usr/src/cmd/mdb/common/kmdb/kctl/kctl_wr.c +++ b/usr/src/cmd/mdb/common/kmdb/kctl/kctl_wr.c @@ -21,6 +21,7 @@ /* * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright (c) 2016 by Delphix. All rights reserved. */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -72,7 +73,7 @@ kctl_wr_process_cb(kmdb_wr_t *wn, void *arg) if (unloading) { /* * If the user didn't wait for all dmods to load before - * she triggered the debugger unload, we may have some + * they triggered the debugger unload, we may have some * dmod load requests on the queue in front of the * blizzard of dmod unload requests that the debugger * will generate as part of its unload. The debugger diff --git a/usr/src/cmd/mdb/common/modules/genunix/modhash.c b/usr/src/cmd/mdb/common/modules/genunix/modhash.c index fa9c4a7bcc..b5c207de36 100644 --- a/usr/src/cmd/mdb/common/modules/genunix/modhash.c +++ b/usr/src/cmd/mdb/common/modules/genunix/modhash.c @@ -22,6 +22,7 @@ /* * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright (c) 2016 by Delphix. All rights reserved. */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -403,7 +404,7 @@ modhash(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv) "permitted\n"); return (DCMD_USAGE); } - /* we force short mode here, no matter what he says */ + /* we force short mode here, no matter what it says */ new_argv[0].a_type = MDB_TYPE_STRING; new_argv[0].a_un.a_str = opt_t ? "-st" : "-s"; if (mdb_walk_dcmd("modhash", "modhash", 1, new_argv) == -1) { diff --git a/usr/src/cmd/mpathadm/mpathadm.c b/usr/src/cmd/mpathadm/mpathadm.c index 615fa25144..407bbdbeab 100644 --- a/usr/src/cmd/mpathadm/mpathadm.c +++ b/usr/src/cmd/mpathadm/mpathadm.c @@ -21,6 +21,7 @@ /* * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright (c) 2016 by Delphix. All rights reserved. */ /* @@ -1126,7 +1127,7 @@ compareLUName(MP_CHAR *cmpString, MP_CHAR *deviceProperty) * Displays info about an LU * * luOid - LU to list - * luProps - properties of he LU to list + * luProps - properties of the LU to list * * **************************************************************************** */ @@ -1265,7 +1266,7 @@ showLogicalUnit(int operandLen, char *operand[]) * Displays info about an LU * * luOid - LU to show - * luProps - properties of he LU to show + * luProps - properties of the LU to show * pluginProps - propertis of the plugin this LU belongs to * * **************************************************************************** diff --git a/usr/src/cmd/nscd/cache.c b/usr/src/cmd/nscd/cache.c index 709611547e..2ffb95c30d 100644 --- a/usr/src/cmd/nscd/cache.c +++ b/usr/src/cmd/nscd/cache.c @@ -21,6 +21,7 @@ /* * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2012 Milan Jurik. All rights reserved. + * Copyright (c) 2016 by Delphix. All rights reserved. */ /* @@ -1276,7 +1277,7 @@ check_config(nsc_lookup_args_t *largs, nscd_cfg_cache_t *cfgp, } /* - * if caller requests lookup using his + * if caller requests lookup using its * own nsswitch config, bypass cache */ if (nsw_config_in_phdr(largs->buffer)) diff --git a/usr/src/cmd/nscd/server.c b/usr/src/cmd/nscd/server.c index 85d7572f6b..b8fe888f54 100644 --- a/usr/src/cmd/nscd/server.c +++ b/usr/src/cmd/nscd/server.c @@ -20,6 +20,7 @@ */ /* * Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016 by Delphix. All rights reserved. */ /* @@ -144,7 +145,7 @@ main(int argc, char ** argv) } /* - * Special case non-root user here - he can just print stats + * Special case non-root user here - they can only print stats */ if (geteuid()) { if (argc != 2 || diff --git a/usr/src/cmd/pg/pg.c b/usr/src/cmd/pg/pg.c index 5408ee79c0..7988800c79 100644 --- a/usr/src/cmd/pg/pg.c +++ b/usr/src/cmd/pg/pg.c @@ -21,6 +21,7 @@ /* * Copyright (c) 1989, 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 */ @@ -516,7 +517,7 @@ char *filename; /* * Wait for output to drain before going on. * This is done so that the user will not hit - * break and quit before he has seen the prompt. + * break and quit before they have seen the prompt. */ (void) ioctl(1, TCSBRK, 1); if (setjmp(restore) > 0) diff --git a/usr/src/cmd/rcm_daemon/common/ttymux_rcm.c b/usr/src/cmd/rcm_daemon/common/ttymux_rcm.c index f8c2b17a41..5b50679a3e 100644 --- a/usr/src/cmd/rcm_daemon/common/ttymux_rcm.c +++ b/usr/src/cmd/rcm_daemon/common/ttymux_rcm.c @@ -22,6 +22,7 @@ /* * Copyright 2004 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright (c) 2016 by Delphix. All rights reserved. */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -917,7 +918,7 @@ rsrc_unavailable(rsrc_t *rsrc) * greater than zero then a resource which uses rsrc will only be * returned if it is associated with >= redundancy dependents. * - * Thus, provided that the caller keeps the list locked he can iterate + * Thus, provided that the caller keeps the list locked it can iterate * through all the resources in the cache that depend upon rsrc. */ static rsrc_t * diff --git a/usr/src/cmd/rpcsvc/rpc.bootparamd/bootparam_subr.c b/usr/src/cmd/rpcsvc/rpc.bootparamd/bootparam_subr.c index 9a9dd01af3..e82b6c2226 100644 --- a/usr/src/cmd/rpcsvc/rpc.bootparamd/bootparam_subr.c +++ b/usr/src/cmd/rpcsvc/rpc.bootparamd/bootparam_subr.c @@ -22,6 +22,7 @@ /* * Copyright 1999-2003 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright (c) 2016 by Delphix. All rights reserved. */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -177,8 +178,8 @@ bootparamproc_getfile_1(bp_getfile_arg *argp, CLIENT *cl) * * file_key=server_hostname:path_on_server * - * In the getfile RPC call, the client gives us his hostname - * and a file_key. We lookup his client entry, then locate a + * In the getfile RPC call, the client gives us its hostname + * and a file_key. We lookup its client entry, then locate a * file entry matching that file_key. We then parse out the * server_hostname and path_on_server from the file entry, map * the server_hostname to an IP address, and return both the diff --git a/usr/src/cmd/sendmail/aux/vacation.c b/usr/src/cmd/sendmail/aux/vacation.c index ce922d3c41..d1f3675985 100644 --- a/usr/src/cmd/sendmail/aux/vacation.c +++ b/usr/src/cmd/sendmail/aux/vacation.c @@ -1,6 +1,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) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T * All Rights Reserved @@ -47,7 +48,7 @@ static char SccsId[] = "%W% %E% SMI"; * For best operation, this program should run setuid to * root or uucp or someone else that sendmail will believe * a -f flag from. Otherwise, the user must be careful - * to include a header on his .vacation.msg file. + * to include a header on their .vacation.msg file. * * Positional Parameters: * the user to collect the vacation message from. diff --git a/usr/src/cmd/sendmail/src/conf.c b/usr/src/cmd/sendmail/src/conf.c index f5504c0b56..8c8ca6e788 100644 --- a/usr/src/cmd/sendmail/src/conf.c +++ b/usr/src/cmd/sendmail/src/conf.c @@ -14,6 +14,7 @@ /* * Copyright 1999-2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright (c) 2016 by Delphix. All rights reserved. */ #include <sendmail.h> @@ -1152,7 +1153,7 @@ username() ** TTYPATH -- Get the path of the user's tty ** ** Returns the pathname of the user's tty. Returns NULL if -** the user is not logged in or if s/he has write permission +** the user is not logged in or if they have write permission ** denied. ** ** Parameters: diff --git a/usr/src/cmd/sendmail/src/envelope.c b/usr/src/cmd/sendmail/src/envelope.c index 022c3ca8b2..80fa857e84 100644 --- a/usr/src/cmd/sendmail/src/envelope.c +++ b/usr/src/cmd/sendmail/src/envelope.c @@ -10,7 +10,9 @@ * the sendmail distribution. * */ - +/* + * Copyright (c) 2016 by Delphix. All rights reserved. + */ #include <sendmail.h> SM_RCSID("@(#)$Id: envelope.c,v 8.310 2009/12/18 17:08:01 ca Exp $") @@ -930,7 +932,7 @@ closexscript(e) ** SETSENDER -- set the person who this message is from ** ** Under certain circumstances allow the user to say who -** s/he is (using -f or -r). These are: +** they are (using -f or -r). These are: ** 1. The user's uid is zero (root). ** 2. The user's login name is in an approved list (typically ** from a network server). diff --git a/usr/src/cmd/sendmail/src/savemail.c b/usr/src/cmd/sendmail/src/savemail.c index 4178245cc5..97816041e8 100644 --- a/usr/src/cmd/sendmail/src/savemail.c +++ b/usr/src/cmd/sendmail/src/savemail.c @@ -10,7 +10,9 @@ * the sendmail distribution. * */ - +/* + * Copyright (c) 2016 by Delphix. All rights reserved. + */ #include <sendmail.h> SM_RCSID("@(#)$Id: savemail.c,v 8.314 2009/12/18 17:08:01 ca Exp $") @@ -23,7 +25,7 @@ static bool pruneroute __P((char *)); ** ** If mailing back errors, mail it back to the originator ** together with an error message; otherwise, just put it in -** dead.letter in the user's home directory (if he exists on +** dead.letter in the user's home directory (if they exist on ** this machine). ** ** Parameters: @@ -37,7 +39,7 @@ static bool pruneroute __P((char *)); ** ** Side Effects: ** Saves the letter, by writing or mailing it back to the -** sender, or by putting it in dead.letter in her home +** sender, or by putting it in dead.letter in their home ** directory. */ diff --git a/usr/src/cmd/soelim/soelim.c b/usr/src/cmd/soelim/soelim.c index 02acc14a4b..68dbb14b8e 100644 --- a/usr/src/cmd/soelim/soelim.c +++ b/usr/src/cmd/soelim/soelim.c @@ -1,6 +1,7 @@ /* * Copyright 2005 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 */ @@ -24,7 +25,7 @@ * This program eliminates .so's from a n/troff input stream. * It can be used to prepare safe input for submission to the * phototypesetter since the software supporting the operator - * doesn't let him do chdir. + * doesn't let them do chdir. * * This is a kludge and the operator should be given the * ability to do chdir. diff --git a/usr/src/cmd/stat/fsstat/fsstat.c b/usr/src/cmd/stat/fsstat/fsstat.c index 31b2f5e054..5563f410ca 100644 --- a/usr/src/cmd/stat/fsstat/fsstat.c +++ b/usr/src/cmd/stat/fsstat/fsstat.c @@ -21,6 +21,7 @@ /* * Copyright 2010 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright (c) 2016 by Delphix. All rights reserved. */ #include <stdio.h> @@ -1031,7 +1032,7 @@ main(int argc, char *argv[]) * If we're only displaying FStypes (-F) then don't * complain about any file systems that might not * be loaded. Otherwise, let the user know that - * he chose poorly. + * they chose poorly. */ if (fstypes_only == B_FALSE) { (void) fprintf(stderr, gettext( diff --git a/usr/src/cmd/sulogin/sulogin.c b/usr/src/cmd/sulogin/sulogin.c index 0693ca1d6b..f242af0e68 100644 --- a/usr/src/cmd/sulogin/sulogin.c +++ b/usr/src/cmd/sulogin/sulogin.c @@ -21,6 +21,7 @@ /* * Copyright 2013 Nexenta Systems, Inc. All rights reserved. + * Copyright (c) 2016 by Delphix. All rights reserved. */ /* @@ -777,7 +778,7 @@ childcleanup(int sig) /* Only need to kill the child that became the shell. */ for (i = 0; i < nchild; i++) { - /* Don't kill gramps before his time */ + /* Don't kill grandparent before it's necessary */ if (pidlist[i] != getppid()) (void) sigsend(P_PID, pidlist[i], SIGHUP); } diff --git a/usr/src/cmd/svc/configd/configd.c b/usr/src/cmd/svc/configd/configd.c index cdff0ef574..3f3902c258 100644 --- a/usr/src/cmd/svc/configd/configd.c +++ b/usr/src/cmd/svc/configd/configd.c @@ -25,6 +25,7 @@ /* * Copyright (c) 2012, Joyent, Inc. All rights reserved. + * Copyright (c) 2016 by Delphix. All rights reserved. */ #include <assert.h> @@ -353,11 +354,11 @@ create_connection(ucred_t *uc, repository_door_request_t *rp, sizeof (info)) return (REPOSITORY_DOOR_FAIL_PERMISSION_DENIED); - privileged = 1; /* he gets full privileges */ + privileged = 1; /* it gets full privileges */ } else if (privileged_user != 0) { /* * in privileged user mode, only one particular user is - * allowed to connect to us, and he can do anything. + * allowed to connect to us, and they can do anything. */ if (ucred_geteuid(uc) != privileged_user) return (REPOSITORY_DOOR_FAIL_PERMISSION_DENIED); diff --git a/usr/src/cmd/svc/configd/file_object.c b/usr/src/cmd/svc/configd/file_object.c index ad1da04d8f..3f4fe478c6 100644 --- a/usr/src/cmd/svc/configd/file_object.c +++ b/usr/src/cmd/svc/configd/file_object.c @@ -21,6 +21,7 @@ /* * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright (c) 2016 by Delphix. All rights reserved. */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -247,7 +248,7 @@ pg_lnk_tbl_delete(delete_info_t *dip, const delete_ent_t *ent) /* * For non-persistent backends, we could only have one parent, and - * he's already been deleted. + * it's already been deleted. * * For normal backends, we need to check to see if we're in * a snapshot or are the active generation for the property diff --git a/usr/src/cmd/svc/configd/rc_node.c b/usr/src/cmd/svc/configd/rc_node.c index 3cc30e3e67..ec885d44f4 100644 --- a/usr/src/cmd/svc/configd/rc_node.c +++ b/usr/src/cmd/svc/configd/rc_node.c @@ -22,6 +22,7 @@ /* * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2013, Joyent, Inc. All rights reserved. + * Copyright (c) 2016 by Delphix. All rights reserved. */ /* @@ -585,11 +586,11 @@ static audit_special_prop_item_t special_props_list[] = { * Clients use their position in the list to track which notifications they * have not yet reported. As they process notifications, they move forward * in the list past them. There is always a client at the beginning of the - * list -- as he moves past notifications, he removes them from the list and + * list -- as it moves past notifications, it removes them from the list and * cleans them up. * * The rc_pg_notify_lock protects all notification state. The rc_pg_notify_cv - * is used for global signalling, and each client has a cv which he waits for + * is used for global signalling, and each client has a cv which it waits for * events of interest on. * * rc_notify_in_use is used to protect rc_notify_list from deletions when diff --git a/usr/src/cmd/svc/svcs/svcs.c b/usr/src/cmd/svc/svcs/svcs.c index 2bd5387daf..501c51a9d8 100644 --- a/usr/src/cmd/svc/svcs/svcs.c +++ b/usr/src/cmd/svc/svcs/svcs.c @@ -22,7 +22,7 @@ /* * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2011, Joyent, Inc. All rights reserved. - * Copyright (c) 2015 by Delphix. All rights reserved. + * Copyright (c) 2015, 2016 by Delphix. All rights reserved. */ /* @@ -2493,7 +2493,7 @@ print_detailed(void *unused, scf_walkinfo_t *wip) /* * Property values may be longer than max_scf_fmri_length, but these * shouldn't be, so we'll just reuse buf. The user can use svcprop if - * he suspects something fishy. + * they suspect something fishy. */ if (scf_instance_get_pg(wip->inst, SCF_PG_RESTARTER, rpg) != 0) { if (scf_error() != SCF_ERROR_NOT_FOUND) diff --git a/usr/src/cmd/tar/tar.c b/usr/src/cmd/tar/tar.c index e5cc47ac24..7b15c3c2b2 100644 --- a/usr/src/cmd/tar/tar.c +++ b/usr/src/cmd/tar/tar.c @@ -22,6 +22,7 @@ * Copyright (c) 1988, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2012 Milan Jurik. All rights reserved. * Copyright 2015 Joyent, Inc. + * Copyright (c) 2016 by Delphix. All rights reserved. */ /* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ @@ -1464,7 +1465,7 @@ dorep(char *argv[]) * endtape checks the entry in dblock.dbuf to see if its the * special EOT entry. Endtape is usually called after getdir(). * - * endtape used to call backtape; it no longer does, he who + * endtape used to call backtape; it no longer does, it who * wants it backed up must call backtape himself * RETURNS: 0 if not EOT, tape position unaffected * 1 if EOT, tape position unaffected diff --git a/usr/src/cmd/utmpd/utmpd.c b/usr/src/cmd/utmpd/utmpd.c index f6e6d13a41..d1abc313b8 100644 --- a/usr/src/cmd/utmpd/utmpd.c +++ b/usr/src/cmd/utmpd/utmpd.c @@ -20,6 +20,7 @@ */ /* * Copyright 2014, 2015 Shruti V Sampat <shrutisampat@gmail.com> + * Copyright (c) 2016 by Delphix. All rights reserved. */ /* @@ -728,7 +729,7 @@ add_pid(pid_t pid) */ if (pid != 0 && (fd = proc_to_fd(pid)) == -1) { /* - * No so the process died before we got to watch for him + * No, so the process died before we got to watch for it. */ return; } diff --git a/usr/src/cmd/vi/port/ex_cmdsub.c b/usr/src/cmd/vi/port/ex_cmdsub.c index 0260d334fe..d908fa785f 100644 --- a/usr/src/cmd/vi/port/ex_cmdsub.c +++ b/usr/src/cmd/vi/port/ex_cmdsub.c @@ -21,6 +21,7 @@ /* * Copyright (c) 1989, 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 */ @@ -477,14 +478,14 @@ pragged(bool kill) if (!kill) getDOT(); - + /* * Copy "abcd" into genbuf. * Note that gp points to 'c'. */ strcpy(genbuf, linebuf); - + /* * Get last line of undo area ("3") into linebuf. */ @@ -492,7 +493,7 @@ pragged(bool kill) getaline(*unddol); if (kill) *pkill[1] = 0; - + /* * Concatenate trailing end of current line @@ -520,7 +521,7 @@ pragged(bool kill) getaline(dol[1]); if (kill) strcLIN(pkill[0]); - + /* * Copy the first line of the undo save area * over what is pointed to by sp. @@ -528,7 +529,7 @@ pragged(bool kill) */ strcpy(gp, linebuf); - + /* * Now copy genbuf back into linebuf. * linebuf = "ab1" @@ -662,8 +663,8 @@ badtag: /* * Loop once for each file in tags "path". - * - * System tags array limits to 4k (tags[ONMSZ]) long, + * + * System tags array limits to 4k (tags[ONMSZ]) long, * therefore, tagfbuf should be able to hold all tags. */ @@ -780,7 +781,7 @@ badtags: if (*savedfile) { savetag((char *)savedfile); } -#endif +#endif strcpy(cmdbuf, cp); if (strcmp(filebuf, savedfile) || !edited) { unsigned char cmdbuf2[sizeof filebuf + 10]; @@ -908,7 +909,7 @@ badtags2: if (*savedfile) { savetag((char *)savedfile); } -#endif +#endif strcpy(cmdbuf, cp); if (strcmp(filebuf, savedfile) || !edited) { unsigned char cmdbuf2[sizeof filebuf + 10]; @@ -1209,7 +1210,7 @@ undo(bool c) if (inglobal && inopen <= 0) error(value(vi_TERSE) ? gettext("Can't undo in global") : gettext("Can't undo in global commands")); - + /* * Unless flag indicates a forced undo, make sure * there really was a change before trying to undo it. @@ -1217,7 +1218,7 @@ undo(bool c) if (!c) somechange(); - + /* * Update change flags. */ @@ -1296,7 +1297,7 @@ undo(bool c) * then we must move the text between undap1 and undap2 * and it must not be at the bottom of the file */ - + if ((i = (kp = undap2) - (jp = undap1)) > 0) { if (kp != dolp1) { @@ -1330,18 +1331,18 @@ undo(bool c) } /* * Unddel, the line just before the spot where this - * test was deleted, may have moved. Account for + * test was deleted, may have moved. Account for * this in restoration of saved deleted lines. */ if (unddel >= jp) unddel -= i; - + /* * The last line (dol) may have changed, * account for this. */ newdol -= i; - + /* * For the case where no lines are restored, dot * is the line before the first line deleted. @@ -1356,25 +1357,25 @@ undo(bool c) unddel = undap1 - 1; squish(); } - + /* * Set jp to the line where deleted text is to be added. */ jp = unddel + 1; - + /* * Set kp to end of undo save area. * * If there is any deleted text to be added, do reverses. */ - + if ((i = (kp = unddol) - dol) > 0) { - + /* * If deleted lines are not to be appended * to the bottom of the file... */ - + if (jp != dolp1) { /* * FILE: LINE START REV1 REV2 REV3 @@ -1398,7 +1399,7 @@ undo(bool c) * 7) mn mn kl 56 * unddol: 8) op op ij 78 */ - + reverse(jp, dolp1); reverse(dolp1, ++kp); reverse(jp, kp); @@ -1414,11 +1415,11 @@ undo(bool c) * Dot is the first resurrected line. */ dot = jp; - + /* * Account for a shift in the last line (dol). */ - + newdol += i; } /* @@ -1434,17 +1435,17 @@ undo(bool c) undadot = newadot; } else undkind = UNDCHANGE; - /* - * Now relocate all marks for lines that were modified, - * since the marks point to lines whose address has - * been modified from the save area to the current - * area - */ - - for (j=unddol; j> dol; j--) - for (k=0; k<=25; k++) - if (names[k] == *(j)) - names[k]= *((undap1+(j-dolp1)) ); + /* + * Now relocate all marks for lines that were modified, + * since the marks point to lines whose address has + * been modified from the save area to the current + * area + */ + + for (j=unddol; j> dol; j--) + for (k=0; k<=25; k++) + if (names[k] == *(j)) + names[k]= *((undap1+(j-dolp1)) ); } /* * Defensive programming - after a munged undadot. @@ -1623,7 +1624,7 @@ addmac(unsigned char *src, unsigned char *dest, unsigned char *dname, * We don't let the user rob himself of ":", and making * multi char words is a bad idea so we don't allow it. * Note that if user sets mapinput and maps all of return, - * linefeed, and escape, he can hurt himself. This is + * linefeed, and escape, they can hurt themself. This is * so weird I don't bother to check for it. */ if (isalpha(src[0]) && isascii(src[0]) && src[1] || any(src[0],":")) @@ -1651,7 +1652,7 @@ addmac(unsigned char *src, unsigned char *dest, unsigned char *dname, zer = slot; /* remember an empty slot */ } } - + if (slot >= MAXNOMACS) error(gettext("Too many macros")); @@ -1805,7 +1806,7 @@ bool quick; } if (!tag_depth) error(gettext("Tagstack empty.")); - + /* change to old file */ if (strcmp(tagstack[tag_depth-1].tag_file, savedfile) ) { if (!quick) { diff --git a/usr/src/cmd/vi/port/ex_io.c b/usr/src/cmd/vi/port/ex_io.c index e63fab87ae..fd11f486a0 100644 --- a/usr/src/cmd/vi/port/ex_io.c +++ b/usr/src/cmd/vi/port/ex_io.c @@ -21,6 +21,7 @@ /* * Copyright (c) 1989, 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 */ @@ -392,7 +393,7 @@ rop(int c) if (c == 'e' && errno == ENOENT) { edited++; /* - * If the user just did "ex foo" he is probably + * If the user just did "ex foo" they're probably * creating a new file. Don't be an error, since * this is ugly, and it messes up the + option. */ @@ -450,7 +451,7 @@ rop(int c) /* If it is a read command, then we must set dot to addr1 * (value of N in :Nr ). In the default case, addr1 will * already be set to dot. - * + * * Next, it is necessary to mark the beginning (undap1) and * ending (undap2) addresses affected (for undo). Note that * rop2() and rop3() will adjust the value of undap2. @@ -535,7 +536,7 @@ samei(struct stat64 *sp, unsigned char *cp) { struct stat64 stb; - if (stat64((char *)cp, &stb) < 0) + if (stat64((char *)cp, &stb) < 0) return (0); return (IDENTICAL((*sp), stb)); } @@ -589,7 +590,7 @@ gettext("No current filename")); case 0: if (!exclam && (!value(vi_WRITEANY) || value(vi_READONLY))) switch (edfile()) { - + case NOTEDF: if (nonexist) break; diff --git a/usr/src/cmd/vi/port/ex_unix.c b/usr/src/cmd/vi/port/ex_unix.c index 94c5816630..5a050acf06 100644 --- a/usr/src/cmd/vi/port/ex_unix.c +++ b/usr/src/cmd/vi/port/ex_unix.c @@ -21,6 +21,7 @@ /* * Copyright 2007 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 */ @@ -138,8 +139,8 @@ gettext("No previous command to substitute for !")); * * The user has just entered ":!!" which * means that though there is only technically - * one '!' we know he really meant ":!!!". So - * substitute the last command for him. + * one '!' we know they really meant ":!!!". So + * substitute the last command for them. */ fp = puxb; if (*fp == 0) { @@ -166,7 +167,7 @@ gettext("No previous command to substitute for !")); error(gettext("Command too long")); } *up++ = c; - } + } break; case '#': @@ -390,7 +391,7 @@ vi_filter(int mode) error(gettext("No more processes")); } if (pid2 == 0) { - extern unsigned char tfname[]; + extern unsigned char tfname[]; setrupt(); io = pvec[1]; close(pvec[0]); diff --git a/usr/src/cmd/vi/port/expreserve.c b/usr/src/cmd/vi/port/expreserve.c index 5c648eaef1..11d0c3e36f 100644 --- a/usr/src/cmd/vi/port/expreserve.c +++ b/usr/src/cmd/vi/port/expreserve.c @@ -22,6 +22,7 @@ /* * Copyright 2005 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 */ @@ -392,7 +393,7 @@ mknext(unsigned char *dir, unsigned char *cp) } /* - * Notify user uid that his file fname has been saved. + * Notify user uid that their file fname has been saved. */ void notify(int uid, unsigned char *fname, int flag, int cryflag) @@ -437,7 +438,7 @@ was killed or was unable to save your changes.\n", fname, (cryflag) ? "[ENCRYPTE fprintf(mf, "This buffer can be retrieved using the \"recover\" command of the editor.\n"); fprintf(mf, -"An easy way to do this is to give the command \"vi -r %s\".\n", +"An easy way to do this is to give the command \"vi -r %s\".\n", (fname[0] == 0) ? "LOST" : (char *) fname); fprintf(mf, "This works for \"edit\" and \"ex\" also.\n"); (void) pclose(mf); diff --git a/usr/src/cmd/vscan/vscand/vs_eng.c b/usr/src/cmd/vscan/vscand/vs_eng.c index 434dee01cc..d4888cb02a 100644 --- a/usr/src/cmd/vscan/vscand/vs_eng.c +++ b/usr/src/cmd/vscan/vscand/vs_eng.c @@ -21,6 +21,7 @@ /* * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright (c) 2016 by Delphix. All rights reserved. */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -70,7 +71,7 @@ * seconds will be closed by the housekeeper thread. * * When a scan engine is reconfigured to have less connections - * (or is disabled) any of he superflous connections which are in + * (or is disabled) any of the superflous connections which are in * AVAILABLE state are closed (DISCONNECTED). Others are set to * CLOSE_PENDING to be closed (DISCONNECTED) when the engine is * released (when the current request completes). diff --git a/usr/src/cmd/write/write.c b/usr/src/cmd/write/write.c index f2db2a1413..7518cf85ab 100644 --- a/usr/src/cmd/write/write.c +++ b/usr/src/cmd/write/write.c @@ -26,6 +26,7 @@ /* * Copyright 2004 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright (c) 2016 by Delphix. All rights reserved. */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -232,7 +233,7 @@ main(int argc, char **argv) /* If this is the second terminal, print out the first. In all */ /* cases of multiple terminals, list out all the other terminals */ -/* so the user can restart knowing what her/his choices are. */ +/* so the user can restart knowing what their choices are. */ else if (terminal == NULL) { if (count == 1 && bad == 0) { @@ -515,7 +516,7 @@ eof() /* * permit: check mode of terminal - if not writable by all disallow writing to - * (even the user him/herself cannot therefore write to their own tty) + * (even the user cannot therefore write to their own tty) */ static int @@ -546,7 +547,7 @@ char *term; /* * permit1: check mode of terminal - if not writable by all disallow writing - * to (even the user him/herself cannot therefore write to their own tty) + * to (even the user themself cannot therefore write to their own tty) */ /* this is used with fstat (which is faster than stat) where possible */ diff --git a/usr/src/cmd/ypcmd/mknetid/mknetid.c b/usr/src/cmd/ypcmd/mknetid/mknetid.c index 85a1661b81..1cc0d85057 100644 --- a/usr/src/cmd/ypcmd/mknetid/mknetid.c +++ b/usr/src/cmd/ypcmd/mknetid/mknetid.c @@ -21,6 +21,7 @@ /* * Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016 by Delphix. All rights reserved. */ /* @@ -59,7 +60,7 @@ extern char *strcpy(); /* * The group list - * Store username and groups to which he/she belongs + * Store username and groups to which they belong */ struct group_list { char *user; diff --git a/usr/src/cmd/ypcmd/ypcat.c b/usr/src/cmd/ypcmd/ypcat.c index 130f90d661..38fd403e19 100644 --- a/usr/src/cmd/ypcmd/ypcat.c +++ b/usr/src/cmd/ypcmd/ypcat.c @@ -21,6 +21,7 @@ * * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright (c) 2016 by Delphix. All rights reserved. */ /* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ @@ -37,7 +38,7 @@ /* * This is a user command which dumps each entry in a yp data base. It gets * the stuff using the normal ypclnt package; the user doesn't get to choose - * which server gives him the input. Usage is: + * which server gives them the input. Usage is: * ypcat [-k] [-d domain] [-t] map * ypcat -x * where the -k switch will dump keys followed by a single blank space diff --git a/usr/src/cmd/ypcmd/yppush.c b/usr/src/cmd/ypcmd/yppush.c index 4659ea57bb..f24eb7c6d8 100644 --- a/usr/src/cmd/ypcmd/yppush.c +++ b/usr/src/cmd/ypcmd/yppush.c @@ -28,7 +28,9 @@ * 4.3 BSD under license from the Regents of the University of * California. */ - +/* + * Copyright (c) 2016 by Delphix. All rights reserved. + */ #pragma ident "%Z%%M% %I% %E% SMI" #define _SVID_GETTOD @@ -993,7 +995,7 @@ get_xfr_response(SVCXPRT *transp) * This sends a message to a single ypserv process. The return value is * a state value. If the RPC call fails because of a version * mismatch, we'll assume that we're talking to a version 1 ypserv process, - * and will send him an old "YPPROC_GET" request, as was defined in the + * and will send it an old "YPPROC_GET" request, as was defined in the * earlier version of yp_prot.h */ static unsigned short diff --git a/usr/src/cmd/ypcmd/ypserv_proc.c b/usr/src/cmd/ypcmd/ypserv_proc.c index c5e8bc7c16..4958ac4016 100644 --- a/usr/src/cmd/ypcmd/ypserv_proc.c +++ b/usr/src/cmd/ypcmd/ypserv_proc.c @@ -22,6 +22,7 @@ /* * Copyright 2003 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright (c) 2016 by Delphix. All rights reserved. */ /* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ @@ -171,7 +172,7 @@ ypdomain(SVCXPRT *transp, bool always_respond) * This case is the one in which the domain is not * supported, and in which we are not to respond in the * unsupported case. We are going to make an error happen - * to allow the portmapper to end his wait without the + * to allow the portmapper to end its wait without the * normal timeout period. The assumption here is that * the only process in the world which is using the function * in its no-answer-if-nack form is the portmapper, which is diff --git a/usr/src/cmd/ypcmd/ypxfr.c b/usr/src/cmd/ypcmd/ypxfr.c index c6a8d403aa..e8fb165297 100644 --- a/usr/src/cmd/ypcmd/ypxfr.c +++ b/usr/src/cmd/ypcmd/ypxfr.c @@ -21,6 +21,7 @@ * * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright (c) 2016 by Delphix. All rights reserved. */ /* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ @@ -37,7 +38,7 @@ * server, and gets it to the local site by using the normal NIS client * enumeration functions. The map is copied to a temp name, then the real * map is removed and the temp map is moved to the real name. ypxfr then - * sends a "YPPROC_CLEAR" message to the local server to insure that he will + * sends a "YPPROC_CLEAR" message to the local server to insure that it will * not hold a removed map open, so serving an obsolete version. * * ypxfr [ -h <host> ] [ -d <domainname> ] @@ -1828,7 +1829,7 @@ xfr_exit(status) /* * This sets up a UDP connection to the yppush process which contacted our - * parent ypserv, and sends him a status on the requested transfer. + * parent ypserv, and sends it a status on the requested transfer. */ void send_callback(status) diff --git a/usr/src/cmd/zoneadmd/vplat.c b/usr/src/cmd/zoneadmd/vplat.c index cb741397ca..d76fbbf9f7 100644 --- a/usr/src/cmd/zoneadmd/vplat.c +++ b/usr/src/cmd/zoneadmd/vplat.c @@ -22,7 +22,7 @@ /* * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2013, Joyent Inc. All rights reserved. - * Copyright (c) 2015 by Delphix. All rights reserved. + * Copyright (c) 2015, 2016 by Delphix. All rights reserved. */ /* @@ -465,7 +465,7 @@ make_one_dir(zlog_t *zlogp, const char *prefix, const char *subdir, mode_t mode, /* * We don't check the file mode since presumably the zone * administrator may have had good reason to change the mode, - * and we don't need to second guess him. + * and we don't need to second guess them. */ if (!S_ISDIR(st.st_mode)) { if (S_ISREG(st.st_mode)) { @@ -1234,11 +1234,12 @@ mount_one(zlog_t *zlogp, struct zone_fstab *fsptr, const char *rootpath, /* * In general the strategy here is to do just as much verification as * necessary to avoid crashing or otherwise doing something bad; if the - * administrator initiated the operation via zoneadm(1m), he'll get - * auto-verification which will let him know what's wrong. If he - * modifies the zone configuration of a running zone and doesn't attempt - * to verify that it's OK we won't crash but won't bother trying to be - * too helpful either. zoneadm verify is only a couple keystrokes away. + * administrator initiated the operation via zoneadm(1m), they'll get + * auto-verification which will let them know what's wrong. If they + * modify the zone configuration of a running zone, and don't attempt + * to verify that it's OK, then we won't crash but won't bother trying + * to be too helpful either. zoneadm verify is only a couple keystrokes + * away. */ if (!zonecfg_valid_fs_type(fsptr->zone_fs_type)) { zerror(zlogp, B_FALSE, "cannot mount %s on %s: " diff --git a/usr/src/cmd/zoneadmd/zoneadmd.c b/usr/src/cmd/zoneadmd/zoneadmd.c index e2bbd20640..3d265063e7 100644 --- a/usr/src/cmd/zoneadmd/zoneadmd.c +++ b/usr/src/cmd/zoneadmd/zoneadmd.c @@ -22,6 +22,7 @@ /* * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2014 Nexenta Systems, Inc. All rights reserved. + * Copyright (c) 2016 by Delphix. All rights reserved. */ /* @@ -1373,7 +1374,7 @@ server(void *cookie, char *args, size_t alen, door_desc_t *dp, abort(); /* * We could have two clients racing to halt this - * zone; the second client loses, but his request + * zone; the second client loses, but its request * doesn't fail, since the zone is now in the desired * state. */ @@ -1469,7 +1470,7 @@ server(void *cookie, char *args, size_t alen, door_desc_t *dp, case Z_READY: /* * We could have two clients racing to ready this - * zone; the second client loses, but his request + * zone; the second client loses, but its request * doesn't fail, since the zone is now in the desired * state. */ @@ -1551,7 +1552,7 @@ server(void *cookie, char *args, size_t alen, door_desc_t *dp, case Z_BOOT: /* * We could have two clients racing to boot this - * zone; the second client loses, but his request + * zone; the second client loses, but its request * doesn't fail, since the zone is now in the desired * state. */ |