systemd: merge branch 'systemd'

Conflicts:
	src/systemd/src/shared/strv.c
	src/systemd/src/shared/util.c

diff --cc src/systemd/src/shared/path-util.c
Simple merge

diff --cc src/systemd/src/shared/path-util.h
Simple merge

diff --cc src/systemd/src/shared/strv.c
index a983f27,d44a72f..df44f61
--- 1/src/systemd/src/shared/strv.c
--- 2/src/systemd/src/shared/strv.c
+++ b/src/systemd/src/shared/strv.c
@@@ -280,8 -278,7 +280,8 @@@ char **strv_split_newlines(const char *
          return l;
  }
  
- int strv_split_quoted(char ***t, const char *s, bool relax) {
 +#if 0 /* NM_IGNORED */
+ int strv_split_quoted(char ***t, const char *s, UnquoteFlags flags) {
          size_t n = 0, allocated = 0;
          _cleanup_strv_free_ char **l = NULL;
          int r;

diff --cc src/systemd/src/shared/strv.h
Simple merge

diff --cc src/systemd/src/shared/util.c
index 03dcfa7,de56d98..8e1a29a
--- 1/src/systemd/src/shared/util.c
--- 2/src/systemd/src/shared/util.c
+++ b/src/systemd/src/shared/util.c
@@@ -1498,18 -1523,17 +1543,18 @@@ int cunescape_length_with_prefix(const 
          }
  
          *t = 0;
-         return r;
- }
  
- char *cunescape_length(const char *s, size_t length) {
-         return cunescape_length_with_prefix(s, length, NULL);
+         *ret = r;
+         return t - r;
  }
  
- char *cunescape(const char *s) {
-         assert(s);
 +#if 0 /* NM_IGNORED */
+ int cunescape_length(const char *s, size_t length, UnescapeFlags flags, char **ret) {
+         return cunescape_length_with_prefix(s, length, NULL, flags, ret);
+ }
  
-         return cunescape_length(s, strlen(s));
+ int cunescape(const char *s, UnescapeFlags flags, char **ret) {
+         return cunescape_length(s, strlen(s), flags, ret);
  }
  
  char *xescape(const char *s, const char *bad) {

diff --cc src/systemd/src/shared/util.h
index faa91f9,e7a5d63..0c431a7
--- 1/src/systemd/src/shared/util.h
--- 2/src/systemd/src/shared/util.h
+++ b/src/systemd/src/shared/util.h
@@@ -43,8 -41,8 +43,9 @@@
  #include <locale.h>
  #include <mntent.h>
  #include <sys/inotify.h>
+ #include <sys/statfs.h>
  
 +#if 0 /* NM_IGNORED */
  #if SIZEOF_PID_T == 4
  #  define PID_PRI PRIi32
  #elif SIZEOF_PID_T == 2