Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 3431 → Rev 3432

/programs/cmm/installer/copyf.c
3,17 → 3,17
 
void copyf(dword params)
{
//copyf /sys/lib|/sys/lib2
//copyf: /sys/lib|/sys/lib2
char from[4096], to[4096];
BDVK from_atr;
int border;
mem_Init();
 
if (!params) { notify("Error: no copyf params!"); return; }
program_path[strrchr(#program_path, '/')] = 0x0;
//ищем разделитель
border = strchr(params, '|');
if (!border) border = strchr(params, ' ');
 
if (ESBYTE[params]<>'/')
if (ESBYTE[params]<>'/') //абсолютный путь?
{
strcpy(#from, #program_path);
strcat(#from, params);
28,14 → 28,10
 
GetFileInfo(#from, #from_atr);
if (TestBit(from_atr.attr, 4)==1)
{
CopyFolder(#from, #to);
}
else
{
CopyFile(#from, #to);
}
}
 
 
void CopyFolder(dword from, to)
46,7 → 42,7
char from2[4096], to2[4096];
 
error = GetDir(#dirbuf, #fcount, from);
if (error) debug_error(from, error);
if (error) { debug_error(from, error); return; }
if ((strcmp(to, "/sys")!=0) && (strcmp(to, "/tmp9/1")!=0))
{
102,7 → 98,7
"Error #5 - File or folder not found",
"Error #6 - End of file, EOF",
"Error #7 - Pointer lies outside of application memory",
"Error #8 - Too less disk space or FAT table is destroyed",
"Error #8 - Too less disk space",
"Error #9 - FAT table is destroyed",
"Error #10 - Access denied",
"Error #11 - Device error",
129,45 → 125,3
}
debug(#error);
}
 
/*
int files_num;
void CalculateFilesNumber(dword from)
{
dword dirbuf, fcount, filename;
int i, isdir, error;
char from2[4096];
 
error = GetDir(#dirbuf, #fcount, from);
if (error) debug_error(from, error);
debugi(fcount);
 
for (i=0; i<fcount; i++)
{
filename = i*304+dirbuf+72;
 
isdir = TestBit(ESDWORD[filename-40], 4);
if (!isdir)
{
files_num++;
debug(filename);
}
else
{
if ( (!strcmp(filename, ".")) || (!strcmp(filename, "..")) ) continue;
strcpy(#from2, from);
chrcat(#from2, '/');
strcat(#from2, filename);
CalculateFilesNumber(#from2);
}
}
free(dirbuf);
}
 
int GetFilesNumber(dword pathz)
{
files_num = 0;
CalculateFilesNumber(pathz);
return files_num;
}
*/
/programs/cmm/installer/main.c
55,9 → 55,7
void main()
{
mem_Init();
//if (load_dll2(boxlib, #box_lib_init,0)!=0) notify("Error while loading library /rd/1/lib/box_lib.obj");
//SetEventMask(0x27);
program_path[strrchr(#program_path, '/')] = 0x0;
program_path[strrchr(#program_path, '/')] = '\0';
HalloLoop();
}