Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 9984 → Rev 9983

/programs/network/ircc/ircc.asm
13,7 → 13,7
;; ;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
version equ '0.36'
version equ '0.35c'
 
; connection status
STATUS_DISCONNECTED = 0
572,8 → 572,6
window_active dd windows
window_print dd windows
 
cmd_remaining dd 0
 
align 4
@IMPORT:
 
/programs/network/ircc/serverparser.inc
548,10 → 548,6
cmp byte [esi+4], ' '
jne .fail
add esi, 5 ; skip 'PART '
cmp byte[esi], ':'
jne @f
inc esi
@@:
 
; Is it me who parted?
mov edi, servercommand+1
614,10 → 610,6
cmp byte[esi+4], ' '
jne .fail
add esi, 5 ; skip 'JOIN '
cmp byte[esi], ':'
jne @f
inc esi
@@:
 
; did we join a channel?
mov edi, servercommand+1
990,19 → 982,22
; TODO: remove all users?
 
.add:
push esi
call user_add
pop esi
 
.namesloop:
lodsb
test al, al
jz .done
cmp al, ' '
je .add
dec esi
call user_add
cmp al, ' ' ; names list is separated with spaces
jne .namesloop
jmp .add
 
.done:
call draw_user_list
.fail:
 
.fail:
ret
 
 
/programs/network/ircc/socket.inc
210,7 → 210,9
 
pusha
 
.recv_more:
; FIXME: make this a proper stream!
 
.nextpacket:
mcall recv, [socketnum], packetbuf , PACKETBUF_SIZE, MSG_DONTWAIT ; read a packet
inc eax ; check if we got any data
jz .done ; TODO: handle errors!
221,11 → 223,11
 
mov ecx, eax
mov esi, packetbuf ; esi = start pointer
.nextcommand:
mov edi, servercommand
add edi, [cmd_remaining]
.byteloop:
test ecx, ecx
jz .recv_more
jz .nextpacket
lodsb
dec ecx
cmp al, 10
232,8 → 234,6
je .got_command
cmp al, 13
je .got_command
cmp edi, servercommand + SERVERCOMMAND_SIZE ; Prevent command buffer overflow
jae .byteloop
stosb
jmp .byteloop
 
249,12 → 249,8
sub ecx, servercommand ; put length in ecx
call server_parser
pop ecx esi
jmp .nextcommand
 
.nextcommand:
mov edi, servercommand
mov [cmd_remaining], ecx ; remaining bytes since last EOL
jmp .byteloop
 
.done:
popa
ret
/programs/network/ircc/users.inc
1,6 → 1,6
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; ;;
;; Copyright (C) KolibriOS team 2004-2024. All rights reserved. ;;
;; Copyright (C) KolibriOS team 2004-2016. All rights reserved. ;;
;; Distributed under terms of the GNU General Public License ;;
;; ;;
;; Written by hidnplayr@kolibrios.org ;;
24,7 → 24,6
cmp [ebx + window.users], MAX_USERS
jae .fail
 
; Check if user is already listed (case insensitive)
mov edi, [ebx + window.data_ptr]
add edi, window_data.names
mov ebp, [ebx + window.users]
108,8 → 107,6
je .done
cmp al, 10
je .done
cmp al, 0
je .done
stosb
loop .fill
.done:
118,7 → 115,6
 
inc [ebx + window.users]
or [ebx + window.flags], FLAG_UPDATED
dec esi
.fail:
ret