global: stop including fd-set-nonblock.h & fd-close-on-exec.h directly

diff --git a/src/doveadm/doveadm-dsync.c b/src/doveadm/doveadm-dsync.c
index b2806f5c80c1ccd3886d9b1b6e618d73ea4378c3..091be874395f75d77fb04f22b133c69752297ba1 100644 (file)
--- a/src/doveadm/doveadm-dsync.c
+++ b/src/doveadm/doveadm-dsync.c
@@ -4,7 +4,6 @@
 #include "lib-signals.h"
 #include "array.h"
 #include "execv-const.h"
-#include "fd-set-nonblock.h"
 #include "child-wait.h"
 #include "istream.h"
 #include "ostream.h"

diff --git a/src/doveadm/dsync/dsync-ibc-stream.c b/src/doveadm/dsync/dsync-ibc-stream.c
index 7f6cc53dcbf171005caa9ea8f736c10a8e16c438..ad7631f3127f5e1e6c439978a518f48f05cfceea 100644 (file)
--- a/src/doveadm/dsync/dsync-ibc-stream.c
+++ b/src/doveadm/dsync/dsync-ibc-stream.c
@@ -2,7 +2,6 @@
 
 #include "lib.h"
 #include "array.h"
-#include "fd-set-nonblock.h"
 #include "safe-mkstemp.h"
 #include "ioloop.h"
 #include "istream.h"

diff --git a/src/imap-hibernate/imap-client.c b/src/imap-hibernate/imap-client.c
index 53b28767b5a208427703829f270694c94ea95577..6a9cc06611fda92eec0ac816cfcc08e8c0092c7a 100644 (file)
--- a/src/imap-hibernate/imap-client.c
+++ b/src/imap-hibernate/imap-client.c
@@ -3,7 +3,6 @@
 #include "lib.h"
 #include "array.h"
 #include "ioloop.h"
-#include "fd-set-nonblock.h"
 #include "fdpass.h"
 #include "hostpid.h"
 #include "connection.h"

diff --git a/src/imap/main.c b/src/imap/main.c
index 1fe024e00a445de8c0c53afeb996ab7a12bf63f4..15ffb480d20f2f152fa719b3cd68f58650174e60 100644 (file)
--- a/src/imap/main.c
+++ b/src/imap/main.c
@@ -10,7 +10,6 @@
 #include "process-title.h"
 #include "randgen.h"
 #include "restrict-access.h"
-#include "fd-close-on-exec.h"
 #include "write-full.h"
 #include "settings-parser.h"
 #include "master-interface.h"

diff --git a/src/lda/main.c b/src/lda/main.c
index 4d25d5c0ad5b0ff683855f101b0ee310f157c263..847861bdcdd151d1f9ceae5b26570b964902cbcd 100644 (file)
--- a/src/lda/main.c
+++ b/src/lda/main.c
@@ -4,7 +4,6 @@
 #include "lib-signals.h"
 #include "ioloop.h"
 #include "env-util.h"
-#include "fd-set-nonblock.h"
 #include "istream.h"
 #include "istream-seekable.h"
 #include "path-util.h"

diff --git a/src/lib-imap-client/test-imapc-client.c b/src/lib-imap-client/test-imapc-client.c
index 257a3ef2b2ddd48244ccceda468a31322f7622dc..af64c00a4bca08e3f9f0cf0d20e6ee72258da774 100644 (file)
--- a/src/lib-imap-client/test-imapc-client.c
+++ b/src/lib-imap-client/test-imapc-client.c
@@ -4,7 +4,6 @@
 #include "array.h"
 #include "hostpid.h"
 #include "net.h"
-#include "fd-set-nonblock.h"
 #include "istream.h"
 #include "ostream.h"
 #include "ioloop.h"

diff --git a/src/lib-master/master-login.c b/src/lib-master/master-login.c
index ac0181d126c5e0d58fc94748136116ec840b0723..df707cdd25270f668791b3260aabbdf0b18368b9 100644 (file)
--- a/src/lib-master/master-login.c
+++ b/src/lib-master/master-login.c
@@ -4,7 +4,6 @@
 #include "ioloop.h"
 #include "ostream.h"
 #include "fdpass.h"
-#include "fd-close-on-exec.h"
 #include "llist.h"
 #include "str.h"
 #include "strescape.h"

diff --git a/src/lib-master/master-service.c b/src/lib-master/master-service.c
index 19bfcd218d2707eb05ffa76105a145c8f8bfe1ae..78c445497cf7da489b675e1cc6809322917c072b 100644 (file)
--- a/src/lib-master/master-service.c
+++ b/src/lib-master/master-service.c
@@ -10,7 +10,6 @@
 #include "home-expand.h"
 #include "process-title.h"
 #include "restrict-access.h"
-#include "fd-close-on-exec.h"
 #include "settings-parser.h"
 #include "syslog-util.h"
 #include "master-instance.h"

diff --git a/src/lib/failures.c b/src/lib/failures.c
index f66933923576fa13fb20357e1db378bddcae18aa..fe41cbb57a589069740f017e445e4ee24a4dc9e7 100644 (file)
--- a/src/lib/failures.c
+++ b/src/lib/failures.c
@@ -5,13 +5,11 @@
 #include "str.h"
 #include "hostpid.h"
 #include "net.h"
-#include "fd-set-nonblock.h"
 #include "process-title.h"
 #include "lib-signals.h"
 #include "backtrace-string.h"
 #include "printf-format-fix.h"
 #include "write-full.h"
-#include "fd-close-on-exec.h"
 
 #include <unistd.h>
 #include <fcntl.h>

diff --git a/src/lib/fd-close-on-exec.c b/src/lib/fd-close-on-exec.c
index 23fbc95083b8baed79fd56df1c000fae9b58b29d..6f5db11362fc432208a898a2b4a233379c124be7 100644 (file)
--- a/src/lib/fd-close-on-exec.c
+++ b/src/lib/fd-close-on-exec.c
@@ -2,7 +2,6 @@
 
 #include "lib.h"
 #include "net.h"
-#include "fd-close-on-exec.h"
 
 #include <unistd.h>
 #include <fcntl.h>

diff --git a/src/lib/fd-set-nonblock.c b/src/lib/fd-set-nonblock.c
index 7e1c8190bf7057e4cdc895d5986673e812d97a4c..4b76cd71db50029305f5ead73b875da745b2d249 100644 (file)
--- a/src/lib/fd-set-nonblock.c
+++ b/src/lib/fd-set-nonblock.c
@@ -1,7 +1,6 @@
 /* Copyright (c) 1999-2017 Dovecot authors, see the included COPYING file */
 
 #include "lib.h"
-#include "fd-set-nonblock.h"
 
 #include <fcntl.h>
 

diff --git a/src/lib/ioloop-epoll.c b/src/lib/ioloop-epoll.c
index d3c997df5307f5560ff726cefe78b114e8c9f57c..160098022fab441e14414f4528665091a8a8007e 100644 (file)
--- a/src/lib/ioloop-epoll.c
+++ b/src/lib/ioloop-epoll.c
@@ -2,7 +2,6 @@
 
 #include "lib.h"
 #include "array.h"
-#include "fd-close-on-exec.h"
 #include "ioloop-private.h"
 #include "ioloop-iolist.h"
 

diff --git a/src/lib/ioloop-kqueue.c b/src/lib/ioloop-kqueue.c
index d7fd238996c209175ec84a0782531a7360851d97..b8b4accfb0dcd49eb7a237ddf309ed6c7be3598e 100644 (file)
--- a/src/lib/ioloop-kqueue.c
+++ b/src/lib/ioloop-kqueue.c
@@ -9,7 +9,6 @@
 #ifdef IOLOOP_KQUEUE
 
 #include "array.h"
-#include "fd-close-on-exec.h"
 #include "ioloop-private.h"
 
 #include <unistd.h>

diff --git a/src/lib/ioloop-notify-inotify.c b/src/lib/ioloop-notify-inotify.c
index 1cef6ceac56fd71f72a303baf4b1ad5a03cd3f11..643399c3f3359b1ac88638a7b4f1750f5e256f28 100644 (file)
--- a/src/lib/ioloop-notify-inotify.c
+++ b/src/lib/ioloop-notify-inotify.c
@@ -5,8 +5,6 @@
 
 #ifdef IOLOOP_NOTIFY_INOTIFY
 
-#include "fd-close-on-exec.h"
-#include "fd-set-nonblock.h"
 #include "ioloop-private.h"
 #include "ioloop-notify-fd.h"
 #include "buffer.h"

diff --git a/src/lib/ioloop-notify-kqueue.c b/src/lib/ioloop-notify-kqueue.c
index 57c039cd29bb03b6c41361177a06f00e8ec9d940..ab86291a31b455c01fc9afcd9a1426c3948beb13 100644 (file)
--- a/src/lib/ioloop-notify-kqueue.c
+++ b/src/lib/ioloop-notify-kqueue.c
@@ -11,7 +11,6 @@
 
 #include "ioloop-private.h"
 #include "llist.h"
-#include "fd-close-on-exec.h"
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/types.h>

diff --git a/src/lib/istream.c b/src/lib/istream.c
index 442dd4eea6f10d17af40a4660e13c17f312dca5a..cb904f5bad9d40cea193741f094ea6cf8ac0b792 100644 (file)
--- a/src/lib/istream.c
+++ b/src/lib/istream.c
@@ -4,7 +4,6 @@
 #include "ioloop.h"
 #include "array.h"
 #include "str.h"
-#include "fd-set-nonblock.h"
 #include "istream-private.h"
 
 static bool i_stream_is_buffer_invalid(const struct istream_private *stream);

diff --git a/src/lib/lib-signals.c b/src/lib/lib-signals.c
index be9de2d61436304b23554022d99cc67481defdac..16adccc871f0bce2001e3c98cf2db8d7eefc7bc2 100644 (file)
--- a/src/lib/lib-signals.c
+++ b/src/lib/lib-signals.c
@@ -3,8 +3,6 @@
 #include "lib.h"
 #include "array.h"
 #include "ioloop.h"
-#include "fd-close-on-exec.h"
-#include "fd-set-nonblock.h"
 #include "write-full.h"
 #include "lib-signals.h"
 

diff --git a/src/lib/lib.c b/src/lib/lib.c
index 0ce51bec745dc324561dbf1104b5a60dc6deca7c..3c5739ca1a38bc9201a2d2d81a28a4e9b9dc87a2 100644 (file)
--- a/src/lib/lib.c
+++ b/src/lib/lib.c
@@ -5,7 +5,6 @@
 #include "array.h"
 #include "env-util.h"
 #include "hostpid.h"
-#include "fd-close-on-exec.h"
 #include "ipwd.h"
 #include "process-title.h"
 #include "var-expand-private.h"

diff --git a/src/lib/mmap-anon.c b/src/lib/mmap-anon.c
index ce58c6cbb63f36651191bb21770e6f48e4c510dc..2e2617b7aff8b32e3eab75fd1299ee214fe30a36 100644 (file)
--- a/src/lib/mmap-anon.c
+++ b/src/lib/mmap-anon.c
@@ -17,8 +17,6 @@
 
 #ifndef HAVE_LINUX_MREMAP
 
-#include "fd-close-on-exec.h"
-
 #include <sys/mman.h>
 
 #define MMAP_SIGNATURE 0xdeadbeef

diff --git a/src/lib/net.c b/src/lib/net.c
index df35e4c9028384d0c7c57fdaaa1fd84f6e4af29b..abf4ecfc05bbdd3ae2936a88cba8cf98193d0bc8 100644 (file)
--- a/src/lib/net.c
+++ b/src/lib/net.c
@@ -2,7 +2,6 @@
 
 #define _GNU_SOURCE /* For Linux's struct ucred */
 #include "lib.h"
-#include "fd-set-nonblock.h"
 #include "time-util.h"
 #include "net.h"
 

diff --git a/src/lib/randgen.c b/src/lib/randgen.c
index 2b0410bf9a5d65c6a50f60606aee920faf5f6b3d..9b466db61005f3155bf665359096f55c6282aa1a 100644 (file)
--- a/src/lib/randgen.c
+++ b/src/lib/randgen.c
@@ -2,7 +2,6 @@
 
 #include "lib.h"
 #include "randgen.h"
-#include "fd-close-on-exec.h"
 #include <unistd.h>
 #include <fcntl.h>
 

diff --git a/src/lib/test-iostream-proxy.c b/src/lib/test-iostream-proxy.c
index e23a6f680545f4092a56b6444b685c47ffcadf57..59d70b5c1661aa0a07014b85ddcf3baabaafba37 100644 (file)
--- a/src/lib/test-iostream-proxy.c
+++ b/src/lib/test-iostream-proxy.c
@@ -6,7 +6,6 @@
 #include "buffer.h"
 #include "ioloop.h"
 #include "iostream-proxy.h"
-#include "fd-set-nonblock.h"
 
 #include <unistd.h>
 #include <sys/types.h>

diff --git a/src/lib/test-iostream-pump.c b/src/lib/test-iostream-pump.c
index 374e0fb4c92629df4d07a6177824ba490e3f9d8b..95135c20a4798786dfcd95a6bc46f8c18fde32c4 100644 (file)
--- a/src/lib/test-iostream-pump.c
+++ b/src/lib/test-iostream-pump.c
@@ -7,7 +7,6 @@
 #include "str.h"
 #include "ioloop.h"
 #include "iostream-pump.h"
-#include "fd-set-nonblock.h"
 #include "istream-failure-at.h"
 #include "ostream-failure-at.h"
 

diff --git a/src/lib/test-istream-multiplex.c b/src/lib/test-istream-multiplex.c
index 031069dab7983f31b523958b807b323e35be5c7c..7d927dfbf1be60fa22e47559b6876a2d423708ed 100644 (file)
--- a/src/lib/test-istream-multiplex.c
+++ b/src/lib/test-istream-multiplex.c
@@ -2,7 +2,6 @@
 
 #include "test-lib.h"
 #include "ioloop.h"
-#include "fd-set-nonblock.h"
 #include "str.h"
 #include "crc32.h"
 #include "randgen.h"

diff --git a/src/lib/test-istream-unix.c b/src/lib/test-istream-unix.c
index 30ccd09aa58c3cb6440c9dd8a63c7ffb1a995ee2..30ea8d51b3086983a23477ee85ba819448ac9819 100644 (file)
--- a/src/lib/test-istream-unix.c
+++ b/src/lib/test-istream-unix.c
@@ -2,7 +2,6 @@
 
 #include "test-lib.h"
 #include "net.h"
-#include "fd-set-nonblock.h"
 #include "fdpass.h"
 #include "istream.h"
 #include "istream-unix.h"

diff --git a/src/lib/test-multiplex.c b/src/lib/test-multiplex.c
index 3731665dc455308ef78df37af4e093cb9ce6da81..d7e1f279d1127895fb630832a762f65dad11f7bd 100644 (file)
--- a/src/lib/test-multiplex.c
+++ b/src/lib/test-multiplex.c
@@ -3,7 +3,6 @@
 #include "test-lib.h"
 #include "ioloop.h"
 #include "str.h"
-#include "fd-set-nonblock.h"
 #include "istream.h"
 #include "istream-multiplex.h"
 #include "ostream.h"

diff --git a/src/lib/test-ostream-multiplex.c b/src/lib/test-ostream-multiplex.c
index 8dc0e2b03071eb35df65fa52e8d2becd116d2be6..0228badd479190f2068388f65e96aa8caeff4f90 100644 (file)
--- a/src/lib/test-ostream-multiplex.c
+++ b/src/lib/test-ostream-multiplex.c
@@ -2,7 +2,6 @@
 
 #include "test-lib.h"
 #include "ioloop.h"
-#include "fd-set-nonblock.h"
 #include "str.h"
 #include "istream.h"
 #include "ostream-private.h"

diff --git a/src/lmtp/main.c b/src/lmtp/main.c
index 4f806969781e48190374227bbd93d60eee257adb..f46e6e71914e3f989e94e98d5609720c72cc5cb3 100644 (file)
--- a/src/lmtp/main.c
+++ b/src/lmtp/main.c
@@ -6,7 +6,6 @@
 #include "hostpid.h"
 #include "path-util.h"
 #include "restrict-access.h"
-#include "fd-close-on-exec.h"
 #include "anvil-client.h"
 #include "master-service.h"
 #include "master-service-settings.h"

diff --git a/src/login-common/login-proxy-state.c b/src/login-common/login-proxy-state.c
index 9815e33d89b873f18b154db802f2fd9fc57b8682..fc2d395a533f1019122f3049efc6eb16d8bfb8a0 100644 (file)
--- a/src/login-common/login-proxy-state.c
+++ b/src/login-common/login-proxy-state.c
@@ -5,7 +5,6 @@
 #include "ioloop.h"
 #include "hash.h"
 #include "strescape.h"
-#include "fd-set-nonblock.h"
 #include "login-proxy-state.h"
 
 #include <unistd.h>

diff --git a/src/master/dup2-array.c b/src/master/dup2-array.c
index e1d54de468d5be72e6cd51c10bb5cff0ebdd87d4..87c4c502aabe14fcbe2fb8e211d7711ad503e5cd 100644 (file)
--- a/src/master/dup2-array.c
+++ b/src/master/dup2-array.c
@@ -2,7 +2,6 @@
 
 #include "lib.h"
 #include "array.h"
-#include "fd-close-on-exec.h"
 #include "dup2-array.h"
 
 #include <unistd.h>

diff --git a/src/master/main.c b/src/master/main.c
index cc9a169203e823283c88c9853a7fba7b6b756f7c..a31e5736f08eaf7707d6f24e8afe3ce90ce1a31d 100644 (file)
--- a/src/master/main.c
+++ b/src/master/main.c
@@ -3,7 +3,6 @@
 #include "common.h"
 #include "ioloop.h"
 #include "lib-signals.h"
-#include "fd-close-on-exec.h"
 #include "array.h"
 #include "write-full.h"
 #include "env-util.h"

diff --git a/src/master/service-anvil.c b/src/master/service-anvil.c
index 7b625eace05fe7b15b81674559ca3569e2efc919..76c6ea029c8eda610ad8de2db851247db213b8c7 100644 (file)
--- a/src/master/service-anvil.c
+++ b/src/master/service-anvil.c
@@ -2,8 +2,6 @@
 
 #include "common.h"
 #include "ioloop.h"
-#include "fd-close-on-exec.h"
-#include "fd-set-nonblock.h"
 #include "fdpass.h"
 #include "service.h"
 #include "service-process.h"

diff --git a/src/master/service-listen.c b/src/master/service-listen.c
index 036dedcbec2cb98771a61bfbb1606e76c1417e7a..038efe042ed29d46dbddc0c666a6073b52869863 100644 (file)
--- a/src/master/service-listen.c
+++ b/src/master/service-listen.c
@@ -2,8 +2,6 @@
 
 #include "common.h"
 #include "array.h"
-#include "fd-set-nonblock.h"
-#include "fd-close-on-exec.h"
 #include "ioloop.h"
 #include "net.h"
 #ifdef HAVE_SYSTEMD

diff --git a/src/master/service-log.c b/src/master/service-log.c
index a4e01876c34d37718b1a8c3e732fe6ac64cb3a43..a5672e079beaa941b81bdf16e0fb58e944de943c 100644 (file)
--- a/src/master/service-log.c
+++ b/src/master/service-log.c
@@ -5,8 +5,6 @@
 #include "aqueue.h"
 #include "hash.h"
 #include "ioloop.h"
-#include "fd-close-on-exec.h"
-#include "fd-set-nonblock.h"
 #include "service.h"
 #include "service-process.h"
 #include "service-process-notify.h"

diff --git a/src/master/service-monitor.c b/src/master/service-monitor.c
index 16fa13cf29460202050c928e4d3404e31cbfa8a4..720ac853a91e5305189051e70ff52ce57caa5c1f 100644 (file)
--- a/src/master/service-monitor.c
+++ b/src/master/service-monitor.c
@@ -3,7 +3,6 @@
 #include "common.h"
 #include "array.h"
 #include "ioloop.h"
-#include "fd-close-on-exec.h"
 #include "hash.h"
 #include "str.h"
 #include "safe-mkstemp.h"

diff --git a/src/master/service-process.c b/src/master/service-process.c
index c869da1a64a7134fa35e4eb184d41489c1629890..5a72247f230a5bd5efe4f706ab668f8cfaf7c1eb 100644 (file)
--- a/src/master/service-process.c
+++ b/src/master/service-process.c
@@ -14,7 +14,6 @@
 #include "llist.h"
 #include "hostpid.h"
 #include "env-util.h"
-#include "fd-close-on-exec.h"
 #include "restrict-access.h"
 #include "restrict-process-size.h"
 #include "eacces-error.h"

diff --git a/src/plugins/mail-filter/istream-ext-filter.c b/src/plugins/mail-filter/istream-ext-filter.c
index 682fbca5afe78d78042fed876352b53b16044069..1b1dc6056e85f80e3706e46a671a0ea0d4c58575 100644 (file)
--- a/src/plugins/mail-filter/istream-ext-filter.c
+++ b/src/plugins/mail-filter/istream-ext-filter.c
@@ -5,7 +5,6 @@
 #include "strescape.h"
 #include "net.h"
 #include "eacces-error.h"
-#include "fd-set-nonblock.h"
 #include "ostream.h"
 #include "istream-private.h"
 #include "istream-ext-filter.h"

diff --git a/src/plugins/replication/replication-plugin.c b/src/plugins/replication/replication-plugin.c
index aa61285e52fa34c3ed6cd51a71cbc28c8435f449..4d0679597c4a7134c62503372a92c2f672f13121 100644 (file)
--- a/src/plugins/replication/replication-plugin.c
+++ b/src/plugins/replication/replication-plugin.c
@@ -4,7 +4,6 @@
 #include "array.h"
 #include "str.h"
 #include "strescape.h"
-#include "fd-set-nonblock.h"
 #include "ioloop.h"
 #include "net.h"
 #include "write-full.h"

diff --git a/src/util/rawlog.c b/src/util/rawlog.c
index f0f4ef7f54d4b521ae2a834e0b03edd7095b1890..9b7f1d3a4db975127c93f68d5fcdb13028c22056 100644 (file)
--- a/src/util/rawlog.c
+++ b/src/util/rawlog.c
@@ -3,7 +3,6 @@
 #include "lib.h"
 
 #include "ioloop.h"
-#include "fd-set-nonblock.h"
 #include "net.h"
 #include "str.h"
 #include "write-full.h"