diff options
Diffstat (limited to 'usr.sbin')
113 files changed, 210 insertions, 219 deletions
diff --git a/usr.sbin/IPXrouted/sap_input.c b/usr.sbin/IPXrouted/sap_input.c index 59281b2..a503471 100644 --- a/usr.sbin/IPXrouted/sap_input.c +++ b/usr.sbin/IPXrouted/sap_input.c @@ -136,7 +136,7 @@ sap_input(from, size) * The idea here is that if the hop count is more * than INFINITY it is bogus and should be discarded. * If it is equal to INFINITY it is a message to say - * that a service went down. If we don't allready + * that a service went down. If we don't already * have it in our tables discard it. Otherwise * update our table and set the timer to EXPIRE_TIME * so that it is removed next time we go through the diff --git a/usr.sbin/IPXrouted/sap_tables.c b/usr.sbin/IPXrouted/sap_tables.c index e1572d1..57b5af5 100644 --- a/usr.sbin/IPXrouted/sap_tables.c +++ b/usr.sbin/IPXrouted/sap_tables.c @@ -178,7 +178,7 @@ sap_add(struct sap_info *si, struct sockaddr *from) /* * Change an existing SAP entry. If a clone exist for the old one, - * check if it is cheaper. If it is change tothe clone, otherwise + * check if it is cheaper. If it is change to the clone, otherwise * delete all the clones. */ void diff --git a/usr.sbin/adduser/adduser.sh b/usr.sbin/adduser/adduser.sh index 8e05f33..f645f59 100644 --- a/usr.sbin/adduser/adduser.sh +++ b/usr.sbin/adduser/adduser.sh @@ -894,7 +894,7 @@ if [ "$procowner" != "0" ]; then exit 1 fi -# Overide from our conf file +# Override from our conf file # Quickly go through the commandline line to see if we should read # from our configuration file. The actual parsing of the commandline # arguments happens after we read in our configuration file (commandline @@ -914,7 +914,7 @@ if [ -n "$readconfig" ]; then fi fi -# Proccess command-line options +# Process command-line options # for _switch ; do case $_switch in diff --git a/usr.sbin/bluetooth/btpand/event.h b/usr.sbin/bluetooth/btpand/event.h index 75515e3..e53ba77 100644 --- a/usr.sbin/bluetooth/btpand/event.h +++ b/usr.sbin/bluetooth/btpand/event.h @@ -40,7 +40,7 @@ #define EV_READ 0x02 #define EV_WRITE 0x04 -#define EV_PERSIST 0x10 /* Persistant event */ +#define EV_PERSIST 0x10 /* Persistent event */ #define EV_PENDING (1 << 13) /* internal use only! */ #define EV_HAS_TIMEOUT (1 << 14) /* internal use only! */ #define EV_CURRENT (1 << 15) /* internal use only! */ diff --git a/usr.sbin/bluetooth/sdpd/server.c b/usr.sbin/bluetooth/sdpd/server.c index fa04758..3f168e0 100644 --- a/usr.sbin/bluetooth/sdpd/server.c +++ b/usr.sbin/bluetooth/sdpd/server.c @@ -334,7 +334,7 @@ server_accept_client(server_p srv, int32_t fd) * The minimum L2CAP MTU is 43 bytes. That means we need * 65536 / 43 = ~1524 chunks to transfer maximum packet * size with minimum MTU. The "rsp_cs" field in fd_idx_t - * is 11 bit wide that gives us upto 2048 chunks. + * is 11 bit wide that gives us up to 2048 chunks. */ if (omtu < NG_L2CAP_MTU_MINIMUM) { diff --git a/usr.sbin/bootparamd/bootparamd/README b/usr.sbin/bootparamd/bootparamd/README index 508ee0f..c49b990 100644 --- a/usr.sbin/bootparamd/bootparamd/README +++ b/usr.sbin/bootparamd/bootparamd/README @@ -19,7 +19,7 @@ RPC.BOOTPARAMD The rpc.bootparamd program does NOT use the yellow pages for the bootparams -database. This data should recide in /etc/bootparams on the local host, +database. This data should reside in /etc/bootparams on the local host, or another file given when the server is started. The default router is set to the address of the machine running the server. @@ -59,17 +59,3 @@ Cache the date, instead of rereading it. Maybe match by comparing the inet address instead. (But beware that caching will prevent the server from detecting that a machine has changed name or address.) - - - - - - - - - - - - - - diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_addrs.c b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_addrs.c index 781517f..0daceec 100644 --- a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_addrs.c +++ b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_addrs.c @@ -108,7 +108,7 @@ bridge_compare_macs(const uint8_t *m1, const uint8_t *m2) /* * Insert an address entry in the bridge address TAILQ starting to search * for its place from the position of the first bridge address for the bridge - * interface. Update the first bridge address if neccessary. + * interface. Update the first bridge address if necessary. */ static void bridge_addrs_insert_at(struct tp_entries *headp, @@ -136,7 +136,7 @@ bridge_addrs_insert_at(struct tp_entries *headp, } /* - * Find an address entry's possition in the address list + * Find an address entry's position in the address list * according to bridge interface name. */ static struct tp_entry * diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c index 4586e32..e5f5c50 100644 --- a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c +++ b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c @@ -378,7 +378,7 @@ bridge_get_time_since_tc(struct bridge_if *bif, uint32_t *ticks) * Return: * 1, if successful * 0, if the interface was deleted - * -1, error occured while fetching the info from the kernel. + * -1, error occurred while fetching the info from the kernel. */ static int bridge_update_bif(struct bridge_if *bif) diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c index fe2af04..0127cea 100644 --- a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c +++ b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c @@ -87,7 +87,7 @@ bridge_port_memif_free(struct bridge_ports *headp, /* * Insert a port entry in the base port TAILQ starting to search * for its place from the position of the first bridge port for the bridge - * interface. Update the first bridge port if neccessary. + * interface. Update the first bridge port if necessary. */ static void bridge_port_insert_at(struct bridge_ports *headp, @@ -119,7 +119,7 @@ bridge_port_insert_at(struct bridge_ports *headp, } /* - * Find a port entry's possition in the ports list according + * Find a port entry's position in the ports list according * to it's parent bridge interface name. Returns a NULL if * we should be at the TAILQ head, otherwise the entry after * which we should be inserted. diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c index 9684d68..f8644f4 100644 --- a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c +++ b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c @@ -1167,7 +1167,7 @@ bridge_port_find_ifstplist(uint8_t port_no, struct ifbpstpreq *buf, /* * Read the initial info for all members of a bridge interface. * Returns the number of ports, 0 - if none, otherwise - * -1 if some other error occured. + * -1 if some other error occurred. */ int bridge_getinfo_bif_ports(struct bridge_if *bif) @@ -1358,7 +1358,7 @@ bridge_addrs_getinfo_ifalist(struct bridge_if *bif, struct ifbareq **buf) /* * Read the initial info for all addresses on a bridge interface. * Returns the number of addresses, 0 - if none, otherwise - * -1 if some other error occured. + * -1 if some other error occurred. */ int bridge_getinfo_bif_addrs(struct bridge_if *bif) diff --git a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c index 99d55ee..1741502 100644 --- a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c +++ b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c @@ -200,7 +200,7 @@ device_entry_create(const char *name, const char *location, const char *descr) /* * From here till the end of this function we reuse name_len - * for a diferrent purpose - for device_entry::descr + * for a different purpose - for device_entry::descr */ if (name[0] != '\0') name_len = strlen(name) + strlen(descr) + diff --git a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c index f86334e..87b78e8 100644 --- a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c +++ b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c @@ -170,8 +170,8 @@ OS_getSystemDate(struct snmp_value *value) /** * Get kernel boot path. For FreeBSD it seems that no arguments are - * present. Returns NULL if an error occured. The returned data is a - * pointer to a global strorage. + * present. Returns NULL if an error occurred. The returned data is a + * pointer to a global storage. */ int OS_getSystemInitialLoadParameters(u_char **params) diff --git a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h index 567368a..04928d2 100644 --- a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h +++ b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h @@ -218,7 +218,7 @@ void fs_tbl_process_statfs_entry(const struct statfs *, int32_t); /* Called after refreshing fs part of hrStorageTable */ void fs_tbl_post_refresh(void); -/* Refresh the FS table if neccessary. */ +/* Refresh the FS table if necessary. */ void refresh_fs_tbl(void); /* Finalization routine for hrFSTable. */ diff --git a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_storage_tbl.c b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_storage_tbl.c index 488d9f5..ee8bdcc 100644 --- a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_storage_tbl.c +++ b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_storage_tbl.c @@ -133,7 +133,7 @@ static const struct asn_oid OIDX_hrStorageVirtualMemory_c = OIDX_hrStorageVirtualMemory; /** - * Create a new entry into the storage table and, if neccessary, an + * Create a new entry into the storage table and, if necessary, an * entry into the storage map. */ static struct storage_entry * diff --git a/usr.sbin/bsnmpd/modules/snmp_wlan/BEGEMOT-WIRELESS-MIB.txt b/usr.sbin/bsnmpd/modules/snmp_wlan/BEGEMOT-WIRELESS-MIB.txt index 194ecd1..29ec005 100644 --- a/usr.sbin/bsnmpd/modules/snmp_wlan/BEGEMOT-WIRELESS-MIB.txt +++ b/usr.sbin/bsnmpd/modules/snmp_wlan/BEGEMOT-WIRELESS-MIB.txt @@ -82,8 +82,8 @@ WlanMgmtReasonCode ::= TEXTUAL-CONVENTION associationLeave(8), associationNotAuthenticated(9), -- XXX: TODO - FIXME - dissasocPwrcapBad(10), - dissasocSuperchanBad(11), + disassocPwrcapBad(10), + disassocSuperchanBad(11), ieInvalid(13), micFailure(14), fourWayHandshakeTimeout(15), @@ -579,10 +579,10 @@ wlanIfaceCountryCode OBJECT-TYPE interface is operating include all environments in the specified country. - 2. an ASCII 'O' character, if the country's regulastions are for + 2. an ASCII 'O' character, if the country's regulations are for Outdoor environment only. - 3. an ASCII 'I' character, if the country's regulastions are for + 3. an ASCII 'I' character, if the country's regulations are for Indoor environment only." ::= { wlanIfaceConfigEntry 2 } @@ -634,7 +634,7 @@ wlanIfaceFastFrames OBJECT-TYPE DESCRIPTION "The value of this object controls whether use of Atheros Fast Frames is enabled when when communicating with another Fast - Frames-capable station. The value is only meaningfull for + Frames-capable station. The value is only meaningful for interfaces that support Atheros Fast Frames." ::= { wlanIfaceConfigEntry 7 } @@ -645,7 +645,7 @@ wlanIfaceDturbo OBJECT-TYPE DESCRIPTION "The value of this object controls whether use of Atheros Dynamic Turbo mode is enabled when when communicating with another Dynamic - Turbo-capable station. The value is only meaningfull for interfaces + Turbo-capable station. The value is only meaningful for interfaces that support Atheros Dynamic Turbo mode." ::= { wlanIfaceConfigEntry 8 } @@ -731,7 +731,7 @@ wlanIfaceBeaconMissedThreshold OBJECT-TYPE MAX-ACCESS read-write STATUS current DESCRIPTION - "The value of this object specifies the number of consequtive missed + "The value of this object specifies the number of consecutive missed beacons before an interface operating in station mode will attempt to search for a new access point." DEFVAL { 7 } @@ -788,7 +788,7 @@ wlanIfaceDynamicWds OBJECT-TYPE STATUS current DESCRIPTION "The value of this object specifies whether Dynamic WDS (DWDS) - support is enabled. The value is only meaningfull for interfaces + support is enabled. The value is only meaningful for interfaces that support Dynamic WDS." ::= { wlanIfaceConfigEntry 21 } @@ -798,7 +798,7 @@ wlanIfacePowerSave OBJECT-TYPE STATUS current DESCRIPTION "The value of this object specifies whether powersave operation - is enabled. The value is only meaningfull for interfaces that + is enabled. The value is only meaningful for interfaces that support powersave operation." ::= { wlanIfaceConfigEntry 22 } @@ -809,7 +809,7 @@ wlanIfaceApBridge OBJECT-TYPE DESCRIPTION "The value of this object specifies whether packets between wireless clients will be passed directly by an interface - operating in host ap mode. Disabling it may be usefull in + operating in host ap mode. Disabling it may be useful in situations when traffic between wireless clients needs to be processed with packet filtering." DEFVAL { true } @@ -1308,7 +1308,7 @@ wlanIfaceChannelFrequency OBJECT-TYPE MAX-ACCESS read-only STATUS current DESCRIPTION - "The channel frequency setting in Mhz." + "The channel frequency setting in MHz." ::= { wlanIfaceChannelEntry 5 } wlanIfaceChannelMaxRegPower OBJECT-TYPE @@ -2741,7 +2741,7 @@ wlanStatsDwdsMcastDiscard OBJECT-TYPE MAX-ACCESS read-only STATUS current DESCRIPTION - "The number of multicast over DWDS frames discared by this interface." + "The number of multicast over DWDS frames discarded by this interface." ::= { wlanIfaceStatisticsEntry 98 } wlanStatsHTAssocRejectNoHT OBJECT-TYPE @@ -2759,7 +2759,7 @@ wlanStatsHTAssocDowngrade OBJECT-TYPE MAX-ACCESS read-only STATUS current DESCRIPTION - "The number of times HT was dissallowed for an association on + "The number of times HT was disallowed for an association on this interface due to WEP or TKIP requested." ::= { wlanIfaceStatisticsEntry 100 } @@ -2769,7 +2769,7 @@ wlanStatsHTAssocRateMismatch OBJECT-TYPE MAX-ACCESS read-only STATUS current DESCRIPTION - "The number of times rate mismatch occured furing HT rate set + "The number of times rate mismatch occurred during HT rate set handling on this interface." ::= { wlanIfaceStatisticsEntry 101 } @@ -2787,7 +2787,7 @@ wlanStatsAMPDUMoved OBJECT-TYPE MAX-ACCESS read-only STATUS current DESCRIPTION - "The number of time A-MPDU MSDU moved window occured for this + "The number of time A-MPDU MSDU moved window occurred for this interface." ::= { wlanIfaceStatisticsEntry 103 } @@ -2807,7 +2807,7 @@ wlanStatsADDBANoRequest OBJECT-TYPE MAX-ACCESS read-only STATUS current DESCRIPTION - "The number of received ADDBA responces frames that were discarded + "The number of received ADDBA responses frames that were discarded by this interface due to no pending ADDBA." ::= { wlanIfaceStatisticsEntry 105 } @@ -2817,7 +2817,7 @@ wlanStatsADDBABadToken OBJECT-TYPE MAX-ACCESS read-only STATUS current DESCRIPTION - "The number of received ADDBA responce frames that were discarded + "The number of received ADDBA response frames that were discarded by this interface since ADDBA response caused dialogtoken mismatch." ::= { wlanIfaceStatisticsEntry 106 } @@ -2827,7 +2827,7 @@ wlanStatsADDBABadPolicy OBJECT-TYPE MAX-ACCESS read-only STATUS current DESCRIPTION - "The number of received ADDBA responce frames that were discarded + "The number of received ADDBA response frames that were discarded by this interface since ADDBA response caused policy mismatch." ::= { wlanIfaceStatisticsEntry 107 } @@ -2877,7 +2877,7 @@ wlanLastDissasocReason OBJECT-TYPE MAX-ACCESS read-only STATUS current DESCRIPTION - "The last received dissasociate reason on this interface." + "The last received disassociate reason on this interface." ::= { wlanIfaceStatisticsEntry 113 } wlanLastAuthFailReason OBJECT-TYPE @@ -2942,7 +2942,7 @@ wlanStatsAMPDURexmtFailed OBJECT-TYPE MAX-ACCESS read-only STATUS current DESCRIPTION - "The number of A-MPDU frames for which retransmition failed on + "The number of A-MPDU frames for which retransmission failed on this interface." ::= { wlanIfaceStatisticsEntry 120 } @@ -3696,7 +3696,7 @@ wlanMeshDroppedMisaligned OBJECT-TYPE STATUS current DESCRIPTION "The number of frames that were dropped by this interface due to - bad alighment." + bad alignment." ::= { wlanMeshStatsEntry 11 } -- ---------------------------------------------------------- -- diff --git a/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_tree.def b/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_tree.def index 7c695c4..67301be 100644 --- a/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_tree.def +++ b/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_tree.def @@ -75,8 +75,8 @@ typedef WlanMgmtReasonCode ENUM ( 7 notAssociated 8 associationLeave 9 associationNotAuthenticated - 10 dissasocPwrcapBad - 11 dissasocSuperchanBad + 10 disassocPwrcapBad + 11 disassocSuperchanBad 13 ieInvalid 14 micFailure 15 fourWayHandshakeTimeout diff --git a/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.1 b/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.1 index 97ef694..18b7eb6d 100644 --- a/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.1 +++ b/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.1 @@ -102,7 +102,7 @@ and .Nm bsnmpset are simple tools for retrieving management information from and setting -management information to a Simple Network Managment Protocol (SNMP) agent. +management information to a Simple Network Management Protocol (SNMP) agent. .Pp Depending on the options .Nm bsnmpget @@ -119,7 +119,7 @@ rooted at the provided OIDs. .Nm Bsnmpset constructs a SMNP SetRequest packet, fills in the OIDs (object identifiers), syntaxes and values of the objects whose values are to be set and waits for a -responce from server. +response from server. .Sh OPTIONS .Pp The options are as follows (not all apply to all three programs): @@ -165,7 +165,7 @@ terminal. Retry on error. If an error is returned in the response PDU, resend the request removing the variable that caused the error until a valid response is received. -This is only usefull for a GetRequest- and a GetNextRequest-PDU. +This is only useful for a GetRequest- and a GetNextRequest-PDU. .It Fl h Print a short help text with default values for various options. .It Fl I Ar options diff --git a/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.c b/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.c index c05a05a..b3c57b7 100644 --- a/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.c +++ b/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.c @@ -248,9 +248,9 @@ snmptool_parse_options(struct snmp_toolinfo *snmptoolctx, int argc, char **argv) /* * Read user input OID - one of following formats: - * 1) 1.2.1.1.2.1.0 - that is if option numeric was giveni; + * 1) 1.2.1.1.2.1.0 - that is if option numeric was given; * 2) string - in such case append .0 to the asn_oid subs; - * 3) string.1 - no additional proccessing required in such case. + * 3) string.1 - no additional processing required in such case. */ static char * snmptools_parse_stroid(struct snmp_toolinfo *snmptoolctx, @@ -458,7 +458,7 @@ static int snmptool_walk(struct snmp_toolinfo *snmptoolctx) { struct snmp_pdu req, resp; - struct asn_oid root; /* Keep the inital oid. */ + struct asn_oid root; /* Keep the initial oid. */ int32_t outputs, rc; snmp_pdu_create(&req, SNMP_PDU_GETNEXT); @@ -1105,13 +1105,13 @@ snmptool_set(struct snmp_toolinfo *snmptoolctx) */ /* * According to command line options prepare SNMP Get | GetNext | GetBulk PDU. - * Wait for a responce and print it. + * Wait for a response and print it. */ /* * Do a 'snmp walk' - according to command line options request for values * lexicographically subsequent and subrooted at a common node. Send a GetNext - * PDU requesting the value for each next variable and print the responce. Stop - * when a Responce PDU is received that contains the value of a variable not + * PDU requesting the value for each next variable and print the response. Stop + * when a Response PDU is received that contains the value of a variable not * subrooted at the variable the walk started. */ int diff --git a/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c b/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c index dbaac5b..53deff7 100755 --- a/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c +++ b/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c @@ -87,7 +87,7 @@ static const struct { { "General error", SNMP_ERR_GENERR }, { "No access", SNMP_ERR_NO_ACCESS }, { "Wrong type", SNMP_ERR_WRONG_TYPE }, - { "Wrong lenght", SNMP_ERR_WRONG_LENGTH }, + { "Wrong length", SNMP_ERR_WRONG_LENGTH }, { "Wrong encoding", SNMP_ERR_WRONG_ENCODING }, { "Wrong value", SNMP_ERR_WRONG_VALUE }, { "No creation", SNMP_ERR_NO_CREATION }, @@ -227,12 +227,12 @@ snmp_import_all(struct snmp_toolinfo *snmptoolctx) } /* - * Add a filename to the file list - the initail idea of keeping a list with all + * Add a filename to the file list - the initial idea of keeping a list with all * files to read OIDs from was that an application might want to have loaded in * memory the OIDs from a single file only and when done with them read the OIDs * from another file. This is not used yet but might be a good idea at some * point. Size argument is number of bytes in string including trailing '\0', - * not string lenght. + * not string length. */ int32_t add_filename(struct snmp_toolinfo *snmptoolctx, const char *filename, @@ -449,7 +449,7 @@ parse_ascii(char *ascii, uint8_t *binstr, size_t binlen) uint32_t val; char dptr[3]; - /* Filter 0x at the beggining */ + /* Filter 0x at the beginning */ if ((alen = strlen(ascii)) > 2 && ascii[0] == '0' && ascii[1] == 'x') i = 2; else @@ -468,7 +468,7 @@ parse_ascii(char *ascii, uint8_t *binstr, size_t binlen) } binstr[count] = (uint8_t) val; if (++count >= binlen) { - warnx("Key %s too long - truncating to %zu octest", + warnx("Key %s too long - truncating to %zu octets", ascii, binlen); break; } @@ -1523,10 +1523,10 @@ snmp_object_seterror(struct snmp_toolinfo *snmptoolctx, } /* - * Check a PDU received in responce to a SNMP_PDU_GET/SNMP_PDU_GETBULK request + * Check a PDU received in response to a SNMP_PDU_GET/SNMP_PDU_GETBULK request * but don't compare syntaxes - when sending a request PDU they must be null. * This is a (almost) complete copy of snmp_pdu_check() - with matching syntaxes - * checks and some other checks skiped. + * checks and some other checks skipped. */ int32_t snmp_parse_get_resp(struct snmp_pdu *resp, struct snmp_pdu *req) @@ -1605,7 +1605,7 @@ snmp_parse_getnext_resp(struct snmp_pdu *resp, struct snmp_pdu *req) } /* - * Should be called to check a responce to get/getnext/getbulk. + * Should be called to check a response to get/getnext/getbulk. */ int32_t snmp_parse_resp(struct snmp_pdu *resp, struct snmp_pdu *req) @@ -1624,7 +1624,7 @@ snmp_parse_resp(struct snmp_pdu *resp, struct snmp_pdu *req) } if (resp->error_status != SNMP_ERR_NOERROR) { - warnx("Error %d in responce", resp->error_status); + warnx("Error %d in response", resp->error_status); return (-1); } diff --git a/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.h b/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.h index 6e62186..ee28385 100644 --- a/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.h +++ b/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.h @@ -185,14 +185,14 @@ extern struct snmp_toolinfo snmptool; /* Definitions for some flags' bits. */ #define OUTPUT_BITS 0x00000003 /* bits 0-1 for output type */ #define NUMERIC_BIT 0x00000004 /* bit 2 for numeric oids */ -#define RETRY_BIT 0x00000008 /* bit 3 for retry on error responce */ +#define RETRY_BIT 0x00000008 /* bit 3 for retry on error response */ #define ERRIGNORE_BIT 0x00000010 /* bit 4 for skip sanity checking */ #define ERRIGNORE_BIT 0x00000010 /* bit 4 for skip sanity checking */ #define EDISCOVER_BIT 0x00000020 /* bit 5 for SNMP Engine Discovery */ #define LOCALKEY_BIT 0x00000040 /* bit 6 for using localized key */ - /* 0x00000080 */ /* bit 7 reserverd */ + /* 0x00000080 */ /* bit 7 reserved */ #define PDUTYPE_BITS 0x00000f00 /* bits 8-11 for pdu type */ - /* 0x0000f000 */ /* bit 12-15 reserverd */ + /* 0x0000f000 */ /* bit 12-15 reserved */ #define MAXREP_BITS 0x00ff0000 /* bits 16-23 for max-repetit. value */ #define NONREP_BITS 0xff000000 /* bits 24-31 for non-repeaters value */ diff --git a/usr.sbin/cron/cron/do_command.c b/usr.sbin/cron/cron/do_command.c index daf695f..fee4131 100644 --- a/usr.sbin/cron/cron/do_command.c +++ b/usr.sbin/cron/cron/do_command.c @@ -147,7 +147,7 @@ child_process(e, u) #ifdef USE_SIGCHLD /* our parent is watching for our death by catching SIGCHLD. we * do not care to watch for our children's deaths this way -- we - * use wait() explictly. so we have to disable the signal (which + * use wait() explicitly. so we have to disable the signal (which * was inherited from the parent). */ (void) signal(SIGCHLD, SIG_DFL); diff --git a/usr.sbin/cron/doc/CHANGES b/usr.sbin/cron/doc/CHANGES index 59f6803..ed52a65 100644 --- a/usr.sbin/cron/doc/CHANGES +++ b/usr.sbin/cron/doc/CHANGES @@ -1,3 +1,6 @@ +$FreeBSD$ +-------- + Vixie Cron Changes from V2 to V3 Paul Vixie 29-Dec-1993 @@ -20,7 +23,7 @@ be reread whenever it changes. I also added a "-e" option to crontab(1). Nine people also sent me diffs to add this option, but I had already implemented it on my own. I actually -released an interrim version (V2.2, I think) for limited testing, and got a +released an interim version (V2.2, I think) for limited testing, and got a chance to fix a bad security bug in the "-e" option thanks to XXX. The daemon used to be extraordinarily sloppy in its use of file descriptors. @@ -57,7 +60,7 @@ which explains why a lot of other people complained that it wasn't using syslog even when they configured it that way :-). Steve Simmons told me first, though, so he gets the point. -An interrim version of the daemon tried to "stat" every file before +An interim version of the daemon tried to "stat" every file before executing it; this turned out to be a horribly bad idea since finding the name of a file from a shell command is a hard job (that's why we have shells, right?) I removed this bogus code. Dave Burgess gets the point. diff --git a/usr.sbin/cron/doc/MAIL b/usr.sbin/cron/doc/MAIL index 3549e94..624f7c4 100644 --- a/usr.sbin/cron/doc/MAIL +++ b/usr.sbin/cron/doc/MAIL @@ -186,7 +186,7 @@ five fields. Examples: (run command if day-of-month AND day-of-week are true) -Get the picture? This would be compatable with existing versions of +Get the picture? This would be compatible with existing versions of cron (which wouldn't currently be using any special characters, so that old crontabs would be handled correctly). diff --git a/usr.sbin/cron/lib/entry.c b/usr.sbin/cron/lib/entry.c index b6be69c..ea015da 100644 --- a/usr.sbin/cron/lib/entry.c +++ b/usr.sbin/cron/lib/entry.c @@ -254,7 +254,7 @@ load_entry(file, error_func, pw, envp) } } - /* make sundays equivilent */ + /* make sundays equivalent */ if (bit_test(e->dow, 0) || bit_test(e->dow, 7)) { bit_set(e->dow, 0); bit_set(e->dow, 7); diff --git a/usr.sbin/edquota/edquota.c b/usr.sbin/edquota/edquota.c index 69ea497..0957011 100644 --- a/usr.sbin/edquota/edquota.c +++ b/usr.sbin/edquota/edquota.c @@ -426,7 +426,7 @@ putprivs(long id, struct quotause *quplist) } /* - * Take a list of priviledges and get it edited. + * Take a list of privileges and get it edited. */ int editit(char *tmpf) diff --git a/usr.sbin/fwcontrol/fwcontrol.c b/usr.sbin/fwcontrol/fwcontrol.c index b8aeb5b..36efea1 100644 --- a/usr.sbin/fwcontrol/fwcontrol.c +++ b/usr.sbin/fwcontrol/fwcontrol.c @@ -1056,7 +1056,7 @@ main(int argc, char **argv) show_topology_map(fd); /* - * Recieve data file from node "-R" + * Receive data file from node "-R" */ #define TAG (1<<6) #define CHANNEL 63 diff --git a/usr.sbin/fwcontrol/fwmpegts.c b/usr.sbin/fwcontrol/fwmpegts.c index d90b6dd..4f84789 100644 --- a/usr.sbin/fwcontrol/fwmpegts.c +++ b/usr.sbin/fwcontrol/fwmpegts.c @@ -94,7 +94,7 @@ MPEG-2 Transport Stream (MPEG TS) packet format according to IEC 61883: N.b. that CRCs are removed by firewire layer! -The following fiels are fixed for IEEE-1394: +The following fields are fixed for IEEE-1394: tag = 01b tcode = 1010b The length is payload length, i.e. includes CIP header and data size. diff --git a/usr.sbin/ifmcstat/ifmcstat.c b/usr.sbin/ifmcstat/ifmcstat.c index 5ee4328..139058c 100644 --- a/usr.sbin/ifmcstat/ifmcstat.c +++ b/usr.sbin/ifmcstat/ifmcstat.c @@ -888,7 +888,7 @@ out_free: /* * Retrieve MLD per-group source filter mode and lists via sysctl. * - * Note: The 128-bit IPv6 group addres needs to be segmented into + * Note: The 128-bit IPv6 group address needs to be segmented into * 32-bit pieces for marshaling to sysctl. So the MIB name ends * up looking like this: * a.b.c.d.e.ifindex.g[0].g[1].g[2].g[3] diff --git a/usr.sbin/inetd/builtins.c b/usr.sbin/inetd/builtins.c index ad7a82e..974e54f 100644 --- a/usr.sbin/inetd/builtins.c +++ b/usr.sbin/inetd/builtins.c @@ -745,7 +745,7 @@ machtime_stream(int s, struct servtab *sep __unused) #define MAX_SERV_LEN (256+2) /* 2 bytes for \r\n */ #define strwrite(fd, buf) (void) write(fd, buf, sizeof(buf)-1) -static int /* # of characters upto \r,\n or \0 */ +static int /* # of characters up to \r,\n or \0 */ getline(int fd, char *buf, int len) { int count = 0, n; diff --git a/usr.sbin/kbdmap/kbdmap.c b/usr.sbin/kbdmap/kbdmap.c index 726652f..c6348a6 100644 --- a/usr.sbin/kbdmap/kbdmap.c +++ b/usr.sbin/kbdmap/kbdmap.c @@ -547,7 +547,7 @@ check_file(const char *keym) } /* - * Read options from the relevent configuration file, then + * Read options from the relevant configuration file, then * present to user. */ static void diff --git a/usr.sbin/kgmon/kgmon.c b/usr.sbin/kgmon/kgmon.c index bdb2da2..d5cdf96 100644 --- a/usr.sbin/kgmon/kgmon.c +++ b/usr.sbin/kgmon/kgmon.c @@ -240,13 +240,13 @@ kern_readonly(mode) if (pflag && (mode == GMON_PROF_HIRES || mode == GMON_PROF_ON)) (void)fprintf(stderr, "data may be inconsistent\n"); if (rflag) - (void)fprintf(stderr, "-r supressed\n"); + (void)fprintf(stderr, "-r suppressed\n"); if (Bflag) - (void)fprintf(stderr, "-B supressed\n"); + (void)fprintf(stderr, "-B suppressed\n"); if (bflag) - (void)fprintf(stderr, "-b supressed\n"); + (void)fprintf(stderr, "-b suppressed\n"); if (hflag) - (void)fprintf(stderr, "-h supressed\n"); + (void)fprintf(stderr, "-h suppressed\n"); rflag = Bflag = bflag = hflag = 0; } diff --git a/usr.sbin/lpr/common_source/rmjob.c b/usr.sbin/lpr/common_source/rmjob.c index 2a6b0e9..912a48f 100644 --- a/usr.sbin/lpr/common_source/rmjob.c +++ b/usr.sbin/lpr/common_source/rmjob.c @@ -78,7 +78,7 @@ void rmjob(const char *printer) { register int i, nitems; - int assasinated = 0; + int assassinated = 0; struct dirent **files; char *cp; struct printer myprinter, *pp = &myprinter; @@ -125,9 +125,9 @@ rmjob(const char *printer) */ if (lockchk(pp, pp->lock_file) && chk(current)) { seteuid(euid); - assasinated = kill(cur_daemon, SIGINT) == 0; + assassinated = kill(cur_daemon, SIGINT) == 0; seteuid(uid); - if (!assasinated) + if (!assassinated) fatal(pp, "cannot kill printer daemon"); } /* @@ -140,7 +140,7 @@ rmjob(const char *printer) /* * Restart the printer daemon if it was killed */ - if (assasinated && !startdaemon(pp)) + if (assassinated && !startdaemon(pp)) fatal(pp, "cannot restart printer daemon\n"); exit(0); } diff --git a/usr.sbin/lpr/lpc/cmds.c b/usr.sbin/lpr/lpc/cmds.c index f8843f9..287825f 100644 --- a/usr.sbin/lpr/lpc/cmds.c +++ b/usr.sbin/lpr/lpc/cmds.c @@ -496,7 +496,7 @@ sortq(const void *a, const void *b) fname_b = (*(const struct dirent * const *)b)->d_name; /* - * First separate filenames into cagatories. Catagories are + * First separate filenames into categories. Categories are * legitimate `cf', `df', `rf' & `tf' filenames, and "other" - in * that order. It is critical that the mapping be exactly the * same for 'a' vs 'b', so define a macro for the job. @@ -562,7 +562,7 @@ sortq(const void *a, const void *b) /* * We have two files which belong to the same job. Sort based - * on the catagory of file (`c' before `d', etc). + * on the category of file (`c' before `d', etc). */ if (cat_a < cat_b) { res = a_lt_b; @@ -573,8 +573,8 @@ sortq(const void *a, const void *b) } /* - * Two files in the same catagory for a single job. Sort based - * on the sequence letter(s). (usually `A' thru `Z', etc). + * Two files in the same category for a single job. Sort based + * on the sequence letter(s). (usually `A' through `Z', etc). */ if (seq_a < seq_b) { res = a_lt_b; diff --git a/usr.sbin/lpr/lpd/printjob.c b/usr.sbin/lpr/lpd/printjob.c index ca5fc11..2407c3c 100644 --- a/usr.sbin/lpr/lpd/printjob.c +++ b/usr.sbin/lpr/lpd/printjob.c @@ -604,7 +604,7 @@ pass2: /* * Print a file. * Set up the chain [ PR [ | {IF, OF} ] ] or {IF, RF, TF, NF, DF, CF, VF}. - * Return -1 if a non-recoverable error occured, + * Return -1 if a non-recoverable error occurred, * 2 if the filter detected some errors (but printed the job anyway), * 1 if we should try to reprint this job and * 0 if all is well. @@ -887,7 +887,7 @@ start: /* * Send the daemon control file (cf) and any data files. - * Return -1 if a non-recoverable error occured, 1 if a recoverable error and + * Return -1 if a non-recoverable error occurred, 1 if a recoverable error and * 0 if all is well. */ static int diff --git a/usr.sbin/lpr/pac/pac.c b/usr.sbin/lpr/pac/pac.c index 9cc9708..5fdd54f 100644 --- a/usr.sbin/lpr/pac/pac.c +++ b/usr.sbin/lpr/pac/pac.c @@ -203,7 +203,7 @@ usage(void) * Read the entire accounting file, accumulating statistics * for the users that we have in the hash table. If allflag * is set, then just gather the facts on everyone. - * Note that we must accomodate both the active and summary file + * Note that we must accommodate both the active and summary file * formats here. * Host names are ignored if the -m flag is present. */ diff --git a/usr.sbin/makefs/cd9660/cd9660_eltorito.c b/usr.sbin/makefs/cd9660/cd9660_eltorito.c index ca3dfd9..f25dae7 100644 --- a/usr.sbin/makefs/cd9660/cd9660_eltorito.c +++ b/usr.sbin/makefs/cd9660/cd9660_eltorito.c @@ -589,7 +589,7 @@ cd9660_write_boot(FILE *fd) e->entry_type); } /* - * It doesnt matter which one gets written + * It doesn't matter which one gets written * since they are the same size */ fwrite(&(e->entry_data.VE), 1, 32, fd); diff --git a/usr.sbin/makefs/cd9660/cd9660_write.c b/usr.sbin/makefs/cd9660/cd9660_write.c index 4c2a24a..2db4ab3 100644 --- a/usr.sbin/makefs/cd9660/cd9660_write.c +++ b/usr.sbin/makefs/cd9660/cd9660_write.c @@ -305,10 +305,10 @@ cd9660_write_file(FILE *fd, cd9660node *writenode) } } else { /* - * Here is a new revelation that ECMA didnt explain + * Here is a new revelation that ECMA didn't explain * (at least not well). * ALL . and .. records store the name "\0" and "\1" - * resepctively. So, for each directory, we have to + * respectively. So, for each directory, we have to * make a new node. * * This is where it gets kinda messy, since we have to diff --git a/usr.sbin/makefs/cd9660/iso9660_rrip.c b/usr.sbin/makefs/cd9660/iso9660_rrip.c index 68de7cc..39e0acf 100644 --- a/usr.sbin/makefs/cd9660/iso9660_rrip.c +++ b/usr.sbin/makefs/cd9660/iso9660_rrip.c @@ -298,7 +298,7 @@ cd9660_susp_initialize_node(cd9660node *node) * CE: is added for us where needed * ST: not sure if it is even required, but if so, should be * handled by the CE code - * PD: isnt needed (though might be added for testing) + * PD: isn't needed (though might be added for testing) * SP: is stored ONLY on the . record of the root directory * ES: not sure */ diff --git a/usr.sbin/makefs/ffs.c b/usr.sbin/makefs/ffs.c index 26843b6..cdbd2c3 100644 --- a/usr.sbin/makefs/ffs.c +++ b/usr.sbin/makefs/ffs.c @@ -145,7 +145,7 @@ static void *ffs_build_dinode2(struct ufs2_dinode *, dirbuf_t *, fsnode *, int sectorsize; /* XXX: for buf.c::getblk() */ - /* publically visible functions */ + /* publicly visible functions */ void ffs_prep_opts(fsinfo_t *fsopts) diff --git a/usr.sbin/makefs/ffs/ffs_subr.c b/usr.sbin/makefs/ffs/ffs_subr.c index e6788d0..b55174d 100644 --- a/usr.sbin/makefs/ffs/ffs_subr.c +++ b/usr.sbin/makefs/ffs/ffs_subr.c @@ -78,8 +78,8 @@ ffs_fragacct_swap(struct fs *fs, int fragmap, int32_t fraglist[], int cnt, int n * block operations * * check if a block is available - * returns true if all the correponding bits in the free map are 1 - * returns false if any corresponding bit in the free map is 0 + * returns true if all the corresponding bits in the free map are 1 + * returns false if any corresponding bit in the free map is 0 */ int ffs_isblock(fs, cp, h) diff --git a/usr.sbin/makefs/walk.c b/usr.sbin/makefs/walk.c index 0d7bd8e..93eb2a2 100644 --- a/usr.sbin/makefs/walk.c +++ b/usr.sbin/makefs/walk.c @@ -172,7 +172,7 @@ create_fsnode(const char *name, struct stat *stbuf) /* * free_fsnodes -- * Removes node from tree and frees it and all of - * its decendents. + * its descendants. */ void free_fsnodes(fsnode *node) diff --git a/usr.sbin/mount_portalfs/cred.c b/usr.sbin/mount_portalfs/cred.c index 9e5d9f3..2bd3623 100644 --- a/usr.sbin/mount_portalfs/cred.c +++ b/usr.sbin/mount_portalfs/cred.c @@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$"); /* * Set the process's credentials to those specified in user, - * saveing the existing ones in save. + * saving the existing ones in save. * Return 0 on success, -1 (with errno set) on error. */ int diff --git a/usr.sbin/mount_portalfs/pt_pipe.c b/usr.sbin/mount_portalfs/pt_pipe.c index fd54b7e..84ee6e4 100644 --- a/usr.sbin/mount_portalfs/pt_pipe.c +++ b/usr.sbin/mount_portalfs/pt_pipe.c @@ -92,7 +92,7 @@ int portal_pipe(struct portal_cred *pcr, char *key, char **v, if (argc == 0) return (ENOENT); - /* Swap priviledges. */ + /* Swap privileges. */ if (set_user_credentials(pcr, &save_area) < 0) return (errno); @@ -137,7 +137,7 @@ int portal_pipe(struct portal_cred *pcr, char *key, char **v, } done: - /* Re-establish our priviledges. */ + /* Re-establish our privileges. */ if (restore_credentials(&save_area) < 0) error = errno; diff --git a/usr.sbin/mount_portalfs/pt_tcplisten.c b/usr.sbin/mount_portalfs/pt_tcplisten.c index b7febb1..3bd29c1 100644 --- a/usr.sbin/mount_portalfs/pt_tcplisten.c +++ b/usr.sbin/mount_portalfs/pt_tcplisten.c @@ -59,7 +59,7 @@ __FBSDID("$FreeBSD$"); * Key will be tcplisten/host/port * * Create a TCP socket bound to the requested host and port. - * If the host is "ANY" the receving address will be set to INADDR_ANY. + * If the host is "ANY" the receiving address will be set to INADDR_ANY. * If the port is 0 the caller must find out the returned port number * using a call to getsockname. * diff --git a/usr.sbin/mountd/mountd.c b/usr.sbin/mountd/mountd.c index a1e83c3..bc3d497 100644 --- a/usr.sbin/mountd/mountd.c +++ b/usr.sbin/mountd/mountd.c @@ -3092,7 +3092,7 @@ checkmask(struct sockaddr *sa) /* * Compare two sockaddrs according to a specified mask. Return zero if * `sa1' matches `sa2' when filtered by the netmask in `samask'. - * If samask is NULL, perform a full comparision. + * If samask is NULL, perform a full comparison. */ int sacmp(struct sockaddr *sa1, struct sockaddr *sa2, struct sockaddr *samask) diff --git a/usr.sbin/moused/moused.c b/usr.sbin/moused/moused.c index 84e5c0b..c88f8b9 100644 --- a/usr.sbin/moused/moused.c +++ b/usr.sbin/moused/moused.c @@ -1025,7 +1025,7 @@ moused(void) { struct mouse_info mouse; mousestatus_t action0; /* original mouse action */ - mousestatus_t action; /* interrim buffer */ + mousestatus_t action; /* interim buffer */ mousestatus_t action2; /* mapped action */ struct timeval timeout; fd_set fds; @@ -2278,7 +2278,7 @@ r_protocol(u_char rBuf, mousestatus_t *act) act->button |= ((pBuf[0] & MOUSE_PS2_TAP)) ? 0 : MOUSE_BUTTON4DOWN; break; case MOUSE_MODEL_NETSCROLL: - /* three addtional bytes encode buttons and wheel events */ + /* three additional bytes encode buttons and wheel events */ act->button |= (pBuf[3] & MOUSE_PS2_BUTTON3DOWN) ? MOUSE_BUTTON4DOWN : 0; act->button |= (pBuf[3] & MOUSE_PS2_BUTTON1DOWN) diff --git a/usr.sbin/mptutil/mpt_config.c b/usr.sbin/mptutil/mpt_config.c index d914d66..17b9945 100644 --- a/usr.sbin/mptutil/mpt_config.c +++ b/usr.sbin/mptutil/mpt_config.c @@ -482,7 +482,7 @@ restart: if (state->list->drives[i]->PhysDiskID == state->target_id) goto restart; - /* Seach volumes second. */ + /* Search volumes second. */ vol = state->ioc2->RaidVolume; for (i = 0; i < state->ioc2->NumActiveVolumes; vol++, i++) if (vol->VolumeID == state->target_id) diff --git a/usr.sbin/newsyslog/newsyslog.c b/usr.sbin/newsyslog/newsyslog.c index 0a0212e..4e3d077 100644 --- a/usr.sbin/newsyslog/newsyslog.c +++ b/usr.sbin/newsyslog/newsyslog.c @@ -1597,7 +1597,7 @@ delete_oldest_timelog(const struct conf_entry *ent, const char *archive_dir) } /* - * Generate a log filename, when using clasic filenames. + * Generate a log filename, when using classic filenames. */ static void gen_clasiclog_fname(char *fname, size_t fname_sz, const char *archive_dir, @@ -1612,7 +1612,7 @@ gen_clasiclog_fname(char *fname, size_t fname_sz, const char *archive_dir, } /* - * Delete a rotated logfiles, when using clasic filenames. + * Delete a rotated logfiles, when using classic filenames. */ static void delete_clasiclog(const char *archive_dir, const char *namepart, int numlog_c) diff --git a/usr.sbin/nscd/protocol.h b/usr.sbin/nscd/protocol.h index dea2397..270335c 100644 --- a/usr.sbin/nscd/protocol.h +++ b/usr.sbin/nscd/protocol.h @@ -67,7 +67,7 @@ struct cache_read_response { }; enum transformation_type { - TT_USER = 0, // tranform only the entries of the caller + TT_USER = 0, // transform only the entries of the caller TT_ALL = 1 // transform all entries }; diff --git a/usr.sbin/ntp/doc/ntp.conf.5 b/usr.sbin/ntp/doc/ntp.conf.5 index 361c123..c19bc29 100644 --- a/usr.sbin/ntp/doc/ntp.conf.5 +++ b/usr.sbin/ntp/doc/ntp.conf.5 @@ -783,7 +783,7 @@ The remaining files are necessary only for the Autokey protocol. .Pp Certificates imported from OpenSSL or public certificate -authorities have certian limitations. +authorities have certain limitations. The certificate should be in ASN.1 syntax, X.509 Version 3 format and encoded in PEM, which is the same format used by OpenSSL. diff --git a/usr.sbin/pc-sysinstall/backend-partmanager/delete-part.sh b/usr.sbin/pc-sysinstall/backend-partmanager/delete-part.sh index c444f65..1db01ff 100755 --- a/usr.sbin/pc-sysinstall/backend-partmanager/delete-part.sh +++ b/usr.sbin/pc-sysinstall/backend-partmanager/delete-part.sh @@ -73,7 +73,7 @@ DISK="`echo $PARTITION | cut -c 1-${CHARS}`" # Make sure we have a valid disk name still if [ ! -e "/dev/${DISK}" ] ; then - echo "Error: Disk: ${DISK} doesnt exist!" + echo "Error: Disk: ${DISK} doesn't exist!" exit 1 fi diff --git a/usr.sbin/pc-sysinstall/backend/functions-disk.sh b/usr.sbin/pc-sysinstall/backend/functions-disk.sh index 51a659e..84534f9 100755 --- a/usr.sbin/pc-sysinstall/backend/functions-disk.sh +++ b/usr.sbin/pc-sysinstall/backend/functions-disk.sh @@ -417,7 +417,7 @@ setup_disk_slice() if [ $LASTSLICE -gt 4 ] then - exit_err "ERROR: BSD only supports primary partitions, and there are none availble on $DISK" + exit_err "ERROR: BSD only supports primary partitions, and there are none available on $DISK" fi fi diff --git a/usr.sbin/pc-sysinstall/backend/functions-parse.sh b/usr.sbin/pc-sysinstall/backend/functions-parse.sh index 8b9d418..fecb018 100755 --- a/usr.sbin/pc-sysinstall/backend/functions-parse.sh +++ b/usr.sbin/pc-sysinstall/backend/functions-parse.sh @@ -69,7 +69,7 @@ if_check_value_exists() { if [ -n "${1}" -a -n "${2}" ] then - # Get the first occurance of the setting from the config, strip out whitespace + # Get the first occurrence of the setting from the config, strip out whitespace VAL=`grep "^${1}" ${CFGF} | head -n 1 | cut -d '=' -f 2 | tr -d ' '` if [ -z "${VAL}" ] @@ -103,7 +103,7 @@ check_value() { if [ -n "${1}" -a -n "${2}" ] then - # Get the first occurance of the setting from the config, strip out whitespace + # Get the first occurrence of the setting from the config, strip out whitespace VAL=`grep "^${1}" ${CFGF} | head -n 1 | cut -d '=' -f 2 | tr -d ' '` VALID="1" for i in ${2} @@ -122,7 +122,7 @@ check_value() fi }; -# Checks for the presense of the supplied arguements in the config file +# Checks for the presence of the supplied arguments in the config file # 1 = values to confirm exist file_sanity_check() { diff --git a/usr.sbin/pciconf/pciconf.c b/usr.sbin/pciconf/pciconf.c index bb19160..919cc85 100644 --- a/usr.sbin/pciconf/pciconf.c +++ b/usr.sbin/pciconf/pciconf.c @@ -188,10 +188,10 @@ list_devs(int verbose, int bars, int caps) /* * 255 entries should be more than enough for most people, * but if someone has more devices, and then changes things - * around between ioctls, we'll do the cheezy thing and + * around between ioctls, we'll do the cheesy thing and * just bail. The alternative would be to go back to the * beginning of the list, and print things twice, which may - * not be desireable. + * not be desirable. */ if (pc.status == PCI_GETCONF_LIST_CHANGED) { warnx("PCI device list changed, please try again"); diff --git a/usr.sbin/pkg_install/README b/usr.sbin/pkg_install/README index a5a517d..874b588 100644 --- a/usr.sbin/pkg_install/README +++ b/usr.sbin/pkg_install/README @@ -1,4 +1,6 @@ -This is the pkg_install suite of tools for doing maintainance of +$FreeBSD$ + +This is the pkg_install suite of tools for doing maintenance of software "packages". More documentation is available in the man pages for each individual command. diff --git a/usr.sbin/pkg_install/add/add.h b/usr.sbin/pkg_install/add/add.h index f1607ee..d9892ad 100644 --- a/usr.sbin/pkg_install/add/add.h +++ b/usr.sbin/pkg_install/add/add.h @@ -1,7 +1,7 @@ /* $FreeBSD$ */ /* - * FreeBSD install - a package for the installation and maintainance + * FreeBSD install - a package for the installation and maintenance * of non-core utilities. * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/pkg_install/add/extract.c b/usr.sbin/pkg_install/add/extract.c index 732a13f..90c33c0 100644 --- a/usr.sbin/pkg_install/add/extract.c +++ b/usr.sbin/pkg_install/add/extract.c @@ -1,5 +1,5 @@ /* - * FreeBSD install - a package for the installation and maintainance + * FreeBSD install - a package for the installation and maintenance * of non-core utilities. * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/pkg_install/add/futil.c b/usr.sbin/pkg_install/add/futil.c index ca095ea..8f9d369 100644 --- a/usr.sbin/pkg_install/add/futil.c +++ b/usr.sbin/pkg_install/add/futil.c @@ -1,5 +1,5 @@ /* - * FreeBSD install - a package for the installation and maintainance + * FreeBSD install - a package for the installation and maintenance * of non-core utilities. * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/pkg_install/add/main.c b/usr.sbin/pkg_install/add/main.c index b1eec7a..04a2f78 100644 --- a/usr.sbin/pkg_install/add/main.c +++ b/usr.sbin/pkg_install/add/main.c @@ -1,6 +1,6 @@ /* * - * FreeBSD install - a package for the installation and maintainance + * FreeBSD install - a package for the installation and maintenance * of non-core utilities. * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/pkg_install/add/perform.c b/usr.sbin/pkg_install/add/perform.c index b23cd52..1b88888 100644 --- a/usr.sbin/pkg_install/add/perform.c +++ b/usr.sbin/pkg_install/add/perform.c @@ -1,5 +1,5 @@ /* - * FreeBSD install - a package for the installation and maintainance + * FreeBSD install - a package for the installation and maintenance * of non-core utilities. * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/pkg_install/add/pkg_add.1 b/usr.sbin/pkg_install/add/pkg_add.1 index d090cb5..71963d1 100644 --- a/usr.sbin/pkg_install/add/pkg_add.1 +++ b/usr.sbin/pkg_install/add/pkg_add.1 @@ -1,5 +1,5 @@ .\" -.\" FreeBSD install - a package for the installation and maintainance +.\" FreeBSD install - a package for the installation and maintenance .\" of non-core utilities. .\" .\" Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/pkg_install/create/create.h b/usr.sbin/pkg_install/create/create.h index cbade82..301bcff 100644 --- a/usr.sbin/pkg_install/create/create.h +++ b/usr.sbin/pkg_install/create/create.h @@ -1,7 +1,7 @@ /* $FreeBSD$ */ /* - * FreeBSD install - a package for the installation and maintainance + * FreeBSD install - a package for the installation and maintenance * of non-core utilities. * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/pkg_install/create/main.c b/usr.sbin/pkg_install/create/main.c index e4af621..5b5ecb2 100644 --- a/usr.sbin/pkg_install/create/main.c +++ b/usr.sbin/pkg_install/create/main.c @@ -1,5 +1,5 @@ /* - * FreeBSD install - a package for the installation and maintainance + * FreeBSD install - a package for the installation and maintenance * of non-core utilities. * * Jordan K. Hubbard diff --git a/usr.sbin/pkg_install/create/perform.c b/usr.sbin/pkg_install/create/perform.c index 45786b6..0834ecd 100644 --- a/usr.sbin/pkg_install/create/perform.c +++ b/usr.sbin/pkg_install/create/perform.c @@ -1,5 +1,5 @@ /* - * FreeBSD install - a package for the installation and maintainance + * FreeBSD install - a package for the installation and maintenance * of non-core utilities. * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/pkg_install/create/pkg_create.1 b/usr.sbin/pkg_install/create/pkg_create.1 index 5b46374..fa0365e 100644 --- a/usr.sbin/pkg_install/create/pkg_create.1 +++ b/usr.sbin/pkg_install/create/pkg_create.1 @@ -1,5 +1,5 @@ .\" -.\" FreeBSD install - a package for the installation and maintainance +.\" FreeBSD install - a package for the installation and maintenance .\" of non-core utilities. .\" .\" Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/pkg_install/create/pl.c b/usr.sbin/pkg_install/create/pl.c index 18bbaf2..716fd05 100644 --- a/usr.sbin/pkg_install/create/pl.c +++ b/usr.sbin/pkg_install/create/pl.c @@ -1,5 +1,5 @@ /* - * FreeBSD install - a package for the installation and maintainance + * FreeBSD install - a package for the installation and maintenance * of non-core utilities. * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/pkg_install/delete/delete.h b/usr.sbin/pkg_install/delete/delete.h index e0aeca5..f2f4057 100644 --- a/usr.sbin/pkg_install/delete/delete.h +++ b/usr.sbin/pkg_install/delete/delete.h @@ -1,7 +1,7 @@ /* $FreeBSD$ */ /* - * FreeBSD install - a package for the installation and maintainance + * FreeBSD install - a package for the installation and maintenance * of non-core utilities. * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/pkg_install/delete/main.c b/usr.sbin/pkg_install/delete/main.c index f09a432..7cd4677 100644 --- a/usr.sbin/pkg_install/delete/main.c +++ b/usr.sbin/pkg_install/delete/main.c @@ -1,6 +1,6 @@ /* * - * FreeBSD install - a package for the installation and maintainance + * FreeBSD install - a package for the installation and maintenance * of non-core utilities. * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/pkg_install/delete/perform.c b/usr.sbin/pkg_install/delete/perform.c index 113df31..ea00055 100644 --- a/usr.sbin/pkg_install/delete/perform.c +++ b/usr.sbin/pkg_install/delete/perform.c @@ -1,5 +1,5 @@ /* - * FreeBSD install - a package for the installation and maintainance + * FreeBSD install - a package for the installation and maintenance * of non-core utilities. * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/pkg_install/delete/pkg_delete.1 b/usr.sbin/pkg_install/delete/pkg_delete.1 index aa56a44..f10651c 100644 --- a/usr.sbin/pkg_install/delete/pkg_delete.1 +++ b/usr.sbin/pkg_install/delete/pkg_delete.1 @@ -1,5 +1,5 @@ .\" -.\" FreeBSD install - a package for the installation and maintainance +.\" FreeBSD install - a package for the installation and maintenance .\" of non-core utilities. .\" .\" Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/pkg_install/info/info.h b/usr.sbin/pkg_install/info/info.h index 46e29b1..6aa1aa7 100644 --- a/usr.sbin/pkg_install/info/info.h +++ b/usr.sbin/pkg_install/info/info.h @@ -1,7 +1,7 @@ /* $FreeBSD$ */ /* - * FreeBSD install - a package for the installation and maintainance + * FreeBSD install - a package for the installation and maintenance * of non-core utilities. * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/pkg_install/info/main.c b/usr.sbin/pkg_install/info/main.c index 2de638e..6692148 100644 --- a/usr.sbin/pkg_install/info/main.c +++ b/usr.sbin/pkg_install/info/main.c @@ -1,6 +1,6 @@ /* * - * FreeBSD install - a package for the installation and maintainance + * FreeBSD install - a package for the installation and maintenance * of non-core utilities. * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/pkg_install/info/perform.c b/usr.sbin/pkg_install/info/perform.c index 09cad78..bba2de8 100644 --- a/usr.sbin/pkg_install/info/perform.c +++ b/usr.sbin/pkg_install/info/perform.c @@ -1,5 +1,5 @@ /* - * FreeBSD install - a package for the installation and maintainance + * FreeBSD install - a package for the installation and maintenance * of non-core utilities. * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/pkg_install/info/show.c b/usr.sbin/pkg_install/info/show.c index 8b434be..3dc47f9 100644 --- a/usr.sbin/pkg_install/info/show.c +++ b/usr.sbin/pkg_install/info/show.c @@ -1,5 +1,5 @@ /* - * FreeBSD install - a package for the installation and maintainance + * FreeBSD install - a package for the installation and maintenance * of non-core utilities. * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/pkg_install/lib/deps.c b/usr.sbin/pkg_install/lib/deps.c index 66f44a9..c6e70fe 100644 --- a/usr.sbin/pkg_install/lib/deps.c +++ b/usr.sbin/pkg_install/lib/deps.c @@ -1,5 +1,5 @@ /* - * FreeBSD install - a package for the installation and maintainance + * FreeBSD install - a package for the installation and maintenance * of non-core utilities. * * Redistribution and use in source and binary forms, with or without @@ -168,7 +168,7 @@ void list_deps(const char *pkgname, char **pkgs, char *listed, /* * Load +REQUIRED_BY file and return a list with names of - * packages that require package reffered to by `pkgname'. + * packages that require package referred to by `pkgname'. * * Optionally check that packages listed there are actually * installed and filter out those that don't (filter == TRUE). diff --git a/usr.sbin/pkg_install/lib/exec.c b/usr.sbin/pkg_install/lib/exec.c index fc8220c..3647376 100644 --- a/usr.sbin/pkg_install/lib/exec.c +++ b/usr.sbin/pkg_install/lib/exec.c @@ -1,5 +1,5 @@ /* - * FreeBSD install - a package for the installation and maintainance + * FreeBSD install - a package for the installation and maintenance * of non-core utilities. * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/pkg_install/lib/file.c b/usr.sbin/pkg_install/lib/file.c index c7ab9d6..79d4df7 100644 --- a/usr.sbin/pkg_install/lib/file.c +++ b/usr.sbin/pkg_install/lib/file.c @@ -1,5 +1,5 @@ /* - * FreeBSD install - a package for the installation and maintainance + * FreeBSD install - a package for the installation and maintenance * of non-core utilities. * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/pkg_install/lib/global.c b/usr.sbin/pkg_install/lib/global.c index e136ec8..25d2a53 100644 --- a/usr.sbin/pkg_install/lib/global.c +++ b/usr.sbin/pkg_install/lib/global.c @@ -1,5 +1,5 @@ /* - * FreeBSD install - a package for the installation and maintainance + * FreeBSD install - a package for the installation and maintenance * of non-core utilities. * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/pkg_install/lib/lib.h b/usr.sbin/pkg_install/lib/lib.h index 089bfa3..fcf051e 100644 --- a/usr.sbin/pkg_install/lib/lib.h +++ b/usr.sbin/pkg_install/lib/lib.h @@ -1,7 +1,7 @@ /* $FreeBSD$ */ /* - * FreeBSD install - a package for the installation and maintainance + * FreeBSD install - a package for the installation and maintenance * of non-core utilities. * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/pkg_install/lib/match.c b/usr.sbin/pkg_install/lib/match.c index 6c1b2bf..905d7cb 100644 --- a/usr.sbin/pkg_install/lib/match.c +++ b/usr.sbin/pkg_install/lib/match.c @@ -1,5 +1,5 @@ /* - * FreeBSD install - a package for the installation and maintainance + * FreeBSD install - a package for the installation and maintenance * of non-core utilities. * * Redistribution and use in source and binary forms, with or without @@ -361,7 +361,7 @@ LIST_HEAD(, iip_memo) iip_memo = LIST_HEAD_INITIALIZER(iip_memo); /* * * Return 1 if the specified package is installed, - * 0 if not, and -1 if an error occured. + * 0 if not, and -1 if an error occurred. */ int isinstalledpkg(const char *name) diff --git a/usr.sbin/pkg_install/lib/msg.c b/usr.sbin/pkg_install/lib/msg.c index 5b17624..2b0ee07 100644 --- a/usr.sbin/pkg_install/lib/msg.c +++ b/usr.sbin/pkg_install/lib/msg.c @@ -1,5 +1,5 @@ /* - * FreeBSD install - a package for the installation and maintainance + * FreeBSD install - a package for the installation and maintenance * of non-core utilities. * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/pkg_install/lib/pen.c b/usr.sbin/pkg_install/lib/pen.c index 2b405a3..f4ecd75 100644 --- a/usr.sbin/pkg_install/lib/pen.c +++ b/usr.sbin/pkg_install/lib/pen.c @@ -1,5 +1,5 @@ /* - * FreeBSD install - a package for the installation and maintainance + * FreeBSD install - a package for the installation and maintenance * of non-core utilities. * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/pkg_install/lib/plist.c b/usr.sbin/pkg_install/lib/plist.c index 545b541..b7481d8 100644 --- a/usr.sbin/pkg_install/lib/plist.c +++ b/usr.sbin/pkg_install/lib/plist.c @@ -1,5 +1,5 @@ /* - * FreeBSD install - a package for the installation and maintainance + * FreeBSD install - a package for the installation and maintenance * of non-core utilities. * * Redistribution and use in source and binary forms, with or without @@ -123,7 +123,7 @@ find_plist_option(Package *pkg, const char *name) /* * Delete plist item 'type' in the list (if 'name' is non-null, match it - * too.) If 'all' is set, delete all items, not just the first occurance. + * too.) If 'all' is set, delete all items, not just the first occurrance. */ void delete_plist(Package *pkg, Boolean all, plist_t type, const char *name) diff --git a/usr.sbin/pkg_install/lib/str.c b/usr.sbin/pkg_install/lib/str.c index 0d9e288..f1a087f 100644 --- a/usr.sbin/pkg_install/lib/str.c +++ b/usr.sbin/pkg_install/lib/str.c @@ -1,5 +1,5 @@ /* - * FreeBSD install - a package for the installation and maintainance + * FreeBSD install - a package for the installation and maintenance * of non-core utilities. * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/pkg_install/lib/url.c b/usr.sbin/pkg_install/lib/url.c index 8c55347..0097a91 100644 --- a/usr.sbin/pkg_install/lib/url.c +++ b/usr.sbin/pkg_install/lib/url.c @@ -1,5 +1,5 @@ /* - * FreeBSD install - a package for the installation and maintainance + * FreeBSD install - a package for the installation and maintenance * of non-core utilities. * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/pkg_install/version/main.c b/usr.sbin/pkg_install/version/main.c index cad8583..39c603e 100644 --- a/usr.sbin/pkg_install/version/main.c +++ b/usr.sbin/pkg_install/version/main.c @@ -1,5 +1,5 @@ /* - * FreeBSD install - a package for the installation and maintainance + * FreeBSD install - a package for the installation and maintenance * of non-core utilities. * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/pkg_install/version/perform.c b/usr.sbin/pkg_install/version/perform.c index dc85696..733cb5e 100644 --- a/usr.sbin/pkg_install/version/perform.c +++ b/usr.sbin/pkg_install/version/perform.c @@ -1,5 +1,5 @@ /* - * FreeBSD install - a package for the installation and maintainance + * FreeBSD install - a package for the installation and maintenance * of non-core utilities. * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/pkg_install/version/version.h b/usr.sbin/pkg_install/version/version.h index 412c395..1f265d4 100644 --- a/usr.sbin/pkg_install/version/version.h +++ b/usr.sbin/pkg_install/version/version.h @@ -1,7 +1,7 @@ /* $FreeBSD$ */ /* - * FreeBSD install - a package for the installation and maintainance + * FreeBSD install - a package for the installation and maintenance * of non-core utilities. * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/pmcstat/pmcpl_calltree.c b/usr.sbin/pmcstat/pmcpl_calltree.c index 3f3f717..0069330 100644 --- a/usr.sbin/pmcstat/pmcpl_calltree.c +++ b/usr.sbin/pmcstat/pmcpl_calltree.c @@ -862,7 +862,7 @@ pmcpl_ct_node_printchild(struct pmcpl_ct_node *ct) /* * Child cost. - * TODO: attach child cost to the real position in the funtion. + * TODO: attach child cost to the real position in the function. * TODO: cfn=<fn> / call <ncall> addr(<fn>) / addr(call <fn>) <arccost> */ for (i=0 ; i<ct->pct_narc; i++) { diff --git a/usr.sbin/pmcstat/pmcpl_gprof.c b/usr.sbin/pmcstat/pmcpl_gprof.c index 8e4cc79..9ff78e8 100644 --- a/usr.sbin/pmcstat/pmcpl_gprof.c +++ b/usr.sbin/pmcstat/pmcpl_gprof.c @@ -326,7 +326,7 @@ pmcpl_gmon_initimage(struct pmcstat_image *pi) else { /* * Otherwise use a prefix from the original name and - * upto 3 digits. + * up to 3 digits. */ nlen = strlen(sn); nlen = min(nlen, (int) (sizeof(name)-sizeof("~NNN.gmon"))); diff --git a/usr.sbin/pmcstat/pmcstat.c b/usr.sbin/pmcstat/pmcstat.c index 8c54a29..8f13206 100644 --- a/usr.sbin/pmcstat/pmcstat.c +++ b/usr.sbin/pmcstat/pmcstat.c @@ -98,7 +98,7 @@ __FBSDID("$FreeBSD$"); * and starts them. Sets up * monitoring for the child. * - Signals child to start. - * - Recieves signal, attempts exec(). + * - Receives signal, attempts exec(). * * After this point normal processing can happen. */ diff --git a/usr.sbin/pmcstat/pmcstat_log.c b/usr.sbin/pmcstat/pmcstat_log.c index 6c0eb14..db526e3 100644 --- a/usr.sbin/pmcstat/pmcstat_log.c +++ b/usr.sbin/pmcstat/pmcstat_log.c @@ -254,7 +254,7 @@ static void pmcstat_stats_reset(int _reset_global); /* * A simple implementation of interned strings. Each interned string * is assigned a unique address, so that subsequent string compares - * can be done by a simple pointer comparision instead of using + * can be done by a simple pointer comparison instead of using * strcmp(). This speeds up hash table lookups and saves memory if * duplicate strings are the norm. */ diff --git a/usr.sbin/ppp/cbcp.c b/usr.sbin/ppp/cbcp.c index be68e48..23366c8 100644 --- a/usr.sbin/ppp/cbcp.c +++ b/usr.sbin/ppp/cbcp.c @@ -353,7 +353,7 @@ static int cbcp_AdjustResponse(struct cbcp *cbcp, struct cbcp_data *data) { /* - * We've received a REQ (data). Adjust our reponse (cbcp->fsm.*) + * We've received a REQ (data). Adjust our response (cbcp->fsm.*) * so that we (hopefully) agree with the peer */ struct cbcp_addr *addr; diff --git a/usr.sbin/ppp/chat.h b/usr.sbin/ppp/chat.h index b8162bf..91fc7b4 100644 --- a/usr.sbin/ppp/chat.h +++ b/usr.sbin/ppp/chat.h @@ -52,8 +52,8 @@ struct chat { char *nargptr; /* Our next for expect-send-expect */ char buf[LINE_LEN*2]; /* Our input */ - char *bufstart; /* start of relevent data */ - char *bufend; /* end of relevent data */ + char *bufstart; /* start of relevant data */ + char *bufend; /* end of relevant data */ int TimeoutSec; /* Expect timeout value */ int TimedOut; /* We timed out */ diff --git a/usr.sbin/ppp/command.c b/usr.sbin/ppp/command.c index 0468b32..91fe028 100644 --- a/usr.sbin/ppp/command.c +++ b/usr.sbin/ppp/command.c @@ -416,7 +416,7 @@ DialCommand(struct cmdargs const *arg) static char * strstrword(char *big, const char *little) { - /* Get the first occurance of the word ``little'' in ``big'' */ + /* Get the first occurrance of the word ``little'' in ``big'' */ char *pos; int len; @@ -1852,13 +1852,13 @@ SetVariable(struct cmdargs const *arg) case PHASE_ESTABLISH: /* Make sure none of our links are DATALINK_LCP or greater */ if (bundle_HighestState(arg->bundle) >= DATALINK_LCP) { - log_Printf(LogWARN, "mrru: Only changable before LCP negotiations\n"); + log_Printf(LogWARN, "mrru: Only changeable before LCP negotiations\n"); res = 1; break; } break; default: - log_Printf(LogWARN, "mrru: Only changable at phase DEAD/ESTABLISH\n"); + log_Printf(LogWARN, "mrru: Only changeable at phase DEAD/ESTABLISH\n"); res = 1; break; } @@ -2944,13 +2944,13 @@ NegotiateSet(struct cmdargs const *arg) case PHASE_ESTABLISH: /* Make sure none of our links are DATALINK_LCP or greater */ if (bundle_HighestState(arg->bundle) >= DATALINK_LCP) { - log_Printf(LogWARN, "shortseq: Only changable before" + log_Printf(LogWARN, "shortseq: Only changeable before" " LCP negotiations\n"); return 1; } break; default: - log_Printf(LogWARN, "shortseq: Only changable at phase" + log_Printf(LogWARN, "shortseq: Only changeable at phase" " DEAD/ESTABLISH\n"); return 1; } diff --git a/usr.sbin/ppp/mp.c b/usr.sbin/ppp/mp.c index 095f9bb..b2cb46c 100644 --- a/usr.sbin/ppp/mp.c +++ b/usr.sbin/ppp/mp.c @@ -965,13 +965,13 @@ mp_SetEnddisc(struct cmdargs const *arg) case PHASE_ESTABLISH: /* Make sure none of our links are DATALINK_LCP or greater */ if (bundle_HighestState(arg->bundle) >= DATALINK_LCP) { - log_Printf(LogWARN, "enddisc: Only changable before" + log_Printf(LogWARN, "enddisc: Only changeable before" " LCP negotiations\n"); return 1; } break; default: - log_Printf(LogWARN, "enddisc: Only changable at phase DEAD/ESTABLISH\n"); + log_Printf(LogWARN, "enddisc: Only changeable at phase DEAD/ESTABLISH\n"); return 1; } diff --git a/usr.sbin/ppp/ppp.8.m4 b/usr.sbin/ppp/ppp.8.m4 index fcf62d6..935814e 100644 --- a/usr.sbin/ppp/ppp.8.m4 +++ b/usr.sbin/ppp/ppp.8.m4 @@ -1594,7 +1594,7 @@ is the IP number that your route to .Dq ui-gate would normally use. .Pp -When routing your connection accross a public network such as the Internet, +When routing your connection across a public network such as the Internet, it is preferable to encrypt the data. This can be done with the help of the MPPE protocol, although currently this means that you will not be able to also compress the traffic as MPPE is diff --git a/usr.sbin/ppp/vjcomp.c b/usr.sbin/ppp/vjcomp.c index f3c6b71..97166af 100644 --- a/usr.sbin/ppp/vjcomp.c +++ b/usr.sbin/ppp/vjcomp.c @@ -137,7 +137,7 @@ VjUncompressTcp(struct ipcp *ipcp, struct mbuf *bp, u_char type) } /* - * Handle compressed packet. 1) Read upto MAX_VJHEADER bytes into work + * Handle compressed packet. 1) Read up to MAX_VJHEADER bytes into work * space. 2) Try to uncompress it. 3) Compute amount of necessary space. 4) * Copy unread data info there. */ diff --git a/usr.sbin/pw/cpdir.c b/usr.sbin/pw/cpdir.c index 017c200..c5534e5 100644 --- a/usr.sbin/pw/cpdir.c +++ b/usr.sbin/pw/cpdir.c @@ -83,14 +83,14 @@ copymkdir(char const * dir, char const * skel, mode_t mode, uid_t uid, gid_t gid if (S_ISDIR(st.st_mode)) { /* Recurse for this */ if (strcmp(e->d_name, ".") != 0 && strcmp(e->d_name, "..") != 0) copymkdir(dst, src, st.st_mode & _DEF_DIRMODE, uid, gid); - chflags(dst, st.st_flags); /* propogate flags */ + chflags(dst, st.st_flags); /* propagate flags */ } else if (S_ISLNK(st.st_mode) && (len = readlink(src, lnk, sizeof(lnk))) != -1) { lnk[len] = '\0'; symlink(lnk, dst); lchown(dst, uid, gid); /* - * Note: don't propogate special attributes - * but do propogate file flags + * Note: don't propagate special attributes + * but do propagate file flags */ } else if (S_ISREG(st.st_mode) && (outfd = open(dst, O_RDWR | O_CREAT | O_EXCL, st.st_mode)) != -1) { if ((infd = open(src, O_RDONLY)) == -1) { @@ -108,7 +108,7 @@ copymkdir(char const * dir, char const * skel, mode_t mode, uid_t uid, gid_t gid write(outfd, copybuf, b); close(infd); /* - * Propogate special filesystem flags + * Propagate special filesystem flags */ fchown(outfd, uid, gid); fchflags(outfd, st.st_flags); diff --git a/usr.sbin/route6d/route6d.c b/usr.sbin/route6d/route6d.c index 9c3e71e..8723ebe 100644 --- a/usr.sbin/route6d/route6d.c +++ b/usr.sbin/route6d/route6d.c @@ -159,7 +159,7 @@ struct rip6 *ripbuf; /* packet buffer for sending */ * One of the major drawbacks of the linear linked list is the difficulty * of representing the relationship between a couple of routes. This may * be a significant problem when we have to support route aggregation with - * supressing the specifices covered by the aggregate. + * suppressing the specifics covered by the aggregate. */ struct riprt { diff --git a/usr.sbin/rpc.lockd/kern.c b/usr.sbin/rpc.lockd/kern.c index 3c0fe04..e0f63ab 100644 --- a/usr.sbin/rpc.lockd/kern.c +++ b/usr.sbin/rpc.lockd/kern.c @@ -167,7 +167,7 @@ client_request(void) goto err; } daemon_uid = pw->pw_uid; - /* drop our root priviledges */ + /* drop our root privileges */ (void)lockd_seteuid(daemon_uid); for (;;) { diff --git a/usr.sbin/rpc.lockd/lockd_lock.c b/usr.sbin/rpc.lockd/lockd_lock.c index 5900bfa..6c409ad 100644 --- a/usr.sbin/rpc.lockd/lockd_lock.c +++ b/usr.sbin/rpc.lockd/lockd_lock.c @@ -69,7 +69,7 @@ __FBSDID("$FreeBSD$"); * A set of utilities for managing file locking * * XXX: All locks are in a linked list, a better structure should be used - * to improve search/access effeciency. + * to improve search/access efficiency. */ /* struct describing a lock */ @@ -98,7 +98,7 @@ struct blockedlocklist_head blockedlocklist_head = LIST_HEAD_INITIALIZER(blocked #define LKST_LOCKED 1 /* lock is locked */ /* XXX: Is this flag file specific or lock specific? */ #define LKST_WAITING 2 /* file is already locked by another host */ -#define LKST_PROCESSING 3 /* child is trying to aquire the lock */ +#define LKST_PROCESSING 3 /* child is trying to acquire the lock */ #define LKST_DYING 4 /* must dies when we get news from the child */ /* struct describing a monitored host */ @@ -1917,7 +1917,7 @@ testlock(struct nlm4_lock *lock, bool_t exclusive, int flags __unused) } /* - * getlock: try to aquire the lock. + * getlock: try to acquire the lock. * If file is already locked and we can sleep, put the lock in the list with * status LKST_WAITING; it'll be processed later. * Otherwise try to lock. If we're allowed to block, fork a child which @@ -1947,7 +1947,7 @@ getlock(nlm4_lockargs *lckarg, struct svc_req *rqstp, const int flags) } if (lckarg->alock.fh.n_len != sizeof(fhandle_t)) { - debuglog("recieved fhandle size %d, local size %d", + debuglog("received fhandle size %d, local size %d", lckarg->alock.fh.n_len, (int)sizeof(fhandle_t)); } diff --git a/usr.sbin/rpcbind/check_bound.c b/usr.sbin/rpcbind/check_bound.c index 03f70b5..35e0a5a 100644 --- a/usr.sbin/rpcbind/check_bound.c +++ b/usr.sbin/rpcbind/check_bound.c @@ -44,7 +44,7 @@ static char sccsid[] = "@(#)check_bound.c 1.11 89/04/21 Copyr 1989 Sun Micro"; /* * check_bound.c * Checks to see whether the program is still bound to the - * claimed address and returns the univeral merged address + * claimed address and returns the universal merged address * */ diff --git a/usr.sbin/rpcbind/rpcbind.c b/usr.sbin/rpcbind/rpcbind.c index dff0b08..3d11af1 100644 --- a/usr.sbin/rpcbind/rpcbind.c +++ b/usr.sbin/rpcbind/rpcbind.c @@ -366,7 +366,7 @@ init_transport(struct netconfig *nconf) hints.ai_flags &= AI_NUMERICHOST; } else { /* - * Skip if we have an AF_INET6 adress. + * Skip if we have an AF_INET6 address. */ if (inet_pton(AF_INET6, hosts[nhostsbak], host_addr) == 1) { @@ -381,7 +381,7 @@ init_transport(struct netconfig *nconf) hints.ai_flags &= AI_NUMERICHOST; } else { /* - * Skip if we have an AF_INET adress. + * Skip if we have an AF_INET address. */ if (inet_pton(AF_INET, hosts[nhostsbak], host_addr) == 1) { diff --git a/usr.sbin/rtadvd/config.c b/usr.sbin/rtadvd/config.c index 681611f..605d76b 100644 --- a/usr.sbin/rtadvd/config.c +++ b/usr.sbin/rtadvd/config.c @@ -216,7 +216,7 @@ rm_ifinfo(struct ifinfo *ifi) "<%s> ifname=%s marked as UNCONFIGURED.", __func__, ifi->ifi_ifname); - /* XXX: No MC leaving here becasue index is disappeared */ + /* XXX: No MC leaving here because index is disappeared */ /* Inactivate timer */ rtadvd_remove_timer(ifi->ifi_ra_timer); diff --git a/usr.sbin/rtadvd/rtadvd.c b/usr.sbin/rtadvd/rtadvd.c index 092ffb6..a5f306d 100644 --- a/usr.sbin/rtadvd/rtadvd.c +++ b/usr.sbin/rtadvd/rtadvd.c @@ -845,7 +845,7 @@ rtadvd_input(struct sockinfo *s) */ if (!IN6_IS_ADDR_LINKLOCAL(&rcvfrom.sin6_addr)) { syslog(LOG_NOTICE, - "RA witn non-linklocal source address " + "RA with non-linklocal source address " "received from %s on %s", inet_ntop(AF_INET6, &rcvfrom.sin6_addr, ntopbuf, sizeof(ntopbuf)), @@ -1788,7 +1788,7 @@ ra_output(struct ifinfo *ifi) ifi->ifi_burstcount--; if (ifi->ifi_burstcount == 0) { if (ifi->ifi_rainfo == ifi->ifi_rainfo_trans) { - /* Inital burst finished. */ + /* Initial burst finished. */ if (ifi->ifi_rainfo_trans != NULL) ifi->ifi_rainfo_trans = NULL; } diff --git a/usr.sbin/rtsold/rtsold.8 b/usr.sbin/rtsold/rtsold.8 index 97b6000..946eca2 100644 --- a/usr.sbin/rtsold/rtsold.8 +++ b/usr.sbin/rtsold/rtsold.8 @@ -235,7 +235,7 @@ to instead of the default PID file .Pa /var/run/rtsold.pid . .It Fl R Ar script-name -Specifies a script to run when router advertisment options +Specifies a script to run when router advertisement options .Dv RDNSS Pq Recursive DNS Server or .Dv DNSSL Pq DNS Search List diff --git a/usr.sbin/sade/label.c b/usr.sbin/sade/label.c index 02f3a92..d6b03b5 100644 --- a/usr.sbin/sade/label.c +++ b/usr.sbin/sade/label.c @@ -525,12 +525,12 @@ print_label_chunks(void) int ChunkPartStartRow; WINDOW *ChunkWin; - /********************************************************/ - /*** These values are for controling screen resources ***/ - /*** Each label line holds up to 2 labels, so beware! ***/ - /*** strategy will be to try to always make sure the ***/ - /*** highlighted label is in the active display area. ***/ - /********************************************************/ + /*********************************************************/ + /*** These values are for controlling screen resources ***/ + /*** Each label line holds up to 2 labels, so beware! ***/ + /*** strategy will be to try to always make sure the ***/ + /*** highlighted label is in the active display area. ***/ + /*********************************************************/ int pslice_max, label_max; int pslice_count, label_count, label_focus_found, pslice_focus_found; @@ -538,7 +538,7 @@ print_label_chunks(void) mvaddstr(0, 25, "FreeBSD Disklabel Editor"); attrset(A_NORMAL); - /*** Count the number of parition slices ***/ + /*** Count the number of partition slices ***/ pslice_count = 0; for (i = 0; label_chunk_info[i].c ; i++) { if (label_chunk_info[i].type == PART_SLICE) @@ -1048,7 +1048,7 @@ diskLabel(Device *dev) #ifdef __alpha__ /* * SRM requires that the root partition is at the - * begining of the disk and cannot boot otherwise. + * beginning of the disk and cannot boot otherwise. * Warn Alpha users if they are about to shoot themselves in * the foot in this way. * diff --git a/usr.sbin/tcpdump/tcpdump/tcpdump.1 b/usr.sbin/tcpdump/tcpdump/tcpdump.1 index 28c5ff2..84e75c5 100644 --- a/usr.sbin/tcpdump/tcpdump/tcpdump.1 +++ b/usr.sbin/tcpdump/tcpdump/tcpdump.1 @@ -257,7 +257,7 @@ Print the link-level header on each dump line. .B \-E Use \fIspi@ipaddr algo:secret\fP for decrypting IPsec ESP packets that are addressed to \fIaddr\fP and contain Security Parameter Index value -\fIspi\fP. This combination may be repeated with comma or newline seperation. +\fIspi\fP. This combination may be repeated with comma or newline separation. .IP Note that setting the secret for IPv4 ESP packets is supported at this time. .IP @@ -273,7 +273,7 @@ The ability to decrypt packets is only present if \fItcpdump\fP was compiled with cryptography enabled. .IP \fIsecret\fP is the ASCII text for ESP secret key. -If preceeded by 0x, then a hex value will be read. +If preceded by 0x, then a hex value will be read. .IP The option assumes RFC2406 ESP, not RFC1827 ESP. The option is only for debugging purposes, and diff --git a/usr.sbin/timed/timed/CHANGES b/usr.sbin/timed/timed/CHANGES index 424ead2..e51acd1 100644 --- a/usr.sbin/timed/timed/CHANGES +++ b/usr.sbin/timed/timed/CHANGES @@ -94,7 +94,7 @@ Practically any users can send to the master TSP messages and this way corrupt the reliability of the system. Authentication of messages should be provided. Unfortunately, that would require changing the protocol with all of the implied - compatiblity problems. Fortunately, the new -F and -G args + compatibility problems. Fortunately, the new -F and -G args can be used to cause the daemon to ignore time changes from untrusted machines. diff --git a/usr.sbin/vidcontrol/vidcontrol.c b/usr.sbin/vidcontrol/vidcontrol.c index 50df519..b2e41bf 100644 --- a/usr.sbin/vidcontrol/vidcontrol.c +++ b/usr.sbin/vidcontrol/vidcontrol.c @@ -497,15 +497,15 @@ set_screensaver_timeout(char *arg) */ static void -set_cursor_type(char *appearence) +set_cursor_type(char *appearance) { int type; - if (!strcmp(appearence, "normal")) + if (!strcmp(appearance, "normal")) type = 0; - else if (!strcmp(appearence, "blink")) + else if (!strcmp(appearance, "blink")) type = 1; - else if (!strcmp(appearence, "destructive")) + else if (!strcmp(appearance, "destructive")) type = 3; else { revert(); diff --git a/usr.sbin/wpa/hostapd/driver_freebsd.c b/usr.sbin/wpa/hostapd/driver_freebsd.c index 5fb6f85..9b9d7d4 100644 --- a/usr.sbin/wpa/hostapd/driver_freebsd.c +++ b/usr.sbin/wpa/hostapd/driver_freebsd.c @@ -666,10 +666,10 @@ bsd_set_radius_acl_expire(void *priv, const u8 *mac) struct hostapd_data *hapd = drv->hapd; /* - * The expiry of the MAC address from RADIUS ACL cache doesn't mean - * that we should kick off the client. Our current approach doesn't + * The expiry of the MAC address from RADIUS ACL cache doesn't mean + * that we should kick off the client. Our current approach doesn't * require adding/removing entries from an allow/deny list; so this - * function is likely unecessary + * function is likely unnecessary */ wpa_printf(MSG_DEBUG, "[%s] STA " MACSTR " radius acl cache " "expired; nothing to do...", hapd->conf->iface, diff --git a/usr.sbin/ypserv/yp_access.c b/usr.sbin/ypserv/yp_access.c index 66d056b..c0e4804 100644 --- a/usr.sbin/ypserv/yp_access.c +++ b/usr.sbin/ypserv/yp_access.c @@ -287,7 +287,7 @@ not privileged", map, inet_ntoa(rqhost->sin_addr), ntohs(rqhost->sin_port)); if (status_securenets == 0) { #endif /* - * One of the following two events occured: + * One of the following two events occurred: * * (1) The /var/yp/securenets exists and the remote host does not * match any of the networks specified in it. |
