util: split out escaping code into escape.[ch]

This really deserves its own file, given how much code this is now.

3 files changed, 15 insertions, 12 deletions

diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
index 9c4d6a2da0..13af8bfcce 100644
--- a/src/shared/bus-util.c
+++ b/src/shared/bus-util.c
@@ -21,9 +21,9 @@
 
 #include <sys/socket.h>
 
+#include "sd-bus.h"
 #include "sd-daemon.h"
 #include "sd-event.h"
-#include "sd-bus.h"
 
 #include "bus-error.h"
 #include "bus-internal.h"
@@ -32,6 +32,7 @@
 #include "cgroup-util.h"
 #include "def.h"
 #include "env-util.h"
+#include "escape.h"
 #include "macro.h"
 #include "missing.h"
 #include "path-util.h"
diff --git a/src/shared/dropin.c b/src/shared/dropin.c
index 1845068adb..5e0436a55d 100644
--- a/src/shared/dropin.c
+++ b/src/shared/dropin.c
@@ -19,12 +19,13 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "dropin.h"
-#include "util.h"
-#include "strv.h"
-#include "mkdir.h"
-#include "fileio-label.h"
 #include "conf-files.h"
+#include "escape.h"
+#include "fileio-label.h"
+#include "mkdir.h"
+#include "strv.h"
+#include "util.h"
+#include "dropin.h"
 
 int drop_in_file(const char *dir, const char *unit, unsigned level,
                  const char *name, char **_p, char **_q) {
diff --git a/src/shared/generator.c b/src/shared/generator.c
index d912bcd9e1..264a54fb94 100644
--- a/src/shared/generator.c
+++ b/src/shared/generator.c
@@ -21,15 +21,16 @@
 
 #include <unistd.h>
 
-#include "util.h"
-#include "special.h"
+#include "dropin.h"
+#include "escape.h"
+#include "fileio.h"
+#include "fstab-util.h"
 #include "mkdir.h"
+#include "path-util.h"
+#include "special.h"
 #include "unit-name.h"
+#include "util.h"
 #include "generator.h"
-#include "path-util.h"
-#include "fstab-util.h"
-#include "fileio.h"
-#include "dropin.h"
 
 static int write_fsck_sysroot_service(const char *dir, const char *what) {
         _cleanup_free_ char *device = NULL, *escaped = NULL;