From 1428ddf5843cff309527bcf0c7831809a9cfc8fe Mon Sep 17 00:00:00 2001 From: Nasarus Date: Thu, 21 Oct 2010 04:37:59 +0000 Subject: [PATCH] Shell 0.4.51. See History.txt for details. git-svn-id: svn://kolibrios.org@1669 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/system/shell/all.h | 3 +- programs/system/shell/bin/eng/shell.kex | Bin 5263 -> 5286 bytes programs/system/shell/bin/rus/shell.kex | Bin 5375 -> 5408 bytes programs/system/shell/cmd/cmd_kerver.c | 27 ---------- .../cmd/{cmd_turnoff.c => cmd_shutdown.c} | 2 +- programs/system/shell/cmd/cmd_ver.c | 34 +++++++++++- programs/system/shell/globals.h | 5 +- programs/system/shell/locale/eng/globals.h | 49 +++++++++--------- programs/system/shell/locale/rus/globals.h | 49 +++++++++--------- 9 files changed, 84 insertions(+), 85 deletions(-) delete mode 100644 programs/system/shell/cmd/cmd_kerver.c rename programs/system/shell/cmd/{cmd_turnoff.c => cmd_shutdown.c} (50%) diff --git a/programs/system/shell/all.h b/programs/system/shell/all.h index 9f81ae058c..0fc156e0f3 100644 --- a/programs/system/shell/all.h +++ b/programs/system/shell/all.h @@ -35,8 +35,7 @@ #include "cmd/cmd_clear.c" #include "cmd/cmd_ccpuid.c" #include "cmd/cmd_sleep.c" -#include "cmd/cmd_turnoff.c" -#include "cmd/cmd_kerver.c" +#include "cmd/cmd_shutdown.c" #include "cmd/cmd_uptime.c" #include "modules/module_command.c" diff --git a/programs/system/shell/bin/eng/shell.kex b/programs/system/shell/bin/eng/shell.kex index 972ca8a24a15135edbb8847793cf8a8586b8abe9..501e93f43b869509dc52329fd52ee3904a01f6b3 100644 GIT binary patch delta 5283 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 diff --git a/programs/system/shell/cmd/cmd_kerver.c b/programs/system/shell/cmd/cmd_kerver.c deleted file mode 100644 index 455319dc0c..0000000000 --- a/programs/system/shell/cmd/cmd_kerver.c +++ /dev/null @@ -1,27 +0,0 @@ -int cmd_kerver(char param[]) -{ -char *kvbuf; -char *vA, *vB, *vC, *vD; -unsigned *Rev; - -kvbuf = malloc(16); -kol_get_kernel_ver(kvbuf); -vA = kvbuf+0; -vA = *vA; -vB = kvbuf+1; -vB = *vB; -vC = kvbuf+2; -vC = *vC; -vD = kvbuf+3; -vD = *vD; -Rev = kvbuf+5; -Rev = *Rev; - -#if LANG_ENG - printf (" KolibriOS v%d.%d.%d.%d. Kernel SVN-rev.: %d\n\r", vA, vB, vC, vD, Rev); -#elif LANG_RUS - printf (" КолибриОС v%d.%d.%d.%d. SVN-рев. ядра: %d\n\r", vA, vB, vC, vD, Rev); -#endif -free(kvbuf); -return TRUE; -} \ No newline at end of file diff --git a/programs/system/shell/cmd/cmd_turnoff.c b/programs/system/shell/cmd/cmd_shutdown.c similarity index 50% rename from programs/system/shell/cmd/cmd_turnoff.c rename to programs/system/shell/cmd/cmd_shutdown.c index cb7d07e100..06ef8d1100 100644 --- a/programs/system/shell/cmd/cmd_turnoff.c +++ b/programs/system/shell/cmd/cmd_shutdown.c @@ -1,5 +1,5 @@ -int cmd_turnoff(char param[]) +int cmd_shutdown(char param[]) { kol_system_end(2); return TRUE; diff --git a/programs/system/shell/cmd/cmd_ver.c b/programs/system/shell/cmd/cmd_ver.c index c3056468a3..3c50031063 100644 --- a/programs/system/shell/cmd/cmd_ver.c +++ b/programs/system/shell/cmd/cmd_ver.c @@ -1,6 +1,36 @@ int cmd_ver(char param[]) { -printf (" %s\n\r", SHELL_VERSION); -return TRUE; +if (!strcmp(param, "kernel")) + { + char *kvbuf; + char *vA, *vB, *vC, *vD; + unsigned *Rev; + + kvbuf = malloc(16); + kol_get_kernel_ver(kvbuf); + vA = kvbuf+0; + vA = *vA; + vB = kvbuf+1; + vB = *vB; + vC = kvbuf+2; + vC = *vC; + vD = kvbuf+3; + vD = *vD; + Rev = kvbuf+5; + Rev = *Rev; + + #if LANG_ENG + printf (" KolibriOS v%d.%d.%d.%d. Kernel SVN-rev.: %d\n\r", vA, vB, vC, vD, Rev); + #elif LANG_RUS + printf (" КолибриОС v%d.%d.%d.%d. SVN-рев. ядра: %d\n\r", vA, vB, vC, vD, Rev); + #endif + free(kvbuf); + return TRUE; + } +else + { + printf (" Shell v%s\n\r", SHELL_VERSION); + return TRUE; + } } diff --git a/programs/system/shell/globals.h b/programs/system/shell/globals.h index fae15d122b..5d89084c81 100644 --- a/programs/system/shell/globals.h +++ b/programs/system/shell/globals.h @@ -1,5 +1,5 @@ -#define SHELL_VERSION "0.4.5" +#define SHELL_VERSION "0.4.51" extern char PATH[256]; extern char PARAM[256]; @@ -63,8 +63,7 @@ int cmd_rmdir(char dir[]); int cmd_touch(char file[]); int cmd_ver(char arg[]); int cmd_sleep(char arg[]); -int cmd_turnoff(char arg[]); -int cmd_kerver(char arg[]); +int cmd_shutdown(char arg[]); int cmd_uptime(char param[]); /// =========================================================== diff --git a/programs/system/shell/locale/eng/globals.h b/programs/system/shell/locale/eng/globals.h index 08524e153b..be8bebcb51 100644 --- a/programs/system/shell/locale/eng/globals.h +++ b/programs/system/shell/locale/eng/globals.h @@ -1,28 +1,27 @@ const command_t COMMANDS[]= { - {"about", " Displays information about Shell\n\r", &cmd_about}, - {"alias", " Allows the user view the current aliases\n\r", &cmd_alias}, - {"ccpuid", " Displays CPU information\n\r", &cmd_ccpuid}, - {"cd", " Changes current directory. Usage:\n\r cd \n\r", &cmd_cd}, - {"clear", " Clears the screen\n\r", &cmd_clear}, - {"date", " Returns the current date and time\n\r", &cmd_date}, - {"echo", " Echoes the data to the screen. Usage:\n\r echo \n\r", &cmd_echo}, - {"exit", " Exits from Shell\n\r", &cmd_exit}, - {"memory", " Displays total, free and used memory\n\r", &cmd_memory}, - {"help", " Gives help on commands. Usage:\n\r help ;it lists all builtins\n\r help ;help on command\n\r", &cmd_help}, - {"kerver", " Displays the information about a version of KoOS kernel\n\r", &cmd_kerver}, - {"kill", " Stops a running process. Usage:\n\r kill \n\r", &cmd_kill}, - {"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}, - {"ps", " Lists the current processes running\n\r", &cmd_ps}, - {"pwd", " Displays the name of the working directory\n\r", &cmd_pwd}, - {"reboot", " Reboots the computer or KoOS kernel. Usage:\n\r reboot ;reboot a PC\n\r reboot kernel ;reboot the KoOS kernel\n\r", &cmd_reboot}, - {"rm", " Removes a file. Usage:\n\r rm file name>\n\r", &cmd_rm}, - {"rmdir", " Removes a folder. Usage:\n\r rmdir \n\r", &cmd_rmdir}, - {"sleep", " Stops the shell for the desired period. Usage:\n\r sleep