Rev 5806 | Rev 6278 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 5806 | Rev 6251 | ||
|---|---|---|---|
| Line 22... | Line 22... | ||
| 22 | if (error = GetFileInfo(from1, #CopyFile_atr1)) |
22 | if (error = GetFileInfo(from1, #CopyFile_atr1)) |
| 23 | { |
23 | { |
| 24 | debugln("Error: copyf->GetFileInfo"); |
24 | debugln("Error: copyf->GetFileInfo"); |
| 25 | return error; |
25 | return error; |
| 26 | } |
26 | } |
| 27 | if (isdir(from1)) |
27 | if (dir_exists(from1)) |
| 28 | return CopyFolder(from1, in1); |
28 | return CopyFolder(from1, in1); |
| 29 | else |
29 | else |
| 30 | { |
30 | { |
| 31 | Operation_Draw_Progress(from1+strchr(from1, '/')); |
31 | Operation_Draw_Progress(from1+strchr(from1, '/')); |
| 32 | return CopyFile(from1, in1); |
32 | return CopyFile(from1, in1); |
| Line 83... | Line 83... | ||
| 83 | { |
83 | { |
| 84 | filename = i*304+dirbuf+72; |
84 | filename = i*304+dirbuf+72; |
| 85 | sprintf(#copy_from2,"%s/%s",from2,filename); |
85 | sprintf(#copy_from2,"%s/%s",from2,filename); |
| 86 | sprintf(#copy_in2,"%s/%s",in2,filename); |
86 | sprintf(#copy_in2,"%s/%s",in2,filename); |
| Line 87... | Line 87... | ||
| 87 | 87 | ||
| 88 | if ( TestBit(ESDWORD[filename-40], 4) ) //isdir? |
88 | if ( TestBit(ESDWORD[filename-40], 4) ) //dir_exists? |
| 89 | { |
89 | { |
| 90 | if ( (!strncmp(filename, ".",1)) || (!strncmp(filename, "..",2)) ) continue; |
90 | if ( (!strncmp(filename, ".",1)) || (!strncmp(filename, "..",2)) ) continue; |
| 91 | CopyFolder(#copy_from2, #copy_in2); |
91 | CopyFolder(#copy_from2, #copy_in2); |
| 92 | } |
92 | } |