diff options
| author | Ron Yorston <rmy@pobox.com> | 2021-06-28 07:46:32 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2021-06-28 07:46:32 +0100 |
| commit | e1ad66c0b8fd58a7158d40771175a7dab224202d (patch) | |
| tree | 959d687eee9637151ad5798322586174de331141 /libbb/copy_file.c | |
| parent | 0fdf99bee07b6c38795eb5415b5e337ab82cfba8 (diff) | |
| parent | 5dbbd0a6f52befe6bc57baf97d39168e595197f1 (diff) | |
| download | busybox-w32-e1ad66c0b8fd58a7158d40771175a7dab224202d.tar.gz busybox-w32-e1ad66c0b8fd58a7158d40771175a7dab224202d.tar.bz2 busybox-w32-e1ad66c0b8fd58a7158d40771175a7dab224202d.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'libbb/copy_file.c')
| -rw-r--r-- | libbb/copy_file.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libbb/copy_file.c b/libbb/copy_file.c index 9b10dda1f..c0928a5a8 100644 --- a/libbb/copy_file.c +++ b/libbb/copy_file.c | |||
| @@ -117,6 +117,8 @@ int FAST_FUNC copy_file(const char *source, const char *dest, int flags) | |||
| 117 | return -1; | 117 | return -1; |
| 118 | } | 118 | } |
| 119 | #endif | 119 | #endif |
| 120 | if (flags & FILEUTILS_NO_OVERWRITE) /* cp -n */ | ||
| 121 | return 0; | ||
| 120 | dest_exists = 1; | 122 | dest_exists = 1; |
| 121 | } | 123 | } |
| 122 | 124 | ||