aabc2/KOS_qrcodes
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests 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

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

@@ -1,3 +1,9 @@
Shell 0.5.2 // 16.04.2012 // Albom
=======================================
* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ls
* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
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>

10
programs/system/shell/cmd/cmd_ls.c
View File

@@ -7,13 +7,14 @@ unsigned *n;
unsigned num_of_file;
unsigned *t;
unsigned type_of_file;
int i;
int i, result;
k70.p00 = 1;
k70.p04 = 0;
k70.p08 = 0;
k70.p12 = 2*1024*1024; // 2 MB
k70.p16 = malloc(2*1024*1024);
k70.p12 = 10000;
k70.p16 = malloc(32+k70.p12*560);
k70.p20 = 0;
/// !!!
@@ -23,7 +24,8 @@ if ( !strlen(dir) )
else
k70.p21 = dir;
if ( !kol_file_70(&k70) ) // <20><><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>
result = kol_file_70(&k70);
if ( !((result==0) || (result==6)) ) // <20><><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>
{
free(k70.p16);
return FALSE;

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

@@ -9,7 +9,7 @@ char buf[81]; //
char temp[256];
unsigned flags;
if (NULL == file)
if (strlen(file)<1)
{
#if LANG_ENG
printf (" more <filename>\n\r");
@@ -25,11 +25,7 @@ if ( '/' == file[0])
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
file_not_found(file);
return FALSE;
}
}
@@ -42,11 +38,7 @@ else
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
file_not_found(file);
return FALSE;
}
}

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

@@ -1,6 +1,6 @@
int cmd_pwd(char param[])
{
printf (" %s\n\r", cur_dir);
printf (" %s/\n\r", cur_dir);
return TRUE;
}

7
programs/system/shell/cmd/cmd_reboot.c
View File

@@ -2,13 +2,8 @@
int cmd_reboot(char param[])
{
if (!strcmp(param, "kernel"))
{
kol_system_end(4);
return TRUE;
}
else
{
kol_system_end(3);
return TRUE;
}
return TRUE;
}

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

@@ -26,11 +26,9 @@ if (!strcmp(param, "kernel"))
printf (" KolibriOS v%d.%d.%d.%d. SVN-ॢ. <20><><EFBFBD><EFBFBD>: %d\n\r", vA, vB, vC, vD, Rev);
#endif
free(kvbuf);
return TRUE;
}
else
{
printf (" Shell v%s\n\r", SHELL_VERSION);
return TRUE;
}
return TRUE;
}

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

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

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

@@ -5,11 +5,6 @@ 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
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;
}

1
programs/system/shell/prototypes.h
View File

@@ -2,6 +2,7 @@
/// ===========================================================
int file_check(char file[]);
void file_not_found(char file[]);
int dir_check(char dir[]);
void dir_truncate(char dir[]);
int iswhite(char c);

11
programs/system/shell/shell.c
View File

@@ -66,6 +66,17 @@ else
/// ===========================================================
void file_not_found(char file[])
{
#if LANG_ENG
printf (" File '%s' not found.\n\r", file);
#elif LANG_RUS
printf (" <20><><EFBFBD><EFBFBD> '%s' <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\r", file);
#endif
}
/// ===========================================================
int iswhite(char c)
{
return ((' ' == c) || ('\t' == c) || (13 == c) || (10 == c));