KolibriOS/kolibrios
16
25
Fork 62
Code Issues 143 Pull Requests 39 Actions Projects 1 Releases Wiki Activity

ftpd: Add RMD command #353

Merged
Burer merged 4 commits from igorsh/kolibrios:ftpd-add-rmd-command into main 2026-05-19 18:40:25 +00:00
Conversation 10 Commits 4 Files Changed 1
+18 -10
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.
dunkaist marked this conversation as resolved Outdated
dunkaist commented 2026-03-14 19:42:45 +00:00
Outdated
Review
Copy Link
Copy Source

I believe the letter D in RMD means not 'folder'

I believe the letter D in RMD means not 'folder'
;
;------------------------------------------------
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,
dunkaist marked this conversation as resolved Outdated
dunkaist commented 2026-03-14 19:44:01 +00:00
Outdated
Review
Copy Link
Copy Source

Fasm understands just 'R'. Same with 'r' below

Fasm understands just 'R'. Same with 'r' below
; "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'
Burer marked this conversation as resolved Outdated
dunkaist commented 2026-03-14 20:25:21 +00:00
Outdated
Review
Copy Link
Copy Source

Is this 5 strlen("DELE ")? Please, describe the logic around these lines in a comment

Is this 5 strlen("DELE ")? Please, describe the logic around these lines in a comment
👀 1
dunkaist commented 2026-03-18 19:51:52 +00:00
Outdated
Review
Copy Link
Copy Source

Don't forget to describe this logic with a comment, please. Thank you

Don't forget to describe this logic with a comment, please. Thank you
👍 1
dunkaist commented 2026-03-27 09:18:45 +00:00
Outdated
Review
Copy Link
Copy Source

Don't forget to describe this logic with a comment, please. Thank you

Any update, @igorsh?

> Don't forget to describe this logic with a comment, please. Thank you Any update, @igorsh?
igorsh commented 2026-04-18 03:58:15 +00:00
Outdated
Review
Copy Link
Copy Source

Кладем в edx длину команды - 4 и если команда rmd то прыгаем дальше, в противном случае кладем в edx 5, это значит команда DELE

Кладем в edx длину команды - 4 и если команда rmd то прыгаем дальше, в противном случае кладем в edx 5, это значит команда DELE
dunkaist commented 2026-05-13 20:15:53 +00:00
Outdated
Review
Copy Link
Copy Source

@igorsh, please, add a code comment describing this logic. If you can't get rid of those magic numbers, there should be a code comment describing their meaning and use. Thank you

@igorsh, please, add a code comment describing this logic. If you can't get rid of those magic numbers, there should be a code comment describing their meaning and use. Thank you
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
;------------------------------------------------