diff options
author | Ron Yorston <rmy@pobox.com> | 2012-03-30 16:11:26 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2012-03-30 16:11:26 +0100 |
commit | f9f2117d5b7057f986850741b85bde5c30590b02 (patch) | |
tree | 5a069c443649f216bd1fe4474e80ebc37c72a38d /coreutils | |
parent | 40b68b6ecaf47c6a68bfa4158a61ce41bffa8284 (diff) | |
download | busybox-w32-f9f2117d5b7057f986850741b85bde5c30590b02.tar.gz busybox-w32-f9f2117d5b7057f986850741b85bde5c30590b02.tar.bz2 busybox-w32-f9f2117d5b7057f986850741b85bde5c30590b02.zip |
Update mingw.c from latest git/compat
Diffstat (limited to 'coreutils')
-rw-r--r-- | coreutils/cp.c | 5 | ||||
-rw-r--r-- | coreutils/libcoreutils/cp_mv_stat.c | 5 |
2 files changed, 0 insertions, 10 deletions
diff --git a/coreutils/cp.c b/coreutils/cp.c index 45efaba72..de2e512be 100644 --- a/coreutils/cp.c +++ b/coreutils/cp.c | |||
@@ -148,13 +148,8 @@ int cp_main(int argc, char **argv) | |||
148 | last = argv[argc - 1]; | 148 | last = argv[argc - 1]; |
149 | /* If there are only two arguments and... */ | 149 | /* If there are only two arguments and... */ |
150 | if (argc == 2) { | 150 | if (argc == 2) { |
151 | #if ENABLE_PLATFORM_MINGW32 | ||
152 | /* stat can't be aliased, and MinGW uses lstat anyway */ | ||
153 | s_flags = cp_mv_stat2(*argv, &source_stat, lstat); | ||
154 | #else | ||
155 | s_flags = cp_mv_stat2(*argv, &source_stat, | 151 | s_flags = cp_mv_stat2(*argv, &source_stat, |
156 | (flags & FILEUTILS_DEREFERENCE) ? stat : lstat); | 152 | (flags & FILEUTILS_DEREFERENCE) ? stat : lstat); |
157 | #endif | ||
158 | if (s_flags < 0) | 153 | if (s_flags < 0) |
159 | return EXIT_FAILURE; | 154 | return EXIT_FAILURE; |
160 | d_flags = cp_mv_stat(last, &dest_stat); | 155 | d_flags = cp_mv_stat(last, &dest_stat); |
diff --git a/coreutils/libcoreutils/cp_mv_stat.c b/coreutils/libcoreutils/cp_mv_stat.c index 1af2ebb71..5ba07ecc3 100644 --- a/coreutils/libcoreutils/cp_mv_stat.c +++ b/coreutils/libcoreutils/cp_mv_stat.c | |||
@@ -46,10 +46,5 @@ int FAST_FUNC cp_mv_stat2(const char *fn, struct stat *fn_stat, stat_func sf) | |||
46 | 46 | ||
47 | int FAST_FUNC cp_mv_stat(const char *fn, struct stat *fn_stat) | 47 | int FAST_FUNC cp_mv_stat(const char *fn, struct stat *fn_stat) |
48 | { | 48 | { |
49 | #if ENABLE_PLATFORM_MINGW32 | ||
50 | /* stat can't be aliased, and MinGW uses lstat anyway */ | ||
51 | return cp_mv_stat2(fn, fn_stat, lstat); | ||
52 | #else | ||
53 | return cp_mv_stat2(fn, fn_stat, stat); | 49 | return cp_mv_stat2(fn, fn_stat, stat); |
54 | #endif | ||
55 | } | 50 | } |