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.

16 files changed, 19 insertions, 3 deletions

diff --git a/src/udev/ata_id/ata_id.c b/src/udev/ata_id/ata_id.c
index 7acd7b4e92..1e414664ce 100644
--- a/src/udev/ata_id/ata_id.c
+++ b/src/udev/ata_id/ata_id.c
@@ -39,6 +39,7 @@
 
 #include "libudev.h"
 
+#include "fd-util.h"
 #include "libudev-private.h"
 #include "log.h"
 #include "udev-util.h"
diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c
index c308f898ea..e9577930e3 100644
--- a/src/udev/net/link-config.c
+++ b/src/udev/net/link-config.c
@@ -27,6 +27,7 @@
 #include "conf-files.h"
 #include "conf-parser.h"
 #include "ethtool-util.h"
+#include "fd-util.h"
 #include "libudev-private.h"
 #include "link-config.h"
 #include "log.h"
diff --git a/src/udev/scsi_id/scsi_id.c b/src/udev/scsi_id/scsi_id.c
index cbf9478e72..4655691642 100644
--- a/src/udev/scsi_id/scsi_id.c
+++ b/src/udev/scsi_id/scsi_id.c
@@ -31,6 +31,7 @@
 
 #include "libudev.h"
 
+#include "fd-util.h"
 #include "libudev-private.h"
 #include "scsi_id.h"
 #include "string-util.h"
diff --git a/src/udev/udev-builtin-blkid.c b/src/udev/udev-builtin-blkid.c
index 004ddb023f..0976525eb3 100644
--- a/src/udev/udev-builtin-blkid.c
+++ b/src/udev/udev-builtin-blkid.c
@@ -30,6 +30,7 @@
 #include "sd-id128.h"
 
 #include "efivars.h"
+#include "fd-util.h"
 #include "gpt.h"
 #include "string-util.h"
 #include "udev.h"
diff --git a/src/udev/udev-builtin-btrfs.c b/src/udev/udev-builtin-btrfs.c
index ce1a0c3882..cfaa463804 100644
--- a/src/udev/udev-builtin-btrfs.c
+++ b/src/udev/udev-builtin-btrfs.c
@@ -25,6 +25,7 @@
 #include <linux/btrfs.h>
 #endif
 
+#include "fd-util.h"
 #include "missing.h"
 #include "string-util.h"
 #include "udev.h"
diff --git a/src/udev/udev-builtin-input_id.c b/src/udev/udev-builtin-input_id.c
index f36f719a94..fddafbd4dc 100644
--- a/src/udev/udev-builtin-input_id.c
+++ b/src/udev/udev-builtin-input_id.c
@@ -30,6 +30,7 @@
 #include <linux/limits.h>
 #include <linux/input.h>
 
+#include "fd-util.h"
 #include "string-util.h"
 #include "udev.h"
 #include "util.h"
diff --git a/src/udev/udev-builtin-keyboard.c b/src/udev/udev-builtin-keyboard.c
index ce534ae0f9..5e97bdd614 100644
--- a/src/udev/udev-builtin-keyboard.c
+++ b/src/udev/udev-builtin-keyboard.c
@@ -23,6 +23,7 @@
 #include <sys/ioctl.h>
 #include <linux/input.h>
 
+#include "fd-util.h"
 #include "string-util.h"
 #include "udev.h"
 
diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c
index bb721d6f0d..ef9c398e59 100644
--- a/src/udev/udev-builtin-net_id.c
+++ b/src/udev/udev-builtin-net_id.c
@@ -98,6 +98,7 @@
 #include <unistd.h>
 #include <linux/pci_regs.h>
 
+#include "fd-util.h"
 #include "fileio.h"
 #include "string-util.h"
 #include "udev.h"
diff --git a/src/udev/udev-builtin-usb_id.c b/src/udev/udev-builtin-usb_id.c
index c7d47891a7..cb531bd168 100644
--- a/src/udev/udev-builtin-usb_id.c
+++ b/src/udev/udev-builtin-usb_id.c
@@ -29,6 +29,7 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "fd-util.h"
 #include "string-util.h"
 #include "udev.h"
 
diff --git a/src/udev/udev-ctrl.c b/src/udev/udev-ctrl.c
index 56277f551f..937fc4ecd8 100644
--- a/src/udev/udev-ctrl.c
+++ b/src/udev/udev-ctrl.c
@@ -18,8 +18,9 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 
-#include "socket-util.h"
+#include "fd-util.h"
 #include "formats-util.h"
+#include "socket-util.h"
 #include "udev.h"
 
 /* wire protocol magic must match */
diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
index 49a45811a6..bf122f85c7 100644
--- a/src/udev/udev-event.c
+++ b/src/udev/udev-event.c
@@ -31,6 +31,7 @@
 #include <unistd.h>
 
 #include "event-util.h"
+#include "fd-util.h"
 #include "formats-util.h"
 #include "netlink-util.h"
 #include "process-util.h"
diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
index c8abac7fef..f99d1a86c9 100644
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -31,6 +31,7 @@
 
 #include "conf-files.h"
 #include "escape.h"
+#include "fd-util.h"
 #include "path-util.h"
 #include "strbuf.h"
 #include "string-util.h"
diff --git a/src/udev/udevadm-info.c b/src/udev/udevadm-info.c
index 911818eb00..7182668f23 100644
--- a/src/udev/udevadm-info.c
+++ b/src/udev/udevadm-info.c
@@ -26,6 +26,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include "fd-util.h"
 #include "string-util.h"
 #include "udev-util.h"
 #include "udev.h"
diff --git a/src/udev/udevadm-monitor.c b/src/udev/udevadm-monitor.c
index 5e93955186..30aa53feb2 100644
--- a/src/udev/udevadm-monitor.c
+++ b/src/udev/udevadm-monitor.c
@@ -25,9 +25,10 @@
 #include <sys/time.h>
 #include <sys/epoll.h>
 
-#include "udev.h"
-#include "udev-util.h"
+#include "fd-util.h"
 #include "formats-util.h"
+#include "udev-util.h"
+#include "udev.h"
 
 static bool udev_exit;
 
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index a3f0298ae7..a548f9ba49 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -47,6 +47,7 @@
 #include "cpu-set-util.h"
 #include "dev-setup.h"
 #include "event-util.h"
+#include "fd-util.h"
 #include "fileio.h"
 #include "formats-util.h"
 #include "hashmap.h"
diff --git a/src/udev/v4l_id/v4l_id.c b/src/udev/v4l_id/v4l_id.c
index 5c57db44c1..607d78a019 100644
--- a/src/udev/v4l_id/v4l_id.c
+++ b/src/udev/v4l_id/v4l_id.c
@@ -26,6 +26,7 @@
 #include <sys/ioctl.h>
 #include <linux/videodev2.h>
 
+#include "fd-util.h"
 #include "util.h"
 
 int main(int argc, char *argv[]) {