diff --git a/BitchX.help b/BitchX.help index debb7c2..eaef88b 100644 --- a/BitchX.help +++ b/BitchX.help @@ -795,10 +795,10 @@ RELCT - Changes the topic to the last CTCP command issued RELD %gUsage%n: %W/%nreld - - Displays the last DCC msg recieved. + - Displays the last DCC msg received. RELDT %gUsage%n: %W/%nreldt - - Sets the topic to the last DCC message recieved. + - Sets the topic to the last DCC message received. RELI %gUsage%n: %W/%nreli - Shows the last invite message received diff --git a/Changelog b/Changelog index 443bb4e..c958ac7 100644 --- a/Changelog +++ b/Changelog @@ -1,5 +1,7 @@ [Changes 1.2.2] +* Fix spelling of "receive" in all client output. (caf) + * Ignore DCC ACCEPT if RESUME wasn't requested. (caf) * Fix /KB so that it kicks-then-bans as intended (reported by profiler). (caf) diff --git a/bx-conf/file_cpy.c b/bx-conf/file_cpy.c index e6c2064..9de2608 100644 --- a/bx-conf/file_cpy.c +++ b/bx-conf/file_cpy.c @@ -237,7 +237,7 @@ Configure userlist_default[] = { { "Server op protection", "Values 0 for none, 1 for deop, 2 for announce only", "DEFAULT_HACKING", 0,INT_TYPE, edit_dir }, /* 0 1 2 */ {"Auto-Unban time", "", "DEFAULT_AUTO_UNBAN", 600, INT_TYPE, edit_dir }, {"Default Ban time", "", "DEFAULT_BANTIME", 600, INT_TYPE, edit_dir }, -{"Send ctcp msg", "Send notice when ctcp command recieved", "DEFAULT_SEND_CTCP_MSG", ON, BOOL_TYPE, NULL }, +{"Send ctcp msg", "Send notice when ctcp command received", "DEFAULT_SEND_CTCP_MSG", ON, BOOL_TYPE, NULL }, {"Send Op msg", "Send notice when auto-op sent", "DEFAULT_SEND_OP_MSG", ON, BOOL_TYPE, NULL }, { NULL, NULL, NULL, 0, 0, NULL } }; diff --git a/dll/nap/nap.c b/dll/nap/nap.c index fa3b0af..27a50bf 100644 --- a/dll/nap/nap.c +++ b/dll/nap/nap.c @@ -823,7 +823,7 @@ NAP_COMM(cmd_error) nap_error = 11; } else - nap_say("%s", cparse("Recieved error for [$0] $1-.", "%d %s", cmd, args ? args : empty_string)); + nap_say("%s", cparse("Received error for [$0] $1-.", "%d %s", cmd, args ? args : empty_string)); } if (nap_error > 10) { @@ -836,7 +836,7 @@ NAP_COMM(cmd_error) NAP_COMM(cmd_unknown) { if (do_hook(MODULE_LIST, "NAP UNKNOWN %s", args)) - nap_say("%s", cparse("Recieved unknown [$0] $1-.", "%d %s", cmd, args)); + nap_say("%s", cparse("Received unknown [$0] $1-.", "%d %s", cmd, args)); return 0; } diff --git a/dll/nap/napster.h b/dll/nap/napster.h index 330c187..a202b38 100644 --- a/dll/nap/napster.h +++ b/dll/nap/napster.h @@ -258,7 +258,7 @@ enum nap_Commands { CMDS_CHANGEDATA = 703, CMDS_PING = 751, /* user */ - CMDS_PONG = 752, /* recieved from a ping*/ + CMDS_PONG = 752, /* received from a ping*/ /* can also be used to send a pong */ /* 753 */ @@ -271,7 +271,7 @@ enum nap_Commands { /* 821 822 823 826 827 */ CMDS_SENDME = 824, CMDR_NICK = 825, - CMDS_NAME = 830, /* returns 825 with nick info, 830 is recieved on end of list */ + CMDS_NAME = 830, /* returns 825 with nick info, 830 is received on end of list */ /* 831 */ diff --git a/doc/BitchX.doc b/doc/BitchX.doc index b38fefa..570b9e0 100644 --- a/doc/BitchX.doc +++ b/doc/BitchX.doc @@ -228,7 +228,7 @@ ABOUT the people who have helped to make bitchx what it is. ADDFORWARD [nick|#channel] - Forwards all msgs recieved to another nick or channel. + Forwards all msgs received to another nick or channel. ADDIDLE diff --git a/doc/entire-faq.html b/doc/entire-faq.html index f9b034c..357097e 100644 --- a/doc/entire-faq.html +++ b/doc/entire-faq.html @@ -971,7 +971,7 @@ see strftime(3) for more options to start a dcc chat with someone type
/dcc chat nick

-if you recieve a dcc chat request you have two options
+if you receive a dcc chat request you have two options
you can type:
/chat or /nochat
-OR-
@@ -1163,8 +1163,8 @@ YANK_FROM_CUTBUFFER insert the last text you deleted
/RELCR Usage: /relcr- Displays the last CTCP reply message received
/RELCRT Usage: /relcrt- Changes the topic to the last CTCP reply message
/RELCT Usage: /relct- Changes the topic to the last CTCP command issued
-/RELD Usage: /reld- Displays the last DCC msg recieved.
-/RELDT Usage: /reldt- Sets the topic to the last DCC message recieved.
+/RELD Usage: /reld- Displays the last DCC msg received.
+/RELDT Usage: /reldt- Sets the topic to the last DCC message received.
/RELI Usage: /reli- Shows the last invite message received
/RELIT Usage: /relit- Changes the topic to the last invite message received
/RELM Usage: /relm - Redirects last received message to If invoked with -l, the last 10 messages received are listed-l # will display message number #
diff --git a/doc/functions.txt b/doc/functions.txt index bb021c1..a41acbe 100644 --- a/doc/functions.txt +++ b/doc/functions.txt @@ -94,7 +94,7 @@ Notes: It is possible to embed spaces into a word or pattern simply by Function: $userhost() Usage: $userhost() -Returns: the userhost (if any) of the most previously recieved message. +Returns: the userhost (if any) of the most previously received message. Notes: $userhost() changes with every single line that appears on your screen, so if you want to save it, you will need to assign it to a variable. @@ -754,13 +754,13 @@ Example: $winsize(1) returns 22 Function: $lastnotice() Usage: $lastnotice(refnum) -Returns: the last notice recieved or nothing if none +Returns: the last notice received or nothing if none Example: $lastnotice(10) returns "10:19pm |By-Tor| ~by-tor@by-tor.com |By-tor| yo" Function: $lastmessage() Usage: $lastmessage(refnum) -Returns: the last message recieved or nothing if none +Returns: the last message received or nothing if none Example: $lastmessage(10) returns 10:19pm |By-Tor| ~by-tor@by-tor.com |By-tor| yo diff --git a/doc/pana-docs/pana-docs.txt b/doc/pana-docs/pana-docs.txt index 6324ad7..727a005 100644 --- a/doc/pana-docs/pana-docs.txt +++ b/doc/pana-docs/pana-docs.txt @@ -380,7 +380,7 @@ New status line variables: %D Show dcc percentage done on status line. - %^ Show number of recieved messages while away on status line. + %^ Show number of received messages while away on status line. diff --git a/doc/pana-docs/pana-docs2.txt b/doc/pana-docs/pana-docs2.txt index 97d6f01..b27c1e1 100644 --- a/doc/pana-docs/pana-docs2.txt +++ b/doc/pana-docs/pana-docs2.txt @@ -380,7 +380,7 @@ New status line variables: %D Show dcc percentage done on status line. - %^ Show number of recieved messages while away on status line. + %^ Show number of received messages while away on status line. diff --git a/doc/plugins.txt b/doc/plugins.txt index 9d831ce..9a89b21 100644 --- a/doc/plugins.txt +++ b/doc/plugins.txt @@ -68,7 +68,7 @@ this easier ie. CHANNEL_SYNCH_LIST. flag is used in the same procedures as id. a VAR_PROC uses this as the default INT/BOOL value for the variable. CTCP_PROC uses this to tell the -client what todo when we recieve one of these ctcp's. CTCP_SPECIAL, +client what todo when we receive one of these ctcp's. CTCP_SPECIAL, CTCP_TELLUSER, CTCP_REPLY, CTCP_INLINE, CTCP_NOLIMIT are possible values. These can be or'd together as well. HOOK_PROC uses this as the "noise" of this event. diff --git a/include/server.h b/include/server.h index 52d4ecf..e6ceb56 100644 --- a/include/server.h +++ b/include/server.h @@ -95,9 +95,9 @@ typedef struct * used for redirect */ int lag; /* indication of lag from server CDE*/ struct timeval lag_sent; /* time lag ping sent to server CDE */ - struct timeval lag_recv; /* time last lag ping reply was recieved */ + struct timeval lag_recv; /* time last lag ping reply was received */ unsigned long lag_cookie; /* cookie to identify our lag check pings */ - time_t last_msg; /* last mesg recieved from the server CDE */ + time_t last_msg; /* last mesg received from the server CDE */ time_t last_sent; /* last mesg time sent */ QueueSend *queue; /* queue of lines to send to a server */ diff --git a/include/struct.h b/include/struct.h index 5e73f05..a7bf8c7 100644 --- a/include/struct.h +++ b/include/struct.h @@ -1219,7 +1219,7 @@ typedef struct _dcc_internal { struct transfer_struct transfer_orders; /* structure for resending files */ int file; /* file handle open file */ u_32int_t filesize; /* the filesize to get */ - u_32int_t packets; /* number of blocksize packets recieved */ + u_32int_t packets; /* number of blocksize packets received */ int eof; /* in EOF condition. */ int blocksize; /* this dcc's blocksize */ int dcc_fast; /* set if non-blocking used */ diff --git a/source/alias.c b/source/alias.c index 89481e7..ab1295f 100644 --- a/source/alias.c +++ b/source/alias.c @@ -665,7 +665,7 @@ BUILT_IN_COMMAND(dumpcmd) * string "void", then the balance of the remaining alias arguments are * discarded and $* will expand to the false value. If neither "..." nor * "void" are provided in the argument list, then that last variable in the - * list will recieve all of the remaining arguments left at its position. + * list will receive all of the remaining arguments left at its position. * * Examples: * diff --git a/source/ctcp.c b/source/ctcp.c index 7659db4..eaec32d 100644 --- a/source/ctcp.c +++ b/source/ctcp.c @@ -1014,7 +1014,7 @@ const char *my_host; /* - * If we recieve a CTCP DCC REJECT in a notice, then we want to remove + * If we receive a CTCP DCC REJECT in a notice, then we want to remove * the offending DCC request */ CTCP_HANDLER(do_dcc_reply) diff --git a/source/dcc.c b/source/dcc.c index b158189..4dacddd 100644 --- a/source/dcc.c +++ b/source/dcc.c @@ -1223,7 +1223,7 @@ UserList *ul = NULL; #endif else { - put_it("%s", convert_output_format("$G %RDCC%n Unknown DCC $0 ($1) recieved from $2", "%s %s %s", type, description, nick)); + put_it("%s", convert_output_format("$G %RDCC%n Unknown DCC $0 ($1) received from $2", "%s %s %s", type, description, nick)); reset_display_target(); return; } @@ -1235,7 +1235,7 @@ UserList *ul = NULL; if ((s->flags & DCC_ACTIVE)) { /* collision. */ - put_it("%s", convert_output_format("$G %RDCC%n Recieved DCC $0 request from $1 while previous session active", "%s %s", type, nick)); + put_it("%s", convert_output_format("$G %RDCC%n Received DCC $0 request from $1 while previous session active", "%s %s", type, nick)); reset_display_target(); return; } @@ -2902,7 +2902,7 @@ DCC_int *n; } } -/* Looks for the dcc transfer that is "current" (last recieved data) +/* Looks for the dcc transfer that is "current" (last received data) * and returns information for it */ extern char *DCC_get_current_transfer (void) @@ -3040,7 +3040,7 @@ int dcc_exempt_save(FILE *fptr) */ static void output_reject_ctcp (UserhostItem *stuff, char *nick, char *args) { - char *nickname_recieved; + char *nickname_received; char *type; char *description; @@ -3052,10 +3052,10 @@ static void output_reject_ctcp (UserhostItem *stuff, char *nick, char *args) next_arg(args, &args); type = next_arg(args, &args); description = next_arg(args, &args); - nickname_recieved = stuff->nick; + nickname_received = stuff->nick; - if (nickname_recieved && *nickname_recieved) - send_ctcp(CTCP_NOTICE, nickname_recieved, CTCP_DCC, + if (nickname_received && *nickname_received) + send_ctcp(CTCP_NOTICE, nickname_received, CTCP_DCC, "REJECT %s %s", type, description); } diff --git a/source/exec.c b/source/exec.c index dc30bf6..d8ff682 100644 --- a/source/exec.c +++ b/source/exec.c @@ -892,7 +892,7 @@ static void handle_filedesc (Process *proc, int *fd, int hook_nonl, int hook_nl * has exited, or the client has attempted to fork() off a helper process * (such as wserv or gzip) and that process has choked on itself. * - * When SIGCHLD is recieved, the global variable 'dead_children_processes' + * When SIGCHLD is received, the global variable 'dead_children_processes' * is incremented. When this function is called, we go through and call * waitpid() on all of the outstanding zombies, conditionally stopping when * we reach a specific wanted sub-process. @@ -1076,7 +1076,7 @@ void add_process_wait (int proc_index, const char *cmd) * the client. Either stage may happen first, but until both are completed * we keep the process around. * - * 1) We must recieve an EOF on both stdin and stderr, or we must + * 1) We must receive an EOF on both stdin and stderr, or we must * have closed stdin and stderr already (handled by do_processes) * 2) The process must have died (handled by get_child_exit) * @@ -1308,7 +1308,7 @@ void kill_process (int kill_index, int sig) * condition (such as a swap in). You do not know when the process will * actually die. It could be 15 ns, it could be 15 minutes, it could be * 15 years. Its also useful to note that we, as the parent process, will not - * recieve the SIGCHLD signal until after the child dies. That means it is + * receive the SIGCHLD signal until after the child dies. That means it is * pointless to try to reap any children processes here. The main io() * loop handles reaping children (by calling get_child_exit()). */ diff --git a/source/functions.c b/source/functions.c index 9aedc11..edfd515 100644 --- a/source/functions.c +++ b/source/functions.c @@ -1600,7 +1600,7 @@ BUILT_IN_FUNCTION(function_rmatch, input) /* * Usage: $userhost() - * Returns: the userhost (if any) of the most previously recieved message. + * Returns: the userhost (if any) of the most previously received message. * Caveat: $userhost() changes with every single line that appears on * your screen, so if you want to save it, you will need to assign * it to a variable. diff --git a/source/network.c b/source/network.c index 706bfa9..51c5427 100644 --- a/source/network.c +++ b/source/network.c @@ -785,7 +785,7 @@ extern char *BX_one_to_another (const char *what) /* * It is possible for a race condition to exist; such that select() - * indicates that a listen()ing socket is able to recieve a new connection + * indicates that a listen()ing socket is able to receive a new connection * and that a later accept() call will still block because the connection * has been closed in the interim. This wrapper for accept() attempts to * defeat this by making the accept() call nonblocking. diff --git a/source/notice.c b/source/notice.c index a358d83..69c51ab 100644 --- a/source/notice.c +++ b/source/notice.c @@ -738,7 +738,7 @@ void parse_notice(char *from, char **Args) return; if (!*to) { - put_it("*** obsolete notice recieved. [%s]", line+1); + put_it("*** obsolete notice received. [%s]", line+1); return; } diff --git a/source/parse.c b/source/parse.c index e691bb3..a87a12c 100644 --- a/source/parse.c +++ b/source/parse.c @@ -127,7 +127,7 @@ register BanList *eban = NULL; void fake (void) { - bitchsay("--- Fake Message recieved!!! ---"); + bitchsay("--- Fake Message received!!! ---"); return; } diff --git a/source/server.c b/source/server.c index bb6cff7..62d33c0 100644 --- a/source/server.c +++ b/source/server.c @@ -620,7 +620,7 @@ void do_server (fd_set *rd, fd_set *wr) /* server_lag_reply() * - * Called when a reply to a lag check ping has been recieved. + * Called when a reply to a lag check ping has been received. */ void server_lag_reply(int s, unsigned long cookie, struct timeval lag_recv, struct timeval lag_sent) { diff --git a/source/who.c b/source/who.c index 194ffb1..187f28a 100644 --- a/source/who.c +++ b/source/who.c @@ -438,7 +438,7 @@ do if (!new_w) break; /* - * We have recieved a reply to this query -- its too late to + * We have received a reply to this query -- its too late to * piggyback it now! */ new_w->dirty = 1; diff --git a/source/window.c b/source/window.c index b88fc05..d292895 100644 --- a/source/window.c +++ b/source/window.c @@ -3752,7 +3752,7 @@ Window *window_query (Window *window, char **args, char *usage) else if (!strcmp(nick, ",")) { if (!(nick = get_server_recv_nick(window->server))) - say("You have not recieved a message yet"); + say("You have not received a message yet"); } else if (!strcmp(nick, "*") && !(nick = get_current_channel_by_refnum(0)))