From 5f4e6c65ce0d03a0eb67f695fed43f958714df4b Mon Sep 17 00:00:00 2001 From: hidnplayr Date: Mon, 11 Mar 2024 21:52:38 +0000 Subject: [PATCH] Bugfix in CTCP git-svn-id: svn://kolibrios.org@9992 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/network/ircc/ircc.asm | 2 +- programs/network/ircc/userparser.inc | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/programs/network/ircc/ircc.asm b/programs/network/ircc/ircc.asm index 7066b191f1..32a26d9e63 100644 --- a/programs/network/ircc/ircc.asm +++ b/programs/network/ircc/ircc.asm @@ -13,7 +13,7 @@ ;; ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -version equ '0.36' +version equ '0.36b' ; connection status STATUS_DISCONNECTED = 0 diff --git a/programs/network/ircc/userparser.inc b/programs/network/ircc/userparser.inc index fee60495e1..3a1a2cb24e 100644 --- a/programs/network/ircc/userparser.inc +++ b/programs/network/ircc/userparser.inc @@ -223,10 +223,7 @@ cmd_usr_msg: call print_char pop esi - push esi call print_asciiz - pop esi - lea esi, [edi - packetbuf] mcall send, [socketnum], packetbuf, , 0 @@ -530,7 +527,7 @@ cmd_usr_ctcp: mov al, 0x01 stosb - push edi esi + push esi ; copy the message itself @@: @@ -550,7 +547,6 @@ cmd_usr_ctcp: stosb mov ax, 0x0a0d stosw - mov byte[edi], 0 ; now print to the window if TIMESTAMP @@ -560,7 +556,7 @@ cmd_usr_ctcp: mov esi, ctcp_header call print_asciiz - mov esi, packetbuf+8 + mov esi, user_command+6 mov bl, ' ' call print_string @@ -572,13 +568,13 @@ cmd_usr_ctcp: pop esi call print_asciiz - pop esi + mov al, 10 + call print_char ; now send it away lea esi, [edi - packetbuf] ; calculate length mcall send, [socketnum], packetbuf, , 0 ; and finally send to server - .fail: ret