KolibriOS/kolibrios
15
24
Fork 61
Code Issues 132 Pull Requests 32 Actions Projects 1 Releases Wiki Activity

ftpd: Add RMD command (#353)

Browse Source 
Added RMD command

---------

Co-authored-by: Burer <burer@kolibrios.org>
Reviewed-on: #353
Reviewed-by: Burer <burer@kolibrios.org>
Reviewed-by: Ivan B <1+dunkaist@noreply.localhost>
Reviewed-by: Mikhail Frolov <mixa.frolov2003@gmail.com>
Co-authored-by: Igor Shutrov <kolibridev@inbox.ru>
Co-committed-by: Igor Shutrov <kolibridev@inbox.ru>
This commit was merged in pull request #353.
This commit is contained in:
Igor Shutrov
2026-05-19 18:40:19 +00:00
committed by Burer
parent d486c6b33a
commit 68f0454682
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
programs/network/ftpd/commands.inc
+18 -10
View File
@@ -102,7 +102,7 @@ commands: ; all commands must be in uppercase
; dd 'REIN', login_first, login_first, login_first, cmd_REIN
; dd 'REST', login_first, login_first, login_first, cmd_REST
dd 'RETR', login_first, login_first, login_first, cmdRETR
; dd 'RMD', login_first, login_first, login_first, cmd_RMD
dd 'RMD', login_first, login_first, login_first, cmdDELE
; dd 'RNFR', login_first, login_first, login_first, cmd_RNFR
; dd 'RNTO', login_first, login_first, login_first, cmd_RNTO
; dd 'SITE', login_first, login_first, login_first, cmd_SITE
@@ -458,9 +458,9 @@ cmdCWD:
ret
;------------------------------------------------
; "DELE"
; "DELE" & "RMD"
;
; Delete a file from the server.
; Delete a file/directory from the server.
;
;------------------------------------------------
align 4
@@ -469,16 +469,24 @@ cmdDELE:
test [ebp + thread_data.permissions], PERMISSION_DELETE
jz permission_denied
; Create path
cmp ecx, 1024 + 5
; "DELE <path>" and "RMD <path>" share this handler. Skip the
; command + its trailing space to reach <path>: "RMD " = 4,
; "DELE " = 5 bytes. RMD is the only 'R' command routed here.
mov edx, 4 ; strlen("RMD ")
cmp byte[esi], 'R'
je @f
cmp byte[esi], 'r'
je @f
mov edx, 5 ; strlen("DELE ")
@@:
sub ecx, edx ; ecx = <path> length
jb .err ; command line shorter than prefix
cmp ecx, 1024 ; <path> must fit the path buffer
jae .err
sub ecx, 5
jb .err
call create_path
dec edi
lea esi, [ebp + thread_data.buffer + 5]
lea esi, [ebp + thread_data.buffer + edx]
mov ecx, 1024
cmp byte [esi], '/'
jne .loop
@@ -515,7 +523,7 @@ cmdDELE:
sendFTP "250 Command successful"
ret
.err:
sendFTP "550 No such file"
sendFTP "550 Requested action not taken"
ret
;------------------------------------------------