util-lib: split out fd-related operations into fd-util.[ch]

There are more than enough to deserve their own .c file, hence move them
over.

15 files changed, 34 insertions, 19 deletions

diff --git a/src/import/curl-util.c b/src/import/curl-util.c
index 422d517529..455fa1e07d 100644
--- a/src/import/curl-util.c
+++ b/src/import/curl-util.c
@@ -19,8 +19,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "string-util.h"
 #include "curl-util.h"
+#include "fd-util.h"
+#include "string-util.h"
 
 static void curl_glue_check_finished(CurlGlue *g) {
         CURLMsg *msg;
diff --git a/src/import/export-raw.c b/src/import/export-raw.c
index dc4db481ca..24c0ec9309 100644
--- a/src/import/export-raw.c
+++ b/src/import/export-raw.c
@@ -28,6 +28,7 @@
 #include "btrfs-util.h"
 #include "copy.h"
 #include "export-raw.h"
+#include "fd-util.h"
 #include "import-common.h"
 #include "ratelimit.h"
 #include "string-util.h"
diff --git a/src/import/export-tar.c b/src/import/export-tar.c
index 93f2fdbd44..aa9b7f1a91 100644
--- a/src/import/export-tar.c
+++ b/src/import/export-tar.c
@@ -22,12 +22,13 @@
 #include "sd-daemon.h"
 
 #include "btrfs-util.h"
+#include "export-tar.h"
+#include "fd-util.h"
 #include "import-common.h"
 #include "process-util.h"
 #include "ratelimit.h"
 #include "string-util.h"
 #include "util.h"
-#include "export-tar.h"
 
 #define COPY_BUFFER_SIZE (16*1024)
 
diff --git a/src/import/export.c b/src/import/export.c
index 89e23899b1..1ecd1e4e10 100644
--- a/src/import/export.c
+++ b/src/import/export.c
@@ -26,6 +26,7 @@
 #include "event-util.h"
 #include "export-raw.h"
 #include "export-tar.h"
+#include "fd-util.h"
 #include "hostname-util.h"
 #include "import-util.h"
 #include "machine-image.h"
diff --git a/src/import/import-common.c b/src/import/import-common.c
index 9b86dbfa79..d96a000f81 100644
--- a/src/import/import-common.c
+++ b/src/import/import-common.c
@@ -26,9 +26,10 @@
 
 #include "btrfs-util.h"
 #include "capability.h"
+#include "fd-util.h"
+#include "import-common.h"
 #include "signal-util.h"
 #include "util.h"
-#include "import-common.h"
 
 int import_make_read_only_fd(int fd) {
         int r;
diff --git a/src/import/import-raw.c b/src/import/import-raw.c
index b13e80584d..f8fc6c108a 100644
--- a/src/import/import-raw.c
+++ b/src/import/import-raw.c
@@ -26,9 +26,11 @@
 
 #include "btrfs-util.h"
 #include "copy.h"
+#include "fd-util.h"
 #include "hostname-util.h"
 #include "import-common.h"
 #include "import-compress.h"
+#include "import-raw.h"
 #include "machine-pool.h"
 #include "mkdir.h"
 #include "path-util.h"
@@ -37,7 +39,6 @@
 #include "rm-rf.h"
 #include "string-util.h"
 #include "util.h"
-#include "import-raw.h"
 
 struct RawImport {
         sd_event *event;
diff --git a/src/import/import-tar.c b/src/import/import-tar.c
index 0145dcb452..bc0cd9f5ba 100644
--- a/src/import/import-tar.c
+++ b/src/import/import-tar.c
@@ -26,9 +26,11 @@
 
 #include "btrfs-util.h"
 #include "copy.h"
+#include "fd-util.h"
 #include "hostname-util.h"
 #include "import-common.h"
 #include "import-compress.h"
+#include "import-tar.h"
 #include "machine-pool.h"
 #include "mkdir.h"
 #include "path-util.h"
@@ -38,7 +40,6 @@
 #include "rm-rf.h"
 #include "string-util.h"
 #include "util.h"
-#include "import-tar.h"
 
 struct TarImport {
         sd_event *event;
diff --git a/src/import/import.c b/src/import/import.c
index bc0bc78924..e50ded9219 100644
--- a/src/import/import.c
+++ b/src/import/import.c
@@ -24,6 +24,7 @@
 #include "sd-event.h"
 
 #include "event-util.h"
+#include "fd-util.h"
 #include "hostname-util.h"
 #include "import-raw.h"
 #include "import-tar.h"
diff --git a/src/import/importd.c b/src/import/importd.c
index a29e9d4bd5..b712cedcc6 100644
--- a/src/import/importd.c
+++ b/src/import/importd.c
@@ -22,20 +22,22 @@
 #include <sys/prctl.h>
 
 #include "sd-bus.h"
-#include "util.h"
-#include "strv.h"
-#include "bus-util.h"
+
 #include "bus-common-errors.h"
-#include "socket-util.h"
-#include "mkdir.h"
+#include "bus-util.h"
 #include "def.h"
-#include "missing.h"
+#include "fd-util.h"
+#include "hostname-util.h"
+#include "import-util.h"
 #include "machine-pool.h"
+#include "missing.h"
+#include "mkdir.h"
 #include "path-util.h"
-#include "import-util.h"
 #include "process-util.h"
 #include "signal-util.h"
-#include "hostname-util.h"
+#include "socket-util.h"
+#include "strv.h"
+#include "util.h"
 
 typedef struct Transfer Transfer;
 typedef struct Manager Manager;
diff --git a/src/import/pull-common.c b/src/import/pull-common.c
index a79cc5825b..e98554b60c 100644
--- a/src/import/pull-common.c
+++ b/src/import/pull-common.c
@@ -25,7 +25,9 @@
 #include "capability.h"
 #include "copy.h"
 #include "escape.h"
+#include "fd-util.h"
 #include "process-util.h"
+#include "pull-common.h"
 #include "pull-job.h"
 #include "rm-rf.h"
 #include "signal-util.h"
@@ -33,7 +35,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "util.h"
-#include "pull-common.h"
 
 #define FILENAME_ESCAPE "/.#\"\'"
 #define HASH_URL_THRESHOLD_LENGTH (_POSIX_PATH_MAX - 16)
diff --git a/src/import/pull-dkr.c b/src/import/pull-dkr.c
index ea31d11641..1cd9e7b0bd 100644
--- a/src/import/pull-dkr.c
+++ b/src/import/pull-dkr.c
@@ -27,6 +27,7 @@
 #include "aufs-util.h"
 #include "btrfs-util.h"
 #include "curl-util.h"
+#include "fd-util.h"
 #include "hostname-util.h"
 #include "import-common.h"
 #include "import-util.h"
diff --git a/src/import/pull-job.c b/src/import/pull-job.c
index f8b597c9c3..7a0fb54bbe 100644
--- a/src/import/pull-job.c
+++ b/src/import/pull-job.c
@@ -21,10 +21,11 @@
 
 #include <sys/xattr.h>
 
+#include "fd-util.h"
 #include "machine-pool.h"
+#include "pull-job.h"
 #include "string-util.h"
 #include "strv.h"
-#include "pull-job.h"
 
 PullJob* pull_job_unref(PullJob *j) {
         if (!j)
diff --git a/src/import/pull-raw.c b/src/import/pull-raw.c
index a8b2c24507..848a4fcd44 100644
--- a/src/import/pull-raw.c
+++ b/src/import/pull-raw.c
@@ -28,6 +28,7 @@
 #include "btrfs-util.h"
 #include "copy.h"
 #include "curl-util.h"
+#include "fd-util.h"
 #include "hostname-util.h"
 #include "import-common.h"
 #include "import-util.h"
@@ -36,13 +37,13 @@
 #include "path-util.h"
 #include "pull-common.h"
 #include "pull-job.h"
+#include "pull-raw.h"
 #include "qcow2-util.h"
 #include "rm-rf.h"
 #include "string-util.h"
 #include "strv.h"
 #include "utf8.h"
 #include "util.h"
-#include "pull-raw.h"
 
 typedef enum RawProgress {
         RAW_DOWNLOADING,
diff --git a/src/import/pull-tar.c b/src/import/pull-tar.c
index fb4d5bf512..3540bbff41 100644
--- a/src/import/pull-tar.c
+++ b/src/import/pull-tar.c
@@ -27,6 +27,7 @@
 #include "btrfs-util.h"
 #include "copy.h"
 #include "curl-util.h"
+#include "fd-util.h"
 #include "hostname-util.h"
 #include "import-common.h"
 #include "import-util.h"
@@ -36,12 +37,12 @@
 #include "process-util.h"
 #include "pull-common.h"
 #include "pull-job.h"
+#include "pull-tar.h"
 #include "rm-rf.h"
 #include "string-util.h"
 #include "strv.h"
 #include "utf8.h"
 #include "util.h"
-#include "pull-tar.h"
 
 typedef enum TarProgress {
         TAR_DOWNLOADING,
diff --git a/src/import/test-qcow2.c b/src/import/test-qcow2.c
index 9a6c3e8b35..4b60079619 100644
--- a/src/import/test-qcow2.c
+++ b/src/import/test-qcow2.c
@@ -19,10 +19,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "fd-util.h"
 #include "log.h"
-#include "util.h"
-
 #include "qcow2-util.h"
+#include "util.h"
 
 int main(int argc, char *argv[]) {
         _cleanup_close_ int sfd = -1, dfd = -1;