mirror of
https://github.com/MidnightCommander/mc
synced 2025-01-03 18:14:25 +03:00
* src/file.c (move_dir_dir): Remove Win32 specific code.
This commit is contained in:
parent
d647096f53
commit
d2f0a2a5a7
@ -1,3 +1,7 @@
|
|||||||
|
2006-05-23 Pavel Tsekov <ptsekov@gmx.net>
|
||||||
|
|
||||||
|
* file.c (move_dir_dir): Remove Win32 specific code.
|
||||||
|
|
||||||
2006-05-21 Roland Illig <roland.illig@gmx.de>
|
2006-05-21 Roland Illig <roland.illig@gmx.de>
|
||||||
|
|
||||||
* mountlist.c: Fixed so that it builds on NetBSD 3.0.
|
* mountlist.c: Fixed so that it builds on NetBSD 3.0.
|
||||||
|
11
src/file.c
11
src/file.c
@ -1206,14 +1206,6 @@ move_dir_dir (FileOpContext *ctx, const char *s, const char *d,
|
|||||||
return_status = FILE_CONT;
|
return_status = FILE_CONT;
|
||||||
goto ret;
|
goto ret;
|
||||||
}
|
}
|
||||||
/* .ado: Drive, Do we need this anymore? */
|
|
||||||
#ifdef WIN32
|
|
||||||
else {
|
|
||||||
/* EXDEV: cross device; does not work everywhere */
|
|
||||||
if (toupper (s[0]) != toupper (destdir[0]))
|
|
||||||
goto w32try;
|
|
||||||
}
|
|
||||||
#endif /* WIN32 */
|
|
||||||
|
|
||||||
if (errno != EXDEV) {
|
if (errno != EXDEV) {
|
||||||
return_status =
|
return_status =
|
||||||
@ -1224,9 +1216,6 @@ move_dir_dir (FileOpContext *ctx, const char *s, const char *d,
|
|||||||
goto retry_rename;
|
goto retry_rename;
|
||||||
goto ret;
|
goto ret;
|
||||||
}
|
}
|
||||||
#ifdef WIN32
|
|
||||||
w32try:
|
|
||||||
#endif /* WIN32 */
|
|
||||||
/* Failed because of filesystem boundary -> copy dir instead */
|
/* Failed because of filesystem boundary -> copy dir instead */
|
||||||
return_status =
|
return_status =
|
||||||
copy_dir_dir (ctx, s, destdir, 0, 0, 1, 0, progress_count,
|
copy_dir_dir (ctx, s, destdir, 0, 0, 1, 0, progress_count,
|
||||||
|
Loading…
Reference in New Issue
Block a user