WebSVN – Kolibri OS – Diff – /kernel/branches/net/applications/ftpd/commands.inc

 macro sendFTP str {
 local .string, .length, .label
         xor     edi, edi
-        mcall   send, [edx + thread_data.socketnum], .string, .length
+        mcall   send, [ebp + thread_data.socketnum], .string, .length
         jmp     @f
 .string db str, 13, 10
 .length = $ - .string
 @@:
+;
 ; input: esi = ptr to ascii commands
 ;        ecx = number of bytes input
-;        edx = pointer to thread_data structure
+;        ebp = pointer to thread_data structure
+;
 ; output: none
+;
 ;------------------------------------------------
 align 4
 parse_cmd:                              ; esi must point to command
         cmp     eax, [edi]
         je      .got_it
-        add     edi, 4+4*4
+        add     edi, 5*4
         cmp     byte [edi], 0
         jne     .scanloop
   .error:
-        cmp     [edx + thread_data.state], STATE_ACTIVE
+        cmp     [ebp + thread_data.state], STATE_ACTIVE
         jb      login_first
         sendFTP "500 Unsupported command"
         ret
   .got_it:
-        mov     eax, [edx + thread_data.state]
+        mov     eax, [ebp + thread_data.state]
         jmp     dword [edi + 4 + eax]
-align 4
-commands:               ; all commands must be in uppercase
+align 4
-        dd 'ABOR'
-        dd login_first, login_first, login_first, cmdABOR
+commands:               ; all commands must be in uppercase
-;        dd 'ACCT
-;        dd login_first, login_first, login_first, cmd_ACCT
-;        dd 'APPE'
-;        dd login_first, login_first, login_first, cmd_APPE
+        dd 'ABOR', login_first, login_first, login_first, cmdABOR
-        dd 'CDUP'
-        dd login_first, login_first, login_first, cmdCDUP
+;        dd 'ACCT', login_first, login_first, login_first, cmd_ACCT
-        dd 'CWD'
-        dd login_first, login_first, login_first, cmdCWD
+;        dd 'APPE', login_first, login_first, login_first, cmd_APPE
-        dd 'DELE'
-        dd login_first, login_first, login_first, cmdDELE
+        dd 'CDUP', login_first, login_first, login_first, cmdCDUP
-;        dd 'HELP'
-;        dd login_first, login_first, login_first, cmd_HELP
+        dd 'CWD',  login_first, login_first, login_first, cmdCWD
-        dd 'LIST'
-        dd login_first, login_first, login_first, cmdLIST
+        dd 'DELE', login_first, login_first, login_first, cmdDELE
-;        dd 'MDTM'
-;        dd login_first, login_first, login_first, cmd_MDTM
+;        dd 'HELP', login_first, login_first, login_first, cmd_HELP
-;        dd 'MKD'
-;        dd login_first, login_first, login_first, cmd_MKD
+        dd 'LIST', login_first, login_first, login_first, cmdLIST
-;        dd 'MODE'
-;        dd login_first, login_first, login_first, cmd_MODE
+;        dd 'MDTM', login_first, login_first, login_first, cmd_MDTM
-        dd 'NLST'
-        dd login_first, login_first, login_first, cmdNLST
+;        dd 'MKD',  login_first, login_first, login_first, cmd_MKD
-        dd 'NOOP'
-        dd login_first, login_first, login_first, cmdNOOP
+;        dd 'MODE', login_first, login_first, login_first, cmd_MODE
-        dd 'PASS'
-        dd cmdPASS.0,   cmdPASS    , cmdPASS.2,   cmdPASS.3
+        dd 'NLST', login_first, login_first, login_first, cmdNLST
-        dd 'PASV'
-        dd login_first, login_first, login_first, cmdPASV
+        dd 'NOOP', login_first, login_first, login_first, cmdNOOP
-        dd 'PORT'
-        dd login_first, login_first, login_first, cmdPORT
+        dd 'PASS', cmdPASS.0,   cmdPASS    , cmdPASS.2,   cmdPASS.3
-        dd 'PWD'
-        dd login_first, login_first, login_first, cmdPWD
+        dd 'PASV', login_first, login_first, login_first, cmdPASV
-        dd 'QUIT'
-        dd cmdQUIT,     cmdQUIT,     cmdQUIT,     cmdQUIT
+        dd 'PORT', login_first, login_first, login_first, cmdPORT
-;        dd 'REIN'
-;        dd login_first, login_first, login_first, cmd_REIN
+        dd 'PWD',  login_first, login_first, login_first, cmdPWD
-;        dd 'REST'
-;        dd login_first, login_first, login_first, cmd_REST
+        dd 'QUIT', cmdQUIT,     cmdQUIT,     cmdQUIT,     cmdQUIT
-        dd 'RETR'
-        dd login_first, login_first, login_first, cmdRETR
+;        dd 'REIN', login_first, login_first, login_first, cmd_REIN
-;        dd 'RMD'
-;        dd login_first, login_first, login_first, cmd_RMD
+;        dd 'REST', login_first, login_first, login_first, cmd_REST
-;        dd 'RNFR'
-;        dd login_first, login_first, login_first, cmd_RNFR
+        dd 'RETR', login_first, login_first, login_first, cmdRETR
-;        dd 'RNTO'
-;        dd login_first, login_first, login_first, cmd_RNTO
+;        dd 'RMD', login_first, login_first, login_first, cmd_RMD
-;        dd 'SITE'
-;        dd login_first, login_first, login_first, cmd_SITE
+;        dd 'RNFR', login_first, login_first, login_first, cmd_RNFR
-;        dd 'SIZE'
-;        dd login_first, login_first, login_first, cmd_SIZE
+;        dd 'RNTO', login_first, login_first, login_first, cmd_RNTO
-;        dd 'STAT'
-;        dd login_first, login_first, login_first, cmd_STAT
+;        dd 'SITE', login_first, login_first, login_first, cmd_SITE
-        dd 'STOR'
-        dd login_first, login_first, login_first, cmdSTOR
+;        dd 'SIZE', login_first, login_first, login_first, cmd_SIZE
-;        dd 'STOU'
-;        dd login_first, login_first, login_first, cmd_STOU
+;        dd 'STAT', login_first, login_first, login_first, cmd_STAT
-;        dd 'STRU'
-;        dd login_first, login_first, login_first, cmd_STRU
+        dd 'STOR', login_first, login_first, login_first, cmdSTOR
-        dd 'SYST'
-        dd login_first, login_first, login_first, cmdSYST
+;        dd 'STOU', login_first, login_first, login_first, cmd_STOU
-        dd 'TYPE'
+;        dd 'STRU', login_first, login_first, login_first, cmd_STRU
-        dd login_first, login_first, login_first, cmdTYPE
+        dd 'SYST', login_first, login_first, login_first, cmdSYST
-        dd 'USER'
+        dd 'TYPE', login_first, login_first, login_first, cmdTYPE
-        dd cmdUSER,     cmdUSER,     cmdUSER,     cmdUSER.2
+        dd 'USER', cmdUSER,     cmdUSER,     cmdUSER,     cmdUSER.2
 align 4
 abort_transfer:
-        and     [edx + thread_data.permissions], not ABORT
+        and     [ebp + thread_data.permissions], not ABORT
-        mov     [edx + thread_data.mode], MODE_NOTREADY
+        mov     [ebp + thread_data.mode], MODE_NOTREADY
         invoke  file.close, ebx
-        mcall   close, [edx + thread_data.datasocketnum]
+        mcall   close, [ebp + thread_data.datasocketnum]
-        mov     edx, [ebp]
         sendFTP "530 Transfer aborted"
         ret
 align 4
 align 4
 create_path:            ; combine home_dir and work_dir strings into fpath
-        mov     edx, [ebp]
-        lea     edi, [edx + thread_data.fpath]
+        lea     edi, [ebp + thread_data.fpath]
-        lea     esi, [edx + thread_data.home_dir]
+        lea     esi, [ebp + thread_data.home_dir]
         mov     ecx, 1024
   .loop1:
         lodsb
         cmp     al, 0x20
         jb      .next
         dec     edi
        @@:
-        lea     esi, [edx + thread_data.work_dir]
+        lea     esi, [ebp + thread_data.work_dir]
         mov     ecx, 1024
   .loop2:
         lodsb
         cmp     al, 0x20
         jb      .done
         stosb
 align 4
 cmdABOR:
-        or      [edx + thread_data.permissions], ABORT
+        or      [ebp + thread_data.permissions], ABORT
         sendFTP "250 Command succesul"
         ret
 ;------------------------------------------------
 ; "CDUP"
 align 4
 cmdCDUP:
-        test    [edx + thread_data.permissions], PERMISSION_CD
+        test    [ebp + thread_data.permissions], PERMISSION_CD
         jz      permission_denied
-        cmp     byte [edx + thread_data.work_dir+1], 0                          ; are we in "/" ?
+        cmp     byte [ebp + thread_data.work_dir+1], 0                          ; are we in "/" ?
         je      .done
         mov     ecx, 1024
         xor     al, al
-        lea     edi, [edx + thread_data.work_dir]
+        lea     edi, [ebp + thread_data.work_dir]
-        repne   scasb
-        std
-        dec     edi
-        dec     edi
+        repne   scasb
-        dec     edi
+        sub     edi, 3
+        mov     al,'/'
+        std
+        neg     ecx
-        mov     al,'/'
+        add     ecx, 1024
         repne   scasb
         cld
         mov     byte[edi+1], 0
   .done:
 ; Print the new working dir on the console
-        lea     eax, [edx + thread_data.work_dir]
+        lea     eax, [ebp + thread_data.work_dir]
         push    eax
         call    [con_write_asciiz]
 align 4
 cmdCWD:
-        test    [edx + thread_data.permissions], PERMISSION_CD
+        test    [ebp + thread_data.permissions], PERMISSION_CD
         jz      permission_denied
         sub     ecx, 4
         jb      .err
         add     esi, 4
+        mov     ecx, 1024
+        lea     edi, [ebp + thread_data.work_dir]
+        cmp     byte [esi], '/'
+        je      .loop
   .scan:
-        lea     edi, [edx + thread_data.work_dir + 1]
+        lea     edi, [ebp + thread_data.work_dir + 1]
         push    ecx
         mov     ecx, 1024
   .find_zero:
         cmp     byte [edi], 0
         mov     byte [edi], 0
 ; Print the new working dir on the console
-        lea     eax, [edx + thread_data.work_dir]
+        lea     eax, [ebp + thread_data.work_dir]
         push    eax
         call    [con_write_asciiz]
         push    str_newline
         call    [con_write_asciiz]
 align 4
 cmdDELE:
-        test    [edx + thread_data.permissions], PERMISSION_DELETE
+        test    [ebp + thread_data.permissions], PERMISSION_DELETE
         jz      permission_denied
         ret
 align 4
 cmdLIST:
-        test    [edx + thread_data.permissions], PERMISSION_EXEC
+        test    [ebp + thread_data.permissions], PERMISSION_EXEC
         jz      permission_denied
 ; If we are in active mode, it's time to open a data socket..
-        cmp     [edx + thread_data.mode], MODE_ACTIVE
+        cmp     [ebp + thread_data.mode], MODE_ACTIVE
         jne     @f
-        mov     ecx, [edx + thread_data.datasocketnum]
+        mov     ecx, [ebp + thread_data.datasocketnum]
-        lea     edx, [edx + thread_data.datasock]
+        lea     edx, [ebp + thread_data.datasock]
         mov     esi, sizeof.thread_data.datasock
         mcall   connect
         cmp     eax, -1
         je      socketerror
   @@:
-        mov     edx, [ebp]
 ; Create fpath from home_dir and work_dir
         call    create_path
-        lea     ebx, [edx + thread_data.fpath]
+        lea     ebx, [ebp + thread_data.fpath]
-        invoke  con_write_asciiz, ebx
-        invoke  con_write_asciiz, str_newline
         invoke  con_write_asciiz, ebx
-        mov     edx, [ebp]                        ;;;
+        invoke  con_write_asciiz, str_newline
         lea     ebx, [edx + thread_data.fpath]       ;;;;
 ; Start the search
-        invoke  file.find.first, ebx, str_mask, FA_ANY
-        test    eax, eax
+        invoke  file.find.first, ebx, str_mask, FA_READONLY+FA_FOLDER+FA_NORMAL+FA_ARCHIVED
-        jz      .nosuchdir
+        test    eax, eax
         jz      .nosuchdir
         mov     edx, [ebp]                        ;;;
-        lea     edi, [edx + thread_data.buffer]
+        lea     edi, [ebp + thread_data.buffer]
         mov     ax, 0x0a0d
         stosw
-        test    [edx + thread_data.permissions], ABORT          ; Did we receive ABOR command from client?
+        test    [ebp + thread_data.permissions], ABORT          ; Did we receive ABOR command from client?
 ;;;        jnz     .abort                                         ; TODO
 ; check next file
-;;;        invoke  file.find.next, ebx
+        invoke  file.find.next, ebx
-;;;        jmp     .parse_file
+        jmp     .parse_file
-        mov     eax, ebx        ;;;;;
+;;;        mov     eax, ebx        ;;;;;
 ; close file desc
   .done:
-        invoke  file.find.close, eax                            ; file discriptor is still in eax at this point!
+        invoke  file.find.close, ebx                            ; ebx is the
 ; append the string with a 0
         xor     al, al
         stosb
 ; Warn the client we're about to send the data
-        push    edi
+; Warn the client we're about to send the data
-        mov     edx, [ebp]              ;;;;;;;
+        push    edi
-        sendFTP "150 Here it comes.."
-        pop     esi
+        sendFTP "150 Here it comes.."
+        pop     esi
 ; and send it to the client
-        mov     edx, [ebp]
+; and send it to the client
-        mov     ecx, [edx + thread_data.datasocketnum]
+        mov     ecx, [ebp + thread_data.datasocketnum]
-        lea     edx, [edx + thread_data.buffer]
+        lea     edx, [ebp + thread_data.buffer]
-        sub     esi, edx
-        xor     edi, edi
+        sub     esi, edx
-        mcall   send
+        xor     edi, edi
         mcall   send
 ; close the data socket..
-        mov     edx, [ebp]                                      ; thread_data pointer
+; close the data socket..
 align 4
 cmdNLST:
-        test    [edx + thread_data.permissions], PERMISSION_EXEC
+        test    [ebp + thread_data.permissions], PERMISSION_EXEC
         jz      permission_denied
         ; TODO: same as list but simpler output format
         lea     esi, [esi + 5]
 ; read the password from users.ini
-        lea     edi, [edx + thread_data.buffer + 512]           ; temp pass
+        lea     edi, [ebp + thread_data.buffer + 512]           ; temp pass
-        lea     ebx, [edx + thread_data.fpath]                  ; temp username
+        lea     ebx, [ebp + thread_data.fpath]                  ; temp username
         invoke  ini.get_str, path2, ebx, str_pass, edi, 512, str_infinity
         test    eax, eax
         jnz     .incorrect
         cmp     dword [edi], -1
         je      .incorrect
         cmp     byte[edi], 0
   .pass_ok:
         invoke  ini.get_int, path2, ebx, str_mode, 0
-        mov     edx, [ebp]                                      ; because libini destroys edx!
+        mov     [ebp + thread_data.permissions], eax
-        mov     [edx + thread_data.permissions], eax
         invoke  con_write_asciiz, str_pass_ok
-        mov     [edx + thread_data.state], STATE_ACTIVE
+        mov     [ebp + thread_data.state], STATE_ACTIVE
         sendFTP "230 You are now logged in"
         ret
   .2:
   .incorrect:
-        mov     [edx + thread_data.state], STATE_CONNECTED
+        mov     [ebp + thread_data.state], STATE_CONNECTED
         sendFTP "530 Login incorrect"
         ret
         mcall   socket, AF_INET4, SOCK_STREAM, 0
         cmp     eax, -1
         je      socketerror
-        mov     edx, [ebp]                                      ; thread_data pointer
+        mov     [ebp + thread_data.passivesocknum], eax
-        mov     [edx + thread_data.passivesocknum], eax
 ; Bind it to a known local port
-        mov     [edx + thread_data.datasock.sin_family], AF_INET4
+        mov     [ebp + thread_data.datasock.sin_family], AF_INET4
+        pushw   [pasvport]
-        mov     [edx + thread_data.datasock.sin_port], 2000
+        popw    [ebp + thread_data.datasock.sin_port]
+        inc     [pasvport]
-        mov     [edx + thread_data.datasock.sin_addr], 0
+        mov     [ebp + thread_data.datasock.sin_addr], 0
         mov     ecx, eax                                        ; passivesocketnum
-        lea     edx, [edx + thread_data.datasock]
+        lea     edx, [ebp + thread_data.datasock]
         mov     esi, sizeof.thread_data.datasock
         mcall   bind
         cmp     eax, -1
 ;        je      listen_err     ; TODO
 ; Tell our thread we are ready to accept incoming calls
-        mov     edx, [ebp]                                      ; thread_data pointer
+        mov     [ebp + thread_data.mode], MODE_PASSIVE_WAIT
-        mov     [edx + thread_data.mode], MODE_PASSIVE_WAIT
 ; Now tell the client where to connect to in this format:
 ; 227 Entering Passive Mode (a1,a2,a3,a4,p1,p2)
 ; where a1.a2.a3.a4 is the IP address and p1*256+p2 is the port number.
 ; '227 ('
-        lea     edi, [edx + thread_data.buffer]
+        lea     edi, [ebp + thread_data.buffer]
         mov     eax, '227 '     ; FIXME (now hardcoded to 127.0.0.1:2000)
         stosd
         mov     al, '('
         stosb
         mov     al, ','
         stosb
 ; port
-        mov     eax, 7
+        movzx   eax, byte [ebp + thread_data.datasock.sin_port + 1]
         call    dword_to_ascii
         mov     al, ','
         stosb
-        mov     eax, 208
+        movzx   eax, byte [ebp + thread_data.datasock.sin_port]
         call    dword_to_ascii
 ; ')', 13, 10, 0
         mov     eax, ')' + 0x000a0d00
         stosd
         lea     esi, [edi - thread_data.buffer]
-        sub     esi, edx
+        sub     esi, ebp
-        mov     ecx, [edx + thread_data.socketnum]
+        mov     ecx, [ebp + thread_data.socketnum]
-        lea     edx, [edx + thread_data.buffer]
+        lea     edx, [ebp + thread_data.buffer]
         xor     edi, edi
         mcall   send
         ret
 align 4
 cmdPWD:
-        mov     dword [edx + thread_data.buffer], '257 '
+        mov     dword [ebp + thread_data.buffer], '257 '
-        mov     byte [edx + thread_data.buffer+4], '"'
+        mov     byte [ebp + thread_data.buffer+4], '"'
-        lea     edi, [edx + thread_data.buffer+5]
+        lea     edi, [ebp + thread_data.buffer+5]
-        lea     esi, [edx + thread_data.work_dir]
+        lea     esi, [ebp + thread_data.work_dir]
         mov     ecx, 1024
   .loop:
         lodsb
         or      al, al
         jz      .ok
   .ok:
         mov     dword [edi], '"' + 0x000a0d00    ; '"',13,10,0
         lea     esi, [edi - thread_data.buffer + 4]
-        sub     esi, edx
+        sub     esi, ebp
-        mov     ecx, [edx + thread_data.socketnum]
+        mov     ecx, [ebp + thread_data.socketnum]
-        lea     edx, [edx + thread_data.buffer]
+        lea     edx, [ebp + thread_data.buffer]
         xor     edi, edi
         mcall   send
-        mov     edx, [ebp]
 ; Print the new working dir on the console
-        lea     eax, [edx + thread_data.work_dir]
+        lea     eax, [ebp + thread_data.work_dir]
         invoke  con_write_asciiz, eax
         invoke  con_write_asciiz, str_newline
         mov     cl, ','
         call    ip_to_dword
 ; And put it in datasock
-;;;        mov     edx, [ebp]
+        mov     [ebp + thread_data.datasock.sin_addr], ebx
         mov     [edx + thread_data.datasock.sin_addr], ebx
 ; Now the same with portnumber
         inc     esi
         call    ascii_to_byte
         mov     bh, al
         inc     esi
         call    ascii_to_byte
         mov     bl, al
 ; Save it in datasock too
-        mov     [edx + thread_data.datasock.sin_port], bx
+        mov     [ebp + thread_data.datasock.sin_port], bx
 ; We will open the socket, but do not connect yet!
-        mov     [edx + thread_data.datasock.sin_family], AF_INET4
+        mov     [ebp + thread_data.datasock.sin_family], AF_INET4
         mcall   socket, AF_INET4, SOCK_STREAM, 0
         cmp     eax, -1
-        je      socketerror
+        je      socketerror
-        mov     edx, [ebp]                                      ; thread_data pointer
-        mov     [edx + thread_data.datasocketnum], eax
+        mov     [ebp + thread_data.datasocketnum], eax
-        mov     [edx + thread_data.mode], MODE_ACTIVE
+        mov     [ebp + thread_data.mode], MODE_ACTIVE
 cmdQUIT:
         sendFTP "221 Bye!"
-        mov     edx, [ebp]
+        mcall   close, [ebp + thread_data.datasocketnum]
-        mcall   close, [edx + thread_data.datasocketnum]
-        mcall   close, [edx + thread_data.socketnum]
+        mcall   close, [ebp + thread_data.socketnum]
         add     esp, 4          ; get rid of call return address
         jmp     thread_exit     ; now close this thread
 align 4
 cmdRETR:
-        test    [edx + thread_data.permissions], PERMISSION_READ
+        test    [ebp + thread_data.permissions], PERMISSION_READ
         jz      permission_denied
         cmp     ecx, 1024 + 5
         jae     .cannot_open
         sub     ecx, 5
         jb      .cannot_open
-        cmp     [edx + thread_data.mode], MODE_ACTIVE
+        cmp     [ebp + thread_data.mode], MODE_ACTIVE
         jne     @f
         push    ecx esi
-        mov     ecx, [edx + thread_data.datasocketnum]
+        mov     ecx, [ebp + thread_data.datasocketnum]
-        lea     edx, [edx + thread_data.datasock]
+        lea     edx, [ebp + thread_data.datasock]
         mov     esi, sizeof.thread_data.datasock
         mcall   connect
         pop     esi ecx
         xor     al, al
         stosb
-        lea     ebx, [edx + thread_data.fpath]
+        lea     ebx, [ebp + thread_data.fpath]
         invoke  con_write_asciiz, ebx
         invoke  con_write_asciiz, str_newline
         invoke  file.open, ebx, O_READ
         test    eax, eax
         jz      .cannot_open
-        push    eax
-        mov     edx, [ebp]
+        push    eax
         sendFTP "150 Here it comes.."
         pop     ebx
-  .read_more:
-        mov     edx, [ebp]
+  .read_more:
-        test    [edx + thread_data.permissions], ABORT
+        test    [ebp + thread_data.permissions], ABORT
         jnz     abort_transfer
-        lea     eax, [edx + thread_data.buffer]                 ; FIXME: use another buffer!! if we receive something on control connection now, we screw up!
+        lea     eax, [ebp + thread_data.buffer]                 ; FIXME: use another buffer!! if we receive something on control connection now, we screw up!
         invoke  file.read, ebx, eax, BUFFERSIZE
         cmp     eax, -1
         je      .cannot_open                                    ; FIXME: this is not the correct error
         push    eax ebx
         mov     esi, eax
-        mov     ecx, [edx + thread_data.datasocketnum]
+        mov     ecx, [ebp + thread_data.datasocketnum]
-        lea     edx, [edx + thread_data.buffer]
+        lea     edx, [ebp + thread_data.buffer]
-        xor     esi, esi
+        xor     edi, edi
         mcall   send
         pop     ebx ecx
         cmp     eax, -1
-        je      socketerror
+        je      socketerror                                     ; FIXME: not the correct error
-;        cmp     eax, ecx
-;        jne     not_all_byes_sent                               ; TODO
+;        cmp     eax, ecx
+;        jne     not_all_byes_sent                               ; TODO
-        cmp     ecx, BUFFERSIZE
         je      .read_more
         cmp     ecx, BUFFERSIZE
-        invoke  file.close, ebx
+        je      .read_more
 align 4
 cmdSTOR:
-        test    [edx + thread_data.permissions], PERMISSION_WRITE
+        test    [ebp + thread_data.permissions], PERMISSION_WRITE
         jz      permission_denied
 ;;;;
-        test    [edx + thread_data.permissions], ABORT
+        test    [ebp + thread_data.permissions], ABORT
         jnz     abort_transfer
         jmp     parse_cmd.error
   .ascii:
-        mov     [edx + thread_data.type], TYPE_ASCII
+        mov     [ebp + thread_data.type], TYPE_ASCII
         jmp     .subtype
   .ebdic:
-        mov     [edx + thread_data.type], TYPE_EBDIC
+        mov     [ebp + thread_data.type], TYPE_EBDIC
   .subtype:
         jmp     parse_cmd.error
   .non_print:
-        or      [edx + thread_data.type], TYPE_NP
+        or      [ebp + thread_data.type], TYPE_NP
         jmp     .ok
   .telnet:
-        or      [edx + thread_data.type], TYPE_TELNET
+        or      [ebp + thread_data.type], TYPE_TELNET
         jmp     .ok
   .asacc:
-        or      [edx + thread_data.type], TYPE_ASA
+        or      [ebp + thread_data.type], TYPE_ASA
         jmp     .ok
   .image:
-        mov     [edx + thread_data.type], TYPE_IMAGE
+        mov     [ebp + thread_data.type], TYPE_IMAGE
         jmp     .ok
         cmp     al, 9
         ja      parse_cmd.error                         ; FIXME
         or      al, TYPE_LOCAL
-        mov     [edx + thread_data.type], al
+        mov     [ebp + thread_data.type], al
   .ok:
         sendFTP "200 Command ok"
         ret
 cmdUSER:
         lea     esi, [esi + 5]
-        lea     edi, [edx + thread_data.fpath]                  ; temp buffer for username
+        lea     edi, [ebp + thread_data.fpath]                  ; temp buffer for username
   .loop:
         lodsb
         stosb
         cmp     al, 0x20
         jae     .loop
         mov     byte [edi-1], 0
-        lea     esi, [edx + thread_data.fpath]
+        lea     esi, [ebp + thread_data.fpath]
-        lea     eax, [edx + thread_data.home_dir]
+        lea     eax, [ebp + thread_data.home_dir]
         invoke  ini.get_str, path2, esi, str_home, eax, 1024, str_infinity
         cmp     eax, -1
         je      .login_fail
         cmp     dword [esi], -1
         je      .login_fail
-        mov     word [edx + thread_data.work_dir], "/"          ; "/", 0
+        mov     word [ebp + thread_data.work_dir], "/"          ; "/", 0
         invoke  con_write_asciiz, str_logged_in
-        mov     [edx + thread_data.state], STATE_LOGIN
+        mov     [ebp + thread_data.state], STATE_LOGIN
   .sendstr:
         sendFTP "331 Please specify the password"
         ret
   .login_fail:
         invoke  con_write_asciiz, str_login_invalid
-        mov     [edx + thread_data.state], STATE_LOGIN_FAIL
+        mov     [ebp + thread_data.state], STATE_LOGIN_FAIL
         jmp     .sendstr

Subversion Repositories Kolibri OS

(root)/kernel/branches/net/applications/ftpd/commands.inc – Rev 2602 → 2609