Subversion Repositories Kolibri OS

Compare Revisions

No changes between revisions

Regard whitespace Rev 4014 → Rev 4015

/programs/system/shell/History.txt
1,3 → 1,12
Shell 0.7.0 // 13.10.2013 // Albom
* ¥à¥à ¡®â ­ ¬®¤ã«ì ¢¢®¤  ª®¬ ­¤ë (¤®¡ ¢«¥­  ®¡à ¡®âª  ª« ¢¨è "¢«¥¢®", "¢¯à ¢®", Del)
* Œ¥«ª¨¥ ¨á¯à ¢«¥­¨ï
 
 
Shell 0.6.4 // 09.10.2013 // Leency
* ®¤¤¥à¦ª  ®â­®á¨â¥«ì­ëå ¯ã⥩ ¢ áªà¨¯â å
 
 
Shell 0.6.3 // 20.09.2013 // Albom
* msvc-style  âਡãâë ¤«ï ®âª«î祭¨ï ¢ëà ¢­¨¢ ­¨ï ¢ áâàãªâãà å (ᯠᨡ® CleverMouse ¨ Kirakishou!)
 
/programs/system/shell/bin/rus/shell
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
/programs/system/shell/cmd/cmd_cd.c
10,7 → 10,7
#if LANG_ENG
printf(" cd <directory>\n\r");
#elif LANG_RUS
printf(" cd <äèðåêòîðèÿ>\n\r");
printf(" cd <¤¨à¥ªâ®à¨ï>\n\r");
#endif
return TRUE;
}
/programs/system/shell/cmd/cmd_ls.c
18,7 → 18,7
k70.p20 = 0;
 
/// !!!
// Åñëè ls çàïóñêàåòñÿ áåç ïàðàìåòðîâ, ïðîñìàòðèâàåì òåêóùèé êàòàëîã
// …᫨ ls § ¯ã᪠¥âáï ¡¥§ ¯ à ¬¥â஢, ¯à®á¬ âਢ ¥¬ ⥪ã騩 ª â «®£
if ( !strlen(dir) )
k70.p21 = cur_dir;
else
25,7 → 25,7
k70.p21 = dir;
 
result = kol_file_70(&k70);
if ( !((result==0) || (result==6)) ) // ïðîâåðÿåì ñóùåñòâîâàíèå êàòàëîãà
if ( !((result==0) || (result==6)) ) // ¯à®¢¥à塞 áãé¥á⢮¢ ­¨¥ ª â «®£ 
{
free( (void*) k70.p16);
return FALSE;
32,7 → 32,7
}
 
n = (unsigned*) (k70.p16+8);
num_of_file = *n; // ÷èñëî ôàéëîâ â êàòàëîãå
num_of_file = *n; // ç¨á«® ä ©«®¢ ¢ ª â «®£¥
 
for (i = 0; i < num_of_file; i++)
{
/programs/system/shell/cmd/cmd_sleep.c
8,7 → 8,7
#if LANG_ENG
printf(" sleep <time in the 1/100 of second>\n\r");
#elif LANG_RUS
printf(" sleep <интервал в сотых доля секунды>\n\r");
printf(" sleep <¨­â¥à¢ « ¢ á®âëå ¤®«ï ᥪ㭤ë>\n\r");
#endif
return TRUE;
}
/programs/system/shell/cmd/cmd_touch.c
34,7 → 34,6
{
strcpy(temp, cur_dir);
strcat(temp, file);
if ( !file_check(temp) )
k70.p00 = 2;
else
/programs/system/shell/globals.h
1,5 → 1,5
 
#define SHELL_VERSION "0.6.4"
#define SHELL_VERSION "0.7.0"
 
extern char PATH[256];
extern char PARAM[256];
21,8 → 21,6
char CMD_NUM;
char CMD_HISTORY_NUM_REAL = 0;
 
unsigned CMD_POS;
 
/// ===========================================================
 
char script_sign[] = {"#SHS"};
/programs/system/shell/modules/module_command.c
1,15 → 1,6
 
/// ===========================================================
 
void command_clear()
{
for (;CMD_POS;CMD_POS--)
printf("%c %c", 8, 8);
CMD[0]='\0';
}
 
/// ===========================================================
 
void command_history_add(char command[])
{
 
49,11 → 40,11
void command_get()
{
unsigned key;
//unsigned pos = 0;
int hist;
 
CMD_POS = 0;
CMD_NUM = 0;
unsigned i;
unsigned cmdLen = 0;
unsigned cmdPos = 0;
CMD[0] = '\0';
 
for (;;)
{
64,31 → 55,52
switch (key)
{
case 27: // ESC
command_clear();
for (i = cmdPos; i < cmdLen; i++)
printf(" ");
for (i = cmdLen; i > 0; i--)
printf("%c %c", 8, 8);
cmdLen = 0;
cmdPos = 0;
CMD[0] = '\0';
break;
 
 
case 13: // ENTER
CMD[CMD_POS] = '\0';
printf("\n\r");
 
command_history_add(CMD);
return;
 
 
case 8: // BACKSPACE
if (CMD_POS > 0)
if (cmdPos > 0)
{
for (i = cmdPos-1; i < cmdLen; i++)
CMD[i] = CMD[i+1];
 
for (i = 0; i < cmdLen-cmdPos; i++)
printf (" ");
 
for (i = 0; i < cmdLen; i++)
printf ("%c %c", 8, 8);
CMD_POS--;
 
printf("%s", CMD);
 
for (i = 0; i < cmdLen-cmdPos; i++)
printf("%c", 8);
 
cmdPos--;
cmdLen--;
}
break;
 
 
case 9: // TAB
break;
 
 
default:
if (CMD_POS < 255)
if (cmdLen < 255)
{
if ( kol_key_control() & 0x40 ) // ¥á«¨ ¢ª«îçñ­ CapsLock
if ( (kol_key_control() & 1) || (kol_key_control() & 2)) // ¥á«¨ ­ ¦ âë è¨äâë
key = tolower(key);
95,26 → 107,82
else
key = toupper(key);
 
CMD[CMD_POS] = key;
CMD_POS++;
printf("%c", key);
for (i = cmdLen+1; i > cmdPos; i--)
CMD[i] = CMD[i-1];
 
CMD[cmdPos] = key;
 
for (i = cmdPos; i > 0; i--)
printf("%c %c", 8, 8);
 
printf("%s", CMD);
 
for (i = 0; i < cmdLen-cmdPos; i++)
printf("%c", 8);
 
cmdPos++;
cmdLen++;
}
break;
};
 
}
else // ®¡à ¡®âª  à áè¨à¥­­ëå ª« ¢¨è
}
else
{
key = (key>>8)&0xff;
// printf ("%d\n\r", key);
 
switch (key)
{
case 83: // Del
if (cmdPos < cmdLen)
{
for (i = cmdPos; i < cmdLen; i++)
CMD[i] = CMD[i+1];
 
for (i = 0; i < cmdLen-cmdPos; i++)
printf(" ");
 
for (i = 0; i < cmdLen-cmdPos; i++)
printf("%c", 8);
 
for (i = cmdPos; i < cmdLen; i++)
printf("%c", CMD[i]);
 
for (i = 0; i < cmdLen-cmdPos; i++)
printf("%c", 8);
 
cmdLen--;
}
 
break;
 
case 75: // Left
if (cmdPos > 0)
{
printf("%c", 8);
cmdPos--;
}
break;
 
 
case 77: // Right
if (cmdPos < cmdLen)
{
printf("%c", CMD[cmdPos]);
cmdPos++;
}
break;
 
 
case 80: // Down
for (hist = 0; hist < CMD_HISTORY_NUM; hist++)
for (i = 0; i < CMD_HISTORY_NUM; i++)
{
command_clear();
 
for (i = cmdPos; i < cmdLen; i++)
printf(" ");
 
for (i = cmdLen; i > 0; i--)
printf("%c %c", 8, 8);
 
if (CMD_NUM < CMD_HISTORY_NUM-1)
CMD_NUM++;
else
122,17 → 190,25
printf( CMD_HISTORY[CMD_NUM] );
strcpy(CMD, CMD_HISTORY[CMD_NUM]);
if ((CMD_POS = strlen(CMD)) != 0)
cmdLen = strlen(CMD);
if ((cmdPos = strlen(CMD)) != 0)
break;
 
}
 
break;
 
 
case 72: // Up
for (hist = 0; hist < CMD_HISTORY_NUM; hist++)
for (i = 0; i < CMD_HISTORY_NUM; i++)
{
command_clear();
 
for (i = cmdPos; i < cmdLen; i++)
printf(" ");
 
for (i = cmdLen; i > 0; i--)
printf("%c %c", 8, 8);
 
if (CMD_NUM > 0)
CMD_NUM--;
else
140,22 → 216,23
 
printf( CMD_HISTORY[CMD_NUM] );
strcpy(CMD, CMD_HISTORY[CMD_NUM]);
if ((CMD_POS = strlen(CMD)) != 0)
cmdLen = strlen(CMD);
if ((cmdPos = strlen(CMD)) != 0)
break;
}
break;
 
 
case 0: // console window closed
cmd_exit(NULL);
 
};
}
}
}
 
}
 
 
/// ===========================================================
 
int command_get_cmd(char cmd[])