fixed names coincidence

git-svn-id: svn://kolibrios.org@3441 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2013-04-02 13:39:25 +00:00
parent 2e36ea6cf7
commit 38cdd04005

View File

@ -50,7 +50,7 @@ byte
del_active=0, del_active=0,
show_dev_name=1, show_dev_name=1,
sort_num=2, sort_num=2,
isdir; itdir;
proc_info Form; proc_info Form;
mouse m; mouse m;
@ -281,7 +281,7 @@ void main()
case 024: //Ctrl+X case 024: //Ctrl+X
case 003: //Ctrl+C case 003: //Ctrl+C
CTRLC_MARK: CTRLC_MARK:
IF (isdir) break; IF (itdir) break;
strcpy(#copy_file, #file_path); strcpy(#copy_file, #file_path);
IF (key==24) cut_active=1; ELSE cut_active=0; IF (key==24) cut_active=1; ELSE cut_active=0;
break; break;
@ -482,7 +482,7 @@ void Line_ReDraw(dword color, filenum){
if (TestBit(ESDWORD[off-40],1)) || (TestBit(ESDWORD[off-40],2)) text_col=0xA6A6B7; //system or hiden? if (TestBit(ESDWORD[off-40],1)) || (TestBit(ESDWORD[off-40],2)) text_col=0xA6A6B7; //system or hiden?
if (color<>0xFFFfff) if (color<>0xFFFfff)
{ {
isdir=TestBit(ESDWORD[off-40], 4); itdir=TestBit(ESDWORD[off-40], 4);
strcpy(#file_name, off); strcpy(#file_name, off);
strcpy(#file_path, #path); strcpy(#file_path, #path);
strcat(#file_path, #file_name); strcat(#file_path, #file_name);
@ -560,7 +560,7 @@ inline Sorting()
FOR (j=files.count-1, off=files.count-1*304+buf+32; j>=0; j--, off-=304;) //files | folders FOR (j=files.count-1, off=files.count-1*304+buf+32; j>=0; j--, off-=304;) //files | folders
{ {
strttl(off+40); strttl(off+40);
if (TestBit(ESDWORD[off],4)) //isdir? if (TestBit(ESDWORD[off],4)) //directory?
{ {
file_mas[k]=j; file_mas[k]=j;
k++; k++;
@ -615,8 +615,8 @@ void Del_File(byte dodel)
IF (del_rezult<>0) IF (del_rezult<>0)
{ {
Write_Error(del_rezult); Write_Error(del_rezult);
IF ( isdir) ShowMessage("Error. Folder isn't empty."); IF ( itdir) ShowMessage("Error. Folder isn't empty.");
IF (!isdir) ShowMessage("Error. Filesystem read-only."); IF (!itdir) ShowMessage("Error. Filesystem read-only.");
} }
} }
del_active=0; del_active=0;
@ -667,7 +667,7 @@ void ReName(byte rename)
strcpy(#edit_name, #file_name); //save edit name to select it later strcpy(#edit_name, #file_name); //save edit name to select it later
strcat(#temp, #file_name); strcat(#temp, #file_name);
if (strcmp(#file_path,#temp)<>0) && (file_name) if (strcmp(#file_path,#temp)<>0) && (file_name)
IF (isdir) IF (itdir)
{ {
del_rezult = DeleteFile(#file_path); del_rezult = DeleteFile(#file_path);
IF (del_rezult!=0) IF (del_rezult!=0)
@ -716,7 +716,7 @@ void Dir_Up()
void Open() void Open()
{ {
if (!isdir) if (!itdir)
{ {
GetIni(0); GetIni(0);
} }
@ -757,10 +757,10 @@ void ActionsProcess(char N)
rename_active=1; rename_active=1;
break; break;
case 3: case 3:
IF (!isdir) RunProgram("/sys/tinypad", #file_path); IF (!itdir) RunProgram("/sys/tinypad", #file_path);
break; break;
case 4: case 4:
IF (!isdir) RunProgram("/sys/develop/heed", #file_path); IF (!itdir) RunProgram("/sys/develop/heed", #file_path);
break; break;
case 5: //refresh cur dir & devs case 5: //refresh cur dir & devs
Tip(56, "Devices", 55, "-"); Tip(56, "Devices", 55, "-");