projects
/
oweals
/
busybox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1f684bc
)
copyfd: guard use of munmap() with #if (windows builds need this)
author
Johannes Schindelin
<johannes.schindelin@gmx.de>
Fri, 14 Jul 2017 14:11:43 +0000
(16:11 +0200)
committer
Denys Vlasenko
<vda.linux@googlemail.com>
Tue, 18 Jul 2017 17:20:58 +0000
(19:20 +0200)
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
libbb/copyfd.c
patch
|
blob
|
history
diff --git
a/libbb/copyfd.c
b/libbb/copyfd.c
index 7e353190372260f32627816b2efcd9cd4442a6e2..921fe3f81005d35063c8fb801cb54a75901586b8 100644
(file)
--- a/
libbb/copyfd.c
+++ b/
libbb/copyfd.c
@@
-119,8
+119,11
@@
static off_t bb_full_fd_action(int src_fd, int dst_fd, off_t size)
}
out:
+/* some environments don't have munmap(), hide it in #if */
+#if CONFIG_FEATURE_COPYBUF_KB > 4
if (buffer_size > 4 * 1024)
munmap(buffer, buffer_size);
+#endif
return status ? -1 : total;
}