Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 6250 → Rev 6251

/programs/cmm/lib/copyf.h
24,7 → 24,7
debugln("Error: copyf->GetFileInfo");
return error;
}
if (isdir(from1))
if (dir_exists(from1))
return CopyFolder(from1, in1);
else
{
85,7 → 85,7
sprintf(#copy_from2,"%s/%s",from2,filename);
sprintf(#copy_in2,"%s/%s",in2,filename);
 
if ( TestBit(ESDWORD[filename-40], 4) ) //isdir?
if ( TestBit(ESDWORD[filename-40], 4) ) //dir_exists?
{
if ( (!strncmp(filename, ".",1)) || (!strncmp(filename, "..",2)) ) continue;
CopyFolder(#copy_from2, #copy_in2);
/programs/cmm/lib/file_system.h
197,15 → 197,23
$int 0x40
}
 
:char isdir(dword fpath)
:char dir_exists(dword fpath)
{
BDVK fpath_atr;
GetFileInfo(fpath, #fpath_atr);
return fpath_atr.isfolder;
}
:char file_exists(dword fpath)
{
BDVK ReadFile_atr;
if (! GetFileInfo(fpath, #ReadFile_atr)) return true;
return false;
}
 
 
:int GetFile(dword buf, filesize, read_path)
{
int return_val = 0;
BDVK ReadFile_atr;
dword rBuf;
if (! GetFileInfo(read_path, #ReadFile_atr))
215,11 → 223,11
{
ESDWORD[buf] = rBuf;
ESDWORD[filesize] = ReadFile_atr.sizelo;
return 1;
return_val = 1;
}
}
free(rBuf);
return 0;
return return_val;
}
 
enum