Egor00f/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

FTPc: use <cr lf> after commands instead of just <lf>

Browse Source 
git-svn-id: svn://kolibrios.org@3814 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
hidnplayr 2013-07-12 09:58:26 +00:00
parent 10d7fd5cf9
commit 008436f41e
2 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
programs/network/ftpc/ftpc.asm
View File

@ -271,7 +271,8 @@ wait_for_usercommand:
mov ecx, 256 mov ecx, 256
xor al, al xor al, al
repne scasb repne scasb
lea esi, [edi-s-1] lea esi, [edi-s]
mov word[edi-2], 0x0a0d
; and send it to the server ; and send it to the server
mcall send, [socketnum], s, , 0 mcall send, [socketnum], s, , 0
@ -286,8 +287,8 @@ open_dataconnection: ; only passive for now..
jne .fail jne .fail
mov dword[s], "PASV" mov dword[s], "PASV"
mov byte[s+4], 10 mov word[s+4], 0x0a0d
mcall send, [socketnum], s, 5, 0 mcall send, [socketnum], s, 6, 0
ret ret
.fail: .fail:

31
programs/network/ftpc/usercommands.inc
View File

@ -14,8 +14,9 @@ cmd_bye:
cmd_pwd: cmd_pwd:
mov dword[s], "PWD" + 10 shl 24 mov dword[s], "PWD" + 13 shl 24
mcall send, [socketnum], s, 4, 0 mov byte[s+4], 10
mcall send, [socketnum], s, 5, 0
jmp wait_for_servercommand jmp wait_for_servercommand
@ -27,7 +28,8 @@ cmd_cwd:
xor al, al xor al, al
mov edi, s mov edi, s
repne scasb repne scasb
lea esi, [edi - s - 1] lea esi, [edi - s]
mov word [edi - 2], 0x0a0d
mcall send, [socketnum], s, , 0 mcall send, [socketnum], s, , 0
@ -42,7 +44,8 @@ cmd_dele:
xor al, al xor al, al
mov edi, s mov edi, s
repne scasb repne scasb
lea esi, [edi - s - 1] lea esi, [edi - s]
mov word [edi - 2], 0x0a0d
mcall send, [socketnum], s, , 0 mcall send, [socketnum], s, , 0
@ -55,8 +58,8 @@ cmd_list:
mov [operation], OPERATION_LIST mov [operation], OPERATION_LIST
mov dword[s], "LIST" mov dword[s], "LIST"
mov byte[s+4], 0x0a mov word[s+4], 0x0a0d
mcall send, [socketnum], s, 5, 0 mcall send, [socketnum], s, 6, 0
jmp wait_for_servercommand jmp wait_for_servercommand
@ -91,7 +94,8 @@ cmd_retr:
xor al, al xor al, al
mov edi, s mov edi, s
repne scasb repne scasb
lea esi, [edi - s - 1] lea esi, [edi - s]
mov word [edi - 2], 0x0a0d
mcall send, [socketnum], s, , 0 mcall send, [socketnum], s, , 0
jmp wait_for_servercommand jmp wait_for_servercommand
@ -121,7 +125,8 @@ cmd_stor:
xor al, al xor al, al
mov edi, s mov edi, s
repne scasb repne scasb
lea esi, [edi - s - 1] lea esi, [edi - s]
mov word [edi - 2], 0x0a0d
mcall send, [socketnum], s, , 0 mcall send, [socketnum], s, , 0
jmp wait_for_servercommand jmp wait_for_servercommand
@ -152,8 +157,8 @@ cmd_lcwd:
cmd_cdup: cmd_cdup:
mov dword[s], "CDUP" mov dword[s], "CDUP"
mov byte[s+4], 0x0a mov word[s+4], 0x0d0a
mcall send, [socketnum], s, 5, 0 mcall send, [socketnum], s, 6, 0
jmp wait_for_servercommand jmp wait_for_servercommand
@ -165,7 +170,8 @@ cmd_rmd:
xor al, al xor al, al
mov edi, s mov edi, s
repne scasb repne scasb
lea esi, [edi - s - 1] lea esi, [edi - s]
mov word [edi - 2], 0x0a0d
mcall send, [socketnum], s, , 0 mcall send, [socketnum], s, , 0
@ -179,7 +185,8 @@ cmd_mkd:
xor al, al xor al, al
mov edi, s mov edi, s
repne scasb repne scasb
lea esi, [edi - s - 1] lea esi, [edi - s]
mov word [edi - 2], 0x0a0d
mcall send, [socketnum], s, , 0 mcall send, [socketnum], s, , 0