libshell: update shell_ping()

make it faster
libc.obj: return _ksys_exit to exit
2026-03-08 18:40:07 +05:00 · 2026-03-08 18:36:42 +05:00 · 2026-03-07 15:00:04 +05:00 · 2026-03-07 13:58:11 +05:00 · 2026-02-17 22:08:04 +05:00 · 2026-01-28 17:22:54 +03:00
38 changed files with 858 additions and 455 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -9,4 +9,3 @@ ehthumbs_vista.db
 ._*
 programs/cmm/cmm.code-workspace
 programs/cmm/menu/.gitignore
-.vscode
--- a/data/Tupfile.lua
+++ b/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"},
 })
--- a/programs/develop/cedit/SHORTCUT.TXT
+++ b/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       поиск следующего вхождения
+
--- a/programs/develop/cedit/SRC/CEdit.ob07
+++ b/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
--- a/programs/develop/ktcc/trunk/lib/libshell/Makefile
+++ b/programs/develop/ktcc/trunk/lib/libshell/Makefile
@@ -1,6 +1,8 @@
 CC = kos32-tcc
 AR = ar
-CFLAGS = -c -I../../libc.obj/include
+CFLAGS = -c -I$(LIBC_INCLUDE)
+
+LIBC_INCLUDE = ../../libc.obj/include

 LIB = libshell.a

@@ -14,7 +16,8 @@ OBJS = \
 	shell_init.o \
 	shell_gets.o \
 	shell_printf.o \
-	shell_putc.o
+	shell_putc.o \
+	shell_write_string.o

 $(LIB): $(OBJS)
 	$(AR) -crs $@ $(OBJS)
@@ -23,4 +26,16 @@ $(LIB): $(OBJS)
 	$(CC) $(CFLAGS) -o $@ $<

 clean:
-	rm -rf $(OBJS) $(LIB)
+	rm -rf $(OBJS) $(LIB)
+
+
+shell_cls.o: shell_cls.c $(LIBC_INCLUDE)/shell_api.h $(LIBC_INCLUDE)/sys/ksys.h
+shell_get_pid.o: shell_get_pid.c $(LIBC_INCLUDE)/shell_api.h $(LIBC_INCLUDE)/string.h
+shell_getc.o: shell_getc.c $(LIBC_INCLUDE)/shell_api.h
+shell_gets.o: shell_gets.c $(LIBC_INCLUDE)/shell_api.h $(LIBC_INCLUDE)/string.h
+shell_init.o: shell_init.c $(LIBC_INCLUDE)/shell_api.h $(LIBC_INCLUDE)/sys/ksys.h $(LIBC_INCLUDE)/string.h $(LIBC_INCLUDE)/stdio.h $(LIBC_INCLUDE)/stdlib.h
+shell_ping.o: shell_ping.c $(LIBC_INCLUDE)/shell_api.h $(LIBC_INCLUDE)/sys/ksys.h
+shell_printf.o: shell_printf.c $(LIBC_INCLUDE)/shell_api.h $(LIBC_INCLUDE)/stdio.h
+shell_putc.o: shell_putc.c $(LIBC_INCLUDE)/shell_api.h
+shell_puts.o: shell_puts.c $(LIBC_INCLUDE)/shell_api.h $(LIBC_INCLUDE)/string.h
+shell_write_string.o: shell_write_string.c $(LIBC_INCLUDE)/shell_api.h $(LIBC_INCLUDE)/string.h
--- a/programs/develop/ktcc/trunk/lib/libshell/shell_cls.c
+++ b/programs/develop/ktcc/trunk/lib/libshell/shell_cls.c
@@ -3,6 +3,9 @@
 void shell_cls()
 {
    __shell_init();
-    *__shell_shm = SHELL_CLS;
+    if(__shell_is_init == __SHELL_INIT_OK)
+    {
+        *__shell_shm = SHELL_CLS;
    __SHELL_WAIT();
+    }
 }
--- a/programs/develop/ktcc/trunk/lib/libshell/shell_exit.c
+++ b/programs/develop/ktcc/trunk/lib/libshell/shell_exit.c
@@ -3,7 +3,7 @@

 void shell_exit()
 {
-    if(__shell_is_init){
+    if (__shell_is_init == __SHELL_INIT_OK) {
        *__shell_shm = SHELL_EXIT;
        __SHELL_WAIT();
        _ksys_shm_close(__shell_shm_name);
--- a/programs/develop/ktcc/trunk/lib/libshell/shell_get_pid.c
+++ b/programs/develop/ktcc/trunk/lib/libshell/shell_get_pid.c
@@ -4,9 +4,14 @@
 unsigned shell_get_pid()
 {
    unsigned pid;
+
    __shell_init();
-    *__shell_shm = SHELL_PID;
-    __SHELL_WAIT();
-    memcpy(&pid, __shell_shm+1, sizeof(unsigned));
+    if (__shell_is_init == __SHELL_INIT_OK)
+    {
+        *__shell_shm = SHELL_PID;
+        __SHELL_WAIT();
+        memcpy(&pid, __shell_shm + 1, sizeof(unsigned));
+    }
+
    return pid;
 }
--- a/programs/develop/ktcc/trunk/lib/libshell/shell_getc.c
+++ b/programs/develop/ktcc/trunk/lib/libshell/shell_getc.c
@@ -1,9 +1,16 @@
-#include "shell_api.h"
+#include <shell_api.h>

 char shell_getc()
 {
    __shell_init();
-    *__shell_shm = SHELL_GETC;
-    __SHELL_WAIT();
-    return *(__shell_shm+1);
+
+    if (__shell_is_init == __SHELL_INIT_OK) {
+        *__shell_shm = SHELL_GETC;
+        __SHELL_WAIT();
+
+        return *(__shell_shm + 1);
+    }
+    else {
+        return 0;
+    }
 }
--- a/programs/develop/ktcc/trunk/lib/libshell/shell_gets.c
+++ b/programs/develop/ktcc/trunk/lib/libshell/shell_gets.c
@@ -4,7 +4,11 @@
 void shell_gets(char *str, int n)
 {
    __shell_init();
-    *__shell_shm = SHELL_GETS;
+    
+    if (__shell_is_init == __SHELL_INIT_OK) {
+        *__shell_shm = SHELL_GETS;
    __SHELL_WAIT();
+
    strncpy(str, __shell_shm+1, n);
+    }
 }
--- a/programs/develop/ktcc/trunk/lib/libshell/shell_init.c
+++ b/programs/develop/ktcc/trunk/lib/libshell/shell_init.c
@@ -5,40 +5,57 @@
 #include <shell_api.h>

 char app_name[13];
-char __shell_shm_name[32]; 
-char*__shell_shm=NULL;
-int __shell_is_init=0;
+char __shell_shm_name[32];
+char *__shell_shm = NULL;
+enum __SHELL_INIT_STATE __shell_is_init = __SHELL_NOT_LOADED;

 int __shell_shm_init()
 {
-    __shell_is_init=1;
-    ksys_thread_t *proc_info = (ksys_thread_t*)malloc(sizeof(ksys_thread_t));
-    if(proc_info == NULL){
-        return -1;
-    }
+    __shell_is_init = __SHELL_LOADING;
+    ksys_thread_t proc_info;
    unsigned PID;

-    _ksys_thread_info(proc_info, -1); 
-    PID = proc_info->pid;
-    strncpy(app_name, proc_info->name, 12);
-    free(proc_info);
+    _ksys_thread_info(&proc_info, -1);
+    PID = proc_info.pid;
+    strncpy(app_name, (&proc_info)->name, 12);

    itoa(PID, __shell_shm_name);
    strcat(__shell_shm_name, "-SHELL");
-    return _ksys_shm_open(__shell_shm_name,  KSYS_SHM_OPEN_ALWAYS | KSYS_SHM_WRITE, SHELL_SHM_MAX, &__shell_shm);
+    return _ksys_shm_open(__shell_shm_name, KSYS_SHM_OPEN_ALWAYS | KSYS_SHM_WRITE, SHELL_SHM_MAX, &__shell_shm);
 }

 void __shell_init()
 {
-    if(!__shell_is_init){
-        if(__shell_shm_init()){
-        debug_printf("%s: shell problems detected!\n", app_name);
-        _ksys_exit();
+    switch (__shell_is_init) {
+    case __SHELL_NOT_LOADED:
+        if (__shell_shm_init()) {
+            debug_printf("%s: shell problems detected!\n", app_name);
+            goto __shell_init_err;
        }

-        if(!shell_ping()){
-        debug_printf("%s: no shell found!\n", app_name);
-        _ksys_exit();
+        if (!shell_ping()) {
+            goto __shell_init_err;
        }
+
+        __shell_is_init = __SHELL_INIT_OK; // The shell is being pinged, so it's working.
+        break;
+    case __SHELL_LOADING:
+        while (__shell_is_init == __SHELL_LOADING) {
+            _ksys_thread_yield();
+        }
+    case __SHELL_INIT_OK:
+        if (!shell_ping()) {
+            goto __shell_init_err;
+        }
+        break;
+    default:
+        break;
    }
+
+    return;
+
+__shell_init_err:
+    __shell_is_init = __SHELL_INIT_FAILED;
+    shell_exit();
+    return;
 }
--- a/programs/develop/ktcc/trunk/lib/libshell/shell_ping.c
+++ b/programs/develop/ktcc/trunk/lib/libshell/shell_ping.c
@@ -1,13 +1,24 @@
 #include <shell_api.h>
 #include <sys/ksys.h>
+#include <sys/ksys.h>
+
+#define SHELL_PING_TIMEOUT 10 // 0.1 sec
+#define SHELL_PING_MIN_DELAY 1

 int shell_ping()
 {
-    __shell_init();
    *__shell_shm = SHELL_PING;
-    _ksys_delay(10);
-    if(*__shell_shm==SHELL_OK){
-        return 1;
+
+    _ksys_thread_yield();   // hope shell is fast enough
+
+    size_t i = 0;
+    while (*__shell_shm != SHELL_OK){
+        if (i > (SHELL_PING_TIMEOUT / SHELL_PING_MIN_DELAY)) {
+            return 0;
+        }
+        i++;
+        _ksys_delay(SHELL_PING_MIN_DELAY);
    }
-    return 0;
-}
+
+    return 1;
+}
--- a/programs/develop/ktcc/trunk/lib/libshell/shell_printf.c
+++ b/programs/develop/ktcc/trunk/lib/libshell/shell_printf.c
@@ -1,12 +1,12 @@
 #include <shell_api.h>
 #include <stdio.h>

-void shell_printf(const char *format,...)
+void shell_printf(const char *format, ...)
 {
    va_list ap;
-    va_start (ap, format);
-    *__shell_shm=SHELL_PUTS;
-    vsnprintf(__shell_shm+1, SHELL_SHM_MAX, format, ap);
+    va_start(ap, format);
+    vsnprintf(__shell_shm + 1, SHELL_SHM_MAX, format, ap);
+    *__shell_shm = SHELL_PUTS;
    va_end(ap);
    __SHELL_WAIT();
 }
--- a/programs/develop/ktcc/trunk/lib/libshell/shell_putc.c
+++ b/programs/develop/ktcc/trunk/lib/libshell/shell_putc.c
@@ -3,7 +3,11 @@
 void shell_putc(char c)
 {
    __shell_init();
-    *__shell_shm = SHELL_PUTC;
-    *(__shell_shm+1) = c;
-    __SHELL_WAIT();
+
+    if (__shell_is_init == __SHELL_INIT_OK)
+    {
+        *(__shell_shm + 1) = c;
+        *__shell_shm = SHELL_PUTC;
+        __SHELL_WAIT();
+    }
 }
--- a/programs/develop/ktcc/trunk/lib/libshell/shell_puts.c
+++ b/programs/develop/ktcc/trunk/lib/libshell/shell_puts.c
@@ -3,8 +3,5 @@

 void shell_puts(const char *str)
 {
-    __shell_init();
-    *__shell_shm = SHELL_PUTS;
-    strcpy(__shell_shm+1, str);
-    __SHELL_WAIT();
+    shell_write_string(str, strlen(str));
 }
--- a/programs/develop/ktcc/trunk/lib/libshell/shell_write_string.c
+++ b/programs/develop/ktcc/trunk/lib/libshell/shell_write_string.c
@@ -0,0 +1,22 @@
+#include <shell_api.h>
+#include <string.h>
+
+void shell_write_string(const char *s, size_t len)
+{
+    __shell_init();
+    if (__shell_is_init == __SHELL_INIT_OK)
+    {
+        if (len > SHELL_SHM_MAX - 1)
+        {
+            shell_write_string(s, SHELL_SHM_MAX - 1);                               // Outputs as much as it can.
+            shell_write_string(s + (SHELL_SHM_MAX - 1), len - (SHELL_SHM_MAX - 1)); // Outputs the rest.
+        }
+        else
+        {
+            memset(__shell_shm, 0, SHELL_SHM_MAX);  // without int shell show \t, \n, lose chars and other trash
+            memcpy(__shell_shm + 1, s, len);
+            *__shell_shm = SHELL_PUTS;
+            __SHELL_WAIT();
+        }
+    }
+}
--- a/programs/develop/ktcc/trunk/libc.obj/.gitignore
+++ b/programs/develop/ktcc/trunk/libc.obj/.gitignore
@@ -0,0 +1,8 @@
+.vscode/*
+.tup/*
+
+*.o
+*.kex
+*.obj
+*.a
+*.tmp
--- a/programs/develop/ktcc/trunk/libc.obj/include/shell_api.h
+++ b/programs/develop/ktcc/trunk/libc.obj/include/shell_api.h
@@ -3,6 +3,12 @@

 #include <sys/ksys.h>

+#ifdef _BUILD_LIBC
+#define __EXTERN
+#else
+#define __EXTERN extern
+#endif
+
 #define SHELL_OK   0
 #define SHELL_EXIT 1
 #define SHELL_PUTC 2
@@ -15,25 +21,35 @@

 #define SHELL_SHM_MAX 1024 * 16

-extern char __shell_shm_name[32];
-extern char* __shell_shm;
-extern int __shell_is_init;
-extern void __shell_init();
+enum __SHELL_INIT_STATE {
+    __SHELL_NOT_LOADED = 0, // not try init shell before
+    __SHELL_LOADING = 1,    // in progress
+    __SHELL_INIT_OK = 2,    // ok
+    __SHELL_INIT_FAILED = 3 // fail init shell
+};

-#define __SHELL_WAIT()   \
-    while (*__shell_shm) \
-    _ksys_delay(5)
+__EXTERN char __shell_shm_name[32];
+__EXTERN char* __shell_shm;
+__EXTERN enum __SHELL_INIT_STATE __shell_is_init;
+__EXTERN void __shell_init();

-extern int shell_ping();
-extern unsigned shell_get_pid();
-extern void shell_exit();
+#define __SHELL_WAIT()        \
+    while (*__shell_shm) {    \
+        _ksys_thread_yield(); \
+    }

-extern char shell_getc();
-extern void shell_gets(char* str, int n);
+__EXTERN int shell_ping();
+__EXTERN unsigned shell_get_pid();
+__EXTERN void shell_exit();

-extern void shell_putc(char c);
-extern void shell_puts(const char* str);
-extern void shell_printf(const char* format, ...);
+__EXTERN char shell_getc();
+__EXTERN void shell_gets(char* str, int n);

-extern void shell_cls();
+__EXTERN void shell_putc(char c);
+__EXTERN void shell_puts(const char* str);
+__EXTERN void shell_printf(const char* format, ...);
+
+__EXTERN void shell_write_string(const char* s, size_t len);
+
+__EXTERN void shell_cls();
 #endif
--- a/programs/develop/ktcc/trunk/libc.obj/source/libc.c
+++ b/programs/develop/ktcc/trunk/libc.obj/source/libc.c
@@ -13,6 +13,7 @@
 #include "sys/seekdir.c"
 #include "sys/socket.c"
 #include "sys/telldir.c"
+#include "sys/conio.c"

 #include "stdio/clearerr.c"
 #include "stdio/conio.c"
@@ -120,6 +121,18 @@
 #include "misc/basename.c"
 #include "misc/dirname.c"

+#include "../../lib/libshell/shell_cls.c"
+#include "../../lib/libshell/shell_exit.c"
+#include "../../lib/libshell/shell_get_pid.c"
+#include "../../lib/libshell/shell_getc.c"
+#include "../../lib/libshell/shell_gets.c"
+#include "../../lib/libshell/shell_init.c"
+#include "../../lib/libshell/shell_ping.c"
+#include "../../lib/libshell/shell_printf.c"
+#include "../../lib/libshell/shell_putc.c"
+#include "../../lib/libshell/shell_puts.c"
+#include "../../lib/libshell/shell_write_string.c"
+
 ksys_dll_t EXPORTS[] = {
    { "clearerr", &clearerr },
    { "debug_printf", &debug_printf },
@@ -204,6 +217,7 @@ ksys_dll_t EXPORTS[] = {
    { "strstr", &strstr },
    { "strtok", &strtok },
    { "strxfrm", &strxfrm },
+    { "strpbrk", &strpbrk },
    { "__errno", &__errno },
    { "closedir", &closedir },
    { "opendir", &opendir },
--- a/programs/develop/ktcc/trunk/libc.obj/source/stdio/conio.c
+++ b/programs/develop/ktcc/trunk/libc.obj/source/stdio/conio.c
@@ -73,3 +73,5 @@ int con_init(void)
    return con_init_opt(-1, -1, -1, -1, __con_caption); 
 }

+
+
--- a/programs/develop/ktcc/trunk/libc.obj/source/stdio/fread.c
+++ b/programs/develop/ktcc/trunk/libc.obj/source/stdio/fread.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 #include <errno.h>
-#include "conio.h"
+#include "../sys/_conio.h"
 #include "sys/ksys.h"

 size_t fread(void *restrict ptr, size_t size, size_t nmemb, FILE *restrict stream) {
@@ -19,8 +19,7 @@ size_t fread(void *restrict ptr, size_t size, size_t nmemb, FILE *restrict strea
 	}
 	
 	if(stream==stdin){
-		con_init();
-		con_gets((char*)ptr, bytes_count+1);
+		console_gets((char*)ptr, bytes_count+1);
 		return nmemb;
 	}

--- a/programs/develop/ktcc/trunk/libc.obj/source/stdio/fwrite.c
+++ b/programs/develop/ktcc/trunk/libc.obj/source/stdio/fwrite.c
@@ -1,45 +1,46 @@
 #include <stdio.h>
-#include "conio.h"
+#include "../sys/_conio.h"
 #include <sys/ksys.h>
 #include <errno.h>
+#include <shell_api.h>

-size_t fwrite(const void *restrict ptr, size_t size, size_t nmemb, FILE *restrict stream) {
-	unsigned bytes_written = 0;
-	unsigned bytes_count = size * nmemb;
-	
-	if(!stream){
-		errno = EBADF;
-		return 0;
-	}
-	
-	if(size<=0 || nmemb<=0){
-		errno = EINVAL;
-		stream->error=errno;
-		return 0;
-	}
-	
-	if(stream==stdout){
-		con_init();
-		con_write_string((char*)ptr, bytes_count);
-		return nmemb;
-	}
-	
-	if(stream==stderr){
-		for (size_t i = 0; i < bytes_count; i++) {
-			char c = *(char*)(ptr+i);
-			_ksys_debug_putc(c);
-		}
-		return nmemb;
-	}
-	
-	if(stream->mode != _FILEMODE_R){
-		unsigned status = _ksys_file_write_file(stream->name, stream->position, bytes_count, ptr, &bytes_written);
-		if (status != KSYS_FS_ERR_SUCCESS) {
-			errno = EIO;
-			stream->error = errno;
-			return 0;
-		}
-		stream->position+=bytes_written;
-	}
-	return bytes_written/size;
+size_t fwrite(const void* restrict ptr, size_t size, size_t nmemb, FILE* restrict stream)
+{
+    unsigned bytes_written = 0;
+    unsigned bytes_count = size * nmemb;
+
+    if (!stream) {
+        errno = EBADF;
+        return 0;
+    }
+
+    if (size <= 0 || nmemb <= 0) {
+        errno = EINVAL;
+        stream->error = errno;
+        return 0;
+    }
+
+    if (stream == stdout) {
+        console_write((char*)ptr, size);
+        return nmemb;
+    }
+
+    if (stream == stderr) {
+        for (size_t i = 0; i < bytes_count; i++) {
+            char c = *(char*)(ptr + i);
+            _ksys_debug_putc(c);
+        }
+        return nmemb;
+    }
+
+    if (stream->mode != _FILEMODE_R) {
+        unsigned status = _ksys_file_write_file(stream->name, stream->position, bytes_count, ptr, &bytes_written);
+        if (status != KSYS_FS_ERR_SUCCESS) {
+            errno = EIO;
+            stream->error = errno;
+            return 0;
+        }
+        stream->position += bytes_written;
+    }
+    return bytes_written / size;
 }
--- a/programs/develop/ktcc/trunk/libc.obj/source/stdio/getchar.c
+++ b/programs/develop/ktcc/trunk/libc.obj/source/stdio/getchar.c
@@ -1,10 +1,10 @@
 #include <stdio.h>
-#include <conio.h>
+#include "../sys/_conio.h"

 int getchar(void) {
-	con_init();
+
 	char c = 0;
-	con_gets(&c, 2);
+	console_gets(&c, 2);
 	if (c == 0) {
 		c = EOF;
 	}
--- a/programs/develop/ktcc/trunk/libc.obj/source/stdio/gets.c
+++ b/programs/develop/ktcc/trunk/libc.obj/source/stdio/gets.c
@@ -4,17 +4,16 @@
 #include <errno.h>
 #include <limits.h>

-char *gets(char* str)
+char* gets(char* str)
 {
-    con_init();
-    if(con_gets(str, STDIO_MAX_MEM)==NULL){
+    if (console_gets(str, STDIO_MAX_MEM) == NULL) {
        errno = EIO;
        return NULL;
    }
-    
+
    int str_len = strlen(str);
-    if(str[str_len-1]=='\n'){
-        str[str_len-1]='\0';
+    if (str[str_len - 1] == '\n') {
+        str[str_len - 1] = '\0';
    }
    return str;
 }
--- a/programs/develop/ktcc/trunk/libc.obj/source/stdio/printf.c
+++ b/programs/develop/ktcc/trunk/libc.obj/source/stdio/printf.c
@@ -4,11 +4,13 @@
 #include <stdio.h>
 #include <stdlib.h>

-//#include "format_print.h"
+// #include "format_print.h"

-int printf(const char *format, ...)
+int printf(const char* format, ...)
 {
-  va_list arg;
-  va_start(arg, format);
-  return vprintf(format, arg);
+    va_list arg;
+    va_start(arg, format);
+    int ret = vprintf(format, arg);
+    va_end(arg);
+    return ret;
 }
--- a/programs/develop/ktcc/trunk/libc.obj/source/stdio/puts.c
+++ b/programs/develop/ktcc/trunk/libc.obj/source/stdio/puts.c
@@ -2,13 +2,12 @@

 #include <stdio.h>
 #include <string.h>
-#include "conio.h"
-#include "sys/ksys.h"
+#include "../sys/_conio.h"
+#include <sys/ksys.h>

 int puts(const char *str)
 {
-    con_init();
-    con_write_asciiz(str);
-    con_write_asciiz("\n");
-    return strlen(str);
-}
+    size_t len = strlen(str);
+    console_write(str, len);
+    return len;
+}
--- a/programs/develop/ktcc/trunk/libc.obj/source/stdio/vprintf.c
+++ b/programs/develop/ktcc/trunk/libc.obj/source/stdio/vprintf.c
@@ -4,7 +4,7 @@
 #include <stdio.h>
 #include <stdlib.h>

-#include "conio.h"
+#include "../sys/_conio.h"
 #include <sys/ksys.h>
 #include <errno.h>
 #include <limits.h>
@@ -22,9 +22,9 @@ int vprintf(const char* format, va_list arg)
        errno = ENOMEM;
        return errno;
    }
-    con_init();
+
    len = vsnprintf(s, STDIO_MAX_MEM, format, arg);
-    con_write_string(s, len);
+    console_write(s, len);
    free(s);
    return (len);
 }
--- a/programs/develop/ktcc/trunk/libc.obj/source/stdlib/exit.c
+++ b/programs/develop/ktcc/trunk/libc.obj/source/stdlib/exit.c
@@ -1,12 +1,10 @@
 /* Copyright (C) 2021 Logaev Maxim (turbocat2001), GPLv2 */

-#include <conio.h>
-#include <sys/ksys.h>
+#include "../sys/_conio.h"

 void exit(int status)
 {
-    if (__con_is_load) {
-        con_exit(status);
-    }
+    console_exit();
+    
    _ksys_exit();
 }
--- a/programs/develop/ktcc/trunk/libc.obj/source/sys/_conio.h
+++ b/programs/develop/ktcc/trunk/libc.obj/source/sys/_conio.h
@@ -0,0 +1,10 @@
+#ifndef __LIBC_SYS_CONIO_H_
+#define __LIBC_SYS_CONIO_H
+
+char* console_gets(char* buff, size_t len);
+
+void console_write(const char* ptr, size_t len);
+
+void console_exit();
+
+#endif // __LIBC_SYS_CONIO_H
--- a/programs/develop/ktcc/trunk/libc.obj/source/sys/conio.c
+++ b/programs/develop/ktcc/trunk/libc.obj/source/sys/conio.c
@@ -0,0 +1,42 @@
+#include <shell_api.h>
+#include <conio.h>
+#include "_conio.h"
+
+char* console_gets(char* buff, size_t len)
+{
+    char* ret = buff;
+
+    if (__shell_is_init < __SHELL_INIT_FAILED) {
+        shell_gets(buff, len);
+    }
+    if (__shell_is_init == __SHELL_INIT_FAILED) {
+        con_init();
+        ret = con_gets(buff, len);
+    }
+
+    return ret;
+}
+
+void console_write(const char* ptr, size_t len)
+{
+    if (__shell_is_init < __SHELL_INIT_FAILED) {
+        shell_write_string(ptr, len);
+    }
+    if (__shell_is_init == __SHELL_INIT_FAILED) {
+        con_init();
+        con_write_string((char*)ptr, len);
+    }
+}
+
+void console_exit()
+{
+    if (__shell_is_init < __SHELL_INIT_FAILED) {
+        shell_exit();
+    }
+    if (__shell_is_init == __SHELL_INIT_FAILED) {
+
+        if (__con_is_load) {
+            con_exit(0);
+        }
+    }
+}
--- a/programs/develop/mtdbg/gui.inc
+++ b/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
--- a/programs/develop/mtdbg/mtdbg.asm
+++ b/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 ?, ?
--- a/programs/develop/mtdbg/symbols.inc
+++ b/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
--- a/programs/network/ftpd/commands.inc
+++ b/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
--- a/programs/network/ftpd/ftpd.asm
+++ b/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
--- a/programs/system/shell/cmd/cmd_kfetch.c
+++ b/programs/system/shell/cmd/cmd_kfetch.c
@@ -26,8 +26,8 @@ int cmd_kfetch(char param[]) {
    char str_resolution[24];
    ksys_pos_t resol = _ksys_screen_size();
    sprintf(str_resolution, "%u x %u", resol.x + 1, resol.y + 1);
-    char str_cpu_info[50];
-    get_cpu_brand_string(str_cpu_info);
+    char str_cpu_info[16];
+    get_str_cpu_info(str_cpu_info);
    char str_meminfo[24];
    get_str_meminfo(str_meminfo);

@@ -53,7 +53,7 @@ int cmd_kfetch(char param[]) {
        "\033[0;34;40m   \033[0;31;40m     \033[0;32;40mS\033[0;34;40m@\033[0;5;34;40mX\033[0;1;35;45m.\033[0;1;34;44m8\033[0;5;35;45m \033[0;5;34;44m \033[0;1;30;45m8\033[0;5;35;44m:\033[0;5;37;45m@\033[0;1;30;40m8\033[0;31;40m.\033[0;34;40m \033[0;31;40m  \033[0;34;40m                 \033[0m\n\r"
        "\033[0;34;40m   \033[0;31;40m    \033[0;32;40m \033[0;31;40m.\033[0;32;40m;\033[0;34;40m;8\033[0;32;40m%%\033[0;5;34;40m8\033[0;34;40m8\033[0;1;30;44m8\033[0;1;30;40m8\033[0;34;40m;.\033[0;31;40m \033[0;34;40m  \033[0;31;40m \033[0;34;40m                 \033[0m\n\r"
        "\033[0;34;40m   \033[0;32;40m \033[0;31;40m     \033[0;32;40m.\033[0;31;40m.\033[0;32;40m.\033[0;31;40m.\033[0;32;40m.\033[0;31;40m:. \033[0;32;40m. \033[0;34;40m \033[0;31;40m \033[0;34;40m                   \033[0m\n\r",
-
+        
        "\033[0;36mOS\033[0m: KolibriOS ", str_os_rel_offset_dbgtag, "\033[0;36mKernel\033[0m: ", str_krn_abi_cmtid, "\033[0;36mUptime\033[0m: ", str_uptime, "\033[0;36mResolution\033[0m: ", str_resolution, "\033[0;36mCPU\033[0m: ", str_cpu_info, "\033[0;36mMemory\033[0m: ", str_meminfo
    );

--- a/programs/system/shell/cmd/cmd_ver.c
+++ b/programs/system/shell/cmd/cmd_ver.c
@@ -1,72 +1,65 @@
-#include "../system/kolibri.h"
-
-void get_str_kernel_version(char *str, const char *fmt) {
-    struct kernel_version kv;
-
-    kol_get_kernel_ver(&kv);
-    char str_offset[8] = {'\0'};
-    if (kv.offset)
-        sprintf(str_offset, "+%u", kv.offset);
-    char str_dbgtag[4] = {'\0'};
-    if (kv.dbgtag)
-        sprintf(str_dbgtag, "-%c", kv.dbgtag);
-    char str_cmtid[16] = {'\0'};
-    if (kv.cmtid)
-        sprintf(str_cmtid, " (%08x)", kv.cmtid);
-
-    sprintf(str, fmt, kv.osrel[0], kv.osrel[1], kv.osrel[2], kv.osrel[3],
-            str_offset, str_dbgtag, str_cmtid, kv.abimaj, kv.abimin);
-}
-
-// Retrieves the CPU Brand String and writes it to the provided buffer.
-// out_buffer: A buffer of at least 49 bytes (48 for string + 1 for null)
-void get_cpu_brand_string(char *out_buffer) {
-    if (!out_buffer) return;
-
-    uint32_t regs[4];
-
-    // 1. Check maximum extended function support
-    __asm__ (
-        "cpuid"
-        : "=a" (regs[0]), "=b" (regs[1]), "=c" (regs[2]), "=d" (regs[3])
-        : "a" (0x80000000)
-    );
-
-    if (regs[0] < 0x80000004) {
-        strcpy(out_buffer, "Brand String Not Supported");
-        return;
-    }
-
-    // 2. Extract brand string from leaves 0x80000002 to 0x80000004
-    for (uint32_t leaf = 0x80000002; leaf <= 0x80000004; leaf++) {
-        __asm__ (
-            "cpuid"
-            : "=a" (regs[0]), "=b" (regs[1]), "=c" (regs[2]), "=d" (regs[3])
-            : "a" (leaf)
-        );
-
-        // Copy the 16 bytes (4 registers * 4 bytes) from this leaf into the buffer
-        memcpy(out_buffer + (leaf - 0x80000002) * 16, regs, 16);
-    }
-
-    out_buffer[48] = '\0';
-}
-
-int cmd_ver(char param[]) {
-    if (!strcmp(param, "kernel")) {
-        get_str_kernel_version(tmpstr, CMD_VER_FMT1);
-        printf(tmpstr);
-        return TRUE;
-    }
-
-    if (!strcmp(param, "cpu")) {
-        char str[49];
-        get_cpu_brand_string(str);
-        printf("%s\n\r", str);
-        return TRUE;
-    }
-
-    printf ("  Shell v%s\n\r", SHELL_VERSION);
-    return TRUE;
-}
-
+#include "../system/kolibri.h"
+
+void get_str_kernel_version(char *str, const char *fmt) {
+    struct kernel_version kv;
+
+    kol_get_kernel_ver(&kv);
+    char str_offset[8] = {'\0'};
+    if (kv.offset)
+        sprintf(str_offset, "+%u", kv.offset);
+    char str_dbgtag[4] = {'\0'};
+    if (kv.dbgtag)
+        sprintf(str_dbgtag, "-%c", kv.dbgtag);
+    char str_cmtid[16] = {'\0'};
+    if (kv.cmtid)
+        sprintf(str_cmtid, " (%08x)", kv.cmtid);
+
+    sprintf(str, fmt, kv.osrel[0], kv.osrel[1], kv.osrel[2], kv.osrel[3],
+            str_offset, str_dbgtag, str_cmtid, kv.abimaj, kv.abimin);
+}
+
+void get_str_cpu_info(char *str) {
+    unsigned a, b, c, d;
+
+    asm ("cpuid" :
+                    "=a" (a),
+            "=b" (b),
+            "=c" (c),
+            "=d" (d):
+            "a"(0));
+
+    str[0] = (b&0x000000ff)	>> 0;
+    str[1] = (b&0x0000ff00)	>> 8;
+    str[2] = (b&0x00ff0000)	>> 16;
+    str[3] = (b&0xff000000)	>> 24;
+
+    str[4] = (d&0x000000ff)	>> 0;
+    str[5] = (d&0x0000ff00)	>> 8;
+    str[6] = (d&0x00ff0000)	>> 16;
+    str[7] = (d&0xff000000)	>> 24;
+
+    str[8] = (c&0x000000ff)	>> 0;
+    str[9] = (c&0x0000ff00)	>> 8;
+    str[10] = (c&0x00ff0000)	>> 16;
+    str[11] = (c&0xff000000)	>> 24;
+    str[12] = '\0';
+}
+
+int cmd_ver(char param[]) {
+    if (!strcmp(param, "kernel")) {
+        get_str_kernel_version(tmpstr, CMD_VER_FMT1);
+        printf(tmpstr);
+        return TRUE;
+    }
+
+    if (!strcmp(param, "cpu")) {
+        char str[13];
+        get_str_cpu_info(str);
+        printf("%s\n\r", str);
+        return TRUE;
+    }
+
+    printf ("  Shell v%s\n\r", SHELL_VERSION);
+    return TRUE;
+}
+
--- a/programs/system/shell/shell.c
+++ b/programs/system/shell/shell.c
@@ -1,170 +1,170 @@
-
-#include "all.h"
-
-int dir_check(char dir[])
-/// just checks, if dir[] is really a directory
-{
-    kol_struct70	k70;
-    int		result;
-
-    k70.p00 = 1;
-    k70.p04 = 0;
-    //k70.p08 = 0;
-    k70.p12 = 2; // enough to read . & ..
-    k70.p16 = (unsigned)malloc(32+k70.p12*560);
-    k70.p20 = 0;
-    k70.p21 = dir;
-
-    result = kol_file_70(&k70);
-
-    free((void*)k70.p16);
-
-    if ( (0 == result)||(6 == result) )  // 6 is possible ???
-        return TRUE;
-    else
-        return FALSE;
-
-}
-
-void dir_truncate(char dir[])
-{
-    int i;
-    i = strlen(dir)-1;
-    for (;;i--)
-        if ('/' == dir[i])
-            {
-            dir[i+1] = 0;
-            break;
-            }
-}
-
-void get_file_dir_loc(char *filepath, char *dir_path)
-{
-    char *res = strrchr(filepath, '/');
-    if (res == 0)
-    {
-        dir_path = '\0';
-        return;
-    }
-    size_t pos = res - filepath;
-    strncpy(dir_path, filepath, pos);
-    dir_path[pos] = '\0';
-}
-
-
-int file_check(char file[])
-{
-    kol_struct70	k70;
-    int		result;
-
-    k70.p00 = 0;
-    k70.p04 = 0;
-    //k70.p08 = 0;
-    k70.p12 = 0;
-    k70.p16 = 0;
-    k70.p20 = 0;
-    k70.p21 = file;
-
-    result = kol_file_70(&k70);
-
-    if (0 == result)
-        return TRUE;
-    else
-        return FALSE;
-}
-
-
-void file_not_found(char file[]) {
-    printf (FILE_NOT_FOUND_ERROR, file);
-}
-
-
-int iswhite(char c) {return ((' ' == c) || ('\t' == c) || (13 == c) || (10 == c)); }
-
-void trim(char string[])
-{
-    int i, j;
-
-    for (i=0; ;i++)
-        if ( !iswhite(string[i]) )
-            break;
-    j = 0;
-    for (;;i++, j++)
-        {
-        string[j] = string[i];
-        if ('\0' == string[i] )
-            break;
-        }
-
-    for (i=0; ;i++)
-        if ('\0' == string[i])
-            break;
-    i--;
-    for (;i>0;--i)
-        if ( iswhite(string[i]) )
-            string[i] = '\0';
-        else
-            break;
-}
-
-
-// entry point
-int main(int argc, char **argv)
-{
-    int i; for (i = 1; i < argc; i++) {
-        strcat(cmdline, argv[i]);
-        if (i != argc - 1) {
-            strcat(cmdline, " ");
-        }
-    }
-
-    NUM_OF_CMD = sizeof(COMMANDS)/sizeof(COMMANDS[0]);
-    strcpy(title, "SHELL ");
-    strcat(title, SHELL_VERSION);
-    con_init_opt(-1, -1, -1, -1, title);
-
-    //printf("argc = %d\ncmdline = '%s'\n", argc, cmdline);
-
-    if (sizeof (kol_struct70) != 25) {
-        printf("Invalid struct align kol_struct70, need to fix compile options\n\r");
-        kol_exit();
-    }
-
-    //strcpy(cur_dir, PATH);
-    //dir_truncate(cur_dir);
-    getcwd(cur_dir, sizeof cur_dir);
-    //printf("curdir %s\n", cur_dir);
-
-    con_set_cursor_height(con_get_font_height()-1);
-
-    ALIASES = malloc(128*1024);
-
-    if (!cmdline || cmdline[0] == 0) {
-        strcpy(CMD, argv[0]);
-        dir_truncate(CMD);
-        strcat(CMD, ".shell");
-        if ( !file_check(CMD) )
-            strcpy(CMD, "/sys/settings/.shell");
-    }
-    else {
-        if (cmdline[0] == '/')
-        {
-            strcpy(cur_dir, cmdline);
-            *(strrchr(cur_dir, '/')+1)=0;
-        }
-        strcpy(CMD, cmdline);
-    }
-
-    command_execute();
-
-    for (;;) {
-        //printf("\033[32;1m");
-        printf ("# ");
-        //printf("\033[0m");
-        command_get();
-        command_execute();
-    }
-
-    con_exit(0);
-    kol_exit();
-}
+
+#include "all.h"
+
+int dir_check(char dir[])
+/// just checks, if dir[] is really a directory
+{
+    kol_struct70	k70;
+    int		result;
+
+    k70.p00 = 1;
+    k70.p04 = 0;
+    //k70.p08 = 0;
+    k70.p12 = 2; // enough to read . & ..
+    k70.p16 = (unsigned)malloc(32+k70.p12*560);
+    k70.p20 = 0;
+    k70.p21 = dir;
+
+    result = kol_file_70(&k70);
+
+    free((void*)k70.p16);
+
+    if ( (0 == result)||(6 == result) )  // 6 is possible ???
+        return TRUE;
+    else 
+        return FALSE;
+
+}
+
+void dir_truncate(char dir[])
+{
+    int i;
+    i = strlen(dir)-1;
+    for (;;i--)
+        if ('/' == dir[i])
+            {
+            dir[i+1] = 0;
+            break;
+            }
+}
+
+void get_file_dir_loc(char *filepath, char *dir_path)
+{
+    char *res = strrchr(filepath, '/');
+    if (res == 0)
+    {
+        dir_path = '\0';
+        return;
+    }
+    size_t pos = res - filepath;
+    strncpy(dir_path, filepath, pos);
+    dir_path[pos] = '\0';
+}
+
+
+int file_check(char file[])
+{
+    kol_struct70	k70;
+    int		result;
+
+    k70.p00 = 0;
+    k70.p04 = 0;
+    //k70.p08 = 0;
+    k70.p12 = 0;
+    k70.p16 = 0;
+    k70.p20 = 0;
+    k70.p21 = file;
+
+    result = kol_file_70(&k70);
+
+    if (0 == result)
+        return TRUE;
+    else 
+        return FALSE;
+}
+
+
+void file_not_found(char file[]) {
+    printf (FILE_NOT_FOUND_ERROR, file);
+}
+
+
+int iswhite(char c) {return ((' ' == c) || ('\t' == c) || (13 == c) || (10 == c)); }
+
+void trim(char string[])
+{
+    int i, j;
+
+    for (i=0; ;i++)
+        if ( !iswhite(string[i]) )
+            break;
+    j = 0;
+    for (;;i++, j++)
+        {
+        string[j] = string[i];
+        if ('\0' == string[i] )
+            break;
+        }
+
+    for (i=0; ;i++)
+        if ('\0' == string[i])
+            break;
+    i--;
+    for (;i>0;--i)
+        if ( iswhite(string[i]) )
+            string[i] = '\0';
+        else
+            break;
+}
+
+
+// entry point
+int main(int argc, char **argv)
+{
+    int i; for (i = 1; i < argc; i++) {
+        strcat(cmdline, argv[i]);
+        if (i != argc - 1) {
+            strcat(cmdline, " ");
+        }
+    }
+
+    NUM_OF_CMD = sizeof(COMMANDS)/sizeof(COMMANDS[0]);
+    strcpy(title, "SHELL ");
+    strcat(title, SHELL_VERSION);
+    con_init_opt(-1, -1, -1, -1, title);
+
+    //printf("argc = %d\ncmdline = '%s'\n", argc, cmdline);
+
+    if (sizeof (kol_struct70) != 25) {
+        printf("Invalid struct align kol_struct70, need to fix compile options\n\r");
+        kol_exit();
+    }
+
+    //strcpy(cur_dir, PATH);
+    //dir_truncate(cur_dir);
+    getcwd(cur_dir, sizeof cur_dir);
+    //printf("curdir %s\n", cur_dir);
+
+    con_set_cursor_height(con_get_font_height()-1);
+
+    ALIASES = malloc(128*1024);
+
+    if (!cmdline || cmdline[0] == 0) {
+        strcpy(CMD, argv[0]);
+        dir_truncate(CMD);
+        strcat(CMD, ".shell");
+        if ( !file_check(CMD) )
+            strcpy(CMD, "/sys/settings/.shell");
+    }
+    else {
+        if (cmdline[0] == '/')
+        {
+            strcpy(cur_dir, cmdline);
+            *(strrchr(cur_dir, '/')+1)=0;
+        }
+        strcpy(CMD, cmdline);
+    }
+
+    command_execute();
+
+    for (;;) {
+        //printf("\033[32;1m"); 
+        printf ("# ");
+        //printf("\033[0m"); 
+        command_get();
+        command_execute();
+    }
+
+    con_exit(0);
+    kol_exit();
+}
Author	SHA1	Message	Date
Egor00f	b2e4b02806	libshell: update `shell_ping()` All checks were successful Build system / Check kernel codestyle (pull_request) Successful in 23s Details Build system / Build (pull_request) Successful in 19m18s Details make it faster	2026-03-08 18:40:07 +05:00
Egor00f	18f50b5786	libc.obj: return `_ksys_exit` to `exit`	2026-03-08 18:36:42 +05:00
Egor00f	84fb020568	libc.obj & libshell: formatting fix & update comments & add checks that shell really initialized	2026-03-07 15:00:04 +05:00
Egor00f	6956ce8b8c	libc.obj: add shell console output	2026-03-07 13:58:11 +05:00
Igor Shutrov	668fd4deeb	ftpd: add ip to first message All checks were successful Build system / Check kernel codestyle (pull_request) Successful in 21s Details Build system / Build (pull_request) Successful in 16m30s Details	2026-02-17 22:08:04 +05:00
Max Logaev	dd9a7b92d8	libc.obj: Fixed build skip with TCC build enabled All checks were successful Build system / Check kernel codestyle (pull_request) Successful in 1m19s Details Build system / Build (pull_request) Successful in 16m42s Details Signed-off-by: Max Logaev <maxlogaev@proton.me>	2026-01-28 17:22:54 +03:00
Igor Shutrov	1173ca7b26	Cedit: Improve search panel (#313 ) Улучшения для Cedit в Панели поиска: - Добавлен поиск следующего фрагмента текста по нажатию Enter - Добавлен обратный переход по полям ввода в Панели поиска по Shift-Tab Co-authored-by: Igor Shutrov <igor@shutrov.ru> Reviewed-on: #313 Reviewed-by: Burer <burer@noreply.localhost> Co-authored-by: Igor Shutrov <kolibridev@inbox.ru> Co-committed-by: Igor Shutrov <kolibridev@inbox.ru>	2026-01-18 16:28:46 +00:00
Max Logaev	ccd0c183ec	mtdbg: Backtrace implemented (#315 ) Added support for backtrace/stacktrace output. This is useful for high-level languages like C and Oberon07. If a debug file is provided, searches for the nearest debug symbol. Reviewed-on: #315 Reviewed-by: Mikhail Frolov <mixa.frolov2003@gmail.com> Reviewed-by: Burer <burer@noreply.localhost>	2026-01-18 13:08:02 +00:00
Max Logaev	f065cc6e69	mtdbg: Fixed magic cmd flags Signed-off-by: Max Logaev <maxlogaev@proton.me>	2026-01-11 13:35:58 +00:00
Егор	f1b99bad84	libc.obj: Added missing `strpbrk()` to `EXPORTS` (#310 ) Reviewed-on: #310 Reviewed-by: Max Logaev <maxlogaev@proton.me> Co-authored-by: Егор <velikiydolbayeb@gmail.com> Co-committed-by: Егор <velikiydolbayeb@gmail.com>	2026-01-10 23:27:51 +00:00
igorsh	c580d4ac5b	ftpd: Add XPWD and XCWD commands (#309 ) Добавлены команды XPWD и XCWD, дублирующие PWD и CWD Co-authored-by: Igor Shutrov <igor@shutrov.ru> Co-authored-by: Burer <burer@kolibrios.org> Reviewed-on: #309 Reviewed-by: Burer <burer@noreply.localhost> Co-authored-by: igorsh <kolibridev@inbox.ru> Co-committed-by: igorsh <kolibridev@inbox.ru>	2026-01-08 17:03:23 +00:00
Igor Shutrov	17c33521c3	ftpd: Fix typo	2026-01-07 19:41:28 +00:00
Igor Shutrov	f6395c9501	ftpd: Fix typo	2026-01-07 19:41:28 +00:00
Igor Shutrov	000288ce8b	ftpd: Fix RETR for small and empty files All checks were successful Build system / Check kernel codestyle (pull_request) Successful in 1m5s Details Build system / Build (pull_request) Successful in 15m59s Details	2026-01-06 18:20:39 +00:00