/programs/system/shell/cmd/cmd_info.c |
---|
File deleted |
/programs/system/shell/cmd/cmd_about.c |
---|
1,10 → 1,6 |
int cmd_about(char param[]) |
{ |
char message[] = {"Shell %s\n\r"}; |
printf(message, SHELL_VERSION); |
int cmd_about(char param[]) { |
printf(CMD_ABOUT_MSG, SHELL_VERSION); |
return TRUE; |
} |
/programs/system/shell/cmd/cmd_alias.c |
---|
1,11 → 1,8 |
int cmd_alias(char arg[]) |
{ |
int cmd_alias(char arg[]) { |
int result; |
if (NULL == arg || '\0' == arg[0]) |
{ |
if (NULL == arg || '\0' == arg[0]) { |
alias_list(); |
return TRUE; |
} |
/programs/system/shell/cmd/cmd_cd.c |
---|
1,18 → 1,11 |
int cmd_cd(char dir[]) |
{ |
char temp[256]; |
unsigned result; |
if (NULL == dir) |
{ |
#if LANG_ENG |
printf(" cd <directory>\n\r"); |
#elif LANG_RUS |
printf(" cd <¤¨à¥ªâ®à¨ï>\n\r"); |
#endif |
if (NULL == dir) { |
printf(CMD_CD_USAGE); |
return TRUE; |
} |
19,8 → 12,7 |
if ( 0 == strcmp(dir, ".") || 0 == strcmp(dir, "./") ) |
return TRUE; |
if ( ( 0 == strcmp(dir, "..") || 0 == strcmp(dir, "../") ) && ( 0 != strcmp(cur_dir, "/")) ) |
{ |
if ( ( 0 == strcmp(dir, "..") || 0 == strcmp(dir, "../") ) && ( 0 != strcmp(cur_dir, "/")) ) { |
cur_dir[strlen(cur_dir)-1]='\0'; |
dir_truncate(cur_dir); |
set_cwd(cur_dir); |
27,8 → 19,7 |
return TRUE; |
} |
if ( '/' == dir[0]) |
{ |
if ( '/' == dir[0]) { |
if ( dir_check(dir) ) |
{ |
strcpy(cur_dir, dir); |
37,15 → 28,13 |
} |
return FALSE; |
} |
else |
{ |
else { |
strcpy(temp, cur_dir); |
if (cur_dir[strlen(cur_dir)-1] != '/') |
strcat(temp, "/"); |
strcat(temp, dir); |
if ( dir_check(temp) ) |
{ |
if ( dir_check(temp) ) { |
strcpy(cur_dir, temp); |
set_cwd(cur_dir); |
/programs/system/shell/cmd/cmd_clear.c |
---|
1,6 → 1,5 |
int cmd_clear(char param[]) |
{ |
int cmd_clear(char param[]) { |
con_cls(); |
return TRUE; |
} |
/programs/system/shell/cmd/cmd_cp.c |
---|
19,11 → 19,7 |
if (argc != 2) |
{ |
#if LANG_ENG |
printf(" cp <file_in> <file_out>\n\r"); |
#elif LANG_RUS |
printf(" cp <¨áâ®ç¨ª> <१ã«ìâ â>\n\r"); |
#endif |
printf(CMD_CP_USAGE); |
parameters_free(argc, argv); |
return TRUE; |
} |
/programs/system/shell/cmd/cmd_date.c |
---|
1,5 → 1,4 |
int cmd_date(char param[]) |
{ |
unsigned date; |
6,11 → 5,7 |
unsigned time; |
date = kol_system_date_get(); |
#if LANG_ENG |
printf(" Date [dd.mm.yy]: %x%x.%x%x.%x%x", |
#elif LANG_RUS |
printf(" â [¤¤.¬¬.££]: %x%x.%x%x.%x%x", |
#endif |
printf(CMD_DATE_DATE_FMT, |
(date&0xf00000)>>20, (date&0xf0000)>>16, // day |
(date&0xf000)>>12, (date&0xf00)>>8, //month |
(date&0xf0)>>4, (date&0xf) ); // year |
17,12 → 12,7 |
time = kol_system_time_get(); |
#if LANG_ENG |
printf("\n\r Time [hh:mm:ss]: %x%x:%x%x:%x%x\n\r", |
#elif LANG_RUS |
printf("\n\r ६ï [çç:¬¬:áá]: %x%x:%x%x:%x%x\n\r", |
#endif |
printf(CMD_DATE_TIME_FMT, |
(time&0xf0)>>4, (time&0xf), // hours |
(time&0xf000)>>12, (time&0xf00)>>8, // minutes |
(time&0xf00000)>>20, (time&0xf0000)>>16 ); // seconds |
/programs/system/shell/cmd/cmd_exit.c |
---|
2,7 → 2,7 |
int cmd_exit(char param[]) |
{ |
free(ALIASES); |
_exit(1); |
con_exit(1); |
kol_exit(); |
return TRUE; |
} |
/programs/system/shell/cmd/cmd_free.c |
---|
7,11 → 7,7 |
free = kol_system_memfree(); |
used = total - free; |
#if LANG_ENG |
printf (" Total [kB / MB / %%]: %-7d / %-5d / 100\n\r Free [kB / MB / %%]: %-7d / %-5d / %d\n\r Used [kB / MB / %%]: %-7d / %-5d / %d\n\r", |
#elif LANG_RUS |
printf (" ᥣ® [ / / %%]: %-7d / %-5d / 100\n\r ¢®¡®¤® [ / / %%]: %-7d / %-5d / %d\n\r ᯮ«ì§ã¥âáï [ / / %%]: %-7d / %-5d / %d\n\r", |
#endif |
printf (CMD_FREE_FMT, |
total, total/1024, free, free/1024, (free*100)/total, used, total/1024-free/1024, 100-(free*100)/total ); |
return TRUE; |
/programs/system/shell/cmd/cmd_help.c |
---|
1,21 → 1,11 |
int cmd_help(char cmd[]) |
{ |
int cmd_help(char cmd[]) { |
int i; |
#if LANG_ENG |
char available[]={" %d commands available:\n\r"}; |
#elif LANG_RUS |
char available[]={" ®«¨ç¥á⢮ ¤®áâã¯ëå ª®¬ ¤: %d\n\r"}; |
#endif |
if ( !strlen(cmd) ) |
{ |
if ( !strlen(cmd) ) { |
int columns_max=3; |
printf (available, NUM_OF_CMD); |
for (i = 0; i < NUM_OF_CMD; i++) |
{ |
printf (CMD_HELP_AVAIL, NUM_OF_CMD); |
for (i = 0; i < NUM_OF_CMD; i++) { |
printf(" %-12s", COMMANDS[i].name); |
if ((i) && ((i+1)%columns_max == 0)) printf("\n\r"); |
} |
22,21 → 12,15 |
if ((i)%columns_max != 0) printf("\n\r"); |
return TRUE; |
} |
else |
{ |
else { |
for (i=0; i<NUM_OF_CMD; i++) |
if ( !strcmp(cmd, COMMANDS[i].name) ) |
{ |
if ( !strcmp(cmd, COMMANDS[i].name) ) { |
printf(COMMANDS[i].help); |
return TRUE; |
} |
#if LANG_ENG |
printf (" Command \'%s\' not found.\n\r", cmd); |
#elif LANG_RUS |
printf (" ®¬ ¤ \'%s\' ¥ ©¤¥ .\n\r", cmd); |
#endif |
printf (available, NUM_OF_CMD); |
printf (CMD_HELP_CMD_NOT_FOUND, cmd); |
printf (CMD_HELP_AVAIL, NUM_OF_CMD); |
for (i = 0; i < NUM_OF_CMD; i++) |
printf(" %s\n\r", COMMANDS[i].name); |
} |
/programs/system/shell/cmd/cmd_history.c |
---|
1,14 → 1,9 |
int cmd_history(char arg[]) |
{ |
int cmd_history(char arg[]) { |
int i; |
for (i = CMD_HISTORY_NUM_REAL - 1; i >= 0; i--) |
{ |
for (i = CMD_HISTORY_NUM_REAL - 1; i >= 0; i--) { |
printf("%s\n", CMD_HISTORY[i]); |
} |
return TRUE; |
} |
/programs/system/shell/cmd/cmd_kfetch.c |
---|
0,0 → 1,53 |
void get_str_meminfo(char *str) { |
unsigned mem_all_mib = kol_system_mem() / 1024; |
unsigned mem_free_mib = kol_system_memfree() / 1024; |
sprintf(str, "%uMiB / %uMiB", mem_all_mib - mem_free_mib, mem_all_mib); |
} |
int cmd_kfetch(char param[]) { |
char *str_krnl_ver = malloc(64); |
get_str_kernel_version(str_krnl_ver, "%d.%d.%d.%d. SVN-rev.: %d"); |
char *str_uptime = malloc(64); |
get_str_uptime(str_uptime, "%d day(s), %d:%d:%d.%d"); |
char *str_resolution = malloc(24); |
ksys_pos_t resol = _ksys_screen_size(); |
sprintf(str_resolution, "%u x %u", resol.x + 1, resol.y + 1); |
char *str_cpu_info = malloc(16); |
get_str_cpu_info(str_cpu_info); |
char *str_meminfo = malloc(24); |
get_str_meminfo(str_meminfo); |
printf(/*"\033[0;34;40m \033[0m\n\r"*/ |
/*"\033[0;34;40m \033[0m\n\r"*/ |
/*"\033[0;34;40m \033[0m\n\r"*/ |
"\033[0;34;40m .\033[0;31;40m \033[0;34;40m \033[0m\n\r" |
"\033[0;34;40m t\033[0;1;30;40m@\033[0;34;40m.\033[0;31;40m \033[0;34;40m \033[0m\n\r" |
"\033[0;34;40m ;8\033[0;1;30;40m8\033[0;34;40m8\033[0;1;30;40m8\033[0;32;40m.\033[0;34;40m.\033[0;32;40m \033[0;34;40m \033[0;31;40m.\033[0;34;40mS\033[0;1;30;46m88\033[0;1;35;47m8\033[0;35;44mX\033[0;34;40m;\033[0;32;40m.:\033[0;5;30;40mX\033[0;1;30;46mX8\033[0;34;40m8\033[0m\n\r" |
"\033[0;34;40m \033[0;32;40m \033[0;34;40m t\033[0;5;36;40m8\033[0;5;36;46m@ \033[0;5;37;46m%%\033[0;5;37;47m.\033[0;5;37;46m@\033[0;34;46m8\033[0;31;40mt\033[0;34;40m.\033[0;32;40m.\033[0;34;40m \033[0;31;40m \033[0;1;30;40m8\033[0;1;36;46m%%\033[0;5;37;46m8\033[0;5;1;35;44m8\033[0;1;34;45m8\033[0;30;44m8\033[0;32;40m;;\033[0;5;36;40m8\033[0;37;46m@\033[0;5;37;44m8\033[0;5;35;44m:\033[0;1;30;45m8\033[0;5;34;40m8\033[0m\n\r" |
"\033[0;34;40m@\033[0;5;35;40m8\033[0;1;30;44m8\033[0;5;35;40m8\033[0;35;44m8\033[0;1;30;45m@\033[0;35;44m8\033[0;1;30;45m8\033[0;34;45m8\033[0;1;30;45m8\033[0;1;34;45m8\033[0;1;37;47mt\033[0;5;37;46m@\033[0;1;30;46m8S\033[0;5;37;46m8X\033[0;5;36;46m.t\033[0;1;30;44m8\033[0;31;40m \033[0;32;40m \033[0;34;40m:\033[0;5;36;40m8\033[0;1;30;46m@\033[0;1;34;47m8\033[0;5;37;45m8\033[0;5;35;44m \033[0;1;30;45m8\033[0;1;30;46m88\033[0;36;47m@\033[0;5;37;44m8\033[0;5;35;44m \033[0;5;35;45m;\033[0;5;35;44m.\033[0;37;45m8\033[0;1;30;44mX\033[0;32;40m \033[0m %s\n\r" |
"\033[0;34;40m \033[0;31;40m \033[0;32;40m \033[0;34;40m.\033[0;32;40m.\033[0;34;40m;S@\033[0;5;30;40m8\033[0;33;41m8\033[0;1;33;43m;\033[0;5;33;43m \033[0;1;33;47m8\033[0;5;33;43m \033[0;1;33;43mt\033[0;36;47m8\033[0;5;36;46m \033[0;1;36;46m%%\033[0;5;34;40m8\033[0;1;30;46m%%8\033[0;5;37;46mX\033[0;5;36;46m%%\033[0;5;35;45m.\033[0;5;36;44m.\033[0;37;46m8\033[0;1;34;47m@\033[0;1;36;47mX\033[0;5;1;35;44m8\033[0;5;37;44m8\033[0;5;1;34;45m8\033[0;1;35;45m:\033[0;1;34;47m8\033[0;1;30;45m8\033[0;5;34;40m8\033[0;31;40m: \033[0m %s%s\n\r" |
"\033[0;34;40m \033[0;31;40m \033[0;32;40m \033[0;34;40m \033[0;32;40m.::\033[0;34;40m.\033[0;31;40m;\033[0;1;30;43m8\033[0;5;1;33;41m8\033[0;5;33;43m \033[0;5;33;41m \033[0;5;37;43mX\033[0;5;36;46m8:\033[0;1;36;46mS.\033[0;5;36;46m;@\033[0;1;34;45m88\033[0;1;34;46m8\033[0;1;37;47m.\033[0;5;1;34;45m8\033[0;5;37;45m8\033[0;5;1;34;45m8\033[0;1;35;47m8\033[0;5;1;35;44m8\033[0;5;35;44m \033[0;35;47m8\033[0;35;44m%%\033[0;34;40m;. \033[0;31;40m \033[0m %s%s\n\r" |
"\033[0;34;40m \033[0;31;40m \033[0;32;40m \033[0;34;40m .\033[0;31;40m;\033[0;1;30;41m@\033[0;5;31;41mS\033[0;5;33;41m \033[0;5;1;31;43m8\033[0;1;30;43m8\033[0;5;36;46m88\033[0;5;37;46mX\033[0;1;36;47m@\033[0;1;36;46mS\033[0;1;34;47m@\033[0;1;35;47m@\033[0;5;37;44m8\033[0;5;1;34;45m8\033[0;5;35;44m;\033[0;1;34;45m8\033[0;5;35;44m;\033[0;35;47m8\033[0;5;1;35;44m8\033[0;1;30;45m8\033[0;5;35;40m8\033[0;34;40m%%\033[0;32;40m \033[0;34;40m \033[0;31;40m \033[0m %s%s\n\r" |
"\033[0;34;40m \033[0;31;40m \033[0;32;40m \033[0;34;40m \033[0;32;40m \033[0;34;40m \033[0;32;40m:\033[0;5;33;40mS\033[0;1;32;46m8\033[0;37;43mS\033[0;1;32;47m8\033[0;37;46mS\033[0;5;37;42m8\033[0;5;36;46mX\033[0;36;47m8\033[0;1;30;46m8\033[0;5;35;44mX\033[0;1;34;45m88\033[0;1;30;45m8\033[0;37;45m@\033[0;1;34;45m8\033[0;1;30;45m8\033[0;1;30;44m@\033[0;34;40m8\033[0;32;40m%%\033[0;34;40m; \033[0;32;40m \033[0;34;40m \033[0;31;40m \033[0m %s%s\n\r" |
"\033[0;34;40m \033[0;32;40m \033[0;34;40m .\033[0;32;40m.@\033[0;1;36;46m%%\033[0;5;36;42m;\033[0;1;33;47mX\033[0;5;37;46m8\033[0;5;37;42m8\033[0;5;33;43m \033[0;5;36;46m8\033[0;1;34;46m8\033[0;1;30;45m8\033[0;34;45m8\033[0;1;30;45m8\033[0;5;34;44m.\033[0;1;30;45m8\033[0;5;34;40m@\033[0;34;40mS:\033[0;32;40m;\033[0;34;40m: \033[0;32;40m \033[0m %s%s\n\r" |
"\033[0;34;40m \033[0;32;40m \033[0;34;40m \033[0;32;40m \033[0;34;40m.\033[0;31;40m;\033[0;5;36;40m8\033[0;1;36;46mt\033[0;5;36;42m.\033[0;1;33;47m@\033[0;5;36;42m \033[0;1;36;46m@X\033[0;5;36;46mX\033[0;1;36;46mS\033[0;1;30;46mX\033[0;5;34;44m8\033[0;5;35;40m;\033[0;1;30;44mS\033[0;34;40m \033[0;32;40m.\033[0;34;40m.\033[0;31;40m \033[0;34;40m \033[0;32;40m \033[0m\n\r" |
"\033[0;34;40m \033[0;32;40m \033[0;34;40m \033[0;32;40m .\033[0;1;30;40mX\033[0;1;30;46m@\033[0;1;36;46m%%\033[0;5;36;42mt\033[0;5;37;43m@\033[0;1;32;47m8\033[0;5;36;46m;\033[0;1;36;46m%%S\033[0;1;30;46m@t\033[0;5;36;40m8\033[0;34;40m. \033[0;31;40m \033[0;34;40m \033[0;32;40m \033[0;34;40m \033[0m\n\r" |
"\033[0;34;40m \033[0;32;40m \033[0;34;40m \033[0;32;40m :;\033[0;5;32;40m8\033[0;1;30;46mS\033[0;32;46m8\033[0;5;32;42m.\033[0;1;32;43m8\033[0;5;37;42m88\033[0;1;36;46mX\033[0;1;30;46m.\033[0;5;36;40mX\033[0;30;44m8\033[0;31;40m:\033[0;34;40m \033[0m\n\r" |
"\033[0;34;40m \033[0;32;40m \033[0;34;40m \033[0;32;40m \033[0;34;40m \033[0;32;40m \033[0;31;40m \033[0;34;40m \033[0;32;40m;\033[0;5;32;40m8\033[0;5;36;40m8\033[0;32;46m8\033[0;5;36;40mt \033[0;1;30;46m8\033[0;5;35;44m8\033[0;37;45m@\033[0;5;35;44m%%\033[0;5;35;40m8\033[0;32;40m \033[0;34;40m \033[0m\n\r" |
"\033[0;34;40m \033[0;32;40m \033[0;34;40m \033[0;32;40m \033[0;34;40m \033[0;32;40m \033[0;31;40m \033[0;34;40m .\033[0;31;40m \033[0;5;34;40mX\033[0;1;30;45m8\033[0;34;45m8\033[0;1;30;45m8\033[0;5;34;44m8\033[0;1;30;45m8\033[0;1;35;47m8\033[0;5;36;44m8\033[0;1;30;40m8\033[0;31;40m \033[0;34;40m \033[0m\n\r" |
"\033[0;34;40m \033[0;32;40m \033[0;34;40m \033[0;31;40m \033[0;30;44m8\033[0;1;34;45m88\033[0;1;30;45m8\033[0;5;35;44m%%\033[0;1;34;45m8\033[0;5;35;44m;\033[0;5;37;45m8\033[0;34;45m@\033[0;34;40m@\033[0;32;40m.\033[0;31;40m.\033[0;34;40m \033[0m\n\r" |
"\033[0;34;40m \033[0;32;40m \033[0;34;40m \033[0;31;40m :\033[0;5;35;40m8\033[0;1;34;45m8\033[0;1;30;45m8\033[0;5;35;44m%%\033[0;37;45m@\033[0;5;35;44m:\033[0;5;35;45mS\033[0;5;35;44m%%\033[0;35;47m8\033[0;1;30;44m8\033[0;31;40m.\033[0;34;40m.\033[0;32;40m \033[0;34;40m \033[0m\n\r" |
"\033[0;34;40m \033[0;31;40m \033[0;34;40m \033[0;30;44m8\033[0;1;34;45m888\033[0;5;37;45m@\033[0;35;47m8\033[0;5;35;44mt\033[0;35;47m8\033[0;5;35;44mt\033[0;5;35;45m;\033[0;30;44m8\033[0;32;40m;\033[0;31;40m \033[0;32;40m \033[0;34;40m \033[0m\n\r" |
"\033[0;34;40m \033[0;31;40m \033[0;34;40m \033[0;31;40m.\033[0;1;30;40m8\033[0;5;37;45m@\033[0;5;35;44m:\033[0;1;30;45m8\033[0;5;34;44m \033[0;5;35;45m \033[0;1;34;44m8\033[0;1;35;45m.\033[0;5;34;40mX\033[0;34;40m@\033[0;32;40mS\033[0;31;40m \033[0;34;40m \033[0m\n\r" |
"\033[0;34;40m \033[0;31;40m \033[0;34;40m \033[0;31;40m \033[0;34;40m.;\033[0;1;30;40m8\033[0;1;30;44m8\033[0;34;40m8\033[0;5;34;40m8\033[0;32;40m%%\033[0;34;40m8;\033[0;32;40m;\033[0;31;40m.\033[0;32;40m \033[0;31;40m \033[0;34;40m \033[0m\n\r" |
"\033[0;34;40m \033[0;31;40m \033[0;34;40m \033[0;32;40m .\033[0;31;40m .:\033[0;32;40m.\033[0;31;40m.\033[0;32;40m.\033[0;31;40m.\033[0;32;40m.\033[0;31;40m \033[0;32;40m \033[0;34;40m \033[0m\n\r", |
"\033[0;36mOS\033[0m: KolibriOS", "\033[0;36mKernel\033[0m: ", str_krnl_ver, "\033[0;36mUptime\033[0m: ", str_uptime, "\033[0;36mResolution\033[0m: ", str_resolution, "\033[0;36mCPU\033[0m: ", str_cpu_info, "\033[0;36mMemory\033[0m: ", str_meminfo); |
free(str_krnl_ver); |
free(str_uptime); |
free(str_resolution); |
free(str_cpu_info); |
free(str_meminfo); |
return TRUE; |
} |
/programs/system/shell/cmd/cmd_kill.c |
---|
1,31 → 1,24 |
int cmd_kill(char param[]) |
{ |
unsigned process; |
int result; |
int i; |
if ( strlen(param) == 0 ) |
{ |
printf(" kill <PID>\n\r"); |
if ( strlen(param) == 0 ) { |
printf(CMD_KILL_USAGE); |
return TRUE; |
} |
if (!strcmp(param, "all")) |
{ |
for (i = 2;i<256;i++) |
{ |
if (!strcmp(param, "all")) { |
for (i = 2;i<256;i++) { |
kol_kill_process(i); |
} |
return TRUE; |
} |
else |
{ |
process = _atoi(param); |
if ( 0 != process ) |
{ |
else { |
process = atoi(param); |
if ( 0 != process ) { |
result = kol_process_kill_pid(process); |
if (result < 0) |
return FALSE; |
/programs/system/shell/cmd/cmd_ls.c |
---|
1,6 → 1,5 |
int cmd_ls(char dir[]) |
{ |
int cmd_ls(char dir[]) { |
kol_struct70 k70; |
unsigned *n; |
/programs/system/shell/cmd/cmd_mkdir.c |
---|
1,24 → 1,15 |
int cmd_mkdir(char dir[]) |
{ |
int cmd_mkdir(char dir[]) { |
char temp[FILENAME_MAX]; |
kol_struct70 k70; |
unsigned result; |
if (NULL == dir) |
{ |
#if LANG_ENG |
printf(" mkdir <directory>\n\r"); |
#elif LANG_RUS |
printf(" mkdir <¤¨à¥ªâ®à¨ï>\n\r"); |
#endif |
if (NULL == dir) { |
printf(CMD_MKDIR_USAGE); |
return TRUE; |
} |
if ( 0 == strcmp(dir, ".") || ( 0 == strcmp(dir, "..") ) || ( 0 == strcmp(cur_dir, "/")) ) |
{ |
if ( 0 == strcmp(dir, ".") || ( 0 == strcmp(dir, "..") ) || ( 0 == strcmp(cur_dir, "/")) ) { |
return FALSE; |
} |
31,8 → 22,7 |
if ( '/' == dir[0]) |
k70.p21 = dir; |
else |
{ |
else { |
strcpy(temp, cur_dir); |
if (temp[strlen(temp)-1] != '/') |
strcat(temp, "/"); // add slash |
/programs/system/shell/cmd/cmd_more.c |
---|
1,22 → 1,16 |
int cmd_more(char file[]) |
{ |
int cmd_more(char file[]) { |
kol_struct70 k70; |
kol_struct_BDVK bdvk; |
unsigned result, i; |
unsigned long long filesize, pos; |
char buf[81]; //¡ãä¥à |
char buf[81]; //���� |
char temp[FILENAME_MAX]; |
unsigned flags; |
if (strlen(file)<1) |
{ |
#if LANG_ENG |
printf (" more <filename>\n\r"); |
#elif LANG_RUS |
printf (" more <¨¬ï ä ©« >\n\r"); |
#endif |
if (strlen(file)<1) { |
printf (CMD_MORE_USAGE); |
return TRUE; |
} |
51,11 → 45,11 |
k70.p20 = 0; |
k70.p21 = temp; |
result = kol_file_70(&k70); // ¯®«ãç ¥¬ ¨ä®à¬ æ¨î ® ä ©«¥ |
result = kol_file_70(&k70); // ����砥� ���ଠ�� � 䠩�� |
if ( 0 != result ) |
return FALSE; |
filesize = bdvk.p32; // ¯®«ãç ¥¬ à §¬¥à ä ©« |
filesize = bdvk.p32; // ����砥� ࠧ��� 䠩�� |
buf[80]=0; |
flags = con_get_flags(); |
73,7 → 67,7 |
k70.p20 = 0; |
k70.p21 = temp; |
result = kol_file_70(&k70); // ç⥨¥ 80 ᨬ¢®«®¢ |
result = kol_file_70(&k70); // �⥭�� 80 ᨬ����� |
for (i=0; i<80; i++) |
{ |
/programs/system/shell/cmd/cmd_mv.c |
---|
24,11 → 24,7 |
if (argc != 2) |
{ |
#if LANG_ENG |
printf(" mv <file_in> <file_out>\n\r"); |
#elif LANG_RUS |
printf(" mv <¨áâ®ç¨ª> <१ã«ìâ â>\n\r"); |
#endif |
printf(CMD_MV_USAGE); |
parameters_free(argc, argv); |
return TRUE; |
} |
/programs/system/shell/cmd/cmd_pkill.c |
---|
1,3 → 1,4 |
int cmd_pkill(char param[]) |
{ |
int i=1, n=0; int process_count=0; |
4,21 → 5,8 |
char *buf1k=NULL; |
unsigned PID=0; |
#ifdef LANG_RUS |
#define PKILL_HELP " pkill <¨¬ï_¯à®æ¥áá >\n\r" |
#define PKILL_KILL " PID: %u - 㡨â\n" |
#define PKILL_NOT_KILL " PID: %u - ¥ 㡨â\n" |
#define PKILL_NOT_FOUND " à®æ¥áᮢ á â ª¨¬ ¨¬¥¥¬ ¥ ©¤¥®!\n" |
#else |
#define PKILL_HELP " pkill <process_name>\n\r" |
#define PKILL_KILL " PID: %u - killed\n" |
#define PKILL_NOT_KILL " PID: %u - not killed\n" |
#define PKILL_NOT_FOUND " No processes with this name were found!\n" |
#endif |
if(!strlen(param)){ |
printf(PKILL_HELP); |
printf(CMD_PKILL_HELP); |
return TRUE; |
} |
32,9 → 20,9 |
if(!strnicmp(buf1k+10, param, 10)){ |
memcpy(&PID, buf1k+30 ,sizeof(unsigned)); |
if(kol_process_kill_pid(PID)){ |
printf(PKILL_NOT_KILL, PID); |
printf(CMD_PKILL_NOT_KILL, PID); |
}else{ |
printf(PKILL_KILL, PID); |
printf(CMD_PKILL_KILL, PID); |
} |
process_count++; |
} |
42,7 → 30,7 |
} |
if(!process_count){ |
printf(PKILL_NOT_FOUND); |
printf(CMD_PKILL_NOT_FOUND); |
} |
free(buf1k); |
/programs/system/shell/cmd/cmd_ps.c |
---|
15,18 → 15,14 |
printf (" PID NAME RAM KB\n\r", PID, buf1k+10); |
for (i = 1;;i++) |
{ |
for (i = 1;;i++) { |
n = kol_process_info(i, buf1k); |
memcpy(&PID, buf1k+30 ,sizeof(unsigned)); |
STATE = *(buf1k+50); |
if (9 != STATE) |
{ |
if (!sel || 0 == strnicmp(param, buf1k+10, 10)) |
{ |
if (9 != STATE) { |
if (!sel || 0 == strnicmp(param, buf1k+10, 10)) { |
printf (" %7u %11s %d\n\r", PID, buf1k+10, (*(int*)(buf1k+26)+1)/1024); |
if (sel) |
{ |
if (sel) { |
LAST_PID = PID; |
int cpu_tck = kol_system_cpufreq() / 100; |
printf (" CPU %d%% RAM %d\n\r", *(int*)buf1k / cpu_tck , *(int*)(buf1k+26)+1); |
/programs/system/shell/cmd/cmd_pwd.c |
---|
1,6 → 1,5 |
int cmd_pwd(char param[]) |
{ |
int cmd_pwd(char param[]) { |
printf (" %s%c\n\r", cur_dir, cur_dir[strlen(cur_dir)-1]=='/'?' ':'/' ); |
return TRUE; |
} |
/programs/system/shell/cmd/cmd_reboot.c |
---|
1,6 → 1,5 |
int cmd_reboot(char param[]) |
{ |
int cmd_reboot(char param[]) { |
if (!strcmp(param, "kernel")) |
kol_system_end(4); |
else |
/programs/system/shell/cmd/cmd_ren.c |
---|
1,6 → 1,5 |
int cmd_ren(char param[]) |
{ |
int cmd_ren(char param[]) { |
char* argv[100]; |
int argc; |
/* |
9,19 → 8,14 |
*/ |
argc = parameters_prepare(param, argv); |
if (argc != 2) |
{ |
#if LANG_ENG |
printf(" ren <file> <new_name>\n\r"); |
#elif LANG_RUS |
printf(" ren <ä ©«> <®¢®¥_¨¬ï>\n\r"); |
#endif |
if (argc != 2) { |
printf(CMD_REN_USAGE); |
parameters_free(argc, argv); |
return TRUE; |
} |
char *x; |
if (x = strrchr(argv[1], '/') != 0) // argv[1] must be file name, not path |
{ |
//char *x; |
// argv[1] must be file name, not path |
if (strrchr(argv[1], '/') != NULL) { |
//printf("%d %s", x, argv[1]); |
return FALSE; |
} |
/programs/system/shell/cmd/cmd_rm.c |
---|
1,18 → 1,12 |
int cmd_rm(char file[]) |
{ |
int cmd_rm(char file[]) { |
kol_struct70 k70; |
char temp[FILENAME_MAX]; |
unsigned result; |
if (NULL == file || strlen(file) == 0) |
{ |
#if LANG_ENG |
printf (" rm <filename>\n\r"); |
#elif LANG_RUS |
printf (" rm <¨¬ï ä ©« >\n\r"); |
#endif |
if (NULL == file || strlen(file) == 0) { |
printf (CMD_RM_USAGE); |
return TRUE; |
} |
/programs/system/shell/cmd/cmd_rmdir.c |
---|
1,23 → 1,15 |
int cmd_rmdir(char dir[]) |
{ |
int cmd_rmdir(char dir[]) { |
char temp[FILENAME_MAX]; |
kol_struct70 k70; |
unsigned result; |
if (NULL == dir || strlen(dir) == 0) |
{ |
#if LANG_ENG |
printf(" rmdir <directory>\n\r"); |
#elif LANG_RUS |
printf(" rmdir <¤¨à¥ªâ®à¨ï>\n\r"); |
#endif |
if (NULL == dir || strlen(dir) == 0) { |
printf(CMD_RMDIR_USAGE); |
return TRUE; |
} |
if ( ( 0 == strcmp(dir, ".") ) || ( 0 == strcmp(dir, "..") ) || ( 0 == strcmp(cur_dir, "/")) ) |
{ |
if ( ( 0 == strcmp(dir, ".") ) || ( 0 == strcmp(dir, "..") ) || ( 0 == strcmp(cur_dir, "/")) ) { |
return FALSE; |
} |
30,8 → 22,7 |
if ( '/' == dir[0]) |
k70.p21 = dir; |
else |
{ |
else { |
strcpy(temp, cur_dir); |
if (temp[strlen(temp)-1] != '/') |
strcat(temp, "/"); // add slash |
/programs/system/shell/cmd/cmd_shutdown.c |
---|
1,6 → 1,5 |
int cmd_shutdown(char param[]) |
{ |
int cmd_shutdown(char param[]) { |
kol_system_end(2); |
return TRUE; |
} |
/programs/system/shell/cmd/cmd_sleep.c |
---|
1,19 → 1,11 |
int cmd_sleep(char param[]) |
{ |
int cmd_sleep(char param[]) { |
int delay; |
if (!strlen(param)) |
{ |
#if LANG_ENG |
printf(" sleep <time in the 1/100 of second>\n\r"); |
#elif LANG_RUS |
printf(" sleep <¨â¥à¢ « ¢ á®âëå ¤®«ïx ᥪã¤ë>\n\r"); |
#endif |
if (!strlen(param)) { |
printf(CMD_SLEEP_USAGE); |
return TRUE; |
} |
delay = _atoi(param); |
delay = atoi(param); |
kol_sleep((unsigned)delay); |
return TRUE; |
} |
/programs/system/shell/cmd/cmd_touch.c |
---|
1,28 → 1,20 |
int cmd_touch(char file[]) |
{ |
kol_struct70 k70; |
char temp[FILENAME_MAX]; |
unsigned result; |
if (NULL == file || strlen(file) == 0) |
{ |
#if LANG_ENG |
printf(" touch <filename>\n\r"); |
#elif LANG_RUS |
printf(" touch <¨¬ï ä ©« >\n\r"); |
#endif |
if (NULL == file || strlen(file) == 0) { |
printf(CMD_TOUCH_USAGE); |
return TRUE; |
} |
if ( ( 0 == strcmp(file, ".") ) || ( 0 == strcmp(file, "..") ) || ( 0 == strcmp(cur_dir, "/")) ) |
{ |
if ( ( 0 == strcmp(file, ".") ) || ( 0 == strcmp(file, "..") ) || ( 0 == strcmp(cur_dir, "/")) ) { |
return FALSE; |
} |
if ( '/' == file[0]) |
{ |
if ( '/' == file[0]) { |
strcpy(temp, file); |
if ( !file_check(temp) ) |
29,9 → 21,7 |
k70.p00 = 2; |
else |
k70.p00 = 3; |
} |
else |
{ |
} else { |
strcpy(temp, cur_dir); |
if (temp[strlen(temp)-1] != '/') |
strcat(temp, "/"); // add slash |
/programs/system/shell/cmd/cmd_uptime.c |
---|
1,6 → 1,5 |
int cmd_uptime(char param[]) |
{ |
void get_str_uptime(char *str, const char *fmt) { |
unsigned time_tick, up_days, up_hours, up_minutes, up_seconds, up_millisecs; |
time_tick = kol_time_tick(); |
10,11 → 9,12 |
up_seconds = (time_tick/100)%60; |
up_millisecs = (time_tick*10)%100; |
#if LANG_ENG |
printf (" Uptime: %d day(s), %d:%d:%d.%d\n\r", up_days, up_hours, up_minutes, up_seconds, up_millisecs); |
#elif LANG_RUS |
printf (" Uptime: %d ¤¥©, %d:%d:%d.%d\n\r", up_days, up_hours, up_minutes, up_seconds, up_millisecs); |
#endif |
sprintf (str, fmt, up_days, up_hours, up_minutes, up_seconds, up_millisecs); |
} |
int cmd_uptime(char param[]) { |
get_str_uptime(tmpstr, CMD_UPTIME_FMT); |
printf(tmpstr); |
return TRUE; |
} |
/programs/system/shell/cmd/cmd_ver.c |
---|
1,9 → 1,5 |
int cmd_ver(char param[]) |
{ |
if (!strcmp(param, "kernel")) |
{ |
void get_str_kernel_version(char *str, const char *fmt) { |
char *kvbuf; |
char *vA, *vB, *vC, *vD; |
unsigned *Rev; |
16,24 → 12,14 |
vD = kvbuf+3; |
Rev = (unsigned*)(kvbuf + 5); |
#if LANG_ENG |
printf (" KolibriOS v%d.%d.%d.%d. Kernel SVN-rev.: %d\n\r", *vA, *vB, *vC, *vD, *Rev); |
#elif LANG_RUS |
printf (" KolibriOS v%d.%d.%d.%d. SVN-ॢ. ï¤à : %d\n\r", *vA, *vB, *vC, *vD, *Rev); |
#endif |
sprintf (str, fmt, *vA, *vB, *vC, *vD, *Rev); |
free(kvbuf); |
return TRUE; |
} |
if (!strcmp(param, "cpu")) |
{ |
void get_str_cpu_info(char *str) { |
unsigned a, b, c, d; |
char str[13]; |
str[12] = '\0'; |
asm ("cpuid" : |
"=a" (a), |
"=b" (b), |
55,12 → 41,23 |
str[9] = (c&0x0000ff00) >> 8; |
str[10] = (c&0x00ff0000) >> 16; |
str[11] = (c&0xff000000) >> 24; |
str[12] = '\0'; |
} |
int cmd_ver(char param[]) { |
if (!strcmp(param, "kernel")) { |
get_str_kernel_version(tmpstr, CMD_VER_FMT1); |
printf(tmpstr); |
return TRUE; |
} |
if (!strcmp(param, "cpu")) { |
char str[13]; |
get_str_cpu_info(str); |
printf("%s\n\r", str); |
return TRUE; |
} |
printf (" Shell v%s\n\r", SHELL_VERSION); |
return TRUE; |
} |
/programs/system/shell/cmd/cmd_waitfor.c |
---|
1,8 → 1,6 |
int cmd_waitfor(char param[]) |
// waits for LASTPID or pid in param |
{ |
/* waits for LASTPID or pid in param */ |
int cmd_waitfor(char param[]) { |
int i, n, sel, sel_pid; |
char *buf1k; |
unsigned PID; |
10,27 → 8,19 |
sel = param && strlen(param) > 0; |
sel_pid = LAST_PID; |
if (sel) |
{ |
sel_pid = _atoi(param); |
if (sel) { |
sel_pid = atoi(param); |
} |
if (0 == sel_pid) |
return FALSE; |
if (0 == sel_pid) return FALSE; |
#if LANG_ENG |
printf(" Awaing finish PID %d\n\r", sel_pid); |
#elif LANG_RUS |
printf(" ¦¨¤ ¥¬ § ¢¥à襨ï PID %d\n\r", sel_pid); |
#endif |
printf(CMD_WAITFOR_FMT, sel_pid); |
buf1k = malloc(1024); |
if (NULL == buf1k) |
return FALSE; |
while(1) |
{ |
for (i = 1;;i++) |
{ |
while(1) { |
for (i = 1;;i++) { |
n = kol_process_info(i, buf1k); |
PID = *(buf1k+30); |
STATE = *(buf1k+50); |