ftpd: add ip to first message

Signed-off-by: Max Logaev <maxlogaev@proton.me>

data/Tupfile.lua

@@ -722,6 +722,7 @@ tup.append_table(img_files, {
  {"SHELL", VAR_PROGS .. "/system/shell/shell"},
  {"GAMES/DINO", VAR_PROGS .. "/games/dino/dino"},
  {"GAMES/FLPYBIRD", VAR_PROGS .. "/games/flpybird/flpybird"},
+ {"LIB/LIBC.OBJ", VAR_PROGS .. "/develop/ktcc/trunk/libc.obj/source/libc.obj"},
 })
 tup.append_table(extra_files, {
  {"kolibrios/utils/thashview", VAR_PROGS .. "/other/TinyHashView/thashview"},
@@ -745,7 +746,6 @@ if tup.getconfig('NO_GCC') ~= 'full' then
 tup.append_table(img_files, {
  {"GAMES/REVERSI", VAR_PROGS .. "/games/reversi/reversi"},
  {"LIB/BASE64.OBJ", VAR_PROGS .. "/develop/libraries/base64/base64.obj"},
- {"LIB/LIBC.OBJ", VAR_PROGS .. "/develop/ktcc/trunk/libc.obj/source/libc.obj"},
  {"LIB/ICONV.OBJ", VAR_PROGS .. "/develop/libraries/iconv/iconv.obj"},
  -- {"LIB/MTAR.OBJ", VAR_PROGS .. "/develop/libraries/microtar/mtar.obj"},
 })

programs/develop/cedit/SHORTCUT.TXT

@@ -47,3 +47,9 @@
   перемещение по тексту:
   (ctrl+)Home, (ctrl+)End, (ctrl+)PageUp, (ctrl+)PageDown
   ctrl+Left, ctrl+Right
+
+  перемещение в панели поиска:
+  Tab         к следующему полю ввода
+  Shift-Tab   к предыдущему полю ввода
+  Enter       поиск следующего вхождения
+

programs/develop/cedit/SRC/CEdit.ob07

@@ -28,7 +28,7 @@ IMPORT
     RW, Ini, EB := EditBox, Tabs, Toolbar, SB := StatusBar;
 
 CONST
-    HEADER = "CEdit (30-apr-2025)";
+    HEADER = "CEdit (11-jan-2026)";
 
     ShellFilter = "";
     EditFilter = "sh|inc|txt|asm|ob07|c|cpp|h|pas|pp|lua|ini|json";
@@ -1750,7 +1750,15 @@ BEGIN
         ELSE
             IF EditBox_Focus(FindEdit) THEN
             	IF keyCode = 15 THEN (* Tab *)
-            		SetFocus(ReplaceEdit, TRUE)
+                    IF shift THEN
+            		    SetFocus(GotoEdit, TRUE)
+                    ELSE
+                        SetFocus(ReplaceEdit, TRUE)
+                    END
+                ELSIF keyCode = 28 THEN (* Enter *)    
+                    IF searchOpened & (searchText # "") THEN
+                        notFound := ~T.findNext(text, BKW.value)
+                    END
             	ELSE
 	                EB.key(FindEdit, key);
 	                EditBox_Get(FindEdit, new_searchText);
@@ -1761,14 +1769,26 @@ BEGIN
                 END
             ELSIF EditBox_Focus(ReplaceEdit) THEN
             	IF keyCode = 15 THEN (* Tab *)
-            		SetFocus(GotoEdit, TRUE)
+                    IF shift THEN
+                        SetFocus(FindEdit, TRUE)
+                    ELSE
+                        SetFocus(GotoEdit, TRUE)
+                    END
+                ELSIF keyCode = 28 THEN (* Enter *)    
+                    IF searchOpened & (searchText # "") THEN
+                        notFound := ~T.findNext(text, BKW.value)
+                    END
             	ELSE
                 	EB.key(ReplaceEdit, key);
                 	EditBox_Get(ReplaceEdit, replaceText)
                 END
             ELSIF EditBox_Focus(GotoEdit) THEN
             	IF keyCode = 15 THEN (* Tab *)
-            		SetFocus(FindEdit, TRUE)
+                    IF shift THEN
+                        SetFocus(ReplaceEdit, TRUE)
+                    ELSE
+                        SetFocus(FindEdit, TRUE)
+                    END
             	ELSE
 	                IF (key DIV 256) MOD 256 = 13 THEN
 	                    goto

programs/develop/ktcc/trunk/libc.obj/source/libc.c

@@ -204,6 +204,7 @@ ksys_dll_t EXPORTS[] = {
     { "strstr", &strstr },
     { "strtok", &strtok },
     { "strxfrm", &strxfrm },
+    { "strpbrk", &strpbrk },
     { "__errno", &__errno },
     { "closedir", &closedir },
     { "opendir", &opendir },

programs/develop/mtdbg/gui.inc

@@ -122,7 +122,13 @@ struc fpcvt
   .sizeof:
 }
 
+;-----------------------------------------------------------------------------
+;                         Command flags
 
+CMD_WITHOUT_PARAM       = 1b    ; command may be called without parameters
+CMD_WITH_PARAM          = 10b   ; command may be called with parameters
+CMD_WITHOUT_LOADED_APP  = 100b  ; command may be called without loaded program
+CMD_WITH_LOADED_APP     = 1000b ; command may be called with loaded program
 
 ;-----------------------------------------------------------------------------
 ;                          Entry point
@@ -449,63 +455,56 @@ z1:
         mov     esi, commands
         call    find_cmd
         mov     eax, aUnknownCommand
-        jc      .x11
-
-        ; check command requirements
-        ; flags field:
-        ; &1: command may be called without parameters
-        ; &2: command may be called with parameters
-        ; &4: command may be called without loaded program
-        ; &8: command may be called with loaded program
+        jc      .cmd_procg
         mov     eax, [esi+8]
         mov     ecx, [curarg]
         cmp     byte [ecx], 0
         jz      .noargs
-        test    byte [esi+16], 2
-        jz      .x11
+        test    byte [esi+16], CMD_WITH_PARAM
+        jz      .cmd_procg
         jmp     @f
 
     .noargs:
-        test    byte [esi+16], 1
-        jz      .x11
+        test    byte [esi+16], CMD_WITHOUT_PARAM
+        jz      .cmd_procg
 
     @@:
         cmp     [debuggee_pid], 0
         jz      .nodebuggee
         mov     eax, aAlreadyLoaded
-        test    byte [esi+16], 8
-        jz      .x11
-        jmp     .x9
+        test    byte [esi+16], CMD_WITH_LOADED_APP
+        jz      .cmd_procg
+        jmp     .run_cmd
 
     .nodebuggee:
         mov     eax, need_debuggee
-        test    byte [esi+16], 4
-        jnz     .x9
+        test    byte [esi+16], CMD_WITHOUT_LOADED_APP
+        jnz     .run_cmd
 
-    .x11:
+    .cmd_procg:
         xchg    esi, eax
         call    put_message
 
         ; store cmdline for repeating
-    .x10:
+    .cmd_procg_no_put_msg:
         mov     esi, cmdline
         mov     ecx, [cmdline_len]
 
     @@:
         cmp     ecx, 0
-        jle     .we
+        jle     .wait_event
         mov     al, [esi + ecx]
         mov     [cmdline_prev + ecx], al
         dec     ecx
         jmp     @b
 
-    .we:
+    .wait_event:
         mov     [cmdline_len], 0
         jmp     waitevent
 
-    .x9:
+    .run_cmd:
         call    dword [esi+4]
-        jmp     .x10
+        jmp     .cmd_procg_no_put_msg
 
 ;-----------------------------------------------------------------------------
 ;                            Cmdline handling

programs/develop/mtdbg/mtdbg.asm

@@ -2,7 +2,10 @@
 COLOR_THEME fix MOVIEOS
 
 format binary as ""
+
 include '../../macros.inc'
+include '../../KOSfuncs.inc'
+
 use32
         db      'MENUET01'
         dd      1
@@ -1145,6 +1148,105 @@ OnDump:
     .ret:
         ret
 
+;-----------------------------------------------------------------------------
+;                            Print Backtrace
+
+struct STACK_FRAME
+        prev_frame      rd 1
+        ret_addr        rd 1
+ends
+
+OnBacktrace:
+        push    ebp
+
+        ; Set max depth counter
+        xor     eax, eax
+        dec     eax
+
+        mov     esi, [curarg]
+        cmp     byte [esi], 0
+        jz      .save_depth
+
+        call    get_hex_number
+        mov     esi, aParseError
+        jc      .exit
+
+        ; If depth 0
+        test    eax, eax
+        jz      .done
+
+    .save_depth:
+        mov     [bt_depth], eax
+
+        ; Get start frame addres
+        mov     ebp, [_ebp]
+        test    ebp, ebp
+        jz      .done
+
+        mov     edi, stack_frame_dump
+
+    .next:
+        mcall   SF_DEBUG, SSF_READ_MEMORY, [debuggee_pid], sizeof.STACK_FRAME, ebp
+        cmp     eax, -1
+        mov     esi, read_mem_err
+        jz      .exit
+
+        ; The address of the previous frame must be less than the current one
+        mov     eax, [edi + STACK_FRAME.prev_frame]
+        test    eax, eax
+        jz      .done
+
+        ; Save stack_frame_dump
+        push    edi
+        ; Save previous frame
+        push    ebp
+        ; Save return address
+        mov     eax, [edi + STACK_FRAME.ret_addr]
+        push    eax
+
+        ; Print frame address and return address
+        push    eax         ; pop in put_message_nodraw
+        push    ebp         ; pop in put_message_nodraw
+        mov     esi, aBacktraceFmt
+        call    put_message_nodraw
+
+        ; Restore return address
+        pop     eax
+
+        ; Find symbol by return address
+        call    find_near_symbol
+        test    esi, esi
+        jnz     .print_sym
+
+        mov     esi, aBacktraceSymStub
+
+    .print_sym:
+        call    put_message_nodraw
+        mov     esi, newline
+        call    put_message_nodraw
+
+        ; Restore previous frame
+        pop     ebp
+        ; Restore stack_frame_dump
+        pop     edi
+
+        ; The address of the previous frame must be greater than the current one.
+        cmp     [edi + STACK_FRAME.prev_frame], ebp
+        jna     .done
+
+        ; Set previous frame
+        mov     ebp,  [edi + STACK_FRAME.prev_frame]
+        dec     [bt_depth]
+        jnz     .next
+
+    .done:
+        mov     esi, newline
+
+    .exit:
+        call    put_message
+        pop     ebp
+        ret
+
 ;-----------------------------------------------------------------------------
 ;                   Dissassemble block of executable event
 
@@ -1864,7 +1966,7 @@ include 'disasm.inc'
 
 caption_str db  'Kolibri Debugger',0
 
-begin_str db    'Kolibri Debugger, version 0.35',10
+begin_str db    'Kolibri Debugger, version 0.36',10
         db      'Hint: type "help" for help, "quit" to quit'
 newline db      10,0
 prompt  db      '> ',0
@@ -1880,66 +1982,88 @@ help_groups:
 ;-----------------------------------------------------------------------------
 ;                   Commands format definitions
 
-; TODO: make it with macros
-
-; flags field:
-; &1: command may be called without parameters
-; &2: command may be called with parameters
-; &4: command may be called without loaded program
-; &8: command may be called with loaded program
 commands:
         dd      _aH, OnHelp, HelpSyntax, HelpHelp
-        db      0Fh
+        db      CMD_WITHOUT_PARAM or CMD_WITH_PARAM or CMD_WITHOUT_LOADED_APP or CMD_WITH_LOADED_APP
+
         dd      aHelp, OnHelp, HelpSyntax, HelpHelp
-        db      0Fh
+        db      CMD_WITHOUT_PARAM or CMD_WITH_PARAM or CMD_WITHOUT_LOADED_APP or CMD_WITH_LOADED_APP
+
         dd      aQuit, OnQuit, QuitSyntax, QuitHelp
-        db      0Dh
+        db      CMD_WITHOUT_PARAM or CMD_WITHOUT_LOADED_APP or CMD_WITH_LOADED_APP
+
         dd      aLoad, OnLoad, LoadSyntax, LoadHelp
-        db      6
+        db      CMD_WITH_PARAM or CMD_WITHOUT_LOADED_APP
+    
         dd      aReload, OnReload, ReloadSyntax, ReloadHelp
-        db      0Dh
+        db      CMD_WITHOUT_PARAM or CMD_WITHOUT_LOADED_APP or CMD_WITH_LOADED_APP
+
         dd      aTerminate, OnTerminate, TerminateSyntax, TerminateHelp
-        db      9
+        db      CMD_WITHOUT_PARAM or CMD_WITH_LOADED_APP
+
         dd      aDetach, OnDetach, DetachSyntax, DetachHelp
-        db      9
+        db      CMD_WITHOUT_PARAM or CMD_WITH_LOADED_APP
+
         dd      aSuspend, OnSuspend, SuspendSyntax, SuspendHelp
-        db      9
+        db      CMD_WITHOUT_PARAM or CMD_WITH_LOADED_APP
+
         dd      aResume, OnResume, ResumeSyntax, ResumeHelp
-        db      0Bh
+        db      CMD_WITHOUT_PARAM or CMD_WITH_PARAM or CMD_WITH_LOADED_APP
+
         dd      aStep, OnStepMultiple, StepSyntax, StepHelp
-        db      0Bh
+        db      CMD_WITHOUT_PARAM or CMD_WITH_PARAM or CMD_WITH_LOADED_APP
+    
         dd      aProceed, OnProceedMultiple, ProceedSyntax, ProceedHelp
-        db      0Bh
+        db      CMD_WITHOUT_PARAM or CMD_WITH_PARAM or CMD_WITH_LOADED_APP
+
         dd      aCalc, OnCalc, CalcSyntax, CalcHelp
-        db      0Eh
+        db      CMD_WITH_PARAM or CMD_WITHOUT_LOADED_APP or CMD_WITH_LOADED_APP
+
         dd      aDump, OnDump, DumpSyntax, DumpHelp
-        db      0Bh
+        db      CMD_WITHOUT_PARAM or CMD_WITH_PARAM or CMD_WITH_LOADED_APP
+
+        dd      aBacktrace, OnBacktrace, BacktraceSyntax, BacktraceHelp
+        db      CMD_WITHOUT_PARAM or CMD_WITH_PARAM or CMD_WITH_LOADED_APP
+
         dd      aUnassemble, OnUnassemble, UnassembleSyntax, UnassembleHelp
-        db      0Bh
+        db      CMD_WITHOUT_PARAM or CMD_WITH_PARAM or CMD_WITH_LOADED_APP
+
         dd      aBp, OnBp, BpSyntax, BpHelp
-        db      0Ah
+        db      CMD_WITH_PARAM or CMD_WITH_LOADED_APP
+
         dd      aBpm, OnBpmb, BpmSyntax, BpmHelp
-        db      0Ah
+        db      CMD_WITH_PARAM or CMD_WITH_LOADED_APP
+
         dd      aBpmb, OnBpmb, BpmSyntax, BpmHelp
-        db      0Ah
+        db      CMD_WITH_PARAM or CMD_WITH_LOADED_APP
+
         dd      aBpmw, OnBpmw, BpmSyntax, BpmHelp
-        db      0Ah
+        db      CMD_WITH_PARAM or CMD_WITH_LOADED_APP
+
         dd      aBpmd, OnBpmd, BpmSyntax, BpmHelp
-        db      0Ah
+        db      CMD_WITH_PARAM or CMD_WITH_LOADED_APP
+
         dd      aBl, OnBl, BlSyntax, BlHelp
-        db      0Bh
+        db      CMD_WITHOUT_PARAM or CMD_WITH_PARAM or CMD_WITH_LOADED_APP
+
         dd      aBc, OnBc, BcSyntax, BcHelp
-        db      0Ah
+        db      CMD_WITH_PARAM or CMD_WITH_LOADED_APP
+
         dd      aBd, OnBd, BdSyntax, BdHelp
-        db      0Ah
+        db      CMD_WITH_PARAM or CMD_WITH_LOADED_APP
+
         dd      aBe, OnBe, BeSyntax, BeHelp
-        db      0Ah
+        db      CMD_WITH_PARAM or CMD_WITH_LOADED_APP
+
         dd      aReg, OnReg, RSyntax, RHelp
-        db      0Ah
+        db      CMD_WITH_PARAM or CMD_WITH_LOADED_APP
+
         dd      aUnpack, OnUnpack, UnpackSyntax, UnpackHelp
-        db      9
+        db      CMD_WITHOUT_PARAM or CMD_WITH_LOADED_APP
+
         dd      aLoadSymbols, OnLoadSymbols, LoadSymbolsSyntax, LoadSymbolsHelp
-        db      0Ah
+        db      CMD_WITH_PARAM or CMD_WITH_LOADED_APP
+
         dd      0
 
 ;-----------------------------------------------------------------------------
@@ -1980,7 +2104,8 @@ help_data_msg db        'List of data commands:',10
         db      'd [<expression>]     - dump data at given address',10
         db      'u [<expression>]     - unassemble instructions at given address',10
         db      'r <register> <expression> or',10
-        db      'r <register>=<expression> - set register value',10,0
+        db      'r <register>=<expression> - set register value',10
+        db      'bt [<number>]        - display backtrace / stacktrace',10,0
 
 ;               Breakpoints commands group
 
@@ -2038,6 +2163,11 @@ DumpHelp db     'Dump data of debugged program',10
 DumpSyntax db   'Usage: d <expression> - dump data at specified address',10
         db      '   or: d              - continue current dump',10,0
 
+aBacktrace      db  3,'bt',0
+BacktraceHelp   db 'Display backtrace / stacktrace',10
+BacktraceSyntax db 'Usage: bt <number> - display backtrace with depth',10
+                db '   or: bt            display all backtrace',10,0
+
 aCalc   db      2,'?',0
 CalcHelp db     'Calculate value of expression',10
 CalcSyntax db   'Usage: ? <expression>',10,0
@@ -2102,6 +2232,11 @@ LoadSymbolsSyntax db 'Usage: load-symbols <symbols-file-name>',10,0
 
 aUnknownCommand db 'Unknown command',10,0
 
+;-----------------------------------------------------------------------------
+;                             Info messages
+aBacktraceSymStub  db '??',0
+aBacktraceFmt      db '[0x%8X] 0x%8X in ',0
+
 ;-----------------------------------------------------------------------------
 ;                             Error messages
 
@@ -2474,11 +2609,13 @@ disasm_cur_pos          dd ?
 disasm_cur_str          dd ?
 disasm_string           rb 256
 
-thread_info             process_information
+stack_frame_dump        rb sizeof.STACK_FRAME
+bt_depth                rd 1
 
 ;-----------------------------------------------------------------------------
 ;                  Coordinates and sizes for GUI
 
+thread_info             process_information
 data_x_size_dd          dd ?, ?
 messages_x_size_dd      dd ?, ?
 registers_x_pos_dd      dd ?, ?

programs/develop/mtdbg/symbols.inc

@@ -4,6 +4,11 @@
 
 include 'sort.inc'
 
+struct DEBUG_SYMBOL
+        addr    rd 1
+        string  rd 0
+ends
+
 ; compare proc for sorter
 compare:
         cmpsd
@@ -459,4 +464,69 @@ find_symbol_name:
 
   @@:
         pop     esi
-        ret
+        ret
+
+;-----------------------------------------------------------------------------
+;   
+; Find the nearest symol using binary search
+;
+; in:  eax - target addres
+; out: esi - symbol name
+; destroys: ebx, ecx, edx, edi, ebp
+;
+find_near_symbol:
+        mov     edi, [symbols] 
+        
+        xor     esi, esi            ; Result
+        mov     ecx, esi            ; Left
+        mov     edx, [num_symbols]  ; Right
+        dec     edx
+        js      .end       
+
+        ; If the first address is already greater than the target
+        mov     ebp, [edi + ecx * sizeof.DEBUG_SYMBOL]
+        cmp     [ebp + DEBUG_SYMBOL.addr], eax
+        ja      .end
+
+        ; If the last address is less than or equal to the target
+        mov     ebp, [edi + edx * sizeof.DEBUG_SYMBOL]
+        cmp     [ebp + DEBUG_SYMBOL.addr], eax
+        jbe     .found
+
+    .loop:
+        cmp     ecx, edx
+        ja      .end
+
+        ; Calc middle:
+        mov     ebx, edx            ; Middle
+        sub     ebx, ecx            ; (right - left)
+        shr     ebx, 1              ;  / 2
+        add     ebx, ecx            ; + left
+
+        ; Equal
+        mov     ebp, [edi + ebx * sizeof.DEBUG_SYMBOL]
+        cmp     [ebp + DEBUG_SYMBOL.addr], eax
+        jz      .found
+        jb      .update_left
+
+        ; Update right
+        mov     edx, ebx
+        dec     edx
+        jmp     .loop
+
+    .update_left:
+        ; Save potential result
+        mov     esi, ebp
+        add     esi, DEBUG_SYMBOL.string
+
+        ; Update left
+        mov     ecx, ebx
+        inc     ecx
+        jmp     .loop
+
+    .found:
+        mov     esi, ebp
+        add     esi, DEBUG_SYMBOL.string
+
+    .end:
+        ret

programs/network/ftpd/commands.inc

@@ -84,6 +84,7 @@ commands:               ; all commands must be in uppercase
 ;        dd 'APPE', login_first, login_first, login_first, cmd_APPE
         dd 'CDUP', login_first, login_first, login_first, cmdCDUP
         dd 'CWD',  login_first, login_first, login_first, cmdCWD
+        dd 'XCWD',  login_first, login_first, login_first, cmdCWD
         dd 'DELE', login_first, login_first, login_first, cmdDELE
 ;        dd 'HELP', login_first, login_first, login_first, cmd_HELP
         dd 'LIST', login_first, login_first, login_first, cmdLIST
@@ -96,6 +97,7 @@ commands:               ; all commands must be in uppercase
         dd 'PASV', login_first, login_first, login_first, cmdPASV
         dd 'PORT', login_first, login_first, login_first, cmdPORT
         dd 'PWD',  login_first, login_first, login_first, cmdPWD
+        dd 'XPWD',  login_first, login_first, login_first, cmdPWD
         dd 'QUIT', cmdQUIT,     cmdQUIT,     cmdQUIT,     cmdQUIT
 ;        dd 'REIN', login_first, login_first, login_first, cmd_REIN
 ;        dd 'REST', login_first, login_first, login_first, cmd_REST
@@ -342,7 +344,7 @@ align 4
 cmdABOR:
 
         or      [ebp + thread_data.permissions], ABORT
-        sendFTP "250 Command succesul"
+        sendFTP "250 Command successful"
         ret
 
 ;------------------------------------------------
@@ -383,7 +385,7 @@ cmdCDUP:
         invoke  con_write_asciiz, eax
         invoke  con_write_asciiz, str_newline
 
-        sendFTP "250 Command succesul"
+        sendFTP "250 Command successful"
         ret
 
 ;------------------------------------------------
@@ -448,7 +450,7 @@ cmdCWD:
         invoke  con_write_asciiz, eax
         invoke  con_write_asciiz, str_newline
 
-        sendFTP "250 Command succesful"
+        sendFTP "250 Command successful"
         ret
 
   .err:
@@ -510,7 +512,7 @@ cmdDELE:
         test    eax, eax
         jnz     .err
 
-        sendFTP "250 Command succesful"
+        sendFTP "250 Command successful"
         ret
 .err:
         sendFTP "550 No such file"
@@ -998,7 +1000,9 @@ cmdRETR:
         cmp     eax, -1
         je      .cannot_open                                    ; FIXME: this is not the correct error
 
+        push eax
         invoke  con_write_asciiz, str2
+        pop eax
 
         push    eax ebx
         mov     esi, eax

programs/network/ftpd/ftpd.asm

@@ -135,7 +135,7 @@ start:
         mov     [sockaddr1.port], ax
 
         xchg    al, ah
-        invoke  con_printf, str1, eax
+        invoke  con_printf, str1, ini_buf, eax
         add     esp, 8
 
 ; open listening socket
@@ -341,7 +341,7 @@ thread_exit:
 ; initialized data
 
 title           db 'FTP daemon', 0
-str1            db 'Starting FTP daemon on port %u.', 0
+str1            db 'Starting FTP daemon on %s:%u', 0
 str2            db '.', 0
 str2b           db ' OK!',10,0
 str3            db 'Listen error',10,0