summaryrefslogtreecommitdiff
path: root/src/shared
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-10-26 20:07:55 +0100
committerLennart Poettering <lennart@poettering.net>2015-10-27 13:25:56 +0100
commita09561746f15b84da9471b5c4be74e53d19e4f3f (patch)
treee99301f014ab8d150891d936ca061e369f7bae33 /src/shared
parent78f22b973fa2c9b09bd974680836df17163d9ee0 (diff)
util-lib: introduce dirent-util.[ch] for directory entry calls
Also, move a couple of more path-related functions to path-util.c.
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/clean-ipc.c1
-rw-r--r--src/shared/efivars.c1
-rw-r--r--src/shared/install.c5
-rw-r--r--src/shared/machine-image.c1
4 files changed, 6 insertions, 2 deletions
diff --git a/src/shared/clean-ipc.c b/src/shared/clean-ipc.c
index 2be1bc3fc0..c60f605997 100644
--- a/src/shared/clean-ipc.c
+++ b/src/shared/clean-ipc.c
@@ -35,6 +35,7 @@
#include "string-util.h"
#include "strv.h"
#include "util.h"
+#include "dirent-util.h"
static int clean_sysvipc_shm(uid_t delete_uid) {
_cleanup_fclose_ FILE *f = NULL;
diff --git a/src/shared/efivars.c b/src/shared/efivars.c
index 771bc9458c..6e8f156a68 100644
--- a/src/shared/efivars.c
+++ b/src/shared/efivars.c
@@ -23,6 +23,7 @@
#include <string.h>
#include <fcntl.h>
+#include "dirent-util.h"
#include "efivars.h"
#include "fd-util.h"
#include "io-util.h"
diff --git a/src/shared/install.c b/src/shared/install.c
index a1720488e8..bfafb59008 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -27,8 +27,11 @@
#include "conf-files.h"
#include "conf-parser.h"
+#include "dirent-util.h"
+#include "fd-util.h"
#include "hashmap.h"
#include "install-printf.h"
+#include "install.h"
#include "mkdir.h"
#include "path-lookup.h"
#include "path-util.h"
@@ -38,8 +41,6 @@
#include "strv.h"
#include "unit-name.h"
#include "util.h"
-#include "install.h"
-#include "fd-util.h"
typedef struct {
OrderedHashmap *will_install;
diff --git a/src/shared/machine-image.c b/src/shared/machine-image.c
index 415d939fc6..485793ed5d 100644
--- a/src/shared/machine-image.c
+++ b/src/shared/machine-image.c
@@ -25,6 +25,7 @@
#include "btrfs-util.h"
#include "copy.h"
+#include "dirent-util.h"
#include "fd-util.h"
#include "machine-image.h"
#include "mkdir.h"