KolibriOS/kolibrios
13
14
Fork 12
Code Issues 113 Pull Requests 16 Actions Projects 1 Releases Wiki Activity

Shell: ls command fix, other small fixes

Browse Source 
git-svn-id: svn://kolibrios.org@2617 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Albom
2012-04-16 10:40:07 +00:00
parent 0485c4d0b8
commit f5c6b33aac
10 changed files with 38 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,12 +4,7 @@
int executable_run(char cmd[], char args[])
{
char exec[256];
#if LANG_ENG
char error_starting[]={" No such command '%s'.\n\r"};
#elif LANG_RUS
char error_starting[]={" <20><><EFBFBD> ⠪<><E2A0AA> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> - '%s'.\n\r"};
#endif
char exec[256];
int result;
if ( '/' == cmd[0]) // <20>᫨ <20><><EFBFBD><EFBFBD> <20><>᮫<EFBFBD><E1AEAB><EFBFBD><EFBFBD><EFBFBD>
@@ -18,7 +13,7 @@ if ( '/' == cmd[0]) //
if ( !file_check(exec) ) // <20>஢<EFBFBD><E0AEA2>塞 <20><><EFBFBD><EFBFBD><EFBFBD>⢮<EFBFBD><E2A2AE><EFBFBD><EFBFBD><EFBFBD> 䠩<><E4A0A9>
{
printf(error_starting, cmd);
file_not_found(cmd);
return FALSE;
}
}
@@ -30,15 +25,13 @@ else
strcat(exec, "/"); // add slash
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>
{
strcpy(exec, "/rd/1/"); // <20>஢<EFBFBD><E0AEA2>塞 䠩<> <20><> <20><><EFBFBD><EFBFBD>㠫쭮<E3A0AB> <20><>᪥
strcat(exec, cmd);
if ( !file_check(exec) ) // <20>஢<EFBFBD><E0AEA2>塞 <20><><EFBFBD><EFBFBD><EFBFBD>⢮<EFBFBD><E2A2AE><EFBFBD><EFBFBD><EFBFBD> 䠩<><E4A0A9>
{
printf(error_starting, cmd);
file_not_found(cmd);
return FALSE;
}
}
@@ -65,7 +58,7 @@ if (result > 0)
}
else
{
printf(error_starting, cmd);
file_not_found(cmd);
return FALSE;
}