Rev 5676 | Rev 6251 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 5676 | Rev 5806 | ||
|---|---|---|---|
| Line 26... | Line 26... | ||
| 26 | } |
26 | } |
| 27 | if (isdir(from1)) |
27 | if (isdir(from1)) |
| 28 | return CopyFolder(from1, in1); |
28 | return CopyFolder(from1, in1); |
| 29 | else |
29 | else |
| 30 | { |
30 | { |
| 31 | copyf_Draw_Progress(from1+strchr(from1, '/')); |
31 | Operation_Draw_Progress(from1+strchr(from1, '/')); |
| 32 | return CopyFile(from1, in1); |
32 | return CopyFile(from1, in1); |
| 33 | } |
33 | } |
| 34 | } |
34 | } |
| Line 35... | Line 35... | ||
| 35 | 35 | ||
| Line 90... | Line 90... | ||
| 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 | } |
| 93 | else |
93 | else |
| 94 | { |
94 | { |
| 95 | copyf_Draw_Progress(filename); |
95 | Operation_Draw_Progress(filename); |
| 96 | if (error=CopyFile(#copy_from2, #copy_in2)) |
96 | if (error=CopyFile(#copy_from2, #copy_in2)) |
| 97 | { |
97 | { |
| 98 | if (fabs(error)==8) { debugln("Stop copying."); break;} //TODO: may be need grobal var like stop_all |
98 | if (fabs(error)==8) { debugln("Stop copying."); break;} //TODO: may be need grobal var like stop_all |
| 99 | error=CopyFile(#copy_from2, #copy_in2); // #2 :) |
99 | error=CopyFile(#copy_from2, #copy_in2); // #2 :) |
| 100 | } |
100 | } |