diff options
author | Ron Yorston <rmy@pobox.com> | 2019-03-12 14:41:49 +0000 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2019-03-12 14:41:49 +0000 |
commit | 0a058590010129557bdb9abd26d338297a21f10e (patch) | |
tree | 92a127d160a30824d2f9f191c8481d15e82e5984 /libbb | |
parent | fd0e6a01a68047e959ef13f3161ce302b438d2b1 (diff) | |
download | busybox-w32-0a058590010129557bdb9abd26d338297a21f10e.tar.gz busybox-w32-0a058590010129557bdb9abd26d338297a21f10e.tar.bz2 busybox-w32-0a058590010129557bdb9abd26d338297a21f10e.zip |
win32: fix POSIX build (again)
Some faulty logic with ENABLE_FEATURE_EXTRA_FILE_DATA broke the
POSIX build.
Diffstat (limited to 'libbb')
-rw-r--r-- | libbb/copy_file.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libbb/copy_file.c b/libbb/copy_file.c index abe034f50..1dc515b07 100644 --- a/libbb/copy_file.c +++ b/libbb/copy_file.c | |||
@@ -108,8 +108,10 @@ int FAST_FUNC copy_file(const char *source, const char *dest, int flags) | |||
108 | #if ENABLE_PLATFORM_POSIX || ENABLE_FEATURE_EXTRA_FILE_DATA | 108 | #if ENABLE_PLATFORM_POSIX || ENABLE_FEATURE_EXTRA_FILE_DATA |
109 | if (source_stat.st_dev == dest_stat.st_dev | 109 | if (source_stat.st_dev == dest_stat.st_dev |
110 | && source_stat.st_ino == dest_stat.st_ino | 110 | && source_stat.st_ino == dest_stat.st_ino |
111 | # if ENABLE_FEATURE_EXTRA_FILE_DATA | ||
111 | /* ignore invalid inode numbers */ | 112 | /* ignore invalid inode numbers */ |
112 | && (ENABLE_FEATURE_EXTRA_FILE_DATA && source_stat.st_ino != 0) | 113 | && source_stat.st_ino != 0 |
114 | # endif | ||
113 | ) { | 115 | ) { |
114 | bb_error_msg("'%s' and '%s' are the same file", source, dest); | 116 | bb_error_msg("'%s' and '%s' are the same file", source, dest); |
115 | return -1; | 117 | return -1; |