aabc2/KOS_qrcodes
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

better up/dwn arrows, docu

Browse Source 
git-svn-id: svn://kolibrios.org@6822 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
siemargl
2017-01-01 22:28:50 +00:00
parent 624f3666a5
commit 0a3c951b56
15 changed files with 181 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
programs/system/shell/Docs_rus.txt
View File

@@ -22,3 +22,36 @@ SC_CLS 6
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Shell
=======================================
<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
about <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> shell
alias <09><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,
<09> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> newprg = old_name <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> newprg
<09><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> newprg = "old name"
cd <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <<3C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>>
clear <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
cp <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <<3C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>> <<3C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>>
date <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD>
echo <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <<3C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>
exit <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Shell
free <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: <20><><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
help <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> shell. <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <<3C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
history c<><63><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
kill <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <PID>. kill all <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> PID >=2
ls <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <<3C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>>
mkdir c<><63><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <<3C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
more <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <<3C><><EFBFBD><EFBFBD><EFBFBD>> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>
ps <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><> PID
pwd <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
reboot <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD> KolibriOS. reboot kernel <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> Kolibri
rm <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <<3C><><EFBFBD><EFBFBD>>
rmdir <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <<3C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>>
shutdown <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
sleep <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Shell'<27> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <<3C><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>>
touch <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <<3C><><EFBFBD><EFBFBD>> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>/<2F><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>. <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
uptime <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
ver <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Shell, ver kernel - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> OS, ver cpu - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>

3
programs/system/shell/History.txt
View File

@@ -1,3 +1,6 @@
Shell 0.7.5 // 01.01.2017 // Siemargl
* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>䨪<EFBFBD><E4A8AA>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>ࠡ<EFBFBD>⪨ <20><>५<EFBFBD><E0A5AB> <20><><EFBFBD><EFBFBD><EFBFBD>/<2F><><EFBFBD><EFBFBD>, <20>⮡<EFBFBD> <20><><EFBFBD> <20> <20><><EFBFBD><EFBFBD>
Shell 0.7.4 // 23.01.2014 // Albom Shell 0.7.4 // 23.01.2014 // Albom
* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD>஬ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD>஢<EFBFBD><E0AEA2><EFBFBD><EFBFBD> Ctrl+C <20> <20><>⠢<EFBFBD><E2A0A2> Ctrl+V <20><>ப<EFBFBD> 楫<><E6A5AB><EFBFBD><EFBFBD>) * <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD>஬ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD>஢<EFBFBD><E0AEA2><EFBFBD><EFBFBD> Ctrl+C <20> <20><>⠢<EFBFBD><E2A0A2> Ctrl+V <20><>ப<EFBFBD> 楫<><E6A5AB><EFBFBD><EFBFBD>)

5
programs/system/shell/bin/rus/.shell
View File

@@ -1,5 +1,6 @@
#SHS #SHS
echo
about ver kernel
echo
echo <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 'help' <20><><EFBFBD> <20><>ࠢ<EFBFBD><E0A0A2> echo <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 'help' <20><><EFBFBD> <20><>ࠢ<EFBFBD><E0A0A2>
echo echo

6
programs/system/shell/cmd/cmd_about.c
View File

@@ -2,11 +2,7 @@
int cmd_about(char param[]) int cmd_about(char param[])
{ {
char message[] = { char message[] = {"Shell %s\n\r"};
"\
\n\r\
Shell %s\n\r\n\r\
"};
printf(message, SHELL_VERSION); printf(message, SHELL_VERSION);
return TRUE; return TRUE;

2
programs/system/shell/cmd/cmd_alias.c
View File

@@ -4,7 +4,7 @@ int cmd_alias(char arg[])
int result; int result;
if (NULL == arg) if (NULL == arg || '\0' == arg[0])
{ {
alias_list(); alias_list();
return TRUE; return TRUE;

2
programs/system/shell/cmd/cmd_history.c
View File

@@ -4,7 +4,7 @@ int cmd_history(char arg[])
int i; int i;
for (i = 0; i < CMD_HISTORY_NUM_REAL; i++) for (i = CMD_HISTORY_NUM_REAL - 1; i >= 0; i--)
{ {
printf("%s\n", CMD_HISTORY[i]); printf("%s\n", CMD_HISTORY[i]);
} }

2
programs/system/shell/cmd/cmd_rm.c
View File

@@ -6,7 +6,7 @@ kol_struct70 k70;
char temp[256]; char temp[256];
unsigned result; unsigned result;
if (NULL == file) if (NULL == file || strlen(file) == 0)
{ {
#if LANG_ENG #if LANG_ENG
printf (" rm <filename>\n\r"); printf (" rm <filename>\n\r");

2
programs/system/shell/cmd/cmd_rmdir.c
View File

@@ -6,7 +6,7 @@ char temp[256];
kol_struct70 k70; kol_struct70 k70;
unsigned result; unsigned result;
if (NULL == dir) if (NULL == dir || strlen(dir) == 0)
{ {
#if LANG_ENG #if LANG_ENG
printf(" rmdir <directory>\n\r"); printf(" rmdir <directory>\n\r");

2
programs/system/shell/cmd/cmd_touch.c
View File

@@ -6,7 +6,7 @@ kol_struct70 k70;
char temp[256]; char temp[256];
unsigned result; unsigned result;
if (NULL == file) if (NULL == file || strlen(file) == 0)
{ {
#if LANG_ENG #if LANG_ENG
printf(" touch <filename>\n\r"); printf(" touch <filename>\n\r");

2
programs/system/shell/cmd/cmd_ver.c
View File

@@ -14,7 +14,7 @@ if (!strcmp(param, "kernel"))
vB = kvbuf+1; vB = kvbuf+1;
vC = kvbuf+2; vC = kvbuf+2;
vD = kvbuf+3; vD = kvbuf+3;
Rev = kvbuf+5; Rev = (unsigned*)(kvbuf + 5);
#if LANG_ENG #if LANG_ENG
printf (" KolibriOS v%d.%d.%d.%d. Kernel SVN-rev.: %d\n\r", *vA, *vB, *vC, *vD, *Rev); printf (" KolibriOS v%d.%d.%d.%d. Kernel SVN-rev.: %d\n\r", *vA, *vB, *vC, *vD, *Rev);

4
programs/system/shell/globals.h
View File

@@ -1,5 +1,5 @@
#define SHELL_VERSION "0.7.4" #define SHELL_VERSION "0.7.5"
extern char PATH[256]; extern char PATH[256];
extern char PARAM[256]; extern char PARAM[256];
@@ -14,7 +14,7 @@ unsigned ALIAS_NUM = 0;
/// =========================================================== /// ===========================================================
#define CMD_HISTORY_NUM 10 #define CMD_HISTORY_NUM 11
char CMD[256]; char CMD[256];
char CMD_HISTORY[CMD_HISTORY_NUM][256]; char CMD_HISTORY[CMD_HISTORY_NUM][256];

3
programs/system/shell/locale/eng/.shell
View File

@@ -1,5 +1,6 @@
#SHS #SHS
echo
ver kernel ver kernel
echo
echo Type 'help' for help echo Type 'help' for help
echo echo

3
programs/system/shell/locale/rus/.shell
View File

@@ -1,5 +1,6 @@
#SHS #SHS
echo
ver kernel ver kernel
echo
echo <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 'help' <20><><EFBFBD> <20><>ࠢ<EFBFBD><E0A0A2> echo <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 'help' <20><><EFBFBD> <20><>ࠢ<EFBFBD><E0A0A2>
echo echo

34
programs/system/shell/modules/module_command.c
View File

@@ -6,6 +6,8 @@ void command_history_add()
int i; int i;
if ('\0' == CMD[0]) return;
for (i = 0; i < CMD_HISTORY_NUM_REAL; i++) for (i = 0; i < CMD_HISTORY_NUM_REAL; i++)
if ( 0 == strcmp( CMD_HISTORY[i], CMD ) ) if ( 0 == strcmp( CMD_HISTORY[i], CMD ) )
return; return;
@@ -18,7 +20,7 @@ strcpy(CMD_HISTORY[0], CMD);
if (CMD_HISTORY_NUM_REAL < CMD_HISTORY_NUM-1) if (CMD_HISTORY_NUM_REAL < CMD_HISTORY_NUM-1)
CMD_HISTORY_NUM_REAL++; CMD_HISTORY_NUM_REAL++;
CMD_NUM = 0; CMD_NUM = -1;
} }
@@ -57,19 +59,16 @@ for (;;)
CMD[0] = '\0'; CMD[0] = '\0';
break; break;
case 13: // ENTER case 13: // ENTER
printf("\n\r"); printf("\n\r");
command_history_add(); command_history_add();
return; return;
case 8: // BACKSPACE case 8: // BACKSPACE
if (cmdPos > 0) if (cmdPos > 0)
{ {
for (i = cmdPos-1; i < cmdLen; i++) for (i = cmdPos-1; i < cmdLen; i++)
CMD[i] = CMD[i+1]; CMD[i] = CMD[i+1];
for (i = 0; i < cmdLen-cmdPos; i++) for (i = 0; i < cmdLen-cmdPos; i++)
printf (" "); printf (" ");
@@ -102,7 +101,7 @@ for (;;)
if ((int)*(clipBuf+4)==0) // text? if ((int)*(clipBuf+4)==0) // text?
{ {
if ((int)*(clipBuf+8)==1) // 866 encoding? if ((int)*(clipBuf+8)==1) // 866 encoding?
{
for (i = cmdPos; i < cmdLen; i++) for (i = cmdPos; i < cmdLen; i++)
printf(" "); printf(" ");
for (i = cmdLen; i > 0; i--) for (i = cmdLen; i > 0; i--)
@@ -130,6 +129,7 @@ for (;;)
} }
} }
} }
}
break; break;
@@ -204,7 +204,6 @@ for (;;)
cmdLen--; cmdLen--;
} }
break; break;
case 75: // Left case 75: // Left
@@ -225,9 +224,8 @@ for (;;)
break; break;
case 80: // Down case 72: // Up
if (CMD_HISTORY_NUM_REAL > 0 && CMD_NUM >= -1)
if (CMD_HISTORY_NUM_REAL > 0)
{ {
for (i = cmdPos; i < cmdLen; i++) for (i = cmdPos; i < cmdLen; i++)
@@ -238,10 +236,10 @@ for (;;)
if (CMD_NUM < CMD_HISTORY_NUM_REAL-1) if (CMD_NUM < CMD_HISTORY_NUM_REAL-1)
CMD_NUM++; CMD_NUM++;
else /* else
CMD_NUM = 0; CMD_NUM = 0;
*/
printf( "%s", CMD_HISTORY[CMD_NUM] ); printf("%s", CMD_HISTORY[CMD_NUM]);
strcpy(CMD, CMD_HISTORY[CMD_NUM]); strcpy(CMD, CMD_HISTORY[CMD_NUM]);
cmdLen = strlen(CMD); cmdLen = strlen(CMD);
cmdPos = strlen(CMD); cmdPos = strlen(CMD);
@@ -251,8 +249,8 @@ for (;;)
break; break;
case 72: // Up case 80: // Down
if (CMD_HISTORY_NUM_REAL > 0) if (CMD_HISTORY_NUM_REAL > 0 && CMD_NUM >= 0)
{ {
for (i = cmdPos; i < cmdLen; i++) for (i = cmdPos; i < cmdLen; i++)
@@ -263,10 +261,10 @@ for (;;)
if (CMD_NUM > 0) if (CMD_NUM > 0)
CMD_NUM--; CMD_NUM--;
else /* else
CMD_NUM = CMD_HISTORY_NUM_REAL-1; CMD_NUM = CMD_HISTORY_NUM_REAL-1;
*/
printf( "%s", CMD_HISTORY[CMD_NUM] ); printf("%s", CMD_HISTORY[CMD_NUM]);
strcpy(CMD, CMD_HISTORY[CMD_NUM]); strcpy(CMD, CMD_HISTORY[CMD_NUM]);
cmdLen = strlen(CMD); cmdLen = strlen(CMD);
cmdPos = strlen(CMD); cmdPos = strlen(CMD);
@@ -310,7 +308,7 @@ if (quote == 0)
} }
return i+1; return i+1;
} }
else else
{ {
len = 0; len = 0;
for (i=1;;i++) for (i=1;;i++)

6
programs/system/shell/system/kolibri.c
View File

@@ -58,13 +58,13 @@ asm volatile ("int $0x40"::"a"(11));
} }
void __attribute__((__always_inline__)) kol_paint_start() inline void __attribute__((__always_inline__)) kol_paint_start()
{ {
asm volatile ("int $0x40"::"a"(12), "b"(1)); asm volatile ("int $0x40"::"a"(12), "b"(1));
} }
void __attribute__((__always_inline__)) kol_paint_end() inline void __attribute__((__always_inline__)) kol_paint_end()
{ {
asm volatile ("int $0x40"::"a"(12), "b"(2)); asm volatile ("int $0x40"::"a"(12), "b"(2));
} }
@@ -347,7 +347,7 @@ switch (*fname)
void __attribute__((__always_inline__)) kol_screen_wait_rr() inline void __attribute__((__always_inline__)) kol_screen_wait_rr()
{ {
asm volatile ("int $0x40"::"a"(18), "b"(14)); asm volatile ("int $0x40"::"a"(18), "b"(14));
} }