From 27dadd087befac1f51eac50f886185a62c7d5860 Mon Sep 17 00:00:00 2001 From: Nguyễn Thái Ngọc Duy Date: Mon, 5 Apr 2010 22:21:04 +0200 Subject: win32: copy_file: lstat/stat macro conflict MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rework Signed-off-by: Nguyễn Thái Ngọc Duy --- libbb/copy_file.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libbb/copy_file.c b/libbb/copy_file.c index ed765d8f0..80a64f791 100644 --- a/libbb/copy_file.c +++ b/libbb/copy_file.c @@ -85,7 +85,12 @@ int FAST_FUNC copy_file(const char *source, const char *dest, int flags) /* Inverse of cp -d ("cp without -d") */ #define FLAGS_DEREF (flags & (FILEUTILS_DEREFERENCE + FILEUTILS_DEREFERENCE_L0)) +#if ENABLE_PLATFORM_MINGW32 + /* stat can't be aliased, and MinGW uses lstat anyway */ + if (lstat(source, &source_stat) < 0) { +#else if ((FLAGS_DEREF ? stat : lstat)(source, &source_stat) < 0) { +#endif /* This may be a dangling symlink. * Making [sym]links to dangling symlinks works, so... */ if (flags & (FILEUTILS_MAKE_SOFTLINK|FILEUTILS_MAKE_HARDLINK)) -- cgit v1.2.3-55-g6feb