aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

Merge pull request #43 from ailin-nemui/server-outgoing

Browse Source 
remove newline from "server outgoing modify"

(cherry picked from commit ea961623f5)
This commit is contained in:
ailin-nemui 2021-10-10 12:45:21 +02:00 committed by Ailin Nemui
parent 44298db814
commit 3bb8c619e2
3 changed files with 42 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/signals.txt
View File

@ -151,7 +151,7 @@ irc.c:
"whois default event", SERVER_REC, char *args, char *sender_nick, char *sender_address "whois default event", SERVER_REC, char *args, char *sender_nick, char *sender_address
"server incoming", SERVER_REC, char *data "server incoming", SERVER_REC, char *data
"server outgoing modify", SERVER_REC, GString *data "server outgoing modify", SERVER_REC, GString *data, int crlf
(for perl parser..) (for perl parser..)
"redir "<cmd>, SERVER_REC, char *args, char *sender_nick, char *sender_address "redir "<cmd>, SERVER_REC, char *args, char *sender_nick, char *sender_address

25
src/irc/core/irc-servers.c
View File

@ -718,6 +718,7 @@ static int server_cmd_timeout(IRC_SERVER_REC *server, gint64 now)
GString *str; GString *str;
long usecs; long usecs;
char *cmd; char *cmd;
int crlf;
if (!IS_IRC_SERVER(server)) if (!IS_IRC_SERVER(server))
return 0; return 0;
@ -741,15 +742,29 @@ static int server_cmd_timeout(IRC_SERVER_REC *server, gint64 now)
/* send command */ /* send command */
str = g_string_new(cmd); str = g_string_new(cmd);
signal_emit("server outgoing modify", 2, server, str);
if (str->len > 2 && str->str[str->len - 2] == '\r')
crlf = 2;
else if (str->len > 1 && str->str[str->len - 1] == '\n')
crlf = 1;
else
crlf = 0;
if (crlf)
g_string_truncate(str, str->len - crlf);
signal_emit("server outgoing modify", 3, server, str, crlf);
if (str->len) { if (str->len) {
if (crlf == 2)
g_string_append(str, "\r\n");
else if (crlf == 1)
g_string_append(str, "\n");
irc_server_send_data(server, str->str, str->len); irc_server_send_data(server, str->str, str->len);
/* add to rawlog without [CR+]LF */ /* add to rawlog without [CR+]LF */
if (str->len > 2 && str->str[str->len - 2] == '\r') if (crlf)
str->str[str->len - 2] = '\0'; g_string_truncate(str, str->len - crlf);
else if (str->str[str->len - 1] == '\n')
str->str[str->len - 1] = '\0';
rawlog_output(server->rawlog, str->str); rawlog_output(server->rawlog, str->str);
server_redirect_command(server, str->str, redirect); server_redirect_command(server, str->str, redirect);
} }

28
src/irc/core/irc.c
View File

@ -115,20 +115,34 @@ void irc_send_cmd_full(IRC_SERVER_REC *server, const char *cmd, int irc_send_whe
if (!raw) { if (!raw) {
/* Add CR+LF to command */ /* Add CR+LF to command */
g_string_append_c(str, 13); g_string_append(str, "\r\n");
g_string_append_c(str, 10);
} }
if (irc_send_when == IRC_SEND_NOW) { if (irc_send_when == IRC_SEND_NOW) {
signal_emit("server outgoing modify", 2, server, str); int crlf;
if (str->len > 2 && str->str[str->len - 2] == '\r')
crlf = 2;
else if (str->len > 1 && str->str[str->len - 1] == '\n')
crlf = 1;
else
crlf = 0;
if (crlf)
g_string_truncate(str, str->len - crlf);
signal_emit("server outgoing modify", 3, server, str, crlf);
if (str->len) { if (str->len) {
if (crlf == 2)
g_string_append(str, "\r\n");
else if (crlf == 1)
g_string_append(str, "\n");
irc_server_send_data(server, str->str, str->len); irc_server_send_data(server, str->str, str->len);
/* add to rawlog without [CR+]LF */ /* add to rawlog without [CR+]LF */
if (str->len > 2 && str->str[str->len - 2] == '\r') if (crlf)
str->str[str->len - 2] = '\0'; g_string_truncate(str, str->len - crlf);
else if (str->str[str->len - 1] == '\n')
str->str[str->len - 1] = '\0';
rawlog_output(server->rawlog, str->str); rawlog_output(server->rawlog, str->str);
server_redirect_command(server, str->str, server->redirect_next); server_redirect_command(server, str->str, server->redirect_next);
} }