Killall and ccpuid commands are temporarily removed. Text strings are corrected.

git-svn-id: svn://kolibrios.org@1807 a494cfbc-eb01-0410-851d-a64ba20cac60

programs/system/shell/History.txt

@@ -1,3 +1,7 @@
+Shell 0.4.6 // 30.01.2011 // Albom
+* Временно удалены команды killall и ccpuid (чтобы вернуть, необходимо раскомментировать 2 строчки)
+* Исправления в текстовых строках
+
 Shell 0.4.52 // 25.10.2010 // Pterox
 =======================================
 * Добавлена команда "killall" - убивает все процессы кроме OS/IDLE.

programs/system/shell/cmd/cmd_about.c

@@ -2,27 +2,11 @@
 int cmd_about(char param[])
 {
 
-#if LANG_ENG
 char message[] = {
 "\
 \n\r\
-Shell for KolibriOS\n\r\
+Shell %s\n\r\n\r\
-version %s\n\r\n\r\
-  author: Oleksandr Bogomaz aka Albom\n\r\
-  e-mail: albom85@yandex.ru\n\r\
-    site: http://albom85.narod.ru/\n\r\n\r\
 "};
-#elif LANG_RUS
-char message[] = {
-"\
-\n\r\
-Shell ¤«ï KolibriOS\n\r\
-¢¥àá¨ï %s\n\r\n\r\
-    ¢â®à: €«¥ªá ­¤à <EFBFBD>®£®¬ § aka Albom\n\r\
-  e-mail: albom85@yandex.ru\n\r\
-    á ©â: http://albom85.narod.ru/\n\r\n\r\
-"};
-#endif
 
 printf(message, SHELL_VERSION); 
 return TRUE;

programs/system/shell/cmd/cmd_help.c

@@ -7,7 +7,7 @@ int i;
 #if LANG_ENG
 	char available[]={"  %d commands available:\n\r"};
 #elif LANG_RUS
-	char available[]={"  Š®«-¢® ¤®áâ㯭ëå ª®¬ ­¤: %d\n\r"};
+	char available[]={"  Š®«¨ç¥á⢮ ¤®áâ㯭ëå ª®¬ ­¤: %d\n\r"};
 #endif
 
 if ( !strlen(cmd) )

programs/system/shell/cmd/cmd_killall.c

@@ -12,4 +12,4 @@ if (!strlen(process_name))
 	return TRUE;
 	}
 return TRUE;
-}
+}

programs/system/shell/cmd/cmd_ver.c

@@ -23,7 +23,7 @@ if (!strcmp(param, "kernel"))
 	#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);
+		printf ("  KolibriOS v%d.%d.%d.%d. SVN-ॢ. ï¤à : %d\n\r", vA, vB, vC, vD, Rev);
 	#endif
 	free(kvbuf);
 	return TRUE;

programs/system/shell/globals.h

@@ -1,5 +1,5 @@
 
-#define SHELL_VERSION "0.4.52"
+#define SHELL_VERSION "0.4.6"
 
 extern char	PATH[256];
 extern char	PARAM[256];

programs/system/shell/locale/eng/globals.h

@@ -17,12 +17,12 @@ const command_t COMMANDS[]=
 	{"more",    "  Displays a file data to the screen. Usage:\n\r    more <file name>\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},
+	{"reboot",  "  Reboots the computer or KolibriOS kernel. Usage:\n\r    reboot ;reboot a PC\n\r    reboot kernel ;reboot the KolibriOS 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 <directory>\n\r", &cmd_rmdir},
 	{"sleep",   "  Stops the shell for the desired period. Usage:\n\r    sleep <time in the 1/100 of second>\n\r  Example:\n\r    sleep 500 ;pause for 5sec.\n\r", &cmd_sleep},
 	{"shutdown","  Turns off the computer\n\r", &cmd_shutdown},
 	{"touch",   "  Creates an empty file or updates the time/date stamp on a file. Usage:\n\r    touch <file name>\n\r", &cmd_touch},
 	{"uptime",  "  Displays the uptime\n\r", &cmd_uptime},
-	{"ver",     "  Displays version. Usage:\n\r    ver ;Shell version\n\r    ver kernel ;version of KoOS kernel\n\r", &cmd_ver},
+	{"ver",     "  Displays version. Usage:\n\r    ver ;Shell version\n\r    ver kernel ;version of KolibriOS kernel\n\r", &cmd_ver},
 };

programs/system/shell/locale/rus/globals.h

@@ -1,28 +1,28 @@
 const command_t COMMANDS[]=
 {
 	{"about",   "  ‚뢮¤¨â ¨­ä®à¬ æ¨î ® ¯à®£à ¬¬¥ Shell\n\r", &cmd_about},
-	{"alias",   "  <20>®ª §ë¢ ¥â ᯨ᮪ alias'®¢\n\r", &cmd_alias},
+	{"alias",   "  <20>®ª §ë¢ ¥â ¨ ¯®§¢®«ï¥â ¨§¬¥­¨âì ᯨ᮪ ᨭ®­¨¬®¢ ª®¬ ­¤\n\r", &cmd_alias},
-	{"ccpuid",  "  ‚뢮¤¨â ¨­ä®à¬ æ¨î ® CPU\n\r", &cmd_ccpuid},
+//	{"ccpuid",  "  ‚뢮¤¨â ¨­ä®à¬ æ¨î ® CPU\n\r", &cmd_ccpuid},
 	{"cd",      "  ˆ§¬¥­ï¥â ⥪ãéãî ¤¥à¨ªâ®à¨î. ˆá¯®«ì§®¢ ­¨¥:\n\r    cd <¤¨à¥ªâ®à¨ï>\n\r", &cmd_cd},
 	{"clear",   "  Žç¨é ¥â íªà ­\n\r", &cmd_clear},
 	{"date",    "  <20>®ª §ë¢ ¥â ⥪ãéãî ¤ âã ¨ ¢à¥¬ï\n\r", &cmd_date},
 	{"echo",    "  ‚뢮¤¨â ¤ ­­ë¥ ­  íªà ­. ˆá¯®«ì§®¢ ­¨¥:\n\r    echo <¤ ­­ë¥>\n\r", &cmd_echo},
-	{"exit",    "  ‚ë室 ¨§ ª®­á®«¨\n\r", &cmd_exit},
+	{"exit",    "  ‡ ¢¥à襭¨¥ à ¡®âë Shell\n\r", &cmd_exit},
 	{"memory",  "  <20>®ª §ë¢ ¥â ®¡êñ¬ ¯ ¬ïâ¨: ¢á¥©, ᢮¡®¤­®© ¨ ¨á¯®«ì§ã¥¬®©\n\r", &cmd_memory},
 	{"help",    "  ‘¯à ¢ª  ¯® ª®¬ ­¤ ¬. ˆá¯®«ì§®¢ ­¨¥:\n\r    help ;ᯨ᮪ ¢á¥å ª®¬ ­¤\n\r    help <ª®¬ ­¤ > ;á¯à ¢ª  ¯® ª®¬ ­¤¥\n\r", &cmd_help},
 	{"kill",    "  “¡¨¢ ¥â ¯à®æ¥áá. ˆá¯®«ì§®¢ ­¨¥:\n\r    kill <PID ¯à®æ¥áá >\n\r", &cmd_kill},
-	{"killall", "  “¡¨¢ ¥â ¢á¥ § ¯ã饭­ë¥ ¯à®æ¥ááë\n\r", &cmd_killall},
+//	{"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},
 	{"ps",      "  ‚뢮¤¨â ᯨ᮪ ¯à®æ¥áᮢ\n\r", &cmd_ps},
 	{"pwd",     "  <20>®ª §ë¢ ¥â ¨¬ï ⥪ã饩 ¤¨à¥ªâ®à¨¨\n\r", &cmd_pwd},
-	{"reboot",  "  <20>¥à¥§ £à㦠¥â ª®¬¯ìîâ¥à ¨«¨ ï¤à® KoOS. ˆá¯®«ì§®¢ ­¨¥:\n\r    reboot ;¯¥à¥§ £à㧨âì <20>Š\n\r    reboot kernel ;¯¥à¥§ ¯ãáâ¨âì ï¤à® Kolibri\n\r", &cmd_reboot},
+	{"reboot",  "  <20>¥à¥§ £à㦠¥â ª®¬¯ìîâ¥à ¨«¨ ï¤à® KolibriOS. ˆá¯®«ì§®¢ ­¨¥:\n\r    reboot ;¯¥à¥§ £à㧨âì <20>Š\n\r    reboot kernel ;¯¥à¥§ ¯ãáâ¨âì ï¤à® Kolibri\n\r", &cmd_reboot},
 	{"rm",      "  “¤ «ï¥â ä ©«. ˆá¯®«ì§®¢ ­¨¥:\n\r    rm <¨¬ï ä ©« >\n\r", &cmd_rm},
 	{"rmdir",   "  “¤ «ï¥â ¯ ¯ªã. ˆá¯®«ì§®¢ ­¨¥:\n\r    rmdir <¤¨à¥ªâ®à¨ï>\n\r", &cmd_rmdir},
 	{"sleep",   "  Žáâ ­ ¢«¨¢ ¥â à ¡®âã Shell'  ­  § ¤ ­­®¥ ¢à¥¬ï. ˆá¯®«ì§®¢ ­¨¥:\n\r    sleep <¨­â¥à¢ « ¢ á®âëå ¤®«ï ᥪ㭤ë>\n\r  <20>ਬ¥à:\n\r    sleep 500 ;¯ ã§  ­  5 ᥪ.\n\r", &cmd_sleep},
 	{"shutdown","  ‚몫î砥⠪®¬¯ìîâ¥à\n\r", &cmd_shutdown},
 	{"touch",   "  ‘®§¤ ñâ ¯ãá⮩ ä ©« ¨«¨ ¨§¬¥­ï¥â ¤ âã/¢à¥¬ï ᮧ¤ ­¨ï ä ©« . ˆá¯®«ì§®¢ ­¨¥:\n\r    touch <¨¬ï ä ©« >\n\r", &cmd_touch},
 	{"uptime",  "  <20>®ª §ë¢ ¥â uptime\n\r", &cmd_uptime},
-	{"ver",     "  <20>®ª §ë¢ ¥â ¢¥àá¨î. ˆá¯®«ì§®¢ ­¨¥:\n\r    ver ;¢¥àá¨ï Shell' \n\r    ver kernel ;¢¥àá¨ï ¨ ­®¬¥à ॢ¨§¨¨ ï¤à  Š®Ž‘\n\r", &cmd_ver},
+	{"ver",     "  <20>®ª §ë¢ ¥â ¢¥àá¨î. ˆá¯®«ì§®¢ ­¨¥:\n\r    ver ;¢¥àá¨ï Shell\n\r    ver kernel ;¢¥àá¨ï ¨ ­®¬¥à ॢ¨§¨¨ ï¤à  KolibriOS\n\r", &cmd_ver},
-};
+};