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

Shell: some small fixes

Browse Source 
git-svn-id: svn://kolibrios.org@2615 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Albom
2012-04-15 07:59:47 +00:00
parent ba80d953e5
commit f0c414780c
4 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,3 +1,8 @@
Shell 0.5.1 // 15.04.2012 // Albom
=======================================
* <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><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
Shell 0.5 // 23.03.2012 // Albom Shell 0.5 // 23.03.2012 // Albom
======================================= =======================================
* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> * <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>

12
programs/system/shell/cmd/cmd_more.c
View File

@@ -25,16 +25,28 @@ if ( '/' == file[0])
if ( !file_check(temp) ) if ( !file_check(temp) )
{ {
#if LANG_ENG
printf (" File not found!\n\r");
#elif LANG_RUS
printf (" <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>!\n\r");
#endif
return FALSE; return FALSE;
} }
} }
else else
{ {
strcpy(temp, cur_dir); strcpy(temp, cur_dir);
if (temp[strlen(temp)-1] != '/')
strcat(temp, "/"); // add slash
strcat(temp, file); strcat(temp, file);
if ( !file_check(temp) ) if ( !file_check(temp) )
{ {
#if LANG_ENG
printf (" File not found!\n\r");
#elif LANG_RUS
printf (" <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>!\n\r");
#endif
return FALSE; return FALSE;
} }
} }

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

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

5
programs/system/shell/modules/module_executable.c
View File

@@ -26,9 +26,12 @@ if ( '/' == cmd[0]) //
else else
{ {
strcpy(exec, cur_dir); // <20>஢<EFBFBD><E0AEA2>塞 䠩<> <20> ⥪<>饬 <20><>⠫<EFBFBD><E2A0AB><EFBFBD> strcpy(exec, cur_dir); // <20>஢<EFBFBD><E0AEA2>塞 䠩<> <20> ⥪<>饬 <20><>⠫<EFBFBD><E2A0AB><EFBFBD>
// strcat(exec, "/"); // add slash if (exec[strlen(exec)-1] != '/')
strcat(exec, "/"); // add slash
strcat(exec, cmd); strcat(exec, cmd);
printf("\n%s\n", exec);
if ( !file_check(exec) ) // <20>஢<EFBFBD><E0AEA2>塞 <20><><EFBFBD><EFBFBD><EFBFBD>⢮<EFBFBD><E2A2AE><EFBFBD><EFBFBD><EFBFBD> 䠩<><E4A0A9> if ( !file_check(exec) ) // <20>஢<EFBFBD><E0AEA2>塞 <20><><EFBFBD><EFBFBD><EFBFBD>⢮<EFBFBD><E2A2AE><EFBFBD><EFBFBD><EFBFBD> 䠩<><E4A0A9>
{ {
strcpy(exec, "/rd/1/"); // <20>஢<EFBFBD><E0AEA2>塞 䠩<> <20><> <20><><EFBFBD><EFBFBD>㠫쭮<E3A0AB> <20><>᪥ strcpy(exec, "/rd/1/"); // <20>஢<EFBFBD><E0AEA2>塞 䠩<> <20><> <20><><EFBFBD><EFBFBD>㠫쭮<E3A0AB> <20><>᪥