From 9bd77b61cdc8d0aca2d14701ece7ff7dc1d0a3b0 Mon Sep 17 00:00:00 2001 From: Nasarus Date: Sun, 24 Oct 2010 14:32:14 +0000 Subject: [PATCH] Shell 0.4.52. "killall" added & bugfixes git-svn-id: svn://kolibrios.org@1673 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/system/shell/History.txt | 11 +++++++++-- programs/system/shell/all.h | 1 + programs/system/shell/bin/eng/shell.kex | Bin 5287 -> 0 bytes programs/system/shell/bin/rus/shell.kex | Bin 5408 -> 0 bytes programs/system/shell/cmd/cmd_killall.c | 15 +++++++++++++++ programs/system/shell/cmd/cmd_memory.c | 2 +- programs/system/shell/cmd/cmd_reboot.c | 2 +- programs/system/shell/compile_eng.bat | 8 ++++---- programs/system/shell/compile_rus.bat | 8 ++++---- programs/system/shell/globals.h | 3 ++- programs/system/shell/locale/eng/globals.h | 1 + programs/system/shell/locale/rus/globals.h | 1 + .../system/shell/modules/module_executable.c | 4 ++-- programs/system/shell/system/kolibri.c | 5 +++++ programs/system/shell/system/kolibri.h | 3 ++- 15 files changed, 48 insertions(+), 16 deletions(-) delete mode 100644 programs/system/shell/bin/eng/shell.kex delete mode 100644 programs/system/shell/bin/rus/shell.kex create mode 100644 programs/system/shell/cmd/cmd_killall.c diff --git a/programs/system/shell/History.txt b/programs/system/shell/History.txt index 8ab5c5765e..194e418ad4 100644 --- a/programs/system/shell/History.txt +++ b/programs/system/shell/History.txt @@ -1,9 +1,16 @@ -DDDD@@@@@@@@@@@@!!!!!!!!!!!!!!!!!!!!! +Shell 0.4.52 // 25.10.2010 // Pterox +======================================= +* ─юсртыхэр ъюьрэфр "killall" - єсштрхЄ тёх яЁюЎхёё√ ъЁюьх OS/IDLE. +* ╘шъё√ + +Shell 0.4.51 // 21.10.2010 // Pterox +======================================= +* ╩юьрэфр "turnoff" яхЁхшьхэютрэр т "shutdown", "kerver" єфрыхэр - ЄхяхЁ№ х╕ чрьхэ хЄ "ver kernel"; Їшъё√. Shell 0.4.5 // 19.10.2010 // Pterox ======================================= ╧ЁюуЁрььр ЄхяхЁ№ ьэюую ч√ъютр  (рэуышщёъшщ, ш Ёєёёъшщ  ч√ъ). ╧ЁюуЁрььр яюыэюёЄ№■ ЁєёшЇшЎшЁютрээр. -* ╩юьрэфр "free" яхЁшьхэютрэр т "memory" - фы  ЄюўэюёЄш. +* ╩юьрэфр "free" яхЁхшьхэютрэр т "memory" - фы  ЄюўэюёЄш. * ─юсртыхэ√ ъюьрэф√ turnoff (т√ъы■ўшЄ№ ъюья№■ЄхЁ), kerver (тхЁёш   фЁр KoOS), uptime; reboot ЄхяхЁ№ ьюцхЄ яхЁхчруЁєцрЄ№  фЁю ("reboot kernel") Shell 0.4.4 // 20.08.2010 // Albom diff --git a/programs/system/shell/all.h b/programs/system/shell/all.h index 0fc156e0f3..9129942620 100644 --- a/programs/system/shell/all.h +++ b/programs/system/shell/all.h @@ -37,6 +37,7 @@ #include "cmd/cmd_sleep.c" #include "cmd/cmd_shutdown.c" #include "cmd/cmd_uptime.c" +#include "cmd/cmd_killall.c" #include "modules/module_command.c" #include "modules/module_program.c" diff --git a/programs/system/shell/bin/eng/shell.kex b/programs/system/shell/bin/eng/shell.kex deleted file mode 100644 index b62d31ee53d5805a68dc08b8d76c16f32e8bb275..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5287 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 ;help on command\n\r", &cmd_help}, {"kill", " Stops a running process. Usage:\n\r kill \n\r", &cmd_kill}, + {"killall", " Kills all running processes\n\r", &cmd_killall}, {"ls", " Lists the files in a directory. Usage:\n\r ls ;lists the files in current directory\n\r ls ;lists the files at specified folder\n\r", &cmd_ls}, {"mkdir", " Makes directory. Usage:\n\r mkdir ;creates the folder in working directory\n\r mkdir ;create folder by specified path\n\r", &cmd_mkdir}, {"more", " Displays a file data to the screen. Usage:\n\r more \n\r", &cmd_more}, diff --git a/programs/system/shell/locale/rus/globals.h b/programs/system/shell/locale/rus/globals.h index 899773506e..27b0a65730 100644 --- a/programs/system/shell/locale/rus/globals.h +++ b/programs/system/shell/locale/rus/globals.h @@ -11,6 +11,7 @@ const command_t COMMANDS[]= {"memory", " Показывает объём памяти: всей, свободной и используемой\n\r", &cmd_memory}, {"help", " Справка по командам. Использование:\n\r help ;список всех команд\n\r help <команда> ;справка по команде\n\r", &cmd_help}, {"kill", " Убивает процесс. Использование:\n\r kill \n\r", &cmd_kill}, + {"killall", " Убивает все запущенные процессы\n\r", &cmd_killall}, {"ls", " Выводит список файлов. Использование:\n\r ls ;список файлов в текущем каталоге\n\r ls <директория> ;список файлов из заданной директории\n\r", &cmd_ls}, {"mkdir", " Создает каталог. Использование:\n\r mkdir <имя папки> ;создать папку в текущем каталоге\n\r mkdir <путь><имя папки> ;создать папку по указанному пути\n\r", &cmd_mkdir}, {"more", " Выводит содержимое файла на экран. Использование:\n\r more <имя файла>\n\r", &cmd_more}, diff --git a/programs/system/shell/modules/module_executable.c b/programs/system/shell/modules/module_executable.c index a223790a52..c805080c61 100644 --- a/programs/system/shell/modules/module_executable.c +++ b/programs/system/shell/modules/module_executable.c @@ -8,11 +8,11 @@ char exec[256]; #if LANG_ENG char error_starting[]={" No such command '%s'.\n\r"}; #elif LANG_RUS - char error_starting[]={" Не такой команды - '%s'.\n\r"}; + char error_starting[]={" Нет такой команды - '%s'.\n\r"}; #endif int result; -if ( '/' == cmd[0]) // если путь абсолбтный +if ( '/' == cmd[0]) // если путь абсолютный { strcpy(exec, cmd); diff --git a/programs/system/shell/system/kolibri.c b/programs/system/shell/system/kolibri.c index 978528987a..53b61d357b 100644 --- a/programs/system/shell/system/kolibri.c +++ b/programs/system/shell/system/kolibri.c @@ -411,6 +411,11 @@ int kol_process_kill_pid(unsigned process) asm ("int $0x40"::"a"(18), "b"(18), "c"(process)); } +int kol_kill_process(unsigned process) +{ +asm ("int $0x40"::"a"(18), "b"(2), "c"(process)); +} + void kol_get_kernel_ver(char buff16b[]) { asm ("int $0x40"::"a"(18), "b"(13), "c"(buff16b)); diff --git a/programs/system/shell/system/kolibri.h b/programs/system/shell/system/kolibri.h index 14ad94b2dc..284a3934dd 100644 --- a/programs/system/shell/system/kolibri.h +++ b/programs/system/shell/system/kolibri.h @@ -88,4 +88,5 @@ unsigned kol_time_tick(); unsigned kol_sound_speaker(char data[]); unsigned kol_process_info(unsigned slot, char buf1k[]); int kol_process_kill_pid(unsigned process); -void kol_get_kernel_ver(char buff16b[]); \ No newline at end of file +void kol_get_kernel_ver(char buff16b[]); +int kol_kill_process(unsigned process); \ No newline at end of file