forked from KolibriOS/kolibrios
Shell: ls command fix, other small fixes
git-svn-id: svn://kolibrios.org@2617 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
@@ -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>¥â â ª®© ª®¬ ¤ë - '%s'.\n\r"};
|
||||
#endif
|
||||
char exec[256];
|
||||
int result;
|
||||
|
||||
if ( '/' == cmd[0]) // ¥á«¨ ¯ãâì ¡á®«îâë©
|
||||
@@ -18,7 +13,7 @@ if ( '/' == cmd[0]) //
|
||||
|
||||
if ( !file_check(exec) ) // ¯à®¢¥à塞 áãé¥á⢮¢ ¨¥ ä ©«
|
||||
{
|
||||
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) ) // ¯à®¢¥à塞 áãé¥á⢮¢ ¨¥ ä ©«
|
||||
{
|
||||
strcpy(exec, "/rd/1/"); // ¯à®¢¥à塞 ä ©« ¢¨àâ㠫쮬 ¤¨áª¥
|
||||
strcat(exec, cmd);
|
||||
if ( !file_check(exec) ) // ¯à®¢¥à塞 áãé¥á⢮¢ ¨¥ ä ©«
|
||||
{
|
||||
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;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user