systemd: merge branch 'systemd' into master
authorBeniamino Galvani <bgalvani@redhat.com>
Mon, 23 Nov 2015 15:13:45 +0000 (16:13 +0100)
committerBeniamino Galvani <bgalvani@redhat.com>
Mon, 23 Nov 2015 15:18:10 +0000 (16:18 +0100)
87 files changed:
1  2 
src/Makefile.am
src/dhcp-manager/nm-dhcp-systemd.c
src/systemd/nm-sd-adapt.c
src/systemd/src/basic/alloc-util.c
src/systemd/src/basic/alloc-util.h
src/systemd/src/basic/escape.c
src/systemd/src/basic/escape.h
src/systemd/src/basic/fd-util.c
src/systemd/src/basic/fd-util.h
src/systemd/src/basic/fileio.c
src/systemd/src/basic/fileio.h
src/systemd/src/basic/fs-util.c
src/systemd/src/basic/fs-util.h
src/systemd/src/basic/hashmap.c
src/systemd/src/basic/hexdecoct.c
src/systemd/src/basic/hexdecoct.h
src/systemd/src/basic/hostname-util.c
src/systemd/src/basic/in-addr-util.c
src/systemd/src/basic/io-util.c
src/systemd/src/basic/io-util.h
src/systemd/src/basic/log.h
src/systemd/src/basic/macro.h
src/systemd/src/basic/mempool.c
src/systemd/src/basic/parse-util.c
src/systemd/src/basic/parse-util.h
src/systemd/src/basic/path-util.c
src/systemd/src/basic/path-util.h
src/systemd/src/basic/prioq.c
src/systemd/src/basic/random-util.c
src/systemd/src/basic/siphash24.c
src/systemd/src/basic/siphash24.h
src/systemd/src/basic/socket-util.h
src/systemd/src/basic/string-table.c
src/systemd/src/basic/string-table.h
src/systemd/src/basic/string-util.c
src/systemd/src/basic/string-util.h
src/systemd/src/basic/strv.c
src/systemd/src/basic/strv.h
src/systemd/src/basic/time-util.c
src/systemd/src/basic/time-util.h
src/systemd/src/basic/umask-util.h
src/systemd/src/basic/unaligned.h
src/systemd/src/basic/utf8.c
src/systemd/src/basic/util.c
src/systemd/src/basic/util.h
src/systemd/src/libsystemd-network/arp-util.c
src/systemd/src/libsystemd-network/arp-util.h
src/systemd/src/libsystemd-network/dhcp-identifier.c
src/systemd/src/libsystemd-network/dhcp-identifier.h
src/systemd/src/libsystemd-network/dhcp-internal.h
src/systemd/src/libsystemd-network/dhcp-lease-internal.h
src/systemd/src/libsystemd-network/dhcp-network.c
src/systemd/src/libsystemd-network/dhcp-option.c
src/systemd/src/libsystemd-network/dhcp-packet.c
src/systemd/src/libsystemd-network/dhcp-protocol.h
src/systemd/src/libsystemd-network/dhcp6-internal.h
src/systemd/src/libsystemd-network/dhcp6-lease-internal.h
src/systemd/src/libsystemd-network/dhcp6-network.c
src/systemd/src/libsystemd-network/dhcp6-option.c
src/systemd/src/libsystemd-network/lldp-internal.c
src/systemd/src/libsystemd-network/lldp-internal.h
src/systemd/src/libsystemd-network/lldp-network.c
src/systemd/src/libsystemd-network/lldp-port.c
src/systemd/src/libsystemd-network/lldp-tlv.c
src/systemd/src/libsystemd-network/lldp-tlv.h
src/systemd/src/libsystemd-network/network-internal.c
src/systemd/src/libsystemd-network/network-internal.h
src/systemd/src/libsystemd-network/sd-dhcp-client.c
src/systemd/src/libsystemd-network/sd-dhcp-lease.c
src/systemd/src/libsystemd-network/sd-dhcp6-client.c
src/systemd/src/libsystemd-network/sd-dhcp6-lease.c
src/systemd/src/libsystemd-network/sd-ipv4acd.c
src/systemd/src/libsystemd-network/sd-ipv4ll.c
src/systemd/src/libsystemd-network/sd-lldp.c
src/systemd/src/libsystemd/sd-event/event-util.h
src/systemd/src/libsystemd/sd-id128/sd-id128.c
src/systemd/src/shared/dns-domain.c
src/systemd/src/shared/dns-domain.h
src/systemd/src/systemd/sd-dhcp-client.h
src/systemd/src/systemd/sd-dhcp-lease.h
src/systemd/src/systemd/sd-dhcp6-client.h
src/systemd/src/systemd/sd-dhcp6-lease.h
src/systemd/src/systemd/sd-event.h
src/systemd/src/systemd/sd-ipv4acd.h
src/systemd/src/systemd/sd-ipv4ll.h
src/systemd/src/systemd/sd-lldp.h
src/systemd/src/systemd/sd-ndisc.h

diff --cc src/Makefile.am
@@@ -48,123 -48,6 +48,142 @@@ AM_CPPFLAGS =                             
  # primarily for its side effect of removing duplicates.
  AM_CPPFLAGS += $(foreach d,$(sort $(dir $(libNetworkManager_la_SOURCES))),-I$(top_srcdir)/src/$d)
  
 +noinst_LTLIBRARIES = \
 +      libNetworkManager.la \
 +      libnm-iface-helper.la \
 +      libsystemd-nm.la
 +
 +######################
 +# libsystemd-nm
 +######################
 +
 +SYSTEMD_NM_CFLAGS_PATHS = \
 +      -I$(top_srcdir)/src/systemd/src/systemd \
 +      -I$(top_srcdir)/src/systemd/src/libsystemd-network \
 +      -I$(top_srcdir)/src/systemd/src/libsystemd/sd-event \
 +      -I$(top_srcdir)/src/systemd/src/basic \
 +      -I$(top_srcdir)/src/systemd
 +
 +libsystemd_nm_la_SOURCES = \
 +      systemd/nm-sd-adapt.c \
 +      systemd/nm-sd-adapt.h \
++      systemd/src/basic/alloc-util.c \
++      systemd/src/basic/alloc-util.h \
 +      systemd/src/basic/async.h \
++      systemd/src/basic/escape.c \
++      systemd/src/basic/escape.h \
++      systemd/src/basic/fd-util.c \
++      systemd/src/basic/fd-util.h \
 +      systemd/src/basic/fileio.c \
 +      systemd/src/basic/fileio.h \
++      systemd/src/basic/fs-util.c \
++      systemd/src/basic/fs-util.h \
 +      systemd/src/basic/hashmap.c \
 +      systemd/src/basic/hashmap.h \
++      systemd/src/basic/hexdecoct.c \
++      systemd/src/basic/hexdecoct.h \
 +      systemd/src/basic/hostname-util.c \
 +      systemd/src/basic/hostname-util.h \
 +      systemd/src/basic/in-addr-util.c \
 +      systemd/src/basic/in-addr-util.h \
++      systemd/src/basic/io-util.c \
++      systemd/src/basic/io-util.h \
 +      systemd/src/basic/list.h \
 +      systemd/src/basic/log.h \
 +      systemd/src/basic/macro.h \
 +      systemd/src/basic/mempool.c \
 +      systemd/src/basic/mempool.h \
++      systemd/src/basic/parse-util.c \
++      systemd/src/basic/parse-util.h \
 +      systemd/src/basic/path-util.c \
 +      systemd/src/basic/path-util.h \
 +      systemd/src/basic/prioq.c \
 +      systemd/src/basic/prioq.h \
 +      systemd/src/basic/random-util.c \
 +      systemd/src/basic/random-util.h \
 +      systemd/src/basic/refcnt.h \
 +      systemd/src/basic/siphash24.c \
 +      systemd/src/basic/siphash24.h \
 +      systemd/src/basic/set.h \
 +      systemd/src/basic/socket-util.h \
 +      systemd/src/basic/sparse-endian.h \
++      systemd/src/basic/string-table.c \
++      systemd/src/basic/string-table.h \
++      systemd/src/basic/string-util.c \
++      systemd/src/basic/string-util.h \
 +      systemd/src/basic/strv.c \
 +      systemd/src/basic/strv.h \
 +      systemd/src/basic/time-util.c \
 +      systemd/src/basic/time-util.h \
++      systemd/src/basic/umask-util.h \
 +      systemd/src/basic/unaligned.h \
 +      systemd/src/basic/utf8.c \
 +      systemd/src/basic/utf8.h \
 +      systemd/src/basic/util.c \
 +      systemd/src/basic/util.h \
 +      systemd/src/libsystemd-network/arp-util.c \
 +      systemd/src/libsystemd-network/arp-util.h \
 +      systemd/src/libsystemd-network/dhcp-identifier.c \
 +      systemd/src/libsystemd-network/dhcp-identifier.h \
 +      systemd/src/libsystemd-network/dhcp-internal.h \
 +      systemd/src/libsystemd-network/dhcp-lease-internal.h \
 +      systemd/src/libsystemd-network/dhcp-network.c \
 +      systemd/src/libsystemd-network/dhcp-option.c \
 +      systemd/src/libsystemd-network/dhcp-packet.c \
 +      systemd/src/libsystemd-network/dhcp-protocol.h \
 +      systemd/src/libsystemd-network/dhcp6-internal.h \
 +      systemd/src/libsystemd-network/dhcp6-lease-internal.h \
 +      systemd/src/libsystemd-network/dhcp6-network.c \
 +      systemd/src/libsystemd-network/dhcp6-option.c \
 +      systemd/src/libsystemd-network/dhcp6-protocol.h \
 +      systemd/src/libsystemd-network/lldp.h \
 +      systemd/src/libsystemd-network/lldp-network.h \
 +      systemd/src/libsystemd-network/lldp-network.c \
 +      systemd/src/libsystemd-network/lldp-tlv.c \
 +      systemd/src/libsystemd-network/lldp-tlv.h \
 +      systemd/src/libsystemd-network/lldp-port.c \
 +      systemd/src/libsystemd-network/lldp-port.h \
 +      systemd/src/libsystemd-network/lldp-util.h \
 +      systemd/src/libsystemd-network/lldp-internal.h \
 +      systemd/src/libsystemd-network/lldp-internal.c \
 +      systemd/src/libsystemd-network/network-internal.c \
 +      systemd/src/libsystemd-network/network-internal.h \
 +      systemd/src/libsystemd-network/sd-dhcp-client.c \
 +      systemd/src/libsystemd-network/sd-dhcp-lease.c \
 +      systemd/src/libsystemd-network/sd-dhcp6-client.c \
 +      systemd/src/libsystemd-network/sd-dhcp6-lease.c \
 +      systemd/src/libsystemd-network/sd-ipv4acd.c \
 +      systemd/src/libsystemd-network/sd-ipv4ll.c \
 +      systemd/src/libsystemd-network/sd-lldp.c \
 +      systemd/src/libsystemd/sd-id128/sd-id128.c \
 +      systemd/src/libsystemd/sd-event/event-util.h \
 +      systemd/src/shared/dns-domain.c \
 +      systemd/src/shared/dns-domain.h \
 +      systemd/src/systemd/_sd-common.h \
 +      systemd/src/systemd/sd-dhcp-client.h \
 +      systemd/src/systemd/sd-dhcp-lease.h \
 +      systemd/src/systemd/sd-dhcp6-client.h \
 +      systemd/src/systemd/sd-dhcp6-lease.h \
 +      systemd/src/systemd/sd-lldp.h \
 +      systemd/src/systemd/sd-event.h \
 +      systemd/src/systemd/sd-icmp6-nd.h \
 +      systemd/src/systemd/sd-id128.h \
 +      systemd/src/systemd/sd-ipv4acd.h \
 +      systemd/src/systemd/sd-ipv4ll.h
 +
 +libsystemd_nm_la_CPPFLAGS = \
 +      -I$(top_srcdir)/include \
 +      -I$(top_builddir)/include \
 +      -I$(top_srcdir)/libnm-core \
 +      -I$(top_builddir)/libnm-core \
 +      $(SYSTEMD_NM_CFLAGS_PATHS) \
 +      -I$(top_srcdir)/src/systemd/src/shared \
 +      -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD \
 +      $(GLIB_CFLAGS)
 +
 +libsystemd_nm_la_LIBADD = \
 +      $(GLIB_LIBS)
 +
  ###########################################
  # NetworkManager
  ###########################################
index 3b6cba1,0000000..7bafc72
mode 100644,000000..100644
--- /dev/null
@@@ -1,852 -1,0 +1,858 @@@
 +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 +/* This program is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
 + * the Free Software Foundation; either version 2, or (at your option)
 + * any later version.
 + *
 + * This program is distributed in the hope that it will be useful,
 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 + * GNU General Public License for more details.
 + *
 + * You should have received a copy of the GNU General Public License along
 + * with this program; if not, write to the Free Software Foundation, Inc.,
 + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 + *
 + * Copyright (C) 2014 Red Hat, Inc.
 + */
 +
 +#include "config.h"
 +
 +#include <string.h>
 +#include <stdlib.h>
 +#include <errno.h>
 +#include <unistd.h>
 +#include <stdio.h>
 +#include <netinet/in.h>
 +#include <arpa/inet.h>
 +#include <ctype.h>
 +#include <net/if_arp.h>
 +
 +#include "nm-default.h"
 +#include "nm-dhcp-systemd.h"
 +#include "nm-utils.h"
 +#include "nm-dhcp-utils.h"
 +#include "NetworkManagerUtils.h"
 +#include "nm-platform.h"
 +
 +#include "sd-dhcp-client.h"
 +#include "sd-dhcp6-client.h"
 +#include "dhcp-protocol.h"
 +#include "dhcp-lease-internal.h"
 +#include "dhcp6-protocol.h"
 +#include "dhcp6-lease-internal.h"
 +
 +G_DEFINE_TYPE (NMDhcpSystemd, nm_dhcp_systemd, NM_TYPE_DHCP_CLIENT)
 +
 +#define NM_DHCP_SYSTEMD_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DHCP_SYSTEMD, NMDhcpSystemdPrivate))
 +
 +typedef struct {
 +      struct sd_dhcp_client *client4;
 +      struct sd_dhcp6_client *client6;
 +      char *lease_file;
 +
 +      guint timeout_id;
 +      guint request_count;
 +
 +      gboolean privacy;
 +} NMDhcpSystemdPrivate;
 +
 +/************************************************************/
 +
 +#define DHCP_OPTION_NIS_DOMAIN         40
 +#define DHCP_OPTION_NIS_SERVERS        41
 +#define DHCP_OPTION_DOMAIN_SEARCH     119
 +#define DHCP_OPTION_RFC3442_ROUTES    121
 +#define DHCP_OPTION_MS_ROUTES         249
 +#define DHCP_OPTION_WPAD              252
 +
 +/* Internal values */
 +#define DHCP_OPTION_IP_ADDRESS       1024
 +#define DHCP_OPTION_EXPIRY           1025
 +#define DHCP6_OPTION_IP_ADDRESS      1026
 +#define DHCP6_OPTION_PREFIXLEN       1027
 +#define DHCP6_OPTION_PREFERRED_LIFE  1028
 +#define DHCP6_OPTION_MAX_LIFE        1029
 +#define DHCP6_OPTION_STARTS          1030
 +#define DHCP6_OPTION_LIFE_STARTS     1031
 +#define DHCP6_OPTION_RENEW           1032
 +#define DHCP6_OPTION_REBIND          1033
 +#define DHCP6_OPTION_IAID            1034
 +
 +typedef struct {
 +      guint num;
 +      const char *name;
 +      gboolean include;
 +} ReqOption;
 +
 +#define REQPREFIX "requested_"
 +
 +static const ReqOption dhcp4_requests[] = {
 +      { DHCP_OPTION_SUBNET_MASK,            REQPREFIX "subnet_mask",                     TRUE },
 +      { DHCP_OPTION_TIME_OFFSET,            REQPREFIX "time_offset",                     TRUE },
 +      { DHCP_OPTION_ROUTER,                 REQPREFIX "routers",                         TRUE },
 +      { DHCP_OPTION_DOMAIN_NAME_SERVER,     REQPREFIX "domain_name_servers",             TRUE },
 +      { DHCP_OPTION_HOST_NAME,              REQPREFIX "host_name",                       TRUE },
 +      { DHCP_OPTION_DOMAIN_NAME,            REQPREFIX "domain_name",                     TRUE },
 +      { DHCP_OPTION_INTERFACE_MTU,          REQPREFIX "interface_mtu",                   TRUE },
 +      { DHCP_OPTION_BROADCAST,              REQPREFIX "broadcast_address",               TRUE },
 +      { DHCP_OPTION_STATIC_ROUTE,           REQPREFIX "static_routes",                   TRUE },
 +      { DHCP_OPTION_NIS_DOMAIN,             REQPREFIX "nis_domain",                      TRUE },
 +      { DHCP_OPTION_NIS_SERVERS,            REQPREFIX "nis_servers",                     TRUE },
 +      { DHCP_OPTION_NTP_SERVER,             REQPREFIX "ntp_servers",                     TRUE },
 +      { DHCP_OPTION_SERVER_IDENTIFIER,      REQPREFIX "dhcp_server_identifier",          TRUE },
 +      { DHCP_OPTION_DOMAIN_SEARCH,          REQPREFIX "domain_search",                   TRUE },
 +      { DHCP_OPTION_CLASSLESS_STATIC_ROUTE, REQPREFIX "rfc3442_classless_static_routes", TRUE },
 +      { DHCP_OPTION_MS_ROUTES,              REQPREFIX "ms_classless_static_routes",      TRUE },
 +      { DHCP_OPTION_WPAD,                   REQPREFIX "wpad",                            TRUE },
 +
 +      /* Internal values */
 +      { DHCP_OPTION_IP_ADDRESS_LEASE_TIME, REQPREFIX "expiry",                          FALSE },
 +      { DHCP_OPTION_CLIENT_IDENTIFIER,     REQPREFIX "dhcp_client_identifier",          FALSE },
 +      { DHCP_OPTION_IP_ADDRESS,            REQPREFIX "ip_address",                      FALSE },
 +      { 0, NULL, FALSE }
 +};
 +
 +static const ReqOption dhcp6_requests[] = {
 +      { DHCP6_OPTION_CLIENTID,       REQPREFIX "dhcp6_client_id",     TRUE },
 +
 +      /* Don't request server ID by default; some servers don't reply to
 +       * Information Requests that request the Server ID.
 +       */
 +      { DHCP6_OPTION_SERVERID,       REQPREFIX "dhcp6_server_id",     FALSE },
 +
 +      { DHCP6_OPTION_DNS_SERVERS,    REQPREFIX "dhcp6_name_servers",  TRUE },
 +      { DHCP6_OPTION_DOMAIN_LIST,    REQPREFIX "dhcp6_domain_search", TRUE },
 +      { DHCP6_OPTION_SNTP_SERVERS,   REQPREFIX "dhcp6_sntp_servers",  TRUE },
 +
 +      /* Internal values */
 +      { DHCP6_OPTION_IP_ADDRESS,     REQPREFIX "ip6_address",         FALSE },
 +      { DHCP6_OPTION_PREFIXLEN,      REQPREFIX "ip6_prefixlen",       FALSE },
 +      { DHCP6_OPTION_PREFERRED_LIFE, REQPREFIX "preferred_life",      FALSE },
 +      { DHCP6_OPTION_MAX_LIFE,       REQPREFIX "max_life",            FALSE },
 +      { DHCP6_OPTION_STARTS,         REQPREFIX "starts",              FALSE },
 +      { DHCP6_OPTION_LIFE_STARTS,    REQPREFIX "life_starts",         FALSE },
 +      { DHCP6_OPTION_RENEW,          REQPREFIX "renew",               FALSE },
 +      { DHCP6_OPTION_REBIND,         REQPREFIX "rebind",              FALSE },
 +      { DHCP6_OPTION_IAID,           REQPREFIX "iaid",                FALSE },
 +      { 0, NULL, FALSE }
 +};
 +
 +static void
 +take_option (GHashTable *options,
 +             const ReqOption *requests,
 +             guint option,
 +             char *value)
 +{
 +      guint i;
 +
 +      g_return_if_fail (value != NULL);
 +
 +      for (i = 0; requests[i].name; i++) {
 +              if (requests[i].num == option) {
 +                      g_hash_table_insert (options,
 +                                           (gpointer) (requests[i].name + STRLEN (REQPREFIX)),
 +                                           value);
 +                      break;
 +              }
 +      }
 +      /* Option should always be found */
 +      g_assert (requests[i].name);
 +}
 +
 +static void
 +add_option (GHashTable *options, const ReqOption *requests, guint option, const char *value)
 +{
 +      if (options)
 +              take_option (options, requests, option, g_strdup (value));
 +}
 +
 +static void
 +add_option_u32 (GHashTable *options, const ReqOption *requests, guint option, guint32 value)
 +{
 +      if (options)
 +              take_option (options, requests, option, g_strdup_printf ("%u", value));
 +}
 +
 +static void
 +add_option_u64 (GHashTable *options, const ReqOption *requests, guint option, guint64 value)
 +{
 +      if (options)
 +              take_option (options, requests, option, g_strdup_printf ("%" G_GUINT64_FORMAT, value));
 +}
 +
 +static void
 +add_requests_to_options (GHashTable *options, const ReqOption *requests)
 +{
 +      guint i;
 +
 +      for (i = 0; options && requests[i].name; i++) {
 +              if (requests[i].include)
 +                      g_hash_table_insert (options, (gpointer) requests[i].name, g_strdup ("1"));
 +      }
 +}
 +
 +#define LOG_LEASE(domain, ...) \
 +G_STMT_START { \
 +      if (log_lease) { \
 +              nm_log (LOGL_INFO, (domain), __VA_ARGS__); \
 +      } \
 +} G_STMT_END
 +
 +static NMIP4Config *
 +lease_to_ip4_config (const char *iface,
 +                     int ifindex,
 +                     sd_dhcp_lease *lease,
 +                     GHashTable *options,
 +                     guint32 default_priority,
 +                     gboolean log_lease,
 +                     GError **error)
 +{
 +      NMIP4Config *ip4_config = NULL;
 +      struct in_addr tmp_addr;
 +      const struct in_addr *addr_list;
 +      char buf[INET_ADDRSTRLEN];
 +      const char *str;
 +      guint32 lifetime = 0, i;
 +      NMPlatformIP4Address address;
 +      GString *l;
 +      struct sd_dhcp_route *routes;
 +      guint16 mtu;
 +      int r, num;
 +      guint64 end_time;
 +      const void *data;
 +      gsize data_len;
 +      gboolean metered = FALSE;
 +
 +      g_return_val_if_fail (lease != NULL, NULL);
 +
 +      ip4_config = nm_ip4_config_new (ifindex);
 +
 +      /* Address */
 +      sd_dhcp_lease_get_address (lease, &tmp_addr);
 +      memset (&address, 0, sizeof (address));
 +      address.address = tmp_addr.s_addr;
 +      address.peer_address = tmp_addr.s_addr;
 +      str = nm_utils_inet4_ntop (tmp_addr.s_addr, NULL);
 +      LOG_LEASE (LOGD_DHCP4, "  address %s", str);
 +      add_option (options, dhcp4_requests, DHCP_OPTION_IP_ADDRESS, str);
 +
 +      /* Prefix/netmask */
 +      sd_dhcp_lease_get_netmask (lease, &tmp_addr);
 +      address.plen = nm_utils_ip4_netmask_to_prefix (tmp_addr.s_addr);
 +      LOG_LEASE (LOGD_DHCP4, "  plen %d", address.plen);
 +      add_option (options,
 +                  dhcp4_requests,
 +                  DHCP_OPTION_SUBNET_MASK,
 +                  nm_utils_inet4_ntop (tmp_addr.s_addr, NULL));
 +
 +      /* Lease time */
 +      sd_dhcp_lease_get_lifetime (lease, &lifetime);
 +      address.timestamp = nm_utils_get_monotonic_timestamp_s ();
 +      address.lifetime = address.preferred = lifetime;
 +      end_time = (guint64) time (NULL) + lifetime;
 +      LOG_LEASE (LOGD_DHCP4, "  expires in %" G_GUINT32_FORMAT " seconds", lifetime);
 +      add_option_u64 (options,
 +                      dhcp4_requests,
 +                      DHCP_OPTION_IP_ADDRESS_LEASE_TIME,
 +                      end_time);
 +
 +      address.source = NM_IP_CONFIG_SOURCE_DHCP;
 +      nm_ip4_config_add_address (ip4_config, &address);
 +
 +      /* Gateway */
 +      r = sd_dhcp_lease_get_router (lease, &tmp_addr);
 +      if (r == 0) {
 +              nm_ip4_config_set_gateway (ip4_config, tmp_addr.s_addr);
 +              str = nm_utils_inet4_ntop (tmp_addr.s_addr, NULL);
 +              LOG_LEASE (LOGD_DHCP4, "  gateway %s", str);
 +              add_option (options, dhcp4_requests, DHCP_OPTION_ROUTER, str);
 +      }
 +
 +      /* DNS Servers */
 +      num = sd_dhcp_lease_get_dns (lease, &addr_list);
 +      if (num > 0) {
 +              l = g_string_sized_new (30);
 +              for (i = 0; i < num; i++) {
 +                      if (addr_list[i].s_addr) {
 +                              nm_ip4_config_add_nameserver (ip4_config, addr_list[i].s_addr);
 +                              str = nm_utils_inet4_ntop (addr_list[i].s_addr, NULL);
 +                              LOG_LEASE (LOGD_DHCP4, "  nameserver '%s'", str);
 +                              g_string_append_printf (l, "%s%s", l->len ? " " : "", str);
 +                      }
 +              }
 +              if (l->len)
 +                      add_option (options, dhcp4_requests, DHCP_OPTION_DOMAIN_NAME_SERVER, l->str);
 +              g_string_free (l, TRUE);
 +      }
 +
 +      /* Domain Name */
 +      r = sd_dhcp_lease_get_domainname (lease, &str);
 +      if (r == 0) {
 +              /* Multiple domains sometimes stuffed into the option */
 +              char **domains = g_strsplit (str, " ", 0);
 +              char **s;
 +
 +              for (s = domains; *s; s++) {
 +                      LOG_LEASE (LOGD_DHCP4, "  domain name '%s'", *s);
 +                      nm_ip4_config_add_domain (ip4_config, *s);
 +              }
 +              g_strfreev (domains);
 +              add_option (options, dhcp4_requests, DHCP_OPTION_DOMAIN_NAME, str);
 +      }
 +
 +      /* Hostname */
 +      r = sd_dhcp_lease_get_hostname (lease, &str);
 +      if (r == 0) {
 +              LOG_LEASE (LOGD_DHCP4, "  hostname '%s'", str);
 +              add_option (options, dhcp4_requests, DHCP_OPTION_HOST_NAME, str);
 +      }
 +
 +      /* Routes */
 +      num = sd_dhcp_lease_get_routes (lease, &routes);
 +      if (num > 0) {
 +              l = g_string_sized_new (30);
 +              for (i = 0; i < num; i++) {
 +                      NMPlatformIP4Route route;
 +                      const char *gw_str;
 +
 +                      memset (&route, 0, sizeof (route));
 +                      route.network = routes[i].dst_addr.s_addr;
 +                      route.plen = routes[i].dst_prefixlen;
 +                      route.gateway = routes[i].gw_addr.s_addr;
 +                      route.source = NM_IP_CONFIG_SOURCE_DHCP;
 +                      route.metric = default_priority;
 +                      nm_ip4_config_add_route (ip4_config, &route);
 +
 +                      str = nm_utils_inet4_ntop (route.network, buf);
 +                      gw_str = nm_utils_inet4_ntop (route.gateway, NULL);
 +                      LOG_LEASE (LOGD_DHCP4, "  static route %s/%d gw %s", str, route.plen, gw_str);
 +
 +                      g_string_append_printf (l, "%s%s/%d %s", l->len ? " " : "", str, route.plen, gw_str);
 +              }
 +              add_option (options, dhcp4_requests, DHCP_OPTION_RFC3442_ROUTES, l->str);
 +              g_string_free (l, TRUE);
 +      }
 +
 +      /* MTU */
 +      r = sd_dhcp_lease_get_mtu (lease, &mtu);
 +      if (r == 0 && mtu) {
 +              nm_ip4_config_set_mtu (ip4_config, mtu, NM_IP_CONFIG_SOURCE_DHCP);
 +              add_option_u32 (options, dhcp4_requests, DHCP_OPTION_INTERFACE_MTU, mtu);
 +              LOG_LEASE (LOGD_DHCP4, "  mtu %u", mtu);
 +      }
 +
 +      /* NTP servers */
 +      num = sd_dhcp_lease_get_ntp (lease, &addr_list);
 +      if (num > 0) {
 +              l = g_string_sized_new (30);
 +              for (i = 0; i < num; i++) {
 +                      str = nm_utils_inet4_ntop (addr_list[i].s_addr, buf);
 +                      LOG_LEASE (LOGD_DHCP4, "  ntp server '%s'", str);
 +                      g_string_append_printf (l, "%s%s", l->len ? " " : "", str);
 +              }
 +              add_option (options, dhcp4_requests, DHCP_OPTION_NTP_SERVER, l->str);
 +              g_string_free (l, TRUE);
 +      }
 +
 +      r = sd_dhcp_lease_get_vendor_specific (lease, &data, &data_len);
 +      if (r >= 0)
 +              metered = !!memmem (data, data_len, "ANDROID_METERED", STRLEN ("ANDROID_METERED"));
 +      nm_ip4_config_set_metered (ip4_config, metered);
 +
 +      return ip4_config;
 +}
 +
 +/************************************************************/
 +
 +static char *
 +get_leasefile_path (const char *iface, const char *uuid, gboolean ipv6)
 +{
 +      return g_strdup_printf (NMSTATEDIR "/internal%s-%s-%s.lease",
 +                              ipv6 ? "6" : "",
 +                              uuid,
 +                              iface);
 +}
 +
 +static GSList *
 +nm_dhcp_systemd_get_lease_ip_configs (const char *iface,
 +                                      int ifindex,
 +                                      const char *uuid,
 +                                      gboolean ipv6,
 +                                      guint32 default_route_metric)
 +{
 +      GSList *leases = NULL;
 +      gs_free char *path = NULL;
 +      sd_dhcp_lease *lease = NULL;
 +      NMIP4Config *ip4_config;
 +      int r;
 +
 +      if (ipv6)
 +              return NULL;
 +
 +      path = get_leasefile_path (iface, uuid, FALSE);
 +      r = dhcp_lease_load (&lease, path);
 +      if (r == 0 && lease) {
 +              ip4_config = lease_to_ip4_config (iface, ifindex, lease, NULL, default_route_metric, FALSE, NULL);
 +              if (ip4_config)
 +                      leases = g_slist_append (leases, ip4_config);
 +              sd_dhcp_lease_unref (lease);
 +      }
 +
 +      return leases;
 +}
 +
 +/************************************************************/
 +
 +static void
 +_save_client_id (NMDhcpSystemd *self,
 +                 uint8_t type,
 +                 const uint8_t *client_id,
 +                 size_t len)
 +{
 +      gs_unref_bytes GBytes *b = NULL;
 +      gs_free char *buf = NULL;
 +
 +      g_return_if_fail (self != NULL);
 +      g_return_if_fail (client_id != NULL);
 +      g_return_if_fail (len > 0);
 +
 +      if (!nm_dhcp_client_get_client_id (NM_DHCP_CLIENT (self))) {
 +              buf = g_malloc (len + 1);
 +              buf[0] = type;
 +              memcpy (buf + 1, client_id, len);
 +              b = g_bytes_new (buf, len + 1);
 +              nm_dhcp_client_set_client_id (NM_DHCP_CLIENT (self), b);
 +      }
 +}
 +
 +static void
 +bound4_handle (NMDhcpSystemd *self)
 +{
 +      NMDhcpSystemdPrivate *priv = NM_DHCP_SYSTEMD_GET_PRIVATE (self);
 +      const char *iface = nm_dhcp_client_get_iface (NM_DHCP_CLIENT (self));
 +      sd_dhcp_lease *lease;
 +      NMIP4Config *ip4_config;
 +      GHashTable *options;
 +      GError *error = NULL;
 +      int r;
 +
 +      nm_log_dbg (LOGD_DHCP4, "(%s): lease available", iface);
 +
 +      r = sd_dhcp_client_get_lease (priv->client4, &lease);
 +      if (r < 0 || !lease) {
 +              nm_log_warn (LOGD_DHCP4, "(%s): no lease!", iface);
 +              nm_dhcp_client_set_state (NM_DHCP_CLIENT (self), NM_DHCP_STATE_FAIL, NULL, NULL);
 +              return;
 +      }
 +
 +      options = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, g_free);
 +      ip4_config = lease_to_ip4_config (iface,
 +                                        nm_dhcp_client_get_ifindex (NM_DHCP_CLIENT (self)),
 +                                        lease,
 +                                        options,
 +                                        nm_dhcp_client_get_priority (NM_DHCP_CLIENT (self)),
 +                                        TRUE,
 +                                        &error);
 +      if (ip4_config) {
 +              const uint8_t *client_id = NULL;
 +              size_t client_id_len = 0;
 +              uint8_t type = 0;
 +
 +              add_requests_to_options (options, dhcp4_requests);
 +              dhcp_lease_save (lease, priv->lease_file);
 +
 +              sd_dhcp_client_get_client_id(priv->client4, &type, &client_id, &client_id_len);
 +              if (client_id)
 +                      _save_client_id (self, type, client_id, client_id_len);
 +
 +              nm_dhcp_client_set_state (NM_DHCP_CLIENT (self),
 +                                        NM_DHCP_STATE_BOUND,
 +                                        G_OBJECT (ip4_config),
 +                                        options);
 +      } else {
 +              nm_log_warn (LOGD_DHCP4, "(%s): %s", iface, error->message);
 +              nm_dhcp_client_set_state (NM_DHCP_CLIENT (self), NM_DHCP_STATE_FAIL, NULL, NULL);
 +              g_clear_error (&error);
 +      }
 +
 +      g_hash_table_destroy (options);
 +      g_clear_object (&ip4_config);
 +}
 +
 +static void
 +dhcp_event_cb (sd_dhcp_client *client, int event, gpointer user_data)
 +{
 +      NMDhcpSystemd *self = NM_DHCP_SYSTEMD (user_data);
 +      NMDhcpSystemdPrivate *priv = NM_DHCP_SYSTEMD_GET_PRIVATE (self);
 +      const char *iface = nm_dhcp_client_get_iface (NM_DHCP_CLIENT (self));
 +
 +      g_assert (priv->client4 == client);
 +
 +      nm_log_dbg (LOGD_DHCP4, "(%s): DHCPv4 client event %d", iface, event);
 +
 +      switch (event) {
 +      case SD_DHCP_CLIENT_EVENT_EXPIRED:
 +              nm_dhcp_client_set_state (NM_DHCP_CLIENT (user_data), NM_DHCP_STATE_EXPIRE, NULL, NULL);
 +              break;
 +      case SD_DHCP_CLIENT_EVENT_STOP:
 +              nm_dhcp_client_set_state (NM_DHCP_CLIENT (user_data), NM_DHCP_STATE_FAIL, NULL, NULL);
 +              break;
 +      case SD_DHCP_CLIENT_EVENT_RENEW:
 +      case SD_DHCP_CLIENT_EVENT_IP_CHANGE:
 +      case SD_DHCP_CLIENT_EVENT_IP_ACQUIRE:
 +              bound4_handle (self);
 +              break;
 +      default:
 +              nm_log_warn (LOGD_DHCP4, "(%s): unhandled DHCP event %d", iface, event);
 +              break;
 +      }
 +}
 +
 +static guint16
 +get_arp_type (const GByteArray *hwaddr)
 +{
 +      if (hwaddr->len == ETH_ALEN)
 +              return ARPHRD_ETHER;
 +      else if (hwaddr->len == INFINIBAND_ALEN)
 +              return ARPHRD_INFINIBAND;
 +      else
 +              g_assert_not_reached ();
 +}
 +
 +static gboolean
 +ip4_start (NMDhcpClient *client, const char *dhcp_anycast_addr, const char *last_ip4_address)
 +{
 +      NMDhcpSystemdPrivate *priv = NM_DHCP_SYSTEMD_GET_PRIVATE (client);
 +      const char *iface = nm_dhcp_client_get_iface (client);
 +      const GByteArray *hwaddr;
 +      sd_dhcp_lease *lease = NULL;
 +      GBytes *override_client_id;
 +      const uint8_t *client_id = NULL;
 +      size_t client_id_len = 0;
 +      struct in_addr last_addr = { 0 };
 +      const char *hostname;
 +      int r, i;
 +      gboolean success = FALSE;
 +
 +      g_assert (priv->client4 == NULL);
 +      g_assert (priv->client6 == NULL);
 +
 +      g_free (priv->lease_file);
 +      priv->lease_file = get_leasefile_path (iface, nm_dhcp_client_get_uuid (client), FALSE);
 +
 +      r = sd_dhcp_client_new (&priv->client4);
 +      if (r < 0) {
 +              nm_log_warn (LOGD_DHCP4, "(%s): failed to create DHCPv4 client (%d)", iface, r);
 +              return FALSE;
 +      }
 +
 +      r = sd_dhcp_client_attach_event (priv->client4, NULL, 0);
 +      if (r < 0) {
 +              nm_log_warn (LOGD_DHCP4, "(%s): failed to attach DHCP event (%d)", iface, r);
 +              goto error;
 +      }
 +
 +      hwaddr = nm_dhcp_client_get_hw_addr (client);
 +      if (hwaddr) {
 +              r = sd_dhcp_client_set_mac (priv->client4,
 +                                          hwaddr->data,
 +                                          hwaddr->len,
 +                                          get_arp_type (hwaddr));
 +              if (r < 0) {
 +                      nm_log_warn (LOGD_DHCP4, "(%s): failed to set DHCP MAC address (%d)", iface, r);
 +                      goto error;
 +              }
 +      }
 +
 +      r = sd_dhcp_client_set_index (priv->client4, nm_dhcp_client_get_ifindex (client));
 +      if (r < 0) {
 +              nm_log_warn (LOGD_DHCP4, "(%s): failed to set DHCP ifindex (%d)", iface, r);
 +              goto error;
 +      }
 +
 +      r = sd_dhcp_client_set_callback (priv->client4, dhcp_event_cb, client);
 +      if (r < 0) {
 +              nm_log_warn (LOGD_DHCP4, "(%s): failed to set DHCP callback (%d)", iface, r);
 +              goto error;
 +      }
 +
 +      r = sd_dhcp_client_set_request_broadcast (priv->client4, true);
 +      if (r < 0) {
 +              nm_log_warn (LOGD_DHCP4, "(%s): failed to set DHCP broadcast (%d)", iface, r);
 +              goto error;
 +      }
 +
 +      dhcp_lease_load (&lease, priv->lease_file);
 +
 +      if (last_ip4_address)
 +              inet_pton (AF_INET, last_ip4_address, &last_addr);
 +      else if (lease)
 +              sd_dhcp_lease_get_address (lease, &last_addr);
 +
 +      if (last_addr.s_addr) {
 +              r = sd_dhcp_client_set_request_address (priv->client4, &last_addr);
 +              if (r < 0) {
 +                      nm_log_warn (LOGD_DHCP4, "(%s): failed to set last IPv4 address (%d)", iface, r);
 +                      goto error;
 +              }
 +      }
 +
 +      override_client_id = nm_dhcp_client_get_client_id (client);
 +      if (override_client_id) {
 +              client_id = g_bytes_get_data (override_client_id, &client_id_len);
 +              g_assert (client_id && client_id_len);
 +              sd_dhcp_client_set_client_id (priv->client4,
 +                                            client_id[0],
 +                                            client_id + 1,
 +                                            client_id_len - 1);
 +      } else if (lease) {
 +              r = sd_dhcp_lease_get_client_id (lease, (const void **) &client_id, &client_id_len);
 +              if (r == 0 && client_id_len) {
 +                      sd_dhcp_client_set_client_id (priv->client4,
 +                                                    client_id[0],
 +                                                    client_id + 1,
 +                                                    client_id_len - 1);
 +                      _save_client_id (NM_DHCP_SYSTEMD (client),
 +                                       client_id[0],
 +                                       client_id + 1,
 +                                       client_id_len - 1);
 +              }
 +      }
 +
 +
 +      /* Add requested options */
 +      for (i = 0; dhcp4_requests[i].name; i++) {
 +              if (dhcp4_requests[i].include)
 +                      sd_dhcp_client_set_request_option (priv->client4, dhcp4_requests[i].num);
 +      }
 +
 +      hostname = nm_dhcp_client_get_hostname (client);
 +      if (hostname) {
 +              r = sd_dhcp_client_set_hostname (priv->client4, hostname);
 +              if (r < 0) {
 +                      nm_log_warn (LOGD_DHCP4, "(%s): failed to set DHCP hostname (%d)", iface, r);
 +                      goto error;
 +              }
 +      }
 +
 +      r = sd_dhcp_client_start (priv->client4);
 +      if (r < 0) {
 +              nm_log_warn (LOGD_DHCP4, "(%s): failed to start DHCP (%d)", iface, r);
 +              goto error;
 +      }
 +
 +      success = TRUE;
 +
 +error:
 +      sd_dhcp_lease_unref (lease);
 +      if (!success)
 +              priv->client4 = sd_dhcp_client_unref (priv->client4);
 +      return success;
 +}
 +
 +static void
 +bound6_handle (NMDhcpSystemd *self)
 +{
 +      /* not yet supported... */
 +      nm_log_warn (LOGD_DHCP6, "(%s): internal DHCP does not yet support DHCPv6",
 +                   nm_dhcp_client_get_iface (NM_DHCP_CLIENT (self)));
 +      nm_dhcp_client_set_state (NM_DHCP_CLIENT (self), NM_DHCP_STATE_FAIL, NULL, NULL);
 +}
 +
 +static void
 +dhcp6_event_cb (sd_dhcp6_client *client, int event, gpointer user_data)
 +{
 +      NMDhcpSystemd *self = NM_DHCP_SYSTEMD (user_data);
 +      NMDhcpSystemdPrivate *priv = NM_DHCP_SYSTEMD_GET_PRIVATE (self);
 +      const char *iface = nm_dhcp_client_get_iface (NM_DHCP_CLIENT (self));
 +
 +      g_assert (priv->client6 == client);
 +
 +      nm_log_dbg (LOGD_DHCP6, "(%s): DHCPv6 client event %d", iface, event);
 +
 +      switch (event) {
 +      case SD_DHCP6_CLIENT_EVENT_RETRANS_MAX:
 +              nm_dhcp_client_set_state (NM_DHCP_CLIENT (user_data), NM_DHCP_STATE_TIMEOUT, NULL, NULL);
 +              break;
 +      case SD_DHCP6_CLIENT_EVENT_RESEND_EXPIRE:
 +      case SD_DHCP6_CLIENT_EVENT_STOP:
 +              nm_dhcp_client_set_state (NM_DHCP_CLIENT (user_data), NM_DHCP_STATE_FAIL, NULL, NULL);
 +              break;
 +      case SD_DHCP6_CLIENT_EVENT_IP_ACQUIRE:
 +              bound6_handle (self);
 +              break;
 +      default:
 +              nm_log_warn (LOGD_DHCP6, "(%s): unhandled DHCPv6 event %d", iface, event);
 +              break;
 +      }
 +}
 +
 +static gboolean
 +ip6_start (NMDhcpClient *client,
 +           const char *dhcp_anycast_addr,
 +           const struct in6_addr *ll_addr,
 +           gboolean info_only,
 +           NMSettingIP6ConfigPrivacy privacy,
 +           const GByteArray *duid)
 +{
 +      NMDhcpSystemdPrivate *priv = NM_DHCP_SYSTEMD_GET_PRIVATE (client);
 +      const char *iface = nm_dhcp_client_get_iface (client);
 +      const GByteArray *hwaddr;
 +      int r, i;
 +
 +      g_assert (priv->client4 == NULL);
 +      g_assert (priv->client6 == NULL);
 +      g_return_val_if_fail (duid != NULL, FALSE);
 +
 +      g_free (priv->lease_file);
 +      priv->lease_file = get_leasefile_path (iface, nm_dhcp_client_get_uuid (client), TRUE);
 +
 +      r = sd_dhcp6_client_new (&priv->client6);
 +      if (r < 0) {
 +              nm_log_warn (LOGD_DHCP6, "(%s): failed to create DHCPv6 client (%d)", iface, r);
 +              return FALSE;
 +      }
 +
 +      /* NM stores the entire DUID which includes the uint16 "type", while systemd
 +       * wants the type passed separately from the following data.
 +       */
 +      r = sd_dhcp6_client_set_duid (priv->client6,
 +                                    ntohs (((const guint16 *) duid->data)[0]),
 +                                    duid->data + 2,
 +                                    duid->len - 2);
 +      if (r < 0) {
 +              nm_log_warn (LOGD_DHCP6, "(%s): failed to create DHCPv6 client (%d)", iface, r);
 +              return FALSE;
 +      }
 +
 +      r = sd_dhcp6_client_attach_event (priv->client6, NULL, 0);
 +      if (r < 0) {
 +              nm_log_warn (LOGD_DHCP6, "(%s): failed to attach DHCP event (%d)", iface, r);
 +              goto error;
 +      }
 +
 +      hwaddr = nm_dhcp_client_get_hw_addr (client);
 +      if (hwaddr) {
 +              r = sd_dhcp6_client_set_mac (priv->client6,
 +                                           hwaddr->data,
 +                                           hwaddr->len,
 +                                           get_arp_type (hwaddr));
 +              if (r < 0) {
 +                      nm_log_warn (LOGD_DHCP6, "(%s): failed to set DHCP MAC address (%d)", iface, r);
 +                      goto error;
 +              }
 +      }
 +
 +      r = sd_dhcp6_client_set_index (priv->client6, nm_dhcp_client_get_ifindex (client));
 +      if (r < 0) {
 +              nm_log_warn (LOGD_DHCP6, "(%s): failed to set DHCP ifindex (%d)", iface, r);
 +              goto error;
 +      }
 +
 +      r = sd_dhcp6_client_set_callback (priv->client6, dhcp6_event_cb, client);
 +      if (r < 0) {
 +              nm_log_warn (LOGD_DHCP6, "(%s): failed to set DHCP callback (%d)", iface, r);
 +              goto error;
 +      }
 +
 +      /* Add requested options */
 +      for (i = 0; dhcp6_requests[i].name; i++) {
 +              if (dhcp6_requests[i].include)
 +                      sd_dhcp6_client_set_request_option (priv->client6, dhcp6_requests[i].num);
 +      }
 +
++      r = sd_dhcp6_client_set_local_address (priv->client6, ll_addr);
++      if (r < 0) {
++              nm_log_warn (LOGD_DHCP6, "(%s): failed to set local address (%d)", iface, r);
++              goto error;
++      }
++
 +      r = sd_dhcp6_client_start (priv->client6);
 +      if (r < 0) {
 +              nm_log_warn (LOGD_DHCP6, "(%s): failed to start DHCP (%d)", iface, r);
 +              goto error;
 +      }
 +
 +      return TRUE;
 +
 +error:
 +      sd_dhcp6_client_unref (priv->client6);
 +      priv->client6 = NULL;
 +      return FALSE;
 +}
 +
 +static void
 +stop (NMDhcpClient *client, gboolean release, const GByteArray *duid)
 +{
 +      NMDhcpSystemdPrivate *priv = NM_DHCP_SYSTEMD_GET_PRIVATE (client);
 +      int r = 0;
 +
 +      if (priv->client4)
 +              r = sd_dhcp_client_stop (priv->client4);
 +      else if (priv->client6)
 +              r = sd_dhcp6_client_stop (priv->client6);
 +
 +      if (r) {
 +              nm_log_warn (priv->client6 ? LOGD_DHCP6 : LOGD_DHCP4,
 +                               "(%s): failed to stop DHCP client (%d)",
 +                               nm_dhcp_client_get_iface (client),
 +                               r);
 +      }
 +}
 +
 +/***************************************************/
 +
 +static void
 +nm_dhcp_systemd_init (NMDhcpSystemd *self)
 +{
 +}
 +
 +static void
 +dispose (GObject *object)
 +{
 +      NMDhcpSystemdPrivate *priv = NM_DHCP_SYSTEMD_GET_PRIVATE (object);
 +
 +      g_clear_pointer (&priv->lease_file, g_free);
 +
 +      if (priv->client4) {
 +              sd_dhcp_client_stop (priv->client4);
 +              sd_dhcp_client_unref (priv->client4);
 +              priv->client4 = NULL;
 +      }
 +
 +      if (priv->client6) {
 +              sd_dhcp6_client_stop (priv->client6);
 +              sd_dhcp6_client_unref (priv->client6);
 +              priv->client6 = NULL;
 +      }
 +
 +      G_OBJECT_CLASS (nm_dhcp_systemd_parent_class)->dispose (object);
 +}
 +
 +static void
 +nm_dhcp_systemd_class_init (NMDhcpSystemdClass *sdhcp_class)
 +{
 +      NMDhcpClientClass *client_class = NM_DHCP_CLIENT_CLASS (sdhcp_class);
 +      GObjectClass *object_class = G_OBJECT_CLASS (sdhcp_class);
 +
 +      g_type_class_add_private (sdhcp_class, sizeof (NMDhcpSystemdPrivate));
 +
 +      /* virtual methods */
 +      object_class->dispose = dispose;
 +
 +      client_class->ip4_start = ip4_start;
 +      client_class->ip6_start = ip6_start;
 +      client_class->stop = stop;
 +}
 +
 +static void __attribute__((constructor))
 +register_dhcp_dhclient (void)
 +{
 +      nm_g_type_init ();
 +      _nm_dhcp_client_register (NM_TYPE_DHCP_SYSTEMD,
 +                                "internal",
 +                                NULL,
 +                                nm_dhcp_systemd_get_lease_ip_configs);
 +}
 +
index 3870342,0000000..8b29aed
mode 100644,000000..100644
--- /dev/null
@@@ -1,236 -1,0 +1,237 @@@
 +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 +/* This program is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
 + * the Free Software Foundation; either version 2, or (at your option)
 + * any later version.
 + *
 + * This program is distributed in the hope that it will be useful,
 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 + * GNU General Public License for more details.
 + *
 + * You should have received a copy of the GNU General Public License along
 + * with this program; if not, write to the Free Software Foundation, Inc.,
 + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 + *
 + * Copyright (C) 2014 Red Hat, Inc.
 + */
 +
 +#include "config.h"
 +
 +#include <glib.h>
 +#include <unistd.h>
 +#include <errno.h>
 +
 +#include "sd-event.h"
++#include "fd-util.h"
 +#include "time-util.h"
 +
 +struct sd_event_source {
 +      guint refcount;
 +      guint id;
 +      gpointer user_data;
 +
 +      GIOChannel *channel;
 +
 +      union {
 +              struct {
 +                      sd_event_io_handler_t cb;
 +              } io;
 +              struct {
 +                      sd_event_time_handler_t cb;
 +                      uint64_t usec;
 +              } time;
 +      };
 +};
 +
 +static struct sd_event_source *
 +source_new (void)
 +{
 +      struct sd_event_source *source;
 +
 +      source = g_slice_new0 (struct sd_event_source);
 +      source->refcount = 1;
 +      return source;
 +}
 +
 +int
 +sd_event_source_set_priority (sd_event_source *s, int64_t priority)
 +{
 +      return 0;
 +}
 +
 +sd_event_source*
 +sd_event_source_unref (sd_event_source *s)
 +{
 +
 +      if (!s)
 +              return NULL;
 +
 +      g_return_val_if_fail (s->refcount, NULL);
 +
 +      s->refcount--;
 +      if (s->refcount == 0) {
 +              if (s->id)
 +                      g_source_remove (s->id);
 +              if (s->channel) {
 +                      /* Don't shut down the channel since systemd will soon close
 +                       * the file descriptor itself, which would cause -EBADF.
 +                       */
 +                      g_io_channel_unref (s->channel);
 +              }
 +              g_slice_free (struct sd_event_source, s);
 +      }
 +      return NULL;
 +}
 +
 +int
 +sd_event_source_set_description(sd_event_source *s, const char *description)
 +{
 +      if (!s)
 +              return -EINVAL;
 +
 +      g_source_set_name_by_id (s->id, description);
 +      return 0;
 +}
 +
 +static gboolean
 +io_ready (GIOChannel *channel, GIOCondition condition, struct sd_event_source *source)
 +{
 +      int r, revents = 0;
 +      gboolean result;
 +
 +      if (condition & G_IO_IN)
 +              revents |= EPOLLIN;
 +      if (condition & G_IO_OUT)
 +              revents |= EPOLLOUT;
 +      if (condition & G_IO_PRI)
 +              revents |= EPOLLPRI;
 +      if (condition & G_IO_ERR)
 +              revents |= EPOLLERR;
 +      if (condition & G_IO_HUP)
 +              revents |= EPOLLHUP;
 +
 +      source->refcount++;
 +
 +      r = source->io.cb (source, g_io_channel_unix_get_fd (channel), revents, source->user_data);
 +      if (r < 0 || source->refcount <= 1) {
 +              source->id = 0;
 +              result = G_SOURCE_REMOVE;
 +      } else
 +              result = G_SOURCE_CONTINUE;
 +
 +      sd_event_source_unref (source);
 +
 +      return result;
 +}
 +
 +int
 +sd_event_add_io (sd_event *e, sd_event_source **s, int fd, uint32_t events, sd_event_io_handler_t callback, void *userdata)
 +{
 +      struct sd_event_source *source;
 +      GIOChannel *channel;
 +      GIOCondition condition = 0;
 +
 +      /* systemd supports floating sd_event_source by omitting the @s argument.
 +       * We don't have such users and don't implement floating references. */
 +      g_return_val_if_fail (s, -EINVAL);
 +
 +      channel = g_io_channel_unix_new (fd);
 +      if (!channel)
 +              return -EINVAL;
 +
 +      source = source_new ();
 +      source->io.cb = callback;
 +      source->user_data = userdata;
 +      source->channel = channel;
 +
 +      if (events & EPOLLIN)
 +              condition |= G_IO_IN;
 +      if (events & EPOLLOUT)
 +              condition |= G_IO_OUT;
 +      if (events & EPOLLPRI)
 +              condition |= G_IO_PRI;
 +      if (events & EPOLLERR)
 +              condition |= G_IO_ERR;
 +      if (events & EPOLLHUP)
 +              condition |= G_IO_HUP;
 +
 +      g_io_channel_set_encoding (source->channel, NULL, NULL);
 +      g_io_channel_set_buffered (source->channel, FALSE);
 +      source->id = g_io_add_watch (source->channel, condition, (GIOFunc) io_ready, source);
 +
 +      *s = source;
 +      return 0;
 +}
 +
 +static gboolean
 +time_ready (struct sd_event_source *source)
 +{
 +      source->refcount++;
 +
 +      source->time.cb (source, source->time.usec, source->user_data);
 +      source->id = 0;
 +
 +      sd_event_source_unref (source);
 +
 +      return G_SOURCE_REMOVE;
 +}
 +
 +int
 +sd_event_add_time(sd_event *e, sd_event_source **s, clockid_t clock, uint64_t usec, uint64_t accuracy, sd_event_time_handler_t callback, void *userdata)
 +{
 +      struct sd_event_source *source;
 +      uint64_t n = now (clock);
 +
 +      /* systemd supports floating sd_event_source by omitting the @s argument.
 +       * We don't have such users and don't implement floating references. */
 +      g_return_val_if_fail (s, -EINVAL);
 +
 +      source = source_new ();
 +      source->time.cb = callback;
 +      source->user_data = userdata;
 +      source->time.usec = usec;
 +
 +      if (usec > 1000)
 +              usec = n < usec - 1000 ? usec - n : 1000;
 +      source->id = g_timeout_add (usec / 1000, (GSourceFunc) time_ready, source);
 +
 +      *s = source;
 +      return 0;
 +}
 +
 +/* sd_event is basically a GMainContext; but since we only
 + * ever use the default context, nothing to do here.
 + */
 +
 +int
 +sd_event_default (sd_event **e)
 +{
 +      *e = GUINT_TO_POINTER (1);
 +      return 0;
 +}
 +
 +sd_event*
 +sd_event_ref (sd_event *e)
 +{
 +      return e;
 +}
 +
 +sd_event*
 +sd_event_unref (sd_event *e)
 +{
 +      return NULL;
 +}
 +
 +int
 +sd_event_now (sd_event *e, clockid_t clock, uint64_t *usec)
 +{
 +      *usec = now (clock);
 +      return 0;
 +}
 +
 +int asynchronous_close(int fd) {
 +      safe_close(fd);
 +      return -1;
 +}
 +
index 0000000,48183e3..e6748e1
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,81 +1,83 @@@
+ /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+ /***
+   This file is part of systemd.
+   Copyright 2010 Lennart Poettering
+   systemd is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 2.1 of the License, or
+   (at your option) any later version.
+   systemd is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+   Lesser General Public License for more details.
+   You should have received a copy of the GNU Lesser General Public License
+   along with systemd; If not, see <http://www.gnu.org/licenses/>.
+ ***/
++#include "nm-sd-adapt.h"
++
+ #include "alloc-util.h"
+ #include "util.h"
+ void* memdup(const void *p, size_t l) {
+         void *r;
+         assert(p);
+         r = malloc(l);
+         if (!r)
+                 return NULL;
+         memcpy(r, p, l);
+         return r;
+ }
+ void* greedy_realloc(void **p, size_t *allocated, size_t need, size_t size) {
+         size_t a, newalloc;
+         void *q;
+         assert(p);
+         assert(allocated);
+         if (*allocated >= need)
+                 return *p;
+         newalloc = MAX(need * 2, 64u / size);
+         a = newalloc * size;
+         /* check for overflows */
+         if (a < size * need)
+                 return NULL;
+         q = realloc(*p, a);
+         if (!q)
+                 return NULL;
+         *p = q;
+         *allocated = newalloc;
+         return q;
+ }
+ void* greedy_realloc0(void **p, size_t *allocated, size_t need, size_t size) {
+         size_t prev;
+         uint8_t *q;
+         assert(p);
+         assert(allocated);
+         prev = *allocated;
+         q = greedy_realloc(p, allocated, need, size);
+         if (!q)
+                 return NULL;
+         if (*allocated > prev)
+                 memzero(q + prev * size, (*allocated - prev) * size);
+         return q;
+ }
index 0000000,12b602e..f399f9a
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,108 +1,110 @@@
+ /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+ #pragma once
+ /***
+   This file is part of systemd.
+   Copyright 2010 Lennart Poettering
+   systemd is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 2.1 of the License, or
+   (at your option) any later version.
+   systemd is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+   Lesser General Public License for more details.
+   You should have received a copy of the GNU Lesser General Public License
+   along with systemd; If not, see <http://www.gnu.org/licenses/>.
+ ***/
++#include "nm-sd-adapt.h"
++
+ #include <alloca.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include "macro.h"
+ #define new(t, n) ((t*) malloc_multiply(sizeof(t), (n)))
+ #define new0(t, n) ((t*) calloc((n), sizeof(t)))
+ #define newa(t, n) ((t*) alloca(sizeof(t)*(n)))
+ #define newa0(t, n) ((t*) alloca0(sizeof(t)*(n)))
+ #define newdup(t, p, n) ((t*) memdup_multiply(p, sizeof(t), (n)))
+ #define malloc0(n) (calloc(1, (n)))
+ static inline void *mfree(void *memory) {
+         free(memory);
+         return NULL;
+ }
+ void* memdup(const void *p, size_t l) _alloc_(2);
+ static inline void freep(void *p) {
+         free(*(void**) p);
+ }
+ #define _cleanup_free_ _cleanup_(freep)
+ _malloc_  _alloc_(1, 2) static inline void *malloc_multiply(size_t a, size_t b) {
+         if (_unlikely_(b != 0 && a > ((size_t) -1) / b))
+                 return NULL;
+         return malloc(a * b);
+ }
+ _alloc_(2, 3) static inline void *realloc_multiply(void *p, size_t a, size_t b) {
+         if (_unlikely_(b != 0 && a > ((size_t) -1) / b))
+                 return NULL;
+         return realloc(p, a * b);
+ }
+ _alloc_(2, 3) static inline void *memdup_multiply(const void *p, size_t a, size_t b) {
+         if (_unlikely_(b != 0 && a > ((size_t) -1) / b))
+                 return NULL;
+         return memdup(p, a * b);
+ }
+ void* greedy_realloc(void **p, size_t *allocated, size_t need, size_t size);
+ void* greedy_realloc0(void **p, size_t *allocated, size_t need, size_t size);
+ #define GREEDY_REALLOC(array, allocated, need)                          \
+         greedy_realloc((void**) &(array), &(allocated), (need), sizeof((array)[0]))
+ #define GREEDY_REALLOC0(array, allocated, need)                         \
+         greedy_realloc0((void**) &(array), &(allocated), (need), sizeof((array)[0]))
+ #define alloca0(n)                                      \
+         ({                                              \
+                 char *_new_;                            \
+                 size_t _len_ = n;                       \
+                 _new_ = alloca(_len_);                  \
+                 (void *) memset(_new_, 0, _len_);       \
+         })
+ /* It's not clear what alignment glibc/gcc alloca() guarantee, hence provide a guaranteed safe version */
+ #define alloca_align(size, align)                                       \
+         ({                                                              \
+                 void *_ptr_;                                            \
+                 size_t _mask_ = (align) - 1;                            \
+                 _ptr_ = alloca((size) + _mask_);                        \
+                 (void*)(((uintptr_t)_ptr_ + _mask_) & ~_mask_);         \
+         })
+ #define alloca0_align(size, align)                                      \
+         ({                                                              \
+                 void *_new_;                                            \
+                 size_t _size_ = (size);                                 \
+                 _new_ = alloca_align(_size_, (align));                  \
+                 (void*)memset(_new_, 0, _size_);                        \
+         })
index 0000000,4815161..151c8ec
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,482 +1,484 @@@
+ /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+ /***
+   This file is part of systemd.
+   Copyright 2010 Lennart Poettering
+   systemd is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 2.1 of the License, or
+   (at your option) any later version.
+   systemd is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+   Lesser General Public License for more details.
+   You should have received a copy of the GNU Lesser General Public License
+   along with systemd; If not, see <http://www.gnu.org/licenses/>.
+ ***/
++#include "nm-sd-adapt.h"
++
+ #include "alloc-util.h"
+ #include "escape.h"
+ #include "hexdecoct.h"
+ #include "string-util.h"
+ #include "utf8.h"
+ #include "util.h"
+ size_t cescape_char(char c, char *buf) {
+         char * buf_old = buf;
+         switch (c) {
+                 case '\a':
+                         *(buf++) = '\\';
+                         *(buf++) = 'a';
+                         break;
+                 case '\b':
+                         *(buf++) = '\\';
+                         *(buf++) = 'b';
+                         break;
+                 case '\f':
+                         *(buf++) = '\\';
+                         *(buf++) = 'f';
+                         break;
+                 case '\n':
+                         *(buf++) = '\\';
+                         *(buf++) = 'n';
+                         break;
+                 case '\r':
+                         *(buf++) = '\\';
+                         *(buf++) = 'r';
+                         break;
+                 case '\t':
+                         *(buf++) = '\\';
+                         *(buf++) = 't';
+                         break;
+                 case '\v':
+                         *(buf++) = '\\';
+                         *(buf++) = 'v';
+                         break;
+                 case '\\':
+                         *(buf++) = '\\';
+                         *(buf++) = '\\';
+                         break;
+                 case '"':
+                         *(buf++) = '\\';
+                         *(buf++) = '"';
+                         break;
+                 case '\'':
+                         *(buf++) = '\\';
+                         *(buf++) = '\'';
+                         break;
+                 default:
+                         /* For special chars we prefer octal over
+                          * hexadecimal encoding, simply because glib's
+                          * g_strescape() does the same */
+                         if ((c < ' ') || (c >= 127)) {
+                                 *(buf++) = '\\';
+                                 *(buf++) = octchar((unsigned char) c >> 6);
+                                 *(buf++) = octchar((unsigned char) c >> 3);
+                                 *(buf++) = octchar((unsigned char) c);
+                         } else
+                                 *(buf++) = c;
+                         break;
+         }
+         return buf - buf_old;
+ }
+ char *cescape(const char *s) {
+         char *r, *t;
+         const char *f;
+         assert(s);
+         /* Does C style string escaping. May be reversed with
+          * cunescape(). */
+         r = new(char, strlen(s)*4 + 1);
+         if (!r)
+                 return NULL;
+         for (f = s, t = r; *f; f++)
+                 t += cescape_char(*f, t);
+         *t = 0;
+         return r;
+ }
+ int cunescape_one(const char *p, size_t length, char *ret, uint32_t *ret_unicode) {
+         int r = 1;
+         assert(p);
+         assert(*p);
+         assert(ret);
+         /* Unescapes C style. Returns the unescaped character in ret,
+          * unless we encountered a \u sequence in which case the full
+          * unicode character is returned in ret_unicode, instead. */
+         if (length != (size_t) -1 && length < 1)
+                 return -EINVAL;
+         switch (p[0]) {
+         case 'a':
+                 *ret = '\a';
+                 break;
+         case 'b':
+                 *ret = '\b';
+                 break;
+         case 'f':
+                 *ret = '\f';
+                 break;
+         case 'n':
+                 *ret = '\n';
+                 break;
+         case 'r':
+                 *ret = '\r';
+                 break;
+         case 't':
+                 *ret = '\t';
+                 break;
+         case 'v':
+                 *ret = '\v';
+                 break;
+         case '\\':
+                 *ret = '\\';
+                 break;
+         case '"':
+                 *ret = '"';
+                 break;
+         case '\'':
+                 *ret = '\'';
+                 break;
+         case 's':
+                 /* This is an extension of the XDG syntax files */
+                 *ret = ' ';
+                 break;
+         case 'x': {
+                 /* hexadecimal encoding */
+                 int a, b;
+                 if (length != (size_t) -1 && length < 3)
+                         return -EINVAL;
+                 a = unhexchar(p[1]);
+                 if (a < 0)
+                         return -EINVAL;
+                 b = unhexchar(p[2]);
+                 if (b < 0)
+                         return -EINVAL;
+                 /* Don't allow NUL bytes */
+                 if (a == 0 && b == 0)
+                         return -EINVAL;
+                 *ret = (char) ((a << 4U) | b);
+                 r = 3;
+                 break;
+         }
+         case 'u': {
+                 /* C++11 style 16bit unicode */
+                 int a[4];
+                 unsigned i;
+                 uint32_t c;
+                 if (length != (size_t) -1 && length < 5)
+                         return -EINVAL;
+                 for (i = 0; i < 4; i++) {
+                         a[i] = unhexchar(p[1 + i]);
+                         if (a[i] < 0)
+                                 return a[i];
+                 }
+                 c = ((uint32_t) a[0] << 12U) | ((uint32_t) a[1] << 8U) | ((uint32_t) a[2] << 4U) | (uint32_t) a[3];
+                 /* Don't allow 0 chars */
+                 if (c == 0)
+                         return -EINVAL;
+                 if (c < 128)
+                         *ret = c;
+                 else {
+                         if (!ret_unicode)
+                                 return -EINVAL;
+                         *ret = 0;
+                         *ret_unicode = c;
+                 }
+                 r = 5;
+                 break;
+         }
+         case 'U': {
+                 /* C++11 style 32bit unicode */
+                 int a[8];
+                 unsigned i;
+                 uint32_t c;
+                 if (length != (size_t) -1 && length < 9)
+                         return -EINVAL;
+                 for (i = 0; i < 8; i++) {
+                         a[i] = unhexchar(p[1 + i]);
+                         if (a[i] < 0)
+                                 return a[i];
+                 }
+                 c = ((uint32_t) a[0] << 28U) | ((uint32_t) a[1] << 24U) | ((uint32_t) a[2] << 20U) | ((uint32_t) a[3] << 16U) |
+                     ((uint32_t) a[4] << 12U) | ((uint32_t) a[5] <<  8U) | ((uint32_t) a[6] <<  4U) |  (uint32_t) a[7];
+                 /* Don't allow 0 chars */
+                 if (c == 0)
+                         return -EINVAL;
+                 /* Don't allow invalid code points */
+                 if (!unichar_is_valid(c))
+                         return -EINVAL;
+                 if (c < 128)
+                         *ret = c;
+                 else {
+                         if (!ret_unicode)
+                                 return -EINVAL;
+                         *ret = 0;
+                         *ret_unicode = c;
+                 }
+                 r = 9;
+                 break;
+         }
+         case '0':
+         case '1':
+         case '2':
+         case '3':
+         case '4':
+         case '5':
+         case '6':
+         case '7': {
+                 /* octal encoding */
+                 int a, b, c;
+                 uint32_t m;
+                 if (length != (size_t) -1 && length < 3)
+                         return -EINVAL;
+                 a = unoctchar(p[0]);
+                 if (a < 0)
+                         return -EINVAL;
+                 b = unoctchar(p[1]);
+                 if (b < 0)
+                         return -EINVAL;
+                 c = unoctchar(p[2]);
+                 if (c < 0)
+                         return -EINVAL;
+                 /* don't allow NUL bytes */
+                 if (a == 0 && b == 0 && c == 0)
+                         return -EINVAL;
+                 /* Don't allow bytes above 255 */
+                 m = ((uint32_t) a << 6U) | ((uint32_t) b << 3U) | (uint32_t) c;
+                 if (m > 255)
+                         return -EINVAL;
+                 *ret = m;
+                 r = 3;
+                 break;
+         }
+         default:
+                 return -EINVAL;
+         }
+         return r;
+ }
+ int cunescape_length_with_prefix(const char *s, size_t length, const char *prefix, UnescapeFlags flags, char **ret) {
+         char *r, *t;
+         const char *f;
+         size_t pl;
+         assert(s);
+         assert(ret);
+         /* Undoes C style string escaping, and optionally prefixes it. */
+         pl = prefix ? strlen(prefix) : 0;
+         r = new(char, pl+length+1);
+         if (!r)
+                 return -ENOMEM;
+         if (prefix)
+                 memcpy(r, prefix, pl);
+         for (f = s, t = r + pl; f < s + length; f++) {
+                 size_t remaining;
+                 uint32_t u;
+                 char c;
+                 int k;
+                 remaining = s + length - f;
+                 assert(remaining > 0);
+                 if (*f != '\\') {
+                         /* A literal literal, copy verbatim */
+                         *(t++) = *f;
+                         continue;
+                 }
+                 if (remaining == 1) {
+                         if (flags & UNESCAPE_RELAX) {
+                                 /* A trailing backslash, copy verbatim */
+                                 *(t++) = *f;
+                                 continue;
+                         }
+                         free(r);
+                         return -EINVAL;
+                 }
+                 k = cunescape_one(f + 1, remaining - 1, &c, &u);
+                 if (k < 0) {
+                         if (flags & UNESCAPE_RELAX) {
+                                 /* Invalid escape code, let's take it literal then */
+                                 *(t++) = '\\';
+                                 continue;
+                         }
+                         free(r);
+                         return k;
+                 }
+                 if (c != 0)
+                         /* Non-Unicode? Let's encode this directly */
+                         *(t++) = c;
+                 else
+                         /* Unicode? Then let's encode this in UTF-8 */
+                         t += utf8_encode_unichar(t, u);
+                 f += k;
+         }
+         *t = 0;
+         *ret = r;
+         return t - r;
+ }
+ int cunescape_length(const char *s, size_t length, UnescapeFlags flags, char **ret) {
+         return cunescape_length_with_prefix(s, length, NULL, flags, ret);
+ }
+ 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) {
+         char *r, *t;
+         const char *f;
+         /* Escapes all chars in bad, in addition to \ and all special
+          * chars, in \xFF style escaping. May be reversed with
+          * cunescape(). */
+         r = new(char, strlen(s) * 4 + 1);
+         if (!r)
+                 return NULL;
+         for (f = s, t = r; *f; f++) {
+                 if ((*f < ' ') || (*f >= 127) ||
+                     (*f == '\\') || strchr(bad, *f)) {
+                         *(t++) = '\\';
+                         *(t++) = 'x';
+                         *(t++) = hexchar(*f >> 4);
+                         *(t++) = hexchar(*f);
+                 } else
+                         *(t++) = *f;
+         }
+         *t = 0;
+         return r;
+ }
+ static char *strcpy_backslash_escaped(char *t, const char *s, const char *bad) {
+         assert(bad);
+         for (; *s; s++) {
+                 if (*s == '\\' || strchr(bad, *s))
+                         *(t++) = '\\';
+                 *(t++) = *s;
+         }
+         return t;
+ }
+ char *shell_escape(const char *s, const char *bad) {
+         char *r, *t;
+         r = new(char, strlen(s)*2+1);
+         if (!r)
+                 return NULL;
+         t = strcpy_backslash_escaped(r, s, bad);
+         *t = 0;
+         return r;
+ }
+ char *shell_maybe_quote(const char *s) {
+         const char *p;
+         char *r, *t;
+         assert(s);
+         /* Encloses a string in double quotes if necessary to make it
+          * OK as shell string. */
+         for (p = s; *p; p++)
+                 if (*p <= ' ' ||
+                     *p >= 127 ||
+                     strchr(SHELL_NEED_QUOTES, *p))
+                         break;
+         if (!*p)
+                 return strdup(s);
+         r = new(char, 1+strlen(s)*2+1+1);
+         if (!r)
+                 return NULL;
+         t = r;
+         *(t++) = '"';
+         t = mempcpy(t, s, p - s);
+         t = strcpy_backslash_escaped(t, p, SHELL_NEED_ESCAPE);
+         *(t++)= '"';
+         *t = 0;
+         return r;
+ }
index 0000000,30604c5..6c033c4
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,48 +1,50 @@@
+ /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+ #pragma once
+ /***
+   This file is part of systemd.
+   Copyright 2010 Lennart Poettering
+   systemd is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 2.1 of the License, or
+   (at your option) any later version.
+   systemd is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+   Lesser General Public License for more details.
+   You should have received a copy of the GNU Lesser General Public License
+   along with systemd; If not, see <http://www.gnu.org/licenses/>.
+ ***/
++#include "nm-sd-adapt.h"
++
+ #include <inttypes.h>
+ #include <sys/types.h>
+ /* What characters are special in the shell? */
+ /* must be escaped outside and inside double-quotes */
+ #define SHELL_NEED_ESCAPE "\"\\`$"
+ /* can be escaped or double-quoted */
+ #define SHELL_NEED_QUOTES SHELL_NEED_ESCAPE GLOB_CHARS "'()<>|&;"
+ typedef enum UnescapeFlags {
+         UNESCAPE_RELAX = 1,
+ } UnescapeFlags;
+ char *cescape(const char *s);
+ size_t cescape_char(char c, char *buf);
+ int cunescape(const char *s, UnescapeFlags flags, char **ret);
+ int cunescape_length(const char *s, size_t length, UnescapeFlags flags, char **ret);
+ int cunescape_length_with_prefix(const char *s, size_t length, const char *prefix, UnescapeFlags flags, char **ret);
+ int cunescape_one(const char *p, size_t length, char *ret, uint32_t *ret_unicode);
+ char *xescape(const char *s, const char *bad);
+ char *shell_escape(const char *s, const char *bad);
+ char *shell_maybe_quote(const char *s);
index 0000000,d1b1db3..c26f4d6
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,351 +1,359 @@@
+ /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+ /***
+   This file is part of systemd.
+   Copyright 2010 Lennart Poettering
+   systemd is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 2.1 of the License, or
+   (at your option) any later version.
+   systemd is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+   Lesser General Public License for more details.
+   You should have received a copy of the GNU Lesser General Public License
+   along with systemd; If not, see <http://www.gnu.org/licenses/>.
+ ***/
++#include "nm-sd-adapt.h"
++
++#if 0 /* NM_IGNORED */
+ #include "dirent-util.h"
++#endif /* NM_IGNORED */
+ #include "fd-util.h"
++#if 0 /* NM_IGNORED */
+ #include "parse-util.h"
++#endif /* NM_IGNORED */
+ #include "socket-util.h"
+ #include "util.h"
+ int close_nointr(int fd) {
+         assert(fd >= 0);
+         if (close(fd) >= 0)
+                 return 0;
+         /*
+          * Just ignore EINTR; a retry loop is the wrong thing to do on
+          * Linux.
+          *
+          * http://lkml.indiana.edu/hypermail/linux/kernel/0509.1/0877.html
+          * https://bugzilla.gnome.org/show_bug.cgi?id=682819
+          * http://utcc.utoronto.ca/~cks/space/blog/unix/CloseEINTR
+          * https://sites.google.com/site/michaelsafyan/software-engineering/checkforeintrwheninvokingclosethinkagain
+          */
+         if (errno == EINTR)
+                 return 0;
+         return -errno;
+ }
+ int safe_close(int fd) {
+         /*
+          * Like close_nointr() but cannot fail. Guarantees errno is
+          * unchanged. Is a NOP with negative fds passed, and returns
+          * -1, so that it can be used in this syntax:
+          *
+          * fd = safe_close(fd);
+          */
+         if (fd >= 0) {
+                 PROTECT_ERRNO;
+                 /* The kernel might return pretty much any error code
+                  * via close(), but the fd will be closed anyway. The
+                  * only condition we want to check for here is whether
+                  * the fd was invalid at all... */
+                 assert_se(close_nointr(fd) != -EBADF);
+         }
+         return -1;
+ }
+ void safe_close_pair(int p[]) {
+         assert(p);
+         if (p[0] == p[1]) {
+                 /* Special case pairs which use the same fd in both
+                  * directions... */
+                 p[0] = p[1] = safe_close(p[0]);
+                 return;
+         }
+         p[0] = safe_close(p[0]);
+         p[1] = safe_close(p[1]);
+ }
+ void close_many(const int fds[], unsigned n_fd) {
+         unsigned i;
+         assert(fds || n_fd <= 0);
+         for (i = 0; i < n_fd; i++)
+                 safe_close(fds[i]);
+ }
+ int fclose_nointr(FILE *f) {
+         assert(f);
+         /* Same as close_nointr(), but for fclose() */
+         if (fclose(f) == 0)
+                 return 0;
+         if (errno == EINTR)
+                 return 0;
+         return -errno;
+ }
+ FILE* safe_fclose(FILE *f) {
+         /* Same as safe_close(), but for fclose() */
+         if (f) {
+                 PROTECT_ERRNO;
+                 assert_se(fclose_nointr(f) != EBADF);
+         }
+         return NULL;
+ }
+ DIR* safe_closedir(DIR *d) {
+         if (d) {
+                 PROTECT_ERRNO;
+                 assert_se(closedir(d) >= 0 || errno != EBADF);
+         }
+         return NULL;
+ }
+ int fd_nonblock(int fd, bool nonblock) {
+         int flags, nflags;
+         assert(fd >= 0);
+         flags = fcntl(fd, F_GETFL, 0);
+         if (flags < 0)
+                 return -errno;
+         if (nonblock)
+                 nflags = flags | O_NONBLOCK;
+         else
+                 nflags = flags & ~O_NONBLOCK;
+         if (nflags == flags)
+                 return 0;
+         if (fcntl(fd, F_SETFL, nflags) < 0)
+                 return -errno;
+         return 0;
+ }
+ int fd_cloexec(int fd, bool cloexec) {
+         int flags, nflags;
+         assert(fd >= 0);
+         flags = fcntl(fd, F_GETFD, 0);
+         if (flags < 0)
+                 return -errno;
+         if (cloexec)
+                 nflags = flags | FD_CLOEXEC;
+         else
+                 nflags = flags & ~FD_CLOEXEC;
+         if (nflags == flags)
+                 return 0;
+         if (fcntl(fd, F_SETFD, nflags) < 0)
+                 return -errno;
+         return 0;
+ }
++#if 0 /* NM_IGNORED */
+ _pure_ static bool fd_in_set(int fd, const int fdset[], unsigned n_fdset) {
+         unsigned i;
+         assert(n_fdset == 0 || fdset);
+         for (i = 0; i < n_fdset; i++)
+                 if (fdset[i] == fd)
+                         return true;
+         return false;
+ }
+ int close_all_fds(const int except[], unsigned n_except) {
+         _cleanup_closedir_ DIR *d = NULL;
+         struct dirent *de;
+         int r = 0;
+         assert(n_except == 0 || except);
+         d = opendir("/proc/self/fd");
+         if (!d) {
+                 int fd;
+                 struct rlimit rl;
+                 /* When /proc isn't available (for example in chroots)
+                  * the fallback is brute forcing through the fd
+                  * table */
+                 assert_se(getrlimit(RLIMIT_NOFILE, &rl) >= 0);
+                 for (fd = 3; fd < (int) rl.rlim_max; fd ++) {
+                         if (fd_in_set(fd, except, n_except))
+                                 continue;
+                         if (close_nointr(fd) < 0)
+                                 if (errno != EBADF && r == 0)
+                                         r = -errno;
+                 }
+                 return r;
+         }
+         while ((de = readdir(d))) {
+                 int fd = -1;
+                 if (hidden_file(de->d_name))
+                         continue;
+                 if (safe_atoi(de->d_name, &fd) < 0)
+                         /* Let's better ignore this, just in case */
+                         continue;
+                 if (fd < 3)
+                         continue;
+                 if (fd == dirfd(d))
+                         continue;
+                 if (fd_in_set(fd, except, n_except))
+                         continue;
+                 if (close_nointr(fd) < 0) {
+                         /* Valgrind has its own FD and doesn't want to have it closed */
+                         if (errno != EBADF && r == 0)
+                                 r = -errno;
+                 }
+         }
+         return r;
+ }
+ int same_fd(int a, int b) {
+         struct stat sta, stb;
+         pid_t pid;
+         int r, fa, fb;
+         assert(a >= 0);
+         assert(b >= 0);
+         /* Compares two file descriptors. Note that semantics are
+          * quite different depending on whether we have kcmp() or we
+          * don't. If we have kcmp() this will only return true for
+          * dup()ed file descriptors, but not otherwise. If we don't
+          * have kcmp() this will also return true for two fds of the same
+          * file, created by separate open() calls. Since we use this
+          * call mostly for filtering out duplicates in the fd store
+          * this difference hopefully doesn't matter too much. */
+         if (a == b)
+                 return true;
+         /* Try to use kcmp() if we have it. */
+         pid = getpid();
+         r = kcmp(pid, pid, KCMP_FILE, a, b);
+         if (r == 0)
+                 return true;
+         if (r > 0)
+                 return false;
+         if (errno != ENOSYS)
+                 return -errno;
+         /* We don't have kcmp(), use fstat() instead. */
+         if (fstat(a, &sta) < 0)
+                 return -errno;
+         if (fstat(b, &stb) < 0)
+                 return -errno;
+         if ((sta.st_mode & S_IFMT) != (stb.st_mode & S_IFMT))
+                 return false;
+         /* We consider all device fds different, since two device fds
+          * might refer to quite different device contexts even though
+          * they share the same inode and backing dev_t. */
+         if (S_ISCHR(sta.st_mode) || S_ISBLK(sta.st_mode))
+                 return false;
+         if (sta.st_dev != stb.st_dev || sta.st_ino != stb.st_ino)
+                 return false;
+         /* The fds refer to the same inode on disk, let's also check
+          * if they have the same fd flags. This is useful to
+          * distinguish the read and write side of a pipe created with
+          * pipe(). */
+         fa = fcntl(a, F_GETFL);
+         if (fa < 0)
+                 return -errno;
+         fb = fcntl(b, F_GETFL);
+         if (fb < 0)
+                 return -errno;
+         return fa == fb;
+ }
++#endif /* NM_IGNORED */
+ void cmsg_close_all(struct msghdr *mh) {
+         struct cmsghdr *cmsg;
+         assert(mh);
+         CMSG_FOREACH(cmsg, mh)
+                 if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SCM_RIGHTS)
+                         close_many((int*) CMSG_DATA(cmsg), (cmsg->cmsg_len - CMSG_LEN(0)) / sizeof(int));
+ }
+ bool fdname_is_valid(const char *s) {
+         const char *p;
+         /* Validates a name for $LISTEN_FDNAMES. We basically allow
+          * everything ASCII that's not a control character. Also, as
+          * special exception the ":" character is not allowed, as we
+          * use that as field separator in $LISTEN_FDNAMES.
+          *
+          * Note that the empty string is explicitly allowed
+          * here. However, we limit the length of the names to 255
+          * characters. */
+         if (!s)
+                 return false;
+         for (p = s; *p; p++) {
+                 if (*p < ' ')
+                         return false;
+                 if (*p >= 127)
+                         return false;
+                 if (*p == ':')
+                         return false;
+         }
+         return p - s < 256;
+ }
index 0000000,5ce1592..3614dc7
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,75 +1,77 @@@
+ /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+ #pragma once
+ /***
+   This file is part of systemd.
+   Copyright 2010 Lennart Poettering
+   systemd is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 2.1 of the License, or
+   (at your option) any later version.
+   systemd is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+   Lesser General Public License for more details.
+   You should have received a copy of the GNU Lesser General Public License
+   along with systemd; If not, see <http://www.gnu.org/licenses/>.
+ ***/
++#include "nm-sd-adapt.h"
++
+ #include <dirent.h>
+ #include <stdbool.h>
+ #include <stdio.h>
+ #include <sys/socket.h>
+ #include "macro.h"
+ /* Make sure we can distinguish fd 0 and NULL */
+ #define FD_TO_PTR(fd) INT_TO_PTR((fd)+1)
+ #define PTR_TO_FD(p) (PTR_TO_INT(p)-1)
+ int close_nointr(int fd);
+ int safe_close(int fd);
+ void safe_close_pair(int p[]);
+ void close_many(const int fds[], unsigned n_fd);
+ int fclose_nointr(FILE *f);
+ FILE* safe_fclose(FILE *f);
+ DIR* safe_closedir(DIR *f);
+ static inline void closep(int *fd) {
+         safe_close(*fd);
+ }
+ static inline void close_pairp(int (*p)[2]) {
+         safe_close_pair(*p);
+ }
+ static inline void fclosep(FILE **f) {
+         safe_fclose(*f);
+ }
+ DEFINE_TRIVIAL_CLEANUP_FUNC(FILE*, pclose);
+ DEFINE_TRIVIAL_CLEANUP_FUNC(DIR*, closedir);
+ #define _cleanup_close_ _cleanup_(closep)
+ #define _cleanup_fclose_ _cleanup_(fclosep)
+ #define _cleanup_pclose_ _cleanup_(pclosep)
+ #define _cleanup_closedir_ _cleanup_(closedirp)
+ #define _cleanup_close_pair_ _cleanup_(close_pairp)
+ int fd_nonblock(int fd, bool nonblock);
+ int fd_cloexec(int fd, bool cloexec);
+ int close_all_fds(const int except[], unsigned n_except);
+ int same_fd(int a, int b);
+ void cmsg_close_all(struct msghdr *mh);
+ bool fdname_is_valid(const char *s);
    along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
 +#include "nm-sd-adapt.h"
 +
  #include <unistd.h>
  
- #include "util.h"
- #include "strv.h"
- #include "utf8.h"
+ #include "alloc-util.h"
  #include "ctype.h"
+ #include "escape.h"
+ #include "fd-util.h"
  #include "fileio.h"
+ #include "fs-util.h"
+ #include "hexdecoct.h"
+ #include "parse-util.h"
+ #include "path-util.h"
+ #include "random-util.h"
++#if 0 /* NM_IGNORED */
+ #include "stdio-util.h"
++#endif /* NM_IGNORED */
+ #include "string-util.h"
+ #include "strv.h"
+ #include "umask-util.h"
+ #include "utf8.h"
+ #include "util.h"
  
  int write_string_stream(FILE *f, const char *line, bool enforce_newline) {
  
@@@ -847,3 -911,332 +915,336 @@@ int get_proc_field(const char *filename
          *field = f;
          return 0;
  }
+ DIR *xopendirat(int fd, const char *name, int flags) {
+         int nfd;
+         DIR *d;
+         assert(!(flags & O_CREAT));
+         nfd = openat(fd, name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|flags, 0);
+         if (nfd < 0)
+                 return NULL;
+         d = fdopendir(nfd);
+         if (!d) {
+                 safe_close(nfd);
+                 return NULL;
+         }
+         return d;
+ }
++#if 0 /* NM_IGNORED */
+ static int search_and_fopen_internal(const char *path, const char *mode, const char *root, char **search, FILE **_f) {
+         char **i;
+         assert(path);
+         assert(mode);
+         assert(_f);
+         if (!path_strv_resolve_uniq(search, root))
+                 return -ENOMEM;
+         STRV_FOREACH(i, search) {
+                 _cleanup_free_ char *p = NULL;
+                 FILE *f;
+                 if (root)
+                         p = strjoin(root, *i, "/", path, NULL);
+                 else
+                         p = strjoin(*i, "/", path, NULL);
+                 if (!p)
+                         return -ENOMEM;
+                 f = fopen(p, mode);
+                 if (f) {
+                         *_f = f;
+                         return 0;
+                 }
+                 if (errno != ENOENT)
+                         return -errno;
+         }
+         return -ENOENT;
+ }
+ int search_and_fopen(const char *path, const char *mode, const char *root, const char **search, FILE **_f) {
+         _cleanup_strv_free_ char **copy = NULL;
+         assert(path);
+         assert(mode);
+         assert(_f);
+         if (path_is_absolute(path)) {
+                 FILE *f;
+                 f = fopen(path, mode);
+                 if (f) {
+                         *_f = f;
+                         return 0;
+                 }
+                 return -errno;
+         }
+         copy = strv_copy((char**) search);
+         if (!copy)
+                 return -ENOMEM;
+         return search_and_fopen_internal(path, mode, root, copy, _f);
+ }
+ int search_and_fopen_nulstr(const char *path, const char *mode, const char *root, const char *search, FILE **_f) {
+         _cleanup_strv_free_ char **s = NULL;
+         if (path_is_absolute(path)) {
+                 FILE *f;
+                 f = fopen(path, mode);
+                 if (f) {
+                         *_f = f;
+                         return 0;
+                 }
+                 return -errno;
+         }
+         s = strv_split_nulstr(search);
+         if (!s)
+                 return -ENOMEM;
+         return search_and_fopen_internal(path, mode, root, s, _f);
+ }
++#endif /* NM_IGNORED */
+ int fopen_temporary(const char *path, FILE **_f, char **_temp_path) {
+         FILE *f;
+         char *t;
+         int r, fd;
+         assert(path);
+         assert(_f);
+         assert(_temp_path);
+         r = tempfn_xxxxxx(path, NULL, &t);
+         if (r < 0)
+                 return r;
+         fd = mkostemp_safe(t, O_WRONLY|O_CLOEXEC);
+         if (fd < 0) {
+                 free(t);
+                 return -errno;
+         }
+         f = fdopen(fd, "we");
+         if (!f) {
+                 unlink_noerrno(t);
+                 free(t);
+                 safe_close(fd);
+                 return -errno;
+         }
+         *_f = f;
+         *_temp_path = t;
+         return 0;
+ }
+ int fflush_and_check(FILE *f) {
+         assert(f);
+         errno = 0;
+         fflush(f);
+         if (ferror(f))
+                 return errno ? -errno : -EIO;
+         return 0;
+ }
+ /* This is much like like mkostemp() but is subject to umask(). */
+ int mkostemp_safe(char *pattern, int flags) {
+         _cleanup_umask_ mode_t u;
+         int fd;
+         assert(pattern);
+         u = umask(077);
+         fd = mkostemp(pattern, flags);
+         if (fd < 0)
+                 return -errno;
+         return fd;
+ }
+ int open_tmpfile(const char *path, int flags) {
+         char *p;
+         int fd;
+         assert(path);
+ #ifdef O_TMPFILE
+         /* Try O_TMPFILE first, if it is supported */
+         fd = open(path, flags|O_TMPFILE|O_EXCL, S_IRUSR|S_IWUSR);
+         if (fd >= 0)
+                 return fd;
+ #endif
+         /* Fall back to unguessable name + unlinking */
+         p = strjoina(path, "/systemd-tmp-XXXXXX");
+         fd = mkostemp_safe(p, flags);
+         if (fd < 0)
+                 return fd;
+         unlink(p);
+         return fd;
+ }
+ int tempfn_xxxxxx(const char *p, const char *extra, char **ret) {
+         const char *fn;
+         char *t;
+         assert(p);
+         assert(ret);
+         /*
+          * Turns this:
+          *         /foo/bar/waldo
+          *
+          * Into this:
+          *         /foo/bar/.#<extra>waldoXXXXXX
+          */
+         fn = basename(p);
+         if (!filename_is_valid(fn))
+                 return -EINVAL;
+         if (extra == NULL)
+                 extra = "";
+         t = new(char, strlen(p) + 2 + strlen(extra) + 6 + 1);
+         if (!t)
+                 return -ENOMEM;
+         strcpy(stpcpy(stpcpy(stpcpy(mempcpy(t, p, fn - p), ".#"), extra), fn), "XXXXXX");
+         *ret = path_kill_slashes(t);
+         return 0;
+ }
+ int tempfn_random(const char *p, const char *extra, char **ret) {
+         const char *fn;
+         char *t, *x;
+         uint64_t u;
+         unsigned i;
+         assert(p);
+         assert(ret);
+         /*
+          * Turns this:
+          *         /foo/bar/waldo
+          *
+          * Into this:
+          *         /foo/bar/.#<extra>waldobaa2a261115984a9
+          */
+         fn = basename(p);
+         if (!filename_is_valid(fn))
+                 return -EINVAL;
+         if (!extra)
+                 extra = "";
+         t = new(char, strlen(p) + 2 + strlen(extra) + 16 + 1);
+         if (!t)
+                 return -ENOMEM;
+         x = stpcpy(stpcpy(stpcpy(mempcpy(t, p, fn - p), ".#"), extra), fn);
+         u = random_u64();
+         for (i = 0; i < 16; i++) {
+                 *(x++) = hexchar(u & 0xF);
+                 u >>= 4;
+         }
+         *x = 0;
+         *ret = path_kill_slashes(t);
+         return 0;
+ }
+ int tempfn_random_child(const char *p, const char *extra, char **ret) {
+         char *t, *x;
+         uint64_t u;
+         unsigned i;
+         assert(p);
+         assert(ret);
+         /* Turns this:
+          *         /foo/bar/waldo
+          * Into this:
+          *         /foo/bar/waldo/.#<extra>3c2b6219aa75d7d0
+          */
+         if (!extra)
+                 extra = "";
+         t = new(char, strlen(p) + 3 + strlen(extra) + 16 + 1);
+         if (!t)
+                 return -ENOMEM;
+         x = stpcpy(stpcpy(stpcpy(t, p), "/.#"), extra);
+         u = random_u64();
+         for (i = 0; i < 16; i++) {
+                 *(x++) = hexchar(u & 0xF);
+                 u >>= 4;
+         }
+         *x = 0;
+         *ret = path_kill_slashes(t);
+         return 0;
+ }
++#if 0 /* NM_IGNORED */
+ int write_timestamp_file_atomic(const char *fn, usec_t n) {
+         char ln[DECIMAL_STR_MAX(n)+2];
+         /* Creates a "timestamp" file, that contains nothing but a
+          * usec_t timestamp, formatted in ASCII. */
+         if (n <= 0 || n >= USEC_INFINITY)
+                 return -ERANGE;
+         xsprintf(ln, USEC_FMT "\n", n);
+         return write_string_file(fn, ln, WRITE_STRING_FILE_CREATE|WRITE_STRING_FILE_ATOMIC);
+ }
++#endif /* NM_IGNORED */
+ int read_timestamp_file(const char *fn, usec_t *ret) {
+         _cleanup_free_ char *ln = NULL;
+         uint64_t t;
+         int r;
+         r = read_one_line_file(fn, &ln);
+         if (r < 0)
+                 return r;
+         r = safe_atou64(ln, &t);
+         if (r < 0)
+                 return r;
+         if (t <= 0 || t >= (uint64_t) USEC_INFINITY)
+                 return -ERANGE;
+         *ret = (usec_t) t;
+         return 0;
+ }
    along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
 +#include "nm-sd-adapt.h"
 +
+ #include <dirent.h>
+ #include <stdbool.h>
  #include <stddef.h>
  #include <stdio.h>
+ #include <sys/types.h>
  
  #include "macro.h"
+ #include "time-util.h"
  
  typedef enum {
          WRITE_STRING_FILE_CREATE = 1,
index 0000000,2b6189a..e9a4f7e
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,500 +1,512 @@@
+ /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+ /***
+   This file is part of systemd.
+   Copyright 2010 Lennart Poettering
+   systemd is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 2.1 of the License, or
+   (at your option) any later version.
+   systemd is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+   Lesser General Public License for more details.
+   You should have received a copy of the GNU Lesser General Public License
+   along with systemd; If not, see <http://www.gnu.org/licenses/>.
+ ***/
++#include "nm-sd-adapt.h"
++
+ #include "alloc-util.h"
++#if 0 /* NM_IGNORED */
+ #include "dirent-util.h"
++#endif /* NM_IGNORED */
+ #include "fd-util.h"
+ #include "fileio.h"
+ #include "fs-util.h"
++#if 0 /* NM_IGNORED */
+ #include "mkdir.h"
++#endif /* NM_IGNORED */
+ #include "parse-util.h"
+ #include "path-util.h"
+ #include "string-util.h"
+ #include "strv.h"
++#if 0 /* NM_IGNORED */
+ #include "user-util.h"
++#endif /* NM_IGNORED */
+ #include "util.h"
+ int unlink_noerrno(const char *path) {
+         PROTECT_ERRNO;
+         int r;
+         r = unlink(path);
+         if (r < 0)
+                 return -errno;
+         return 0;
+ }
++#if 0 /* NM_IGNORED */
+ int rmdir_parents(const char *path, const char *stop) {
+         size_t l;
+         int r = 0;
+         assert(path);
+         assert(stop);
+         l = strlen(path);
+         /* Skip trailing slashes */
+         while (l > 0 && path[l-1] == '/')
+                 l--;
+         while (l > 0) {
+                 char *t;
+                 /* Skip last component */
+                 while (l > 0 && path[l-1] != '/')
+                         l--;
+                 /* Skip trailing slashes */
+                 while (l > 0 && path[l-1] == '/')
+                         l--;
+                 if (l <= 0)
+                         break;
+                 t = strndup(path, l);
+                 if (!t)
+                         return -ENOMEM;
+                 if (path_startswith(stop, t)) {
+                         free(t);
+                         return 0;
+                 }
+                 r = rmdir(t);
+                 free(t);
+                 if (r < 0)
+                         if (errno != ENOENT)
+                                 return -errno;
+         }
+         return 0;
+ }
+ int rename_noreplace(int olddirfd, const char *oldpath, int newdirfd, const char *newpath) {
+         struct stat buf;
+         int ret;
+         ret = renameat2(olddirfd, oldpath, newdirfd, newpath, RENAME_NOREPLACE);
+         if (ret >= 0)
+                 return 0;
+         /* renameat2() exists since Linux 3.15, btrfs added support for it later.
+          * If it is not implemented, fallback to another method. */
+         if (!IN_SET(errno, EINVAL, ENOSYS))
+                 return -errno;
+         /* The link()/unlink() fallback does not work on directories. But
+          * renameat() without RENAME_NOREPLACE gives the same semantics on
+          * directories, except when newpath is an *empty* directory. This is
+          * good enough. */
+         ret = fstatat(olddirfd, oldpath, &buf, AT_SYMLINK_NOFOLLOW);
+         if (ret >= 0 && S_ISDIR(buf.st_mode)) {
+                 ret = renameat(olddirfd, oldpath, newdirfd, newpath);
+                 return ret >= 0 ? 0 : -errno;
+         }
+         /* If it is not a directory, use the link()/unlink() fallback. */
+         ret = linkat(olddirfd, oldpath, newdirfd, newpath, 0);
+         if (ret < 0)
+                 return -errno;
+         ret = unlinkat(olddirfd, oldpath, 0);
+         if (ret < 0) {
+                 /* backup errno before the following unlinkat() alters it */
+                 ret = errno;
+                 (void) unlinkat(newdirfd, newpath, 0);
+                 errno = ret;
+                 return -errno;
+         }
+         return 0;
+ }
+ int readlinkat_malloc(int fd, const char *p, char **ret) {
+         size_t l = 100;
+         int r;
+         assert(p);
+         assert(ret);
+         for (;;) {
+                 char *c;
+                 ssize_t n;
+                 c = new(char, l);
+                 if (!c)
+                         return -ENOMEM;
+                 n = readlinkat(fd, p, c, l-1);
+                 if (n < 0) {
+                         r = -errno;
+                         free(c);
+                         return r;
+                 }
+                 if ((size_t) n < l-1) {
+                         c[n] = 0;
+                         *ret = c;
+                         return 0;
+                 }
+                 free(c);
+                 l *= 2;
+         }
+ }
+ int readlink_malloc(const char *p, char **ret) {
+         return readlinkat_malloc(AT_FDCWD, p, ret);
+ }
+ int readlink_value(const char *p, char **ret) {
+         _cleanup_free_ char *link = NULL;
+         char *value;
+         int r;
+         r = readlink_malloc(p, &link);
+         if (r < 0)
+                 return r;
+         value = basename(link);
+         if (!value)
+                 return -ENOENT;
+         value = strdup(value);
+         if (!value)
+                 return -ENOMEM;
+         *ret = value;
+         return 0;
+ }
+ int readlink_and_make_absolute(const char *p, char **r) {
+         _cleanup_free_ char *target = NULL;
+         char *k;
+         int j;
+         assert(p);
+         assert(r);
+         j = readlink_malloc(p, &target);
+         if (j < 0)
+                 return j;
+         k = file_in_same_dir(p, target);
+         if (!k)
+                 return -ENOMEM;
+         *r = k;
+         return 0;
+ }
+ int readlink_and_canonicalize(const char *p, char **r) {
+         char *t, *s;
+         int j;
+         assert(p);
+         assert(r);
+         j = readlink_and_make_absolute(p, &t);
+         if (j < 0)
+                 return j;
+         s = canonicalize_file_name(t);
+         if (s) {
+                 free(t);
+                 *r = s;
+         } else
+                 *r = t;
+         path_kill_slashes(*r);
+         return 0;
+ }
+ int readlink_and_make_absolute_root(const char *root, const char *path, char **ret) {
+         _cleanup_free_ char *target = NULL, *t = NULL;
+         const char *full;
+         int r;
+         full = prefix_roota(root, path);
+         r = readlink_malloc(full, &target);
+         if (r < 0)
+                 return r;
+         t = file_in_same_dir(path, target);
+         if (!t)
+                 return -ENOMEM;
+         *ret = t;
+         t = NULL;
+         return 0;
+ }
+ int chmod_and_chown(const char *path, mode_t mode, uid_t uid, gid_t gid) {
+         assert(path);
+         /* Under the assumption that we are running privileged we
+          * first change the access mode and only then hand out
+          * ownership to avoid a window where access is too open. */
+         if (mode != MODE_INVALID)
+                 if (chmod(path, mode) < 0)
+                         return -errno;
+         if (uid != UID_INVALID || gid != GID_INVALID)
+                 if (chown(path, uid, gid) < 0)
+                         return -errno;
+         return 0;
+ }
+ int fchmod_and_fchown(int fd, mode_t mode, uid_t uid, gid_t gid) {
+         assert(fd >= 0);
+         /* Under the assumption that we are running privileged we
+          * first change the access mode and only then hand out
+          * ownership to avoid a window where access is too open. */
+         if (mode != MODE_INVALID)
+                 if (fchmod(fd, mode) < 0)
+                         return -errno;
+         if (uid != UID_INVALID || gid != GID_INVALID)
+                 if (fchown(fd, uid, gid) < 0)
+                         return -errno;
+         return 0;
+ }
++#endif /* NM_IGNORED */
+ int fchmod_umask(int fd, mode_t m) {
+         mode_t u;
+         int r;
+         u = umask(0777);
+         r = fchmod(fd, m & (~u)) < 0 ? -errno : 0;
+         umask(u);
+         return r;
+ }
++#if 0 /* NM_IGNORED */
+ int fd_warn_permissions(const char *path, int fd) {
+         struct stat st;
+         if (fstat(fd, &st) < 0)
+                 return -errno;
+         if (st.st_mode & 0111)
+                 log_warning("Configuration file %s is marked executable. Please remove executable permission bits. Proceeding anyway.", path);
+         if (st.st_mode & 0002)
+                 log_warning("Configuration file %s is marked world-writable. Please remove world writability permission bits. Proceeding anyway.", path);
+         if (getpid() == 1 && (st.st_mode & 0044) != 0044)
+                 log_warning("Configuration file %s is marked world-inaccessible. This has no effect as configuration data is accessible via APIs without restrictions. Proceeding anyway.", path);
+         return 0;
+ }
+ int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gid, mode_t mode) {
+         _cleanup_close_ int fd;
+         int r;
+         assert(path);
+         if (parents)
+                 mkdir_parents(path, 0755);
+         fd = open(path, O_WRONLY|O_CREAT|O_CLOEXEC|O_NOCTTY, mode > 0 ? mode : 0644);
+         if (fd < 0)
+                 return -errno;
+         if (mode != MODE_INVALID) {
+                 r = fchmod(fd, mode);
+                 if (r < 0)
+                         return -errno;
+         }
+         if (uid != UID_INVALID || gid != GID_INVALID) {
+                 r = fchown(fd, uid, gid);
+                 if (r < 0)
+                         return -errno;
+         }
+         if (stamp != USEC_INFINITY) {
+                 struct timespec ts[2];
+                 timespec_store(&ts[0], stamp);
+                 ts[1] = ts[0];
+                 r = futimens(fd, ts);
+         } else
+                 r = futimens(fd, NULL);
+         if (r < 0)
+                 return -errno;
+         return 0;
+ }
+ int touch(const char *path) {
+         return touch_file(path, false, USEC_INFINITY, UID_INVALID, GID_INVALID, MODE_INVALID);
+ }
+ int symlink_idempotent(const char *from, const char *to) {
+         _cleanup_free_ char *p = NULL;
+         int r;
+         assert(from);
+         assert(to);
+         if (symlink(from, to) < 0) {
+                 if (errno != EEXIST)
+                         return -errno;
+                 r = readlink_malloc(to, &p);
+                 if (r < 0)
+                         return r;
+                 if (!streq(p, from))
+                         return -EINVAL;
+         }
+         return 0;
+ }
+ int symlink_atomic(const char *from, const char *to) {
+         _cleanup_free_ char *t = NULL;
+         int r;
+         assert(from);
+         assert(to);
+         r = tempfn_random(to, NULL, &t);
+         if (r < 0)
+                 return r;
+         if (symlink(from, t) < 0)
+                 return -errno;
+         if (rename(t, to) < 0) {
+                 unlink_noerrno(t);
+                 return -errno;
+         }
+         return 0;
+ }
+ int mknod_atomic(const char *path, mode_t mode, dev_t dev) {
+         _cleanup_free_ char *t = NULL;
+         int r;
+         assert(path);
+         r = tempfn_random(path, NULL, &t);
+         if (r < 0)
+                 return r;
+         if (mknod(t, mode, dev) < 0)
+                 return -errno;
+         if (rename(t, path) < 0) {
+                 unlink_noerrno(t);
+                 return -errno;
+         }
+         return 0;
+ }
+ int mkfifo_atomic(const char *path, mode_t mode) {
+         _cleanup_free_ char *t = NULL;
+         int r;
+         assert(path);
+         r = tempfn_random(path, NULL, &t);
+         if (r < 0)
+                 return r;
+         if (mkfifo(t, mode) < 0)
+                 return -errno;
+         if (rename(t, path) < 0) {
+                 unlink_noerrno(t);
+                 return -errno;
+         }
+         return 0;
+ }
+ int get_files_in_directory(const char *path, char ***list) {
+         _cleanup_closedir_ DIR *d = NULL;
+         size_t bufsize = 0, n = 0;
+         _cleanup_strv_free_ char **l = NULL;
+         assert(path);
+         /* Returns all files in a directory in *list, and the number
+          * of files as return value. If list is NULL returns only the
+          * number. */
+         d = opendir(path);
+         if (!d)
+                 return -errno;
+         for (;;) {
+                 struct dirent *de;
+                 errno = 0;
+                 de = readdir(d);
+                 if (!de && errno != 0)
+                         return -errno;
+                 if (!de)
+                         break;
+                 dirent_ensure_type(d, de);
+                 if (!dirent_is_file(de))
+                         continue;
+                 if (list) {
+                         /* one extra slot is needed for the terminating NULL */
+                         if (!GREEDY_REALLOC(l, bufsize, n + 2))
+                                 return -ENOMEM;
+                         l[n] = strdup(de->d_name);
+                         if (!l[n])
+                                 return -ENOMEM;
+                         l[++n] = NULL;
+                 } else
+                         n++;
+         }
+         if (list) {
+                 *list = l;
+                 l = NULL; /* avoid freeing */
+         }
+         return n;
+ }
++#endif /* NM_IGNORED */
index 0000000,5fbb7bc..0414f04
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,75 +1,77 @@@
+ /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+ #pragma once
+ /***
+   This file is part of systemd.
+   Copyright 2010 Lennart Poettering
+   systemd is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 2.1 of the License, or
+   (at your option) any later version.
+   systemd is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+   Lesser General Public License for more details.
+   You should have received a copy of the GNU Lesser General Public License
+   along with systemd; If not, see <http://www.gnu.org/licenses/>.
+ ***/
++#include "nm-sd-adapt.h"
++
+ #include <fcntl.h>
+ #include <limits.h>
+ #include <sys/inotify.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+ #include "time-util.h"
+ int unlink_noerrno(const char *path);
+ int rmdir_parents(const char *path, const char *stop);
+ int rename_noreplace(int olddirfd, const char *oldpath, int newdirfd, const char *newpath);
+ int readlinkat_malloc(int fd, const char *p, char **ret);
+ int readlink_malloc(const char *p, char **r);
+ int readlink_value(const char *p, char **ret);
+ int readlink_and_make_absolute(const char *p, char **r);
+ int readlink_and_canonicalize(const char *p, char **r);
+ int readlink_and_make_absolute_root(const char *root, const char *path, char **ret);
+ int chmod_and_chown(const char *path, mode_t mode, uid_t uid, gid_t gid);
+ int fchmod_and_fchown(int fd, mode_t mode, uid_t uid, gid_t gid);
+ int fchmod_umask(int fd, mode_t mode);
+ int fd_warn_permissions(const char *path, int fd);
+ #define laccess(path, mode) faccessat(AT_FDCWD, (path), (mode), AT_SYMLINK_NOFOLLOW)
+ int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gid, mode_t mode);
+ int touch(const char *path);
+ int symlink_idempotent(const char *from, const char *to);
+ int symlink_atomic(const char *from, const char *to);
+ int mknod_atomic(const char *path, mode_t mode, dev_t dev);
+ int mkfifo_atomic(const char *path, mode_t mode);
+ int get_files_in_directory(const char *path, char ***list);
+ #define INOTIFY_EVENT_MAX (sizeof(struct inotify_event) + NAME_MAX + 1)
+ #define FOREACH_INOTIFY_EVENT(e, buffer, sz) \
+         for ((e) = &buffer.ev;                                \
+              (uint8_t*) (e) < (uint8_t*) (buffer.raw) + (sz); \
+              (e) = (struct inotify_event*) ((uint8_t*) (e) + sizeof(struct inotify_event) + (e)->len))
+ union inotify_event_buffer {
+         struct inotify_event ev;
+         uint8_t raw[INOTIFY_EVENT_MAX];
+ };
    along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
- #include <stdlib.h>
 +#include "nm-sd-adapt.h"
 +
  #include <errno.h>
  #include <pthread.h>
+ #include <stdlib.h>
  
- #include "util.h"
+ #include "alloc-util.h"
  #include "hashmap.h"
- #include "set.h"
  #include "macro.h"
- #include "siphash24.h"
- #include "strv.h"
  #include "mempool.h"
++#if 0 /* NM_IGNORED */
+ #include "process-util.h"
++#endif /* NM_IGNORED */
  #include "random-util.h"
+ #include "set.h"
+ #include "siphash24.h"
+ #include "strv.h"
+ #include "util.h"
  
  #ifdef ENABLE_DEBUG_HASHMAP
  #include "list.h"
index 0000000,4eb566b..66c81d0
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,698 +1,700 @@@
+ /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+ /***
+   This file is part of systemd.
+   Copyright 2010 Lennart Poettering
+   systemd is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 2.1 of the License, or
+   (at your option) any later version.
+   systemd is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+   Lesser General Public License for more details.
+   You should have received a copy of the GNU Lesser General Public License
+   along with systemd; If not, see <http://www.gnu.org/licenses/>.
+ ***/
++#include "nm-sd-adapt.h"
++
+ #include <ctype.h>
+ #include <inttypes.h>
+ #include "alloc-util.h"
+ #include "hexdecoct.h"
+ #include "util.h"
+ char octchar(int x) {
+         return '0' + (x & 7);
+ }
+ int unoctchar(char c) {
+         if (c >= '0' && c <= '7')
+                 return c - '0';
+         return -EINVAL;
+ }
+ char decchar(int x) {
+         return '0' + (x % 10);
+ }
+ int undecchar(char c) {
+         if (c >= '0' && c <= '9')
+                 return c - '0';
+         return -EINVAL;
+ }
+ char hexchar(int x) {
+         static const char table[16] = "0123456789abcdef";
+         return table[x & 15];
+ }
+ int unhexchar(char c) {
+         if (c >= '0' && c <= '9')
+                 return c - '0';
+         if (c >= 'a' && c <= 'f')
+                 return c - 'a' + 10;
+         if (c >= 'A' && c <= 'F')
+                 return c - 'A' + 10;
+         return -EINVAL;
+ }
+ char *hexmem(const void *p, size_t l) {
+         char *r, *z;
+         const uint8_t *x;
+         z = r = malloc(l * 2 + 1);
+         if (!r)
+                 return NULL;
+         for (x = p; x < (const uint8_t*) p + l; x++) {
+                 *(z++) = hexchar(*x >> 4);
+                 *(z++) = hexchar(*x & 15);
+         }
+         *z = 0;
+         return r;
+ }
+ int unhexmem(const char *p, size_t l, void **mem, size_t *len) {
+         _cleanup_free_ uint8_t *r = NULL;
+         uint8_t *z;
+         const char *x;
+         assert(mem);
+         assert(len);
+         assert(p);
+         z = r = malloc((l + 1) / 2 + 1);
+         if (!r)
+                 return -ENOMEM;
+         for (x = p; x < p + l; x += 2) {
+                 int a, b;
+                 a = unhexchar(x[0]);
+                 if (a < 0)
+                         return a;
+                 else if (x+1 < p + l) {
+                         b = unhexchar(x[1]);
+                         if (b < 0)
+                                 return b;
+                 } else
+                         b = 0;
+                 *(z++) = (uint8_t) a << 4 | (uint8_t) b;
+         }
+         *z = 0;
+         *mem = r;
+         r = NULL;
+         *len = (l + 1) / 2;
+         return 0;
+ }
+ /* https://tools.ietf.org/html/rfc4648#section-6
+  * Notice that base32hex differs from base32 in the alphabet it uses.
+  * The distinction is that the base32hex representation preserves the
+  * order of the underlying data when compared as bytestrings, this is
+  * useful when representing NSEC3 hashes, as one can then verify the
+  * order of hashes directly from their representation. */
+ char base32hexchar(int x) {
+         static const char table[32] = "0123456789"
+                                       "ABCDEFGHIJKLMNOPQRSTUV";
+         return table[x & 31];
+ }
+ int unbase32hexchar(char c) {
+         unsigned offset;
+         if (c >= '0' && c <= '9')
+                 return c - '0';
+         offset = '9' - '0' + 1;
+         if (c >= 'A' && c <= 'V')
+                 return c - 'A' + offset;
+         return -EINVAL;
+ }
+ char *base32hexmem(const void *p, size_t l, bool padding) {
+         char *r, *z;
+         const uint8_t *x;
+         size_t len;
+         if (padding)
+                 /* five input bytes makes eight output bytes, padding is added so we must round up */
+                 len = 8 * (l + 4) / 5;
+         else {
+                 /* same, but round down as there is no padding */
+                 len = 8 * l / 5;
+                 switch (l % 5) {
+                 case 4:
+                         len += 7;
+                         break;
+                 case 3:
+                         len += 5;
+                         break;
+                 case 2:
+                         len += 4;
+                         break;
+                 case 1:
+                         len += 2;
+                         break;
+                 }
+         }
+         z = r = malloc(len + 1);
+         if (!r)
+                 return NULL;
+         for (x = p; x < (const uint8_t*) p + (l / 5) * 5; x += 5) {
+                 /* x[0] == XXXXXXXX; x[1] == YYYYYYYY; x[2] == ZZZZZZZZ
+                    x[3] == QQQQQQQQ; x[4] == WWWWWWWW */
+                 *(z++) = base32hexchar(x[0] >> 3);                    /* 000XXXXX */
+                 *(z++) = base32hexchar((x[0] & 7) << 2 | x[1] >> 6);  /* 000XXXYY */
+                 *(z++) = base32hexchar((x[1] & 63) >> 1);             /* 000YYYYY */
+                 *(z++) = base32hexchar((x[1] & 1) << 4 | x[2] >> 4);  /* 000YZZZZ */
+                 *(z++) = base32hexchar((x[2] & 15) << 1 | x[3] >> 7); /* 000ZZZZQ */
+                 *(z++) = base32hexchar((x[3] & 127) >> 2);            /* 000QQQQQ */
+                 *(z++) = base32hexchar((x[3] & 3) << 3 | x[4] >> 5);  /* 000QQWWW */
+                 *(z++) = base32hexchar((x[4] & 31));                  /* 000WWWWW */
+         }
+         switch (l % 5) {
+         case 4:
+                 *(z++) = base32hexchar(x[0] >> 3);                    /* 000XXXXX */
+                 *(z++) = base32hexchar((x[0] & 7) << 2 | x[1] >> 6);  /* 000XXXYY */
+                 *(z++) = base32hexchar((x[1] & 63) >> 1);             /* 000YYYYY */
+                 *(z++) = base32hexchar((x[1] & 1) << 4 | x[2] >> 4);   /* 000YZZZZ */
+                 *(z++) = base32hexchar((x[2] & 15) << 1 | x[3] >> 7); /* 000ZZZZQ */
+                 *(z++) = base32hexchar((x[3] & 127) >> 2);            /* 000QQQQQ */
+                 *(z++) = base32hexchar((x[3] & 3) << 3);              /* 000QQ000 */
+                 if (padding)
+                         *(z++) = '=';
+                 break;
+         case 3:
+                 *(z++) = base32hexchar(x[0] >> 3);                   /* 000XXXXX */
+                 *(z++) = base32hexchar((x[0] & 7) << 2 | x[1] >> 6); /* 000XXXYY */
+                 *(z++) = base32hexchar((x[1] & 63) >> 1);            /* 000YYYYY */
+                 *(z++) = base32hexchar((x[1] & 1) << 4 | x[2] >> 4); /* 000YZZZZ */
+                 *(z++) = base32hexchar((x[2] & 15) << 1);            /* 000ZZZZ0 */
+                 if (padding) {
+                         *(z++) = '=';
+                         *(z++) = '=';
+                         *(z++) = '=';
+                 }
+                 break;
+         case 2:
+                 *(z++) = base32hexchar(x[0] >> 3);                   /* 000XXXXX */
+                 *(z++) = base32hexchar((x[0] & 7) << 2 | x[1] >> 6); /* 000XXXYY */
+                 *(z++) = base32hexchar((x[1] & 63) >> 1);            /* 000YYYYY */
+                 *(z++) = base32hexchar((x[1] & 1) << 4);             /* 000Y0000 */
+                 if (padding) {
+                         *(z++) = '=';
+                         *(z++) = '=';
+                         *(z++) = '=';
+                         *(z++) = '=';
+                 }
+                 break;
+         case 1:
+                 *(z++) = base32hexchar(x[0] >> 3);       /* 000XXXXX */
+                 *(z++) = base32hexchar((x[0] & 7) << 2); /* 000XXX00 */
+                 if (padding) {
+                         *(z++) = '=';
+                         *(z++) = '=';
+                         *(z++) = '=';
+                         *(z++) = '=';
+                         *(z++) = '=';
+                         *(z++) = '=';
+                 }
+                 break;
+         }
+         *z = 0;
+         return r;
+ }
+ int unbase32hexmem(const char *p, size_t l, bool padding, void **mem, size_t *_len) {
+         _cleanup_free_ uint8_t *r = NULL;
+         int a, b, c, d, e, f, g, h;
+         uint8_t *z;
+         const char *x;
+         size_t len;
+         unsigned pad = 0;
+         assert(p);
+         /* padding ensures any base32hex input has input divisible by 8 */
+         if (padding && l % 8 != 0)
+                 return -EINVAL;
+         if (padding) {
+                 /* strip the padding */
+                 while (l > 0 && p[l - 1] == '=' && pad < 7) {
+                         pad ++;
+                         l --;
+                 }
+         }
+         /* a group of eight input bytes needs five output bytes, in case of
+            padding we need to add some extra bytes */
+         len = (l / 8) * 5;
+         switch (l % 8) {
+         case 7:
+                 len += 4;
+                 break;
+         case 5:
+                 len += 3;
+                 break;
+         case 4:
+                 len += 2;
+                 break;
+         case 2:
+                 len += 1;
+                 break;
+         case 0:
+                 break;
+         default:
+                 return -EINVAL;
+         }
+         z = r = malloc(len + 1);
+         if (!r)
+                 return -ENOMEM;
+         for (x = p; x < p + (l / 8) * 8; x += 8) {
+                 /* a == 000XXXXX; b == 000YYYYY; c == 000ZZZZZ; d == 000WWWWW
+                    e == 000SSSSS; f == 000QQQQQ; g == 000VVVVV; h == 000RRRRR */
+                 a = unbase32hexchar(x[0]);
+                 if (a < 0)
+                         return -EINVAL;
+                 b = unbase32hexchar(x[1]);
+                 if (b < 0)
+                         return -EINVAL;
+                 c = unbase32hexchar(x[2]);
+                 if (c < 0)
+                         return -EINVAL;
+                 d = unbase32hexchar(x[3]);
+                 if (d < 0)
+                         return -EINVAL;
+                 e = unbase32hexchar(x[4]);
+                 if (e < 0)
+                         return -EINVAL;
+                 f = unbase32hexchar(x[5]);
+                 if (f < 0)
+                         return -EINVAL;
+                 g = unbase32hexchar(x[6]);
+                 if (g < 0)
+                         return -EINVAL;
+                 h = unbase32hexchar(x[7]);
+                 if (h < 0)
+                         return -EINVAL;
+                 *(z++) = (uint8_t) a << 3 | (uint8_t) b >> 2;                    /* XXXXXYYY */
+                 *(z++) = (uint8_t) b << 6 | (uint8_t) c << 1 | (uint8_t) d >> 4; /* YYZZZZZW */
+                 *(z++) = (uint8_t) d << 4 | (uint8_t) e >> 1;                    /* WWWWSSSS */
+                 *(z++) = (uint8_t) e << 7 | (uint8_t) f << 2 | (uint8_t) g >> 3; /* SQQQQQVV */
+                 *(z++) = (uint8_t) g << 5 | (uint8_t) h;                         /* VVVRRRRR */
+         }
+         switch (l % 8) {
+         case 7:
+                 a = unbase32hexchar(x[0]);
+                 if (a < 0)
+                         return -EINVAL;
+                 b = unbase32hexchar(x[1]);
+                 if (b < 0)
+                         return -EINVAL;
+                 c = unbase32hexchar(x[2]);
+                 if (c < 0)
+                         return -EINVAL;
+                 d = unbase32hexchar(x[3]);
+                 if (d < 0)
+                         return -EINVAL;
+                 e = unbase32hexchar(x[4]);
+                 if (e < 0)
+                         return -EINVAL;
+                 f = unbase32hexchar(x[5]);
+                 if (f < 0)
+                         return -EINVAL;
+                 g = unbase32hexchar(x[6]);
+                 if (g < 0)
+                         return -EINVAL;
+                 /* g == 000VV000 */
+                 if (g & 7)
+                         return -EINVAL;
+                 *(z++) = (uint8_t) a << 3 | (uint8_t) b >> 2;                    /* XXXXXYYY */
+                 *(z++) = (uint8_t) b << 6 | (uint8_t) c << 1 | (uint8_t) d >> 4; /* YYZZZZZW */
+                 *(z++) = (uint8_t) d << 4 | (uint8_t) e >> 1;                    /* WWWWSSSS */
+                 *(z++) = (uint8_t) e << 7 | (uint8_t) f << 2 | (uint8_t) g >> 3; /* SQQQQQVV */
+                 break;
+         case 5:
+                 a = unbase32hexchar(x[0]);
+                 if (a < 0)
+                         return -EINVAL;
+                 b = unbase32hexchar(x[1]);
+                 if (b < 0)
+                         return -EINVAL;
+                 c = unbase32hexchar(x[2]);
+                 if (c < 0)
+                         return -EINVAL;
+                 d = unbase32hexchar(x[3]);
+                 if (d < 0)
+                         return -EINVAL;
+                 e = unbase32hexchar(x[4]);
+                 if (e < 0)
+                         return -EINVAL;
+                 /* e == 000SSSS0 */
+                 if (e & 1)
+                         return -EINVAL;
+                 *(z++) = (uint8_t) a << 3 | (uint8_t) b >> 2;                    /* XXXXXYYY */
+                 *(z++) = (uint8_t) b << 6 | (uint8_t) c << 1 | (uint8_t) d >> 4; /* YYZZZZZW */
+                 *(z++) = (uint8_t) d << 4 | (uint8_t) e >> 1;                    /* WWWWSSSS */
+                 break;
+         case 4:
+                 a = unbase32hexchar(x[0]);
+                 if (a < 0)
+                         return -EINVAL;
+                 b = unbase32hexchar(x[1]);
+                 if (b < 0)
+                         return -EINVAL;
+                 c = unbase32hexchar(x[2]);
+                 if (c < 0)
+                         return -EINVAL;
+                 d = unbase32hexchar(x[3]);
+                 if (d < 0)
+                         return -EINVAL;
+                 /* d == 000W0000 */
+                 if (d & 15)
+                         return -EINVAL;
+                 *(z++) = (uint8_t) a << 3 | (uint8_t) b >> 2;                    /* XXXXXYYY */
+                 *(z++) = (uint8_t) b << 6 | (uint8_t) c << 1 | (uint8_t) d >> 4; /* YYZZZZZW */
+                 break;
+         case 2:
+                 a = unbase32hexchar(x[0]);
+                 if (a < 0)
+                         return -EINVAL;
+                 b = unbase32hexchar(x[1]);
+                 if (b < 0)
+                         return -EINVAL;
+                 /* b == 000YYY00 */
+                 if (b & 3)
+                         return -EINVAL;
+                 *(z++) = (uint8_t) a << 3 | (uint8_t) b >> 2; /* XXXXXYYY */
+                 break;
+         case 0:
+                 break;
+         default:
+                 return -EINVAL;
+         }
+         *z = 0;
+         *mem = r;
+         r = NULL;
+         *_len = len;
+         return 0;
+ }
+ /* https://tools.ietf.org/html/rfc4648#section-4 */
+ char base64char(int x) {
+         static const char table[64] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+                                       "abcdefghijklmnopqrstuvwxyz"
+                                       "0123456789+/";
+         return table[x & 63];
+ }
+ int unbase64char(char c) {
+         unsigned offset;
+         if (c >= 'A' && c <= 'Z')
+                 return c - 'A';
+         offset = 'Z' - 'A' + 1;
+         if (c >= 'a' && c <= 'z')
+                 return c - 'a' + offset;
+         offset += 'z' - 'a' + 1;
+         if (c >= '0' && c <= '9')
+                 return c - '0' + offset;
+         offset += '9' - '0' + 1;
+         if (c == '+')
+                 return offset;
+         offset ++;
+         if (c == '/')
+                 return offset;
+         return -EINVAL;
+ }
+ char *base64mem(const void *p, size_t l) {
+         char *r, *z;
+         const uint8_t *x;
+         /* three input bytes makes four output bytes, padding is added so we must round up */
+         z = r = malloc(4 * (l + 2) / 3 + 1);
+         if (!r)
+                 return NULL;
+         for (x = p; x < (const uint8_t*) p + (l / 3) * 3; x += 3) {
+                 /* x[0] == XXXXXXXX; x[1] == YYYYYYYY; x[2] == ZZZZZZZZ */
+                 *(z++) = base64char(x[0] >> 2);                    /* 00XXXXXX */
+                 *(z++) = base64char((x[0] & 3) << 4 | x[1] >> 4);  /* 00XXYYYY */
+                 *(z++) = base64char((x[1] & 15) << 2 | x[2] >> 6); /* 00YYYYZZ */
+                 *(z++) = base64char(x[2] & 63);                    /* 00ZZZZZZ */
+         }
+         switch (l % 3) {
+         case 2:
+                 *(z++) = base64char(x[0] >> 2);                   /* 00XXXXXX */
+                 *(z++) = base64char((x[0] & 3) << 4 | x[1] >> 4); /* 00XXYYYY */
+                 *(z++) = base64char((x[1] & 15) << 2);            /* 00YYYY00 */
+                 *(z++) = '=';
+                 break;
+         case 1:
+                 *(z++) = base64char(x[0] >> 2);        /* 00XXXXXX */
+                 *(z++) = base64char((x[0] & 3) << 4);  /* 00XX0000 */
+                 *(z++) = '=';
+                 *(z++) = '=';
+                 break;
+         }
+         *z = 0;
+         return r;
+ }
+ int unbase64mem(const char *p, size_t l, void **mem, size_t *_len) {
+         _cleanup_free_ uint8_t *r = NULL;
+         int a, b, c, d;
+         uint8_t *z;
+         const char *x;
+         size_t len;
+         assert(p);
+         /* padding ensures any base63 input has input divisible by 4 */
+         if (l % 4 != 0)
+                 return -EINVAL;
+         /* strip the padding */
+         if (l > 0 && p[l - 1] == '=')
+                 l --;
+         if (l > 0 && p[l - 1] == '=')
+                 l --;
+         /* a group of four input bytes needs three output bytes, in case of
+            padding we need to add two or three extra bytes */
+         len = (l / 4) * 3 + (l % 4 ? (l % 4) - 1 : 0);
+         z = r = malloc(len + 1);
+         if (!r)
+                 return -ENOMEM;
+         for (x = p; x < p + (l / 4) * 4; x += 4) {
+                 /* a == 00XXXXXX; b == 00YYYYYY; c == 00ZZZZZZ; d == 00WWWWWW */
+                 a = unbase64char(x[0]);
+                 if (a < 0)
+                         return -EINVAL;
+                 b = unbase64char(x[1]);
+                 if (b < 0)
+                         return -EINVAL;
+                 c = unbase64char(x[2]);
+                 if (c < 0)
+                         return -EINVAL;
+                 d = unbase64char(x[3]);
+                 if (d < 0)
+                         return -EINVAL;
+                 *(z++) = (uint8_t) a << 2 | (uint8_t) b >> 4; /* XXXXXXYY */
+                 *(z++) = (uint8_t) b << 4 | (uint8_t) c >> 2; /* YYYYZZZZ */
+                 *(z++) = (uint8_t) c << 6 | (uint8_t) d;      /* ZZWWWWWW */
+         }
+         switch (l % 4) {
+         case 3:
+                 a = unbase64char(x[0]);
+                 if (a < 0)
+                         return -EINVAL;
+                 b = unbase64char(x[1]);
+                 if (b < 0)
+                         return -EINVAL;
+                 c = unbase64char(x[2]);
+                 if (c < 0)
+                         return -EINVAL;
+                 /* c == 00ZZZZ00 */
+                 if (c & 3)
+                         return -EINVAL;
+                 *(z++) = (uint8_t) a << 2 | (uint8_t) b >> 4; /* XXXXXXYY */
+                 *(z++) = (uint8_t) b << 4 | (uint8_t) c >> 2; /* YYYYZZZZ */
+                 break;
+         case 2:
+                 a = unbase64char(x[0]);
+                 if (a < 0)
+                         return -EINVAL;
+                 b = unbase64char(x[1]);
+                 if (b < 0)
+                         return -EINVAL;
+                 /* b == 00YY0000 */
+                 if (b & 15)
+                         return -EINVAL;
+                 *(z++) = (uint8_t) a << 2 | (uint8_t) (b >> 4); /* XXXXXXYY */
+                 break;
+         case 0:
+                 break;
+         default:
+                 return -EINVAL;
+         }
+         *z = 0;
+         *mem = r;
+         r = NULL;
+         *_len = len;
+         return 0;
+ }
+ void hexdump(FILE *f, const void *p, size_t s) {
+         const uint8_t *b = p;
+         unsigned n = 0;
+         assert(s == 0 || b);
+         while (s > 0) {
+                 size_t i;
+                 fprintf(f, "%04x  ", n);
+                 for (i = 0; i < 16; i++) {
+                         if (i >= s)
+                                 fputs("   ", f);
+                         else
+                                 fprintf(f, "%02x ", b[i]);
+                         if (i == 7)
+                                 fputc(' ', f);
+                 }
+                 fputc(' ', f);
+                 for (i = 0; i < 16; i++) {
+                         if (i >= s)
+                                 fputc(' ', f);
+                         else
+                                 fputc(isprint(b[i]) ? (char) b[i] : '.', f);
+                 }
+                 fputc('\n', f);
+                 if (s < 16)
+                         break;
+                 n += 16;
+                 b += 16;
+                 s -= 16;
+         }
+ }
index 0000000,4aeb4c3..23b9afe
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,54 +1,56 @@@
+ /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+ #pragma once
+ /***
+   This file is part of systemd.
+   Copyright 2010 Lennart Poettering
+   systemd is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 2.1 of the License, or
+   (at your option) any later version.
+   systemd is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+   Lesser General Public License for more details.
+   You should have received a copy of the GNU Lesser General Public License
+   along with systemd; If not, see <http://www.gnu.org/licenses/>.
+ ***/
++#include "nm-sd-adapt.h"
++
+ #include <stdbool.h>
+ #include <stdio.h>
+ #include <sys/types.h>
+ #include "macro.h"
+ char octchar(int x) _const_;
+ int unoctchar(char c) _const_;
+ char decchar(int x) _const_;
+ int undecchar(char c) _const_;
+ char hexchar(int x) _const_;
+ int unhexchar(char c) _const_;
+ char *hexmem(const void *p, size_t l);
+ int unhexmem(const char *p, size_t l, void **mem, size_t *len);
+ char base32hexchar(int x) _const_;
+ int unbase32hexchar(char c) _const_;
+ char base64char(int x) _const_;
+ int unbase64char(char c) _const_;
+ char *base32hexmem(const void *p, size_t l, bool padding);
+ int unbase32hexmem(const char *p, size_t l, bool padding, void **mem, size_t *len);
+ char *base64mem(const void *p, size_t l);
+ int unbase64mem(const char *p, size_t l, void **mem, size_t *len);
+ void hexdump(FILE *f, const void *p, size_t s);
    along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
- #include <sys/utsname.h>
 +#include "nm-sd-adapt.h"
 +
  #include <ctype.h>
+ #include <sys/utsname.h>
  
- #include "util.h"
+ #include "fd-util.h"
+ #include "fileio.h"
  #include "hostname-util.h"
+ #include "string-util.h"
+ #include "util.h"
  
  bool hostname_is_set(void) {
          struct utsname u;
    along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
 +#include "nm-sd-adapt.h"
 +
  #include <arpa/inet.h>
  
+ #include "alloc-util.h"
  #include "in-addr-util.h"
  
  int in_addr_is_null(int family, const union in_addr_union *u) {
index 0000000,ac8f93f..d1d9474
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,261 +1,263 @@@
+ /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+ /***
+   This file is part of systemd.
+   Copyright 2010 Lennart Poettering
+   systemd is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 2.1 of the License, or
+   (at your option) any later version.
+   systemd is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+   Lesser General Public License for more details.
+   You should have received a copy of the GNU Lesser General Public License
+   along with systemd; If not, see <http://www.gnu.org/licenses/>.
+ ***/
++#include "nm-sd-adapt.h"
++
+ #include <poll.h>
+ #include <unistd.h>
+ #include "io-util.h"
+ int flush_fd(int fd) {
+         struct pollfd pollfd = {
+                 .fd = fd,
+                 .events = POLLIN,
+         };
+         for (;;) {
+                 char buf[LINE_MAX];
+                 ssize_t l;
+                 int r;
+                 r = poll(&pollfd, 1, 0);
+                 if (r < 0) {
+                         if (errno == EINTR)
+                                 continue;
+                         return -errno;
+                 } else if (r == 0)
+                         return 0;
+                 l = read(fd, buf, sizeof(buf));
+                 if (l < 0) {
+                         if (errno == EINTR)
+                                 continue;
+                         if (errno == EAGAIN)
+                                 return 0;
+                         return -errno;
+                 } else if (l == 0)
+                         return 0;
+         }
+ }
+ ssize_t loop_read(int fd, void *buf, size_t nbytes, bool do_poll) {
+         uint8_t *p = buf;
+         ssize_t n = 0;
+         assert(fd >= 0);
+         assert(buf);
+         /* If called with nbytes == 0, let's call read() at least
+          * once, to validate the operation */
+         if (nbytes > (size_t) SSIZE_MAX)
+                 return -EINVAL;
+         do {
+                 ssize_t k;
+                 k = read(fd, p, nbytes);
+                 if (k < 0) {
+                         if (errno == EINTR)
+                                 continue;
+                         if (errno == EAGAIN && do_poll) {
+                                 /* We knowingly ignore any return value here,
+                                  * and expect that any error/EOF is reported
+                                  * via read() */
+                                 (void) fd_wait_for_event(fd, POLLIN, USEC_INFINITY);
+                                 continue;
+                         }
+                         return n > 0 ? n : -errno;
+                 }
+                 if (k == 0)
+                         return n;
+                 assert((size_t) k <= nbytes);
+                 p += k;
+                 nbytes -= k;
+                 n += k;
+         } while (nbytes > 0);
+         return n;
+ }
+ int loop_read_exact(int fd, void *buf, size_t nbytes, bool do_poll) {
+         ssize_t n;
+         n = loop_read(fd, buf, nbytes, do_poll);
+         if (n < 0)
+                 return (int) n;
+         if ((size_t) n != nbytes)
+                 return -EIO;
+         return 0;
+ }
+ int loop_write(int fd, const void *buf, size_t nbytes, bool do_poll) {
+         const uint8_t *p = buf;
+         assert(fd >= 0);
+         assert(buf);
+         if (nbytes > (size_t) SSIZE_MAX)
+                 return -EINVAL;
+         do {
+                 ssize_t k;
+                 k = write(fd, p, nbytes);
+                 if (k < 0) {
+                         if (errno == EINTR)
+                                 continue;
+                         if (errno == EAGAIN && do_poll) {
+                                 /* We knowingly ignore any return value here,
+                                  * and expect that any error/EOF is reported
+                                  * via write() */
+                                 (void) fd_wait_for_event(fd, POLLOUT, USEC_INFINITY);
+                                 continue;
+                         }
+                         return -errno;
+                 }
+                 if (_unlikely_(nbytes > 0 && k == 0)) /* Can't really happen */
+                         return -EIO;
+                 assert((size_t) k <= nbytes);
+                 p += k;
+                 nbytes -= k;
+         } while (nbytes > 0);
+         return 0;
+ }
+ int pipe_eof(int fd) {
+         struct pollfd pollfd = {
+                 .fd = fd,
+                 .events = POLLIN|POLLHUP,
+         };
+         int r;
+         r = poll(&pollfd, 1, 0);
+         if (r < 0)
+                 return -errno;
+         if (r == 0)
+                 return 0;
+         return pollfd.revents & POLLHUP;
+ }
+ int fd_wait_for_event(int fd, int event, usec_t t) {
+         struct pollfd pollfd = {
+                 .fd = fd,
+                 .events = event,
+         };
+         struct timespec ts;
+         int r;
+         r = ppoll(&pollfd, 1, t == USEC_INFINITY ? NULL : timespec_store(&ts, t), NULL);
+         if (r < 0)
+                 return -errno;
+         if (r == 0)
+                 return 0;
+         return pollfd.revents;
+ }
+ static size_t nul_length(const uint8_t *p, size_t sz) {
+         size_t n = 0;
+         while (sz > 0) {
+                 if (*p != 0)
+                         break;
+                 n++;
+                 p++;
+                 sz--;
+         }
+         return n;
+ }
+ ssize_t sparse_write(int fd, const void *p, size_t sz, size_t run_length) {
+         const uint8_t *q, *w, *e;
+         ssize_t l;
+         q = w = p;
+         e = q + sz;
+         while (q < e) {
+                 size_t n;
+                 n = nul_length(q, e - q);
+                 /* If there are more than the specified run length of
+                  * NUL bytes, or if this is the beginning or the end
+                  * of the buffer, then seek instead of write */
+                 if ((n > run_length) ||
+                     (n > 0 && q == p) ||
+                     (n > 0 && q + n >= e)) {
+                         if (q > w) {
+                                 l = write(fd, w, q - w);
+                                 if (l < 0)
+                                         return -errno;
+                                 if (l != q -w)
+                                         return -EIO;
+                         }
+                         if (lseek(fd, n, SEEK_CUR) == (off_t) -1)
+                                 return -errno;
+                         q += n;
+                         w = q;
+                 } else if (n > 0)
+                         q += n;
+                 else
+                         q ++;
+         }
+         if (q > w) {
+                 l = write(fd, w, q - w);
+                 if (l < 0)
+                         return -errno;
+                 if (l != q - w)
+                         return -EIO;
+         }
+         return q - (const uint8_t*) p;
+ }
index 0000000,cd2aa75..71319f4
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,76 +1,78 @@@
+ /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+ #pragma once
+ /***
+   This file is part of systemd.
+   Copyright 2010 Lennart Poettering
+   systemd is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 2.1 of the License, or
+   (at your option) any later version.
+   systemd is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+   Lesser General Public License for more details.
+   You should have received a copy of the GNU Lesser General Public License
+   along with systemd; If not, see <http://www.gnu.org/licenses/>.
+ ***/
++#include "nm-sd-adapt.h"
++
+ #include <stdbool.h>
+ #include <sys/types.h>
+ #include <sys/uio.h>
+ #include "time-util.h"
+ int flush_fd(int fd);
+ ssize_t loop_read(int fd, void *buf, size_t nbytes, bool do_poll);
+ int loop_read_exact(int fd, void *buf, size_t nbytes, bool do_poll);
+ int loop_write(int fd, const void *buf, size_t nbytes, bool do_poll);
+ int pipe_eof(int fd);
+ int fd_wait_for_event(int fd, int event, usec_t timeout);
+ ssize_t sparse_write(int fd, const void *p, size_t sz, size_t run_length);
+ #define IOVEC_SET_STRING(i, s)                  \
+         do {                                    \
+                 struct iovec *_i = &(i);        \
+                 char *_s = (char *)(s);         \
+                 _i->iov_base = _s;              \
+                 _i->iov_len = strlen(_s);       \
+         } while(false)
+ static inline size_t IOVEC_TOTAL_SIZE(const struct iovec *i, unsigned n) {
+         unsigned j;
+         size_t r = 0;
+         for (j = 0; j < n; j++)
+                 r += i[j].iov_len;
+         return r;
+ }
+ static inline size_t IOVEC_INCREMENT(struct iovec *i, unsigned n, size_t k) {
+         unsigned j;
+         for (j = 0; j < n; j++) {
+                 size_t sub;
+                 if (_unlikely_(k <= 0))
+                         break;
+                 sub = MIN(i[j].iov_len, k);
+                 i[j].iov_len -= sub;
+                 i[j].iov_base = (uint8_t*) i[j].iov_base + sub;
+                 k -= sub;
+         }
+         return k;
+ }
    along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
- #include <stdbool.h>
 +#include "nm-sd-adapt.h"
 +
+ #include <errno.h>
  #include <stdarg.h>
+ #include <stdbool.h>
  #include <stdlib.h>
- #include <syslog.h>
  #include <sys/signalfd.h>
- #include <errno.h>
+ #include <syslog.h>
  
  #include "sd-id128.h"
  #include "macro.h"
  
  typedef enum LogTarget{
    along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
 +#include "nm-sd-adapt.h"
 +
  #include <assert.h>
- #include <sys/param.h>
- #include <sys/types.h>
- #include <sys/uio.h>
  #include <inttypes.h>
  #include <stdbool.h>
+ #include <sys/param.h>
+ #include <sys/types.h>
  
  #define _printf_(a,b) __attribute__ ((format (printf, a, b)))
  #define _alloc_(...) __attribute__ ((alloc_size(__VA_ARGS__)))
@@@ -477,11 -357,6 +369,7 @@@ static inline unsigned long ALIGN_POWER
  #define noreturn __attribute__((noreturn))
  #endif
  #endif
- #define UID_INVALID ((uid_t) -1)
- #define GID_INVALID ((gid_t) -1)
- #define MODE_INVALID ((mode_t) -1)
 +#endif /* NM_IGNORED */
  
  #define DEFINE_TRIVIAL_CLEANUP_FUNC(type, func)                 \
          static inline void func##p(type *p) {                   \
    along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
- #include "mempool.h"
 +#include "nm-sd-adapt.h"
 +
  #include "macro.h"
+ #include "mempool.h"
  #include "util.h"
  
  struct pool {
index 0000000,3ae99d9..d05297d
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,528 +1,534 @@@
+ /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+ /***
+   This file is part of systemd.
+   Copyright 2010 Lennart Poettering
+   systemd is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 2.1 of the License, or
+   (at your option) any later version.
+   systemd is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+   Lesser General Public License for more details.
+   You should have received a copy of the GNU Lesser General Public License
+   along with systemd; If not, see <http://www.gnu.org/licenses/>.
+ ***/
++#include "nm-sd-adapt.h"
++
+ #include "alloc-util.h"
++#if 0 /* NM_IGNORED */
+ #include "extract-word.h"
++#endif /* NM_IGNORED */
+ #include "parse-util.h"
+ #include "string-util.h"
+ #include "util.h"
+ int parse_boolean(const char *v) {
+         assert(v);
+         if (streq(v, "1") || strcaseeq(v, "yes") || strcaseeq(v, "y") || strcaseeq(v, "true") || strcaseeq(v, "t") || strcaseeq(v, "on"))
+                 return 1;
+         else if (streq(v, "0") || strcaseeq(v, "no") || strcaseeq(v, "n") || strcaseeq(v, "false") || strcaseeq(v, "f") || strcaseeq(v, "off"))
+                 return 0;
+         return -EINVAL;
+ }
+ int parse_pid(const char *s, pid_t* ret_pid) {
+         unsigned long ul = 0;
+         pid_t pid;
+         int r;
+         assert(s);
+         assert(ret_pid);
+         r = safe_atolu(s, &ul);
+         if (r < 0)
+                 return r;
+         pid = (pid_t) ul;
+         if ((unsigned long) pid != ul)
+                 return -ERANGE;
+         if (pid <= 0)
+                 return -ERANGE;
+         *ret_pid = pid;
+         return 0;
+ }
+ int parse_mode(const char *s, mode_t *ret) {
+         char *x;
+         long l;
+         assert(s);
+         assert(ret);
+         s += strspn(s, WHITESPACE);
+         if (s[0] == '-')
+                 return -ERANGE;
+         errno = 0;
+         l = strtol(s, &x, 8);
+         if (errno != 0)
+                 return -errno;
+         if (!x || x == s || *x)
+                 return -EINVAL;
+         if (l < 0 || l  > 07777)
+                 return -ERANGE;
+         *ret = (mode_t) l;
+         return 0;
+ }
+ int parse_ifindex(const char *s, int *ret) {
+         int ifi, r;
+         r = safe_atoi(s, &ifi);
+         if (r < 0)
+                 return r;
+         if (ifi <= 0)
+                 return -EINVAL;
+         *ret = ifi;
+         return 0;
+ }
+ int parse_size(const char *t, uint64_t base, uint64_t *size) {
+         /* Soo, sometimes we want to parse IEC binary suffixes, and
+          * sometimes SI decimal suffixes. This function can parse
+          * both. Which one is the right way depends on the
+          * context. Wikipedia suggests that SI is customary for
+          * hardware metrics and network speeds, while IEC is
+          * customary for most data sizes used by software and volatile
+          * (RAM) memory. Hence be careful which one you pick!
+          *
+          * In either case we use just K, M, G as suffix, and not Ki,
+          * Mi, Gi or so (as IEC would suggest). That's because that's
+          * frickin' ugly. But this means you really need to make sure
+          * to document which base you are parsing when you use this
+          * call. */
+         struct table {
+                 const char *suffix;
+                 unsigned long long factor;
+         };
+         static const struct table iec[] = {
+                 { "E", 1024ULL*1024ULL*1024ULL*1024ULL*1024ULL*1024ULL },
+                 { "P", 1024ULL*1024ULL*1024ULL*1024ULL*1024ULL },
+                 { "T", 1024ULL*1024ULL*1024ULL*1024ULL },
+                 { "G", 1024ULL*1024ULL*1024ULL },
+                 { "M", 1024ULL*1024ULL },
+                 { "K", 1024ULL },
+                 { "B", 1ULL },
+                 { "",  1ULL },
+         };
+         static const struct table si[] = {
+                 { "E", 1000ULL*1000ULL*1000ULL*1000ULL*1000ULL*1000ULL },
+                 { "P", 1000ULL*1000ULL*1000ULL*1000ULL*1000ULL },
+                 { "T", 1000ULL*1000ULL*1000ULL*1000ULL },
+                 { "G", 1000ULL*1000ULL*1000ULL },
+                 { "M", 1000ULL*1000ULL },
+                 { "K", 1000ULL },
+                 { "B", 1ULL },
+                 { "",  1ULL },
+         };
+         const struct table *table;
+         const char *p;
+         unsigned long long r = 0;
+         unsigned n_entries, start_pos = 0;
+         assert(t);
+         assert(base == 1000 || base == 1024);
+         assert(size);
+         if (base == 1000) {
+                 table = si;
+                 n_entries = ELEMENTSOF(si);
+         } else {
+                 table = iec;
+                 n_entries = ELEMENTSOF(iec);
+         }
+         p = t;
+         do {
+                 unsigned long long l, tmp;
+                 double frac = 0;
+                 char *e;
+                 unsigned i;
+                 p += strspn(p, WHITESPACE);
+                 errno = 0;
+                 l = strtoull(p, &e, 10);
+                 if (errno != 0)
+                         return -errno;
+                 if (e == p)
+                         return -EINVAL;
+                 if (*p == '-')
+                         return -ERANGE;
+                 if (*e == '.') {
+                         e++;
+                         /* strtoull() itself would accept space/+/- */
+                         if (*e >= '0' && *e <= '9') {
+                                 unsigned long long l2;
+                                 char *e2;
+                                 l2 = strtoull(e, &e2, 10);
+                                 if (errno != 0)
+                                         return -errno;
+                                 /* Ignore failure. E.g. 10.M is valid */
+                                 frac = l2;
+                                 for (; e < e2; e++)
+                                         frac /= 10;
+                         }
+                 }
+                 e += strspn(e, WHITESPACE);
+                 for (i = start_pos; i < n_entries; i++)
+                         if (startswith(e, table[i].suffix))
+                                 break;
+                 if (i >= n_entries)
+                         return -EINVAL;
+                 if (l + (frac > 0) > ULLONG_MAX / table[i].factor)
+                         return -ERANGE;
+                 tmp = l * table[i].factor + (unsigned long long) (frac * table[i].factor);
+                 if (tmp > ULLONG_MAX - r)
+                         return -ERANGE;
+                 r += tmp;
+                 if ((unsigned long long) (uint64_t) r != r)
+                         return -ERANGE;
+                 p = e + strlen(table[i].suffix);
+                 start_pos = i + 1;
+         } while (*p);
+         *size = r;
+         return 0;
+ }
++#if 0 /* NM_IGNORED */
+ int parse_range(const char *t, unsigned *lower, unsigned *upper) {
+         _cleanup_free_ char *word = NULL;
+         unsigned l, u;
+         int r;
+         assert(lower);
+         assert(upper);
+         /* Extract the lower bound. */
+         r = extract_first_word(&t, &word, "-", EXTRACT_DONT_COALESCE_SEPARATORS);
+         if (r < 0)
+                 return r;
+         if (r == 0)
+                 return -EINVAL;
+         r = safe_atou(word, &l);
+         if (r < 0)
+                 return r;
+         /* Check for the upper bound and extract it if needed */
+         if (!t)
+                 /* Single number with no dashes. */
+                 u = l;
+         else if (!*t)
+                 /* Trailing dash is an error. */
+                 return -EINVAL;
+         else {
+                 r = safe_atou(t, &u);
+                 if (r < 0)
+                         return r;
+         }
+         *lower = l;
+         *upper = u;
+         return 0;
+ }
++#endif /* NM_IGNORED */
+ char *format_bytes(char *buf, size_t l, uint64_t t) {
+         unsigned i;
+         /* This only does IEC units so far */
+         static const struct {
+                 const char *suffix;
+                 uint64_t factor;
+         } table[] = {
+                 { "E", UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024) },
+                 { "P", UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024) },
+                 { "T", UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024) },
+                 { "G", UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024) },
+                 { "M", UINT64_C(1024)*UINT64_C(1024) },
+                 { "K", UINT64_C(1024) },
+         };
+         if (t == (uint64_t) -1)
+                 return NULL;
+         for (i = 0; i < ELEMENTSOF(table); i++) {
+                 if (t >= table[i].factor) {
+                         snprintf(buf, l,
+                                  "%" PRIu64 ".%" PRIu64 "%s",
+                                  t / table[i].factor,
+                                  ((t*UINT64_C(10)) / table[i].factor) % UINT64_C(10),
+                                  table[i].suffix);
+                         goto finish;
+                 }
+         }
+         snprintf(buf, l, "%" PRIu64 "B", t);
+ finish:
+         buf[l-1] = 0;
+         return buf;
+ }
+ int safe_atou(const char *s, unsigned *ret_u) {
+         char *x = NULL;
+         unsigned long l;
+         assert(s);
+         assert(ret_u);
+         /* strtoul() is happy to parse negative values, and silently
+          * converts them to unsigned values without generating an
+          * error. We want a clean error, hence let's look for the "-"
+          * prefix on our own, and generate an error. But let's do so
+          * only after strtoul() validated that the string is clean
+          * otherwise, so that we return EINVAL preferably over
+          * ERANGE. */
+         s += strspn(s, WHITESPACE);
+         errno = 0;
+         l = strtoul(s, &x, 0);
+         if (errno != 0)
+                 return -errno;
+         if (!x || x == s || *x)
+                 return -EINVAL;
+         if (s[0] == '-')
+                 return -ERANGE;
+         if ((unsigned long) (unsigned) l != l)
+                 return -ERANGE;
+         *ret_u = (unsigned) l;
+         return 0;
+ }
+ int safe_atoi(const char *s, int *ret_i) {
+         char *x = NULL;
+         long l;
+         assert(s);
+         assert(ret_i);
+         errno = 0;
+         l = strtol(s, &x, 0);
+         if (errno != 0)
+                 return -errno;
+         if (!x || x == s || *x)
+                 return -EINVAL;
+         if ((long) (int) l != l)
+                 return -ERANGE;
+         *ret_i = (int) l;
+         return 0;
+ }
+ int safe_atollu(const char *s, long long unsigned *ret_llu) {
+         char *x = NULL;
+         unsigned long long l;
+         assert(s);
+         assert(ret_llu);
+         s += strspn(s, WHITESPACE);
+         errno = 0;
+         l = strtoull(s, &x, 0);
+         if (errno != 0)
+                 return -errno;
+         if (!x || x == s || *x)
+                 return -EINVAL;
+         if (*s == '-')
+                 return -ERANGE;
+         *ret_llu = l;
+         return 0;
+ }
+ int safe_atolli(const char *s, long long int *ret_lli) {
+         char *x = NULL;
+         long long l;
+         assert(s);
+         assert(ret_lli);
+         errno = 0;
+         l = strtoll(s, &x, 0);
+         if (errno != 0)
+                 return -errno;
+         if (!x || x == s || *x)
+                 return -EINVAL;
+         *ret_lli = l;
+         return 0;
+ }
+ int safe_atou8(const char *s, uint8_t *ret) {
+         char *x = NULL;
+         unsigned long l;
+         assert(s);
+         assert(ret);
+         s += strspn(s, WHITESPACE);
+         errno = 0;
+         l = strtoul(s, &x, 0);
+         if (errno != 0)
+                 return -errno;
+         if (!x || x == s || *x)
+                 return -EINVAL;
+         if (s[0] == '-')
+                 return -ERANGE;
+         if ((unsigned long) (uint8_t) l != l)
+                 return -ERANGE;
+         *ret = (uint8_t) l;
+         return 0;
+ }
+ int safe_atou16(const char *s, uint16_t *ret) {
+         char *x = NULL;
+         unsigned long l;
+         assert(s);
+         assert(ret);
+         s += strspn(s, WHITESPACE);
+         errno = 0;
+         l = strtoul(s, &x, 0);
+         if (errno != 0)
+                 return -errno;
+         if (!x || x == s || *x)
+                 return -EINVAL;
+         if (s[0] == '-')
+                 return -ERANGE;
+         if ((unsigned long) (uint16_t) l != l)
+                 return -ERANGE;
+         *ret = (uint16_t) l;
+         return 0;
+ }
+ int safe_atoi16(const char *s, int16_t *ret) {
+         char *x = NULL;
+         long l;
+         assert(s);
+         assert(ret);
+         errno = 0;
+         l = strtol(s, &x, 0);
+         if (errno != 0)
+                 return -errno;
+         if (!x || x == s || *x)
+                 return -EINVAL;
+         if ((long) (int16_t) l != l)
+                 return -ERANGE;
+         *ret = (int16_t) l;
+         return 0;
+ }
+ int safe_atod(const char *s, double *ret_d) {
+         char *x = NULL;
+         double d = 0;
+         locale_t loc;
+         assert(s);
+         assert(ret_d);
+         loc = newlocale(LC_NUMERIC_MASK, "C", (locale_t) 0);
+         if (loc == (locale_t) 0)
+                 return -errno;
+         errno = 0;
+         d = strtod_l(s, &x, loc);
+         if (errno != 0) {
+                 freelocale(loc);
+                 return -errno;
+         }
+         if (!x || x == s || *x) {
+                 freelocale(loc);
+                 return -EINVAL;
+         }
+         freelocale(loc);
+         *ret_d = (double) d;
+         return 0;
+ }
+ int parse_fractional_part_u(const char **p, size_t digits, unsigned *res) {
+         size_t i;
+         unsigned val = 0;
+         const char *s;
+         s = *p;
+         /* accept any number of digits, strtoull is limted to 19 */
+         for(i=0; i < digits; i++,s++) {
+                 if (*s < '0' || *s > '9') {
+                         if (i == 0)
+                                 return -EINVAL;
+                         /* too few digits, pad with 0 */
+                         for (; i < digits; i++)
+                                 val *= 10;
+                         break;
+                 }
+                 val *= 10;
+                 val += *s - '0';
+         }
+         /* maybe round up */
+         if (*s >= '5' && *s <= '9')
+                 val++;
+         s += strspn(s, DIGITS);
+         *p = s;
+         *res = val;
+         return 0;
+ }
index 0000000,125de53..39d5903
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,94 +1,96 @@@
+ /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+ #pragma once
+ /***
+   This file is part of systemd.
+   Copyright 2010 Lennart Poettering
+   systemd is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 2.1 of the License, or
+   (at your option) any later version.
+   systemd is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+   Lesser General Public License for more details.
+   You should have received a copy of the GNU Lesser General Public License
+   along with systemd; If not, see <http://www.gnu.org/licenses/>.
+ ***/
++#include "nm-sd-adapt.h"
++
+ #include <inttypes.h>
+ #include <sys/types.h>
+ #include "macro.h"
+ #define MODE_INVALID ((mode_t) -1)
+ int parse_boolean(const char *v) _pure_;
+ int parse_pid(const char *s, pid_t* ret_pid);
+ int parse_mode(const char *s, mode_t *ret);
+ int parse_ifindex(const char *s, int *ret);
+ int parse_size(const char *t, uint64_t base, uint64_t *size);
+ int parse_range(const char *t, unsigned *lower, unsigned *upper);
+ #define FORMAT_BYTES_MAX 8
+ char *format_bytes(char *buf, size_t l, uint64_t t);
+ int safe_atou(const char *s, unsigned *ret_u);
+ int safe_atoi(const char *s, int *ret_i);
+ int safe_atollu(const char *s, unsigned long long *ret_u);
+ int safe_atolli(const char *s, long long int *ret_i);
+ int safe_atou8(const char *s, uint8_t *ret);
+ int safe_atou16(const char *s, uint16_t *ret);
+ int safe_atoi16(const char *s, int16_t *ret);
+ static inline int safe_atou32(const char *s, uint32_t *ret_u) {
+         assert_cc(sizeof(uint32_t) == sizeof(unsigned));
+         return safe_atou(s, (unsigned*) ret_u);
+ }
+ static inline int safe_atoi32(const char *s, int32_t *ret_i) {
+         assert_cc(sizeof(int32_t) == sizeof(int));
+         return safe_atoi(s, (int*) ret_i);
+ }
+ static inline int safe_atou64(const char *s, uint64_t *ret_u) {
+         assert_cc(sizeof(uint64_t) == sizeof(unsigned long long));
+         return safe_atollu(s, (unsigned long long*) ret_u);
+ }
+ static inline int safe_atoi64(const char *s, int64_t *ret_i) {
+         assert_cc(sizeof(int64_t) == sizeof(long long int));
+         return safe_atolli(s, (long long int*) ret_i);
+ }
+ #if LONG_MAX == INT_MAX
+ static inline int safe_atolu(const char *s, unsigned long *ret_u) {
+         assert_cc(sizeof(unsigned long) == sizeof(unsigned));
+         return safe_atou(s, (unsigned*) ret_u);
+ }
+ static inline int safe_atoli(const char *s, long int *ret_u) {
+         assert_cc(sizeof(long int) == sizeof(int));
+         return safe_atoi(s, (int*) ret_u);
+ }
+ #else
+ static inline int safe_atolu(const char *s, unsigned long *ret_u) {
+         assert_cc(sizeof(unsigned long) == sizeof(unsigned long long));
+         return safe_atollu(s, (unsigned long long*) ret_u);
+ }
+ static inline int safe_atoli(const char *s, long int *ret_u) {
+         assert_cc(sizeof(long int) == sizeof(long long int));
+         return safe_atolli(s, (long long int*) ret_u);
+ }
+ #endif
+ int safe_atod(const char *s, double *ret_d);
+ int parse_fractional_part_u(const char **s, size_t digits, unsigned *res);
    along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
- #if 0 /* NM_IGNORED */
- #include <string.h>
- #include <unistd.h>
 +#include "nm-sd-adapt.h"
 +
  #include <errno.h>
- #include <stdlib.h>
- #include <stdio.h>
  #include <fcntl.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
  #include <sys/statvfs.h>
+ #include <unistd.h>
  
- #include "macro.h"
- #include "util.h"
+ /* When we include libgen.h because we need dirname() we immediately
+  * undefine basename() since libgen.h defines it as a macro to the
+  * POSIX version which is really broken. We prefer GNU basename(). */
+ #include <libgen.h>
+ #undef basename
+ #include "alloc-util.h"
++#if 0 /* NM_IGNORED */
+ #include "fd-util.h"
+ #include "fileio.h"
+ #include "fs-util.h"
  #include "log.h"
- #include "strv.h"
+ #include "macro.h"
+ #include "missing.h"
+ #include "parse-util.h"
 +#endif /* NM_IGNORED */
  #include "path-util.h"
- #include "missing.h"
- #include "fileio.h"
 +#if 0 /* NM_IGNORED */
+ #include "stat-util.h"
++#endif /* NM_IGNORED */
+ #include "string-util.h"
++#if 0 /* NM_IGNORED */
+ #include "strv.h"
++#endif /* NM_IGNORED */
+ #include "util.h"
  
++#if 0 /* NM_IGNORED */
  bool path_is_absolute(const char *p) {
          return p[0] == '/';
  }
@@@ -860,4 -636,166 +647,169 @@@ char *prefix_root(const char *root, con
          strcpy(p, path);
          return n;
  }
+ int parse_path_argument_and_warn(const char *path, bool suppress_root, char **arg) {
+         char *p;
+         int r;
+         /*
+          * This function is intended to be used in command line
+          * parsers, to handle paths that are passed in. It makes the
+          * path absolute, and reduces it to NULL if omitted or
+          * root (the latter optionally).
+          *
+          * NOTE THAT THIS WILL FREE THE PREVIOUS ARGUMENT POINTER ON
+          * SUCCESS! Hence, do not pass in uninitialized pointers.
+          */
+         if (isempty(path)) {
+                 *arg = mfree(*arg);
+                 return 0;
+         }
+         r = path_make_absolute_cwd(path, &p);
+         if (r < 0)
+                 return log_error_errno(r, "Failed to parse path \"%s\" and make it absolute: %m", path);
+         path_kill_slashes(p);
+         if (suppress_root && path_equal(p, "/"))
+                 p = mfree(p);
+         free(*arg);
+         *arg = p;
+         return 0;
+ }
+ char* dirname_malloc(const char *path) {
+         char *d, *dir, *dir2;
+         assert(path);
+         d = strdup(path);
+         if (!d)
+                 return NULL;
+         dir = dirname(d);
+         assert(dir);
+         if (dir == d)
+                 return d;
+         dir2 = strdup(dir);
+         free(d);
+         return dir2;
+ }
++#endif /* NM_IGNORED */
+ bool filename_is_valid(const char *p) {
+         const char *e;
+         if (isempty(p))
+                 return false;
+         if (streq(p, "."))
+                 return false;
+         if (streq(p, ".."))
+                 return false;
+         e = strchrnul(p, '/');
+         if (*e != 0)
+                 return false;
+         if (e - p > FILENAME_MAX)
+                 return false;
+         return true;
+ }
++#if 0 /* NM_IGNORED */
+ bool path_is_safe(const char *p) {
+         if (isempty(p))
+                 return false;
+         if (streq(p, "..") || startswith(p, "../") || endswith(p, "/..") || strstr(p, "/../"))
+                 return false;
+         if (strlen(p)+1 > PATH_MAX)
+                 return false;
+         /* The following two checks are not really dangerous, but hey, they still are confusing */
+         if (streq(p, ".") || startswith(p, "./") || endswith(p, "/.") || strstr(p, "/./"))
+                 return false;
+         if (strstr(p, "//"))
+                 return false;
+         return true;
+ }
+ char *file_in_same_dir(const char *path, const char *filename) {
+         char *e, *ret;
+         size_t k;
+         assert(path);
+         assert(filename);
+         /* This removes the last component of path and appends
+          * filename, unless the latter is absolute anyway or the
+          * former isn't */
+         if (path_is_absolute(filename))
+                 return strdup(filename);
+         e = strrchr(path, '/');
+         if (!e)
+                 return strdup(filename);
+         k = strlen(filename);
+         ret = new(char, (e + 1 - path) + k + 1);
+         if (!ret)
+                 return NULL;
+         memcpy(mempcpy(ret, path, e + 1 - path), filename, k + 1);
+         return ret;
+ }
+ bool hidden_file_allow_backup(const char *filename) {
+         assert(filename);
+         return
+                 filename[0] == '.' ||
+                 streq(filename, "lost+found") ||
+                 streq(filename, "aquota.user") ||
+                 streq(filename, "aquota.group") ||
+                 endswith(filename, ".rpmnew") ||
+                 endswith(filename, ".rpmsave") ||
+                 endswith(filename, ".rpmorig") ||
+                 endswith(filename, ".dpkg-old") ||
+                 endswith(filename, ".dpkg-new") ||
+                 endswith(filename, ".dpkg-tmp") ||
+                 endswith(filename, ".dpkg-dist") ||
+                 endswith(filename, ".dpkg-bak") ||
+                 endswith(filename, ".dpkg-backup") ||
+                 endswith(filename, ".dpkg-remove") ||
+                 endswith(filename, ".swp");
+ }
+ bool hidden_file(const char *filename) {
+         assert(filename);
+         if (endswith(filename, "~"))
+                 return true;
+         return hidden_file_allow_backup(filename);
+ }
+ bool is_device_path(const char *path) {
+         /* Returns true on paths that refer to a device, either in
+          * sysfs or in /dev */
+         return
+                 path_startswith(path, "/dev/") ||
+                 path_startswith(path, "/sys/");
+ }
 +#endif /* NM_IGNORED */
Simple merge
   * The underlying algorithm used in this implementation is a Heap.
   */
  
- #include "util.h"
 +#include "nm-sd-adapt.h"
 +
+ #include "alloc-util.h"
  #include "prioq.h"
+ #include "util.h"
  
  struct prioq_item {
          void *data;
    along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
- #include <stdint.h>
 +#include "nm-sd-adapt.h"
 +
  #include <errno.h>
- #include <sys/types.h>
- #include <sys/stat.h>
  #include <fcntl.h>
- #include <time.h>
+ #include <linux/random.h>
+ #include <stdint.h>
  #ifdef HAVE_SYS_AUXV_H
  #include <sys/auxv.h>
  #endif
- #include <linux/random.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <time.h>
  
- #include "random-util.h"
- #include "time-util.h"
+ #include "fd-util.h"
+ #include "io-util.h"
 +#if 0 /* NM_IGNORED */
  #include "missing.h"
 +#endif
+ #include "random-util.h"
+ #include "time-util.h"
  #include "util.h"
  
  int dev_urandom(void *p, size_t n) {
      coding style)
  */
  
- #include "sparse-endian.h"
 +#include "nm-sd-adapt.h"
 +
  #include "siphash24.h"
+ #include "sparse-endian.h"
+ #include "unaligned.h"
  #include "util.h"
  
  static inline uint64_t rotate_left(uint64_t x, uint8_t b) {
Simple merge
    along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
- #include <sys/socket.h>
- #include <netinet/in.h>
 +#include "nm-sd-adapt.h"
 +
  #include <netinet/ether.h>
+ #include <netinet/in.h>
+ #include <sys/socket.h>
  #include <sys/un.h>
  #include <linux/netlink.h>
  #include <linux/if_packet.h>
index 0000000,a860324..5b3141b
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,35 +1,37 @@@
+ /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+ /***
+   This file is part of systemd.
+   Copyright 2010 Lennart Poettering
+   systemd is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 2.1 of the License, or
+   (at your option) any later version.
+   systemd is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+   Lesser General Public License for more details.
+   You should have received a copy of the GNU Lesser General Public License
+   along with systemd; If not, see <http://www.gnu.org/licenses/>.
+ ***/
++#include "nm-sd-adapt.h"
++
+ #include "string-table.h"
+ ssize_t string_table_lookup(const char * const *table, size_t len, const char *key) {
+         size_t i;
+         if (!key)
+                 return -1;
+         for (i = 0; i < len; ++i)
+                 if (streq_ptr(table[i], key))
+                         return (ssize_t) i;
+         return -1;
+ }
index 0000000,51b6007..2f87b92
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,88 +1,90 @@@
+ /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+ #pragma once
+ /***
+   This file is part of systemd.
+   Copyright 2010 Lennart Poettering
+   systemd is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 2.1 of the License, or
+   (at your option) any later version.
+   systemd is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+   Lesser General Public License for more details.
+   You should have received a copy of the GNU Lesser General Public License
+   along with systemd; If not, see <http://www.gnu.org/licenses/>.
+ ***/
++#include "nm-sd-adapt.h"
++
+ #include <stddef.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <sys/types.h>
+ #include "macro.h"
+ #include "parse-util.h"
+ #include "string-util.h"
+ ssize_t string_table_lookup(const char * const *table, size_t len, const char *key);
+ /* For basic lookup tables with strictly enumerated entries */
+ #define _DEFINE_STRING_TABLE_LOOKUP_TO_STRING(name,type,scope)          \
+         scope const char *name##_to_string(type i) {                    \
+                 if (i < 0 || i >= (type) ELEMENTSOF(name##_table))      \
+                         return NULL;                                    \
+                 return name##_table[i];                                 \
+         }
+ #define _DEFINE_STRING_TABLE_LOOKUP_FROM_STRING(name,type,scope)        \
+         scope type name##_from_string(const char *s) {                  \
+                 return (type) string_table_lookup(name##_table, ELEMENTSOF(name##_table), s); \
+         }
+ #define _DEFINE_STRING_TABLE_LOOKUP(name,type,scope)                    \
+         _DEFINE_STRING_TABLE_LOOKUP_TO_STRING(name,type,scope)          \
+         _DEFINE_STRING_TABLE_LOOKUP_FROM_STRING(name,type,scope)        \
+         struct __useless_struct_to_allow_trailing_semicolon__
+ #define DEFINE_STRING_TABLE_LOOKUP(name,type) _DEFINE_STRING_TABLE_LOOKUP(name,type,)
+ #define DEFINE_PRIVATE_STRING_TABLE_LOOKUP(name,type) _DEFINE_STRING_TABLE_LOOKUP(name,type,static)
+ #define DEFINE_PRIVATE_STRING_TABLE_LOOKUP_TO_STRING(name,type) _DEFINE_STRING_TABLE_LOOKUP_TO_STRING(name,type,static)
+ #define DEFINE_PRIVATE_STRING_TABLE_LOOKUP_FROM_STRING(name,type) _DEFINE_STRING_TABLE_LOOKUP_FROM_STRING(name,type,static)
+ /* For string conversions where numbers are also acceptable */
+ #define DEFINE_STRING_TABLE_LOOKUP_WITH_FALLBACK(name,type,max)         \
+         int name##_to_string_alloc(type i, char **str) {                \
+                 char *s;                                                \
+                 if (i < 0 || i > max)                                   \
+                         return -ERANGE;                                 \
+                 if (i < (type) ELEMENTSOF(name##_table)) {              \
+                         s = strdup(name##_table[i]);                    \
+                         if (!s)                                         \
+                                 return -ENOMEM;                         \
+                 } else {                                                \
+                         if (asprintf(&s, "%i", i) < 0)                  \
+                                 return -ENOMEM;                         \
+                 }                                                       \
+                 *str = s;                                               \
+                 return 0;                                               \
+         }                                                               \
+         type name##_from_string(const char *s) {                        \
+                 type i;                                                 \
+                 unsigned u = 0;                                         \
+                 if (!s)                                                 \
+                         return (type) -1;                               \
+                 for (i = 0; i < (type) ELEMENTSOF(name##_table); i++)   \
+                         if (streq_ptr(name##_table[i], s))              \
+                                 return i;                               \
+                 if (safe_atou(s, &u) >= 0 && u <= max)                  \
+                         return (type) u;                                \
+                 return (type) -1;                                       \
+         }                                                               \
+         struct __useless_struct_to_allow_trailing_semicolon__
index 0000000,6006767..8ce4b01
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,800 +1,806 @@@
+ /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+ /***
+   This file is part of systemd.
+   Copyright 2010 Lennart Poettering
+   systemd is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 2.1 of the License, or
+   (at your option) any later version.
+   systemd is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+   Lesser General Public License for more details.
+   You should have received a copy of the GNU Lesser General Public License
+   along with systemd; If not, see <http://www.gnu.org/licenses/>.
+ ***/
++#include "nm-sd-adapt.h"
++
+ #include "alloc-util.h"
++#if 0 /* NM_IGNORED */
+ #include "gunicode.h"
++#endif /* NM_IGNORED */
+ #include "string-util.h"
+ #include "utf8.h"
+ #include "util.h"
+ int strcmp_ptr(const char *a, const char *b) {
+         /* Like strcmp(), but tries to make sense of NULL pointers */
+         if (a && b)
+                 return strcmp(a, b);
+         if (!a && b)
+                 return -1;
+         if (a && !b)
+                 return 1;
+         return 0;
+ }
+ char* endswith(const char *s, const char *postfix) {
+         size_t sl, pl;
+         assert(s);
+         assert(postfix);
+         sl = strlen(s);
+         pl = strlen(postfix);
+         if (pl == 0)
+                 return (char*) s + sl;
+         if (sl < pl)
+                 return NULL;
+         if (memcmp(s + sl - pl, postfix, pl) != 0)
+                 return NULL;
+         return (char*) s + sl - pl;
+ }
+ char* endswith_no_case(const char *s, const char *postfix) {
+         size_t sl, pl;
+         assert(s);
+         assert(postfix);
+         sl = strlen(s);
+         pl = strlen(postfix);
+         if (pl == 0)
+                 return (char*) s + sl;
+         if (sl < pl)
+                 return NULL;
+         if (strcasecmp(s + sl - pl, postfix) != 0)
+                 return NULL;
+         return (char*) s + sl - pl;
+ }
+ char* first_word(const char *s, const char *word) {
+         size_t sl, wl;
+         const char *p;
+         assert(s);
+         assert(word);
+         /* Checks if the string starts with the specified word, either
+          * followed by NUL or by whitespace. Returns a pointer to the
+          * NUL or the first character after the whitespace. */
+         sl = strlen(s);
+         wl = strlen(word);
+         if (sl < wl)
+                 return NULL;
+         if (wl == 0)
+                 return (char*) s;
+         if (memcmp(s, word, wl) != 0)
+                 return NULL;
+         p = s + wl;
+         if (*p == 0)
+                 return (char*) p;
+         if (!strchr(WHITESPACE, *p))
+                 return NULL;
+         p += strspn(p, WHITESPACE);
+         return (char*) p;
+ }
+ static size_t strcspn_escaped(const char *s, const char *reject) {
+         bool escaped = false;
+         int n;
+         for (n=0; s[n]; n++) {
+                 if (escaped)
+                         escaped = false;
+                 else if (s[n] == '\\')
+                         escaped = true;
+                 else if (strchr(reject, s[n]))
+                         break;
+         }
+         /* if s ends in \, return index of previous char */
+         return n - escaped;
+ }
+ /* Split a string into words. */
+ const char* split(const char **state, size_t *l, const char *separator, bool quoted) {
+         const char *current;
+         current = *state;
+         if (!*current) {
+                 assert(**state == '\0');
+                 return NULL;
+         }
+         current += strspn(current, separator);
+         if (!*current) {
+                 *state = current;
+                 return NULL;
+         }
+         if (quoted && strchr("\'\"", *current)) {
+                 char quotechars[2] = {*current, '\0'};
+                 *l = strcspn_escaped(current + 1, quotechars);
+                 if (current[*l + 1] == '\0' || current[*l + 1] != quotechars[0] ||
+                     (current[*l + 2] && !strchr(separator, current[*l + 2]))) {
+                         /* right quote missing or garbage at the end */
+                         *state = current;
+                         return NULL;
+                 }
+                 *state = current++ + *l + 2;
+         } else if (quoted) {
+                 *l = strcspn_escaped(current, separator);
+                 if (current[*l] && !strchr(separator, current[*l])) {
+                         /* unfinished escape */
+                         *state = current;
+                         return NULL;
+                 }
+                 *state = current + *l;
+         } else {
+                 *l = strcspn(current, separator);
+                 *state = current + *l;
+         }
+         return current;
+ }
+ char *strnappend(const char *s, const char *suffix, size_t b) {
+         size_t a;
+         char *r;
+         if (!s && !suffix)
+                 return strdup("");
+         if (!s)
+                 return strndup(suffix, b);
+         if (!suffix)
+                 return strdup(s);
+         assert(s);
+         assert(suffix);
+         a = strlen(s);
+         if (b > ((size_t) -1) - a)
+                 return NULL;
+         r = new(char, a+b+1);
+         if (!r)
+                 return NULL;
+         memcpy(r, s, a);
+         memcpy(r+a, suffix, b);
+         r[a+b] = 0;
+         return r;
+ }
+ char *strappend(const char *s, const char *suffix) {
+         return strnappend(s, suffix, suffix ? strlen(suffix) : 0);
+ }
+ char *strjoin(const char *x, ...) {
+         va_list ap;
+         size_t l;
+         char *r, *p;
+         va_start(ap, x);
+         if (x) {
+                 l = strlen(x);
+                 for (;;) {
+                         const char *t;
+                         size_t n;
+                         t = va_arg(ap, const char *);
+                         if (!t)
+                                 break;
+                         n = strlen(t);
+                         if (n > ((size_t) -1) - l) {
+                                 va_end(ap);
+                                 return NULL;
+                         }
+                         l += n;
+                 }
+         } else
+                 l = 0;
+         va_end(ap);
+         r = new(char, l+1);
+         if (!r)
+                 return NULL;
+         if (x) {
+                 p = stpcpy(r, x);
+                 va_start(ap, x);
+                 for (;;) {
+                         const char *t;
+                         t = va_arg(ap, const char *);
+                         if (!t)
+                                 break;
+                         p = stpcpy(p, t);
+                 }
+                 va_end(ap);
+         } else
+                 r[0] = 0;
+         return r;
+ }
+ char *strstrip(char *s) {
+         char *e;
+         /* Drops trailing whitespace. Modifies the string in
+          * place. Returns pointer to first non-space character */
+         s += strspn(s, WHITESPACE);
+         for (e = strchr(s, 0); e > s; e --)
+                 if (!strchr(WHITESPACE, e[-1]))
+                         break;
+         *e = 0;
+         return s;
+ }
+ char *delete_chars(char *s, const char *bad) {
+         char *f, *t;
+         /* Drops all whitespace, regardless where in the string */
+         for (f = s, t = s; *f; f++) {
+                 if (strchr(bad, *f))
+                         continue;
+                 *(t++) = *f;
+         }
+         *t = 0;
+         return s;
+ }
+ char *truncate_nl(char *s) {
+         assert(s);
+         s[strcspn(s, NEWLINE)] = 0;
+         return s;
+ }
+ char *ascii_strlower(char *t) {
+         char *p;
+         assert(t);
+         for (p = t; *p; p++)
+                 if (*p >= 'A' && *p <= 'Z')
+                         *p = *p - 'A' + 'a';
+         return t;
+ }
+ bool chars_intersect(const char *a, const char *b) {
+         const char *p;
+         /* Returns true if any of the chars in a are in b. */
+         for (p = a; *p; p++)
+                 if (strchr(b, *p))
+                         return true;
+         return false;
+ }
+ bool string_has_cc(const char *p, const char *ok) {
+         const char *t;
+         assert(p);
+         /*
+          * Check if a string contains control characters. If 'ok' is
+          * non-NULL it may be a string containing additional CCs to be
+          * considered OK.
+          */
+         for (t = p; *t; t++) {
+                 if (ok && strchr(ok, *t))
+                         continue;
+                 if (*t > 0 && *t < ' ')
+                         return true;
+                 if (*t == 127)
+                         return true;
+         }
+         return false;
+ }
++#if 0 /* NM_IGNORED */
+ static char *ascii_ellipsize_mem(const char *s, size_t old_length, size_t new_length, unsigned percent) {
+         size_t x;
+         char *r;
+         assert(s);
+         assert(percent <= 100);
+         assert(new_length >= 3);
+         if (old_length <= 3 || old_length <= new_length)
+                 return strndup(s, old_length);
+         r = new0(char, new_length+1);
+         if (!r)
+                 return NULL;
+         x = (new_length * percent) / 100;
+         if (x > new_length - 3)
+                 x = new_length - 3;
+         memcpy(r, s, x);
+         r[x] = '.';
+         r[x+1] = '.';
+         r[x+2] = '.';
+         memcpy(r + x + 3,
+                s + old_length - (new_length - x - 3),
+                new_length - x - 3);
+         return r;
+ }
+ char *ellipsize_mem(const char *s, size_t old_length, size_t new_length, unsigned percent) {
+         size_t x;
+         char *e;
+         const char *i, *j;
+         unsigned k, len, len2;
+         assert(s);
+         assert(percent <= 100);
+         assert(new_length >= 3);
+         /* if no multibyte characters use ascii_ellipsize_mem for speed */
+         if (ascii_is_valid(s))
+                 return ascii_ellipsize_mem(s, old_length, new_length, percent);
+         if (old_length <= 3 || old_length <= new_length)
+                 return strndup(s, old_length);
+         x = (new_length * percent) / 100;
+         if (x > new_length - 3)
+                 x = new_length - 3;
+         k = 0;
+         for (i = s; k < x && i < s + old_length; i = utf8_next_char(i)) {
+                 int c;
+                 c = utf8_encoded_to_unichar(i);
+                 if (c < 0)
+                         return NULL;
+                 k += unichar_iswide(c) ? 2 : 1;
+         }
+         if (k > x) /* last character was wide and went over quota */
+                 x ++;
+         for (j = s + old_length; k < new_length && j > i; ) {
+                 int c;
+                 j = utf8_prev_char(j);
+                 c = utf8_encoded_to_unichar(j);
+                 if (c < 0)
+                         return NULL;
+                 k += unichar_iswide(c) ? 2 : 1;
+         }
+         assert(i <= j);
+         /* we don't actually need to ellipsize */
+         if (i == j)
+                 return memdup(s, old_length + 1);
+         /* make space for ellipsis */
+         j = utf8_next_char(j);
+         len = i - s;
+         len2 = s + old_length - j;
+         e = new(char, len + 3 + len2 + 1);
+         if (!e)
+                 return NULL;
+         /*
+         printf("old_length=%zu new_length=%zu x=%zu len=%u len2=%u k=%u\n",
+                old_length, new_length, x, len, len2, k);
+         */
+         memcpy(e, s, len);
+         e[len]   = 0xe2; /* tri-dot ellipsis: … */
+         e[len + 1] = 0x80;
+         e[len + 2] = 0xa6;
+         memcpy(e + len + 3, j, len2 + 1);
+         return e;
+ }
+ char *ellipsize(const char *s, size_t length, unsigned percent) {
+         return ellipsize_mem(s, strlen(s), length, percent);
+ }
++#endif /* NM_IGNORED */
+ bool nulstr_contains(const char*nulstr, const char *needle) {
+         const char *i;
+         if (!nulstr)
+                 return false;
+         NULSTR_FOREACH(i, nulstr)
+                 if (streq(i, needle))
+                         return true;
+         return false;
+ }
+ char* strshorten(char *s, size_t l) {
+         assert(s);
+         if (l < strlen(s))
+                 s[l] = 0;
+         return s;
+ }
+ char *strreplace(const char *text, const char *old_string, const char *new_string) {
+         const char *f;
+         char *t, *r;
+         size_t l, old_len, new_len;
+         assert(text);
+         assert(old_string);
+         assert(new_string);
+         old_len = strlen(old_string);
+         new_len = strlen(new_string);
+         l = strlen(text);
+         r = new(char, l+1);
+         if (!r)
+                 return NULL;
+         f = text;
+         t = r;
+         while (*f) {
+                 char *a;
+                 size_t d, nl;
+                 if (!startswith(f, old_string)) {
+                         *(t++) = *(f++);
+                         continue;
+                 }
+                 d = t - r;
+                 nl = l - old_len + new_len;
+                 a = realloc(r, nl + 1);
+                 if (!a)
+                         goto oom;
+                 l = nl;
+                 r = a;
+                 t = r + d;
+                 t = stpcpy(t, new_string);
+                 f += old_len;
+         }
+         *t = 0;
+         return r;
+ oom:
+         free(r);
+         return NULL;
+ }
+ char *strip_tab_ansi(char **ibuf, size_t *_isz) {
+         const char *i, *begin = NULL;
+         enum {
+                 STATE_OTHER,
+                 STATE_ESCAPE,
+                 STATE_BRACKET
+         } state = STATE_OTHER;
+         char *obuf = NULL;
+         size_t osz = 0, isz;
+         FILE *f;
+         assert(ibuf);
+         assert(*ibuf);
+         /* Strips ANSI color and replaces TABs by 8 spaces */
+         isz = _isz ? *_isz : strlen(*ibuf);
+         f = open_memstream(&obuf, &osz);
+         if (!f)
+                 return NULL;
+         for (i = *ibuf; i < *ibuf + isz + 1; i++) {
+                 switch (state) {
+                 case STATE_OTHER:
+                         if (i >= *ibuf + isz) /* EOT */
+                                 break;
+                         else if (*i == '\x1B')
+                                 state = STATE_ESCAPE;
+                         else if (*i == '\t')
+                                 fputs("        ", f);
+                         else
+                                 fputc(*i, f);
+                         break;
+                 case STATE_ESCAPE:
+                         if (i >= *ibuf + isz) { /* EOT */
+                                 fputc('\x1B', f);
+                                 break;
+                         } else if (*i == '[') {
+                                 state = STATE_BRACKET;
+                                 begin = i + 1;
+                         } else {
+                                 fputc('\x1B', f);
+                                 fputc(*i, f);
+                                 state = STATE_OTHER;
+                         }
+                         break;
+                 case STATE_BRACKET:
+                         if (i >= *ibuf + isz || /* EOT */
+                             (!(*i >= '0' && *i <= '9') && *i != ';' && *i != 'm')) {
+                                 fputc('\x1B', f);
+                                 fputc('[', f);
+                                 state = STATE_OTHER;
+                                 i = begin-1;
+                         } else if (*i == 'm')
+                                 state = STATE_OTHER;
+                         break;
+                 }
+         }
+         if (ferror(f)) {
+                 fclose(f);
+                 free(obuf);
+                 return NULL;
+         }
+         fclose(f);
+         free(*ibuf);
+         *ibuf = obuf;
+         if (_isz)
+                 *_isz = osz;
+         return obuf;
+ }
+ char *strextend(char **x, ...) {
+         va_list ap;
+         size_t f, l;
+         char *r, *p;
+         assert(x);
+         l = f = *x ? strlen(*x) : 0;
+         va_start(ap, x);
+         for (;;) {
+                 const char *t;
+                 size_t n;
+                 t = va_arg(ap, const char *);
+                 if (!t)
+                         break;
+                 n = strlen(t);
+                 if (n > ((size_t) -1) - l) {
+                         va_end(ap);
+                         return NULL;
+                 }
+                 l += n;
+         }
+         va_end(ap);
+         r = realloc(*x, l+1);
+         if (!r)
+                 return NULL;
+         p = r + f;
+         va_start(ap, x);
+         for (;;) {
+                 const char *t;
+                 t = va_arg(ap, const char *);
+                 if (!t)
+                         break;
+                 p = stpcpy(p, t);
+         }
+         va_end(ap);
+         *p = 0;
+         *x = r;
+         return r + l;
+ }
+ char *strrep(const char *s, unsigned n) {
+         size_t l;
+         char *r, *p;
+         unsigned i;
+         assert(s);
+         l = strlen(s);
+         p = r = malloc(l * n + 1);
+         if (!r)
+                 return NULL;
+         for (i = 0; i < n; i++)
+                 p = stpcpy(p, s);
+         *p = 0;
+         return r;
+ }
+ int split_pair(const char *s, const char *sep, char **l, char **r) {
+         char *x, *a, *b;
+         assert(s);
+         assert(sep);
+         assert(l);
+         assert(r);
+         if (isempty(sep))
+                 return -EINVAL;
+         x = strstr(s, sep);
+         if (!x)
+                 return -EINVAL;
+         a = strndup(s, x - s);
+         if (!a)
+                 return -ENOMEM;
+         b = strdup(x + strlen(sep));
+         if (!b) {
+                 free(a);
+                 return -ENOMEM;
+         }
+         *l = a;
+         *r = b;
+         return 0;
+ }
+ int free_and_strdup(char **p, const char *s) {
+         char *t;
+         assert(p);
+         /* Replaces a string pointer with an strdup()ed new string,
+          * possibly freeing the old one. */
+         if (streq_ptr(*p, s))
+                 return 0;
+         if (s) {
+                 t = strdup(s);
+                 if (!t)
+                         return -ENOMEM;
+         } else
+                 t = NULL;
+         free(*p);
+         *p = t;
+         return 1;
+ }
+ #pragma GCC push_options
+ #pragma GCC optimize("O0")
+ void* memory_erase(void *p, size_t l) {
+         volatile uint8_t* x = (volatile uint8_t*) p;
+         /* This basically does what memset() does, but hopefully isn't
+          * optimized away by the compiler. One of those days, when
+          * glibc learns memset_s() we should replace this call by
+          * memset_s(), but until then this has to do. */
+         for (; l > 0; l--)
+                 *(x++) = 'x';
+         return p;
+ }
+ #pragma GCC pop_options
+ char* string_erase(char *x) {
+         if (!x)
+                 return NULL;
+         /* A delicious drop of snake-oil! To be called on memory where
+          * we stored passphrases or so, after we used them. */
+         return memory_erase(x, strlen(x));
+ }
+ char *string_free_erase(char *s) {
+         return mfree(string_erase(s));
+ }
+ bool string_is_safe(const char *p) {
+         const char *t;
+         if (!p)
+                 return false;
+         for (t = p; *t; t++) {
+                 if (*t > 0 && *t < ' ') /* no control characters */
+                         return false;
+                 if (strchr(QUOTES "\\\x7f", *t))
+                         return false;
+         }
+         return true;
+ }
index 0000000,54f9d30..ca93256
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,184 +1,186 @@@
+ /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+ #pragma once
+ /***
+   This file is part of systemd.
+   Copyright 2010 Lennart Poettering
+   systemd is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 2.1 of the License, or
+   (at your option) any later version.
+   systemd is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+   Lesser General Public License for more details.
+   You should have received a copy of the GNU Lesser General Public License
+   along with systemd; If not, see <http://www.gnu.org/licenses/>.
+ ***/
++#include "nm-sd-adapt.h"
++
+ #include <stdbool.h>
+ #include <string.h>
+ #include "macro.h"
+ /* What is interpreted as whitespace? */
+ #define WHITESPACE        " \t\n\r"
+ #define NEWLINE           "\n\r"
+ #define QUOTES            "\"\'"
+ #define COMMENTS          "#;"
+ #define GLOB_CHARS        "*?["
+ #define DIGITS            "0123456789"
+ #define LOWERCASE_LETTERS "abcdefghijklmnopqrstuvwxyz"
+ #define UPPERCASE_LETTERS "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+ #define LETTERS           LOWERCASE_LETTERS UPPERCASE_LETTERS
+ #define ALPHANUMERICAL    LETTERS DIGITS
+ #define streq(a,b) (strcmp((a),(b)) == 0)
+ #define strneq(a, b, n) (strncmp((a), (b), (n)) == 0)
+ #define strcaseeq(a,b) (strcasecmp((a),(b)) == 0)
+ #define strncaseeq(a, b, n) (strncasecmp((a), (b), (n)) == 0)
+ int strcmp_ptr(const char *a, const char *b) _pure_;
+ static inline bool streq_ptr(const char *a, const char *b) {
+         return strcmp_ptr(a, b) == 0;
+ }
+ static inline const char* strempty(const char *s) {
+         return s ? s : "";
+ }
+ static inline const char* strnull(const char *s) {
+         return s ? s : "(null)";
+ }
+ static inline const char *strna(const char *s) {
+         return s ? s : "n/a";
+ }
+ static inline bool isempty(const char *p) {
+         return !p || !p[0];
+ }
+ static inline char *startswith(const char *s, const char *prefix) {
+         size_t l;
+         l = strlen(prefix);
+         if (strncmp(s, prefix, l) == 0)
+                 return (char*) s + l;
+         return NULL;
+ }
+ static inline char *startswith_no_case(const char *s, const char *prefix) {
+         size_t l;
+         l = strlen(prefix);
+         if (strncasecmp(s, prefix, l) == 0)
+                 return (char*) s + l;
+         return NULL;
+ }
+ char *endswith(const char *s, const char *postfix) _pure_;
+ char *endswith_no_case(const char *s, const char *postfix) _pure_;
+ char *first_word(const char *s, const char *word) _pure_;
+ const char* split(const char **state, size_t *l, const char *separator, bool quoted);
+ #define FOREACH_WORD(word, length, s, state)                            \
+         _FOREACH_WORD(word, length, s, WHITESPACE, false, state)
+ #define FOREACH_WORD_SEPARATOR(word, length, s, separator, state)       \
+         _FOREACH_WORD(word, length, s, separator, false, state)
+ #define FOREACH_WORD_QUOTED(word, length, s, state)                     \
+         _FOREACH_WORD(word, length, s, WHITESPACE, true, state)
+ #define _FOREACH_WORD(word, length, s, separator, quoted, state)        \
+         for ((state) = (s), (word) = split(&(state), &(length), (separator), (quoted)); (word); (word) = split(&(state), &(length), (separator), (quoted)))
+ char *strappend(const char *s, const char *suffix);
+ char *strnappend(const char *s, const char *suffix, size_t length);
+ char *strjoin(const char *x, ...) _sentinel_;
+ #define strjoina(a, ...)                                                \
+         ({                                                              \
+                 const char *_appendees_[] = { a, __VA_ARGS__ };         \
+                 char *_d_, *_p_;                                        \
+                 int _len_ = 0;                                          \
+                 unsigned _i_;                                           \
+                 for (_i_ = 0; _i_ < ELEMENTSOF(_appendees_) && _appendees_[_i_]; _i_++) \
+                         _len_ += strlen(_appendees_[_i_]);              \
+                 _p_ = _d_ = alloca(_len_ + 1);                          \
+                 for (_i_ = 0; _i_ < ELEMENTSOF(_appendees_) && _appendees_[_i_]; _i_++) \
+                         _p_ = stpcpy(_p_, _appendees_[_i_]);            \
+                 *_p_ = 0;                                               \
+                 _d_;                                                    \
+         })
+ char *strstrip(char *s);
+ char *delete_chars(char *s, const char *bad);
+ char *truncate_nl(char *s);
+ char *ascii_strlower(char *path);
+ bool chars_intersect(const char *a, const char *b) _pure_;
+ static inline bool _pure_ in_charset(const char *s, const char* charset) {
+         assert(s);
+         assert(charset);
+         return s[strspn(s, charset)] == '\0';
+ }
+ bool string_has_cc(const char *p, const char *ok) _pure_;
+ char *ellipsize_mem(const char *s, size_t old_length_bytes, size_t new_length_columns, unsigned percent);
+ char *ellipsize(const char *s, size_t length, unsigned percent);
+ bool nulstr_contains(const char*nulstr, const char *needle);
+ char* strshorten(char *s, size_t l);
+ char *strreplace(const char *text, const char *old_string, const char *new_string);
+ char *strip_tab_ansi(char **p, size_t *l);
+ char *strextend(char **x, ...) _sentinel_;
+ char *strrep(const char *s, unsigned n);
+ int split_pair(const char *s, const char *sep, char **l, char **r);
+ int free_and_strdup(char **p, const char *s);
+ /* Normal memmem() requires haystack to be nonnull, which is annoying for zero-length buffers */
+ static inline void *memmem_safe(const void *haystack, size_t haystacklen, const void *needle, size_t needlelen) {
+         if (needlelen <= 0)
+                 return (void*) haystack;
+         if (haystacklen < needlelen)
+                 return NULL;
+         assert(haystack);
+         assert(needle);
+         return memmem(haystack, haystacklen, needle, needlelen);
+ }
+ void* memory_erase(void *p, size_t l);
+ char *string_erase(char *x);
+ char *string_free_erase(char *s);
+ DEFINE_TRIVIAL_CLEANUP_FUNC(char *, string_free_erase);
+ #define _cleanup_string_free_erase_ _cleanup_(string_free_erasep)
+ bool string_is_safe(const char *p) _pure_;
    along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
- #include <stdlib.h>
 +#include "nm-sd-adapt.h"
 +
+ #include <errno.h>
  #include <stdarg.h>
+ #include <stdlib.h>
  #include <string.h>
- #include <errno.h>
  
- #include "util.h"
+ #include "alloc-util.h"
+ #include "escape.h"
+ #include "string-util.h"
  #include "strv.h"
+ #include "util.h"
  
  char *strv_find(char **l, const char *name) {
          char **i;
    along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
 +#include "nm-sd-adapt.h"
 +
+ #include <fnmatch.h>
  #include <stdarg.h>
  #include <stdbool.h>
- #include <fnmatch.h>
  
++#if 0 /* NM_IGNORED */
+ #include "extract-word.h"
++#endif /* NM_IGNORED */
  #include "util.h"
  
  char *strv_find(char **l, const char *name) _pure_;
@@@ -75,7 -78,7 +82,9 @@@ static inline bool strv_isempty(char * 
  char **strv_split(const char *s, const char *separator);
  char **strv_split_newlines(const char *s);
  
++#if 0 /* NM_IGNORED */
  int strv_split_extract(char ***t, const char *s, const char *separators, ExtractFlags flags);
++#endif /* NM_IGNORED */
  
  char *strv_join(char **l, const char *separator);
  char *strv_join_quoted(char **l);
    along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
- #include <time.h>
 +#include "nm-sd-adapt.h"
 +
  #include <string.h>
- #include <sys/timex.h>
  #include <sys/timerfd.h>
+ #include <sys/timex.h>
  
- #include "util.h"
- #include "time-util.h"
+ #include "alloc-util.h"
+ #include "fd-util.h"
+ #include "fileio.h"
++#if 0 /* NM_IGNORED */
+ #include "fs-util.h"
+ #include "parse-util.h"
++#endif /* NM_IGNORED */
  #include "path-util.h"
+ #include "string-util.h"
  #include "strv.h"
+ #include "time-util.h"
+ #include "util.h"
  
  usec_t now(clockid_t clock_id) {
          struct timespec ts;
@@@ -1079,4 -1114,25 +1123,26 @@@ int get_timezone(char **tz) 
          *tz = z;
          return 0;
  }
+ time_t mktime_or_timegm(struct tm *tm, bool utc) {
+         return utc ? timegm(tm) : mktime(tm);
+ }
+ struct tm *localtime_or_gmtime_r(const time_t *t, struct tm *tm, bool utc) {
+         return utc ? gmtime_r(t, tm) : localtime_r(t, tm);
+ }
+ unsigned long usec_to_jiffies(usec_t u) {
+         static thread_local unsigned long hz = 0;
+         long r;
+         if (hz == 0) {
+                 r = sysconf(_SC_CLK_TCK);
+                 assert(r > 0);
+                 hz = (unsigned long) r;
+         }
+         return DIV_ROUND_UP(u , USEC_PER_SEC / hz);
+ }
 +#endif /* NM_IGNORED */
    along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
- #include <stdio.h>
 +#include "nm-sd-adapt.h"
 +
  #include <inttypes.h>
+ #include <stdio.h>
+ #include <time.h>
  
  typedef uint64_t usec_t;
  typedef uint64_t nsec_t;
index 0000000,8ed3465..aada054
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,48 +1,50 @@@
+ /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+ #pragma once
+ /***
+   This file is part of systemd.
+   Copyright 2010 Lennart Poettering
+   systemd is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 2.1 of the License, or
+   (at your option) any later version.
+   systemd is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+   Lesser General Public License for more details.
+   You should have received a copy of the GNU Lesser General Public License
+   along with systemd; If not, see <http://www.gnu.org/licenses/>.
+ ***/
++#include "nm-sd-adapt.h"
++
+ #include <stdbool.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include "macro.h"
+ static inline void umaskp(mode_t *u) {
+         umask(*u);
+ }
+ #define _cleanup_umask_ _cleanup_(umaskp)
+ struct _umask_struct_ {
+         mode_t mask;
+         bool quit;
+ };
+ static inline void _reset_umask_(struct _umask_struct_ *s) {
+         umask(s->mask);
+ };
+ #define RUN_WITH_UMASK(mask)                                            \
+         for (_cleanup_(_reset_umask_) struct _umask_struct_ _saved_umask_ = { umask(mask), false }; \
+              !_saved_umask_.quit ;                                      \
+              _saved_umask_.quit = true)
    along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
 +#include "nm-sd-adapt.h"
 +
+ #include <endian.h>
  #include <stdint.h>
  
+ /* BE */
  static inline uint16_t unaligned_read_be16(const void *_u) {
          const uint8_t *u = _u;
  
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
   */
  
 +#include "nm-sd-adapt.h"
 +
  #include <errno.h>
- #include <stdlib.h>
  #include <inttypes.h>
- #include <string.h>
  #include <stdbool.h>
+ #include <stdlib.h>
+ #include <string.h>
  
+ #include "alloc-util.h"
+ #include "hexdecoct.h"
  #include "utf8.h"
  #include "util.h"
  
@@@ -74,7 -69,7 +71,8 @@@
   * otherwise conflicts with sys/mount.h. Yay, Linux is great! */
  #include <linux/fs.h>
  
 +#if 0 /* NM_IGNORED */
+ #include "alloc-util.h"
  #include "build.h"
  #include "def.h"
  #include "device-nodes.h"
  #include "hostname-util.h"
  #include "ioprio.h"
  #include "log.h"
 +#endif /* NM_IGNORED */
  #include "macro.h"
 +#if 0 /* NM_IGNORED */
  #include "missing.h"
  #include "mkdir.h"
+ #include "parse-util.h"
 +#endif /* NM_IGNORED */
  #include "path-util.h"
 +#if 0 /* NM_IGNORED */
  #include "process-util.h"
  #include "random-util.h"
  #include "signal-util.h"
  #include "sparse-endian.h"
+ #include "stat-util.h"
+ #include "string-table.h"
+ #include "string-util.h"
  #include "strv.h"
  #include "terminal-util.h"
+ #include "user-util.h"
 +#endif /* NM_IGNORED */
  #include "utf8.h"
  #include "util.h"
 +#if 0 /* NM_IGNORED */
  #include "virt.h"
 +#endif /* NM_IGNORED */
  
  /* Put this test here for a lack of better place */
  assert_cc(EAGAIN == EWOULDBLOCK);
@@@ -130,6620 -125,641 +137,642 @@@ size_t page_size(void) 
          return pgsz;
  }
  
- int strcmp_ptr(const char *a, const char *b) {
-         /* Like strcmp(), but tries to make sense of NULL pointers */
-         if (a && b)
-                 return strcmp(a, b);
-         if (!a && b)
-                 return -1;
-         if (a && !b)
-                 return 1;
-         return 0;
- }
- bool streq_ptr(const char *a, const char *b) {
-         return strcmp_ptr(a, b) == 0;
- }
- char* endswith(const char *s, const char *postfix) {
-         size_t sl, pl;
-         assert(s);
-         assert(postfix);
++#if 0 /* NM_IGNORED */
+ static int do_execute(char **directories, usec_t timeout, char *argv[]) {
+         _cleanup_hashmap_free_free_ Hashmap *pids = NULL;
+         _cleanup_set_free_free_ Set *seen = NULL;
+         char **directory;
  
-         sl = strlen(s);
-         pl = strlen(postfix);
+         /* We fork this all off from a child process so that we can
+          * somewhat cleanly make use of SIGALRM to set a time limit */
  
-         if (pl == 0)
-                 return (char*) s + sl;
+         (void) reset_all_signal_handlers();
+         (void) reset_signal_mask();
  
-         if (sl < pl)
-                 return NULL;
+         assert_se(prctl(PR_SET_PDEATHSIG, SIGTERM) == 0);
  
-         if (memcmp(s + sl - pl, postfix, pl) != 0)
-                 return NULL;
+         pids = hashmap_new(NULL);
+         if (!pids)
+                 return log_oom();
  
-         return (char*) s + sl - pl;
- }
+         seen = set_new(&string_hash_ops);
+         if (!seen)
+                 return log_oom();
  
- char* endswith_no_case(const char *s, const char *postfix) {
-         size_t sl, pl;
+         STRV_FOREACH(directory, directories) {
+                 _cleanup_closedir_ DIR *d;
+                 struct dirent *de;
  
-         assert(s);
-         assert(postfix);
+                 d = opendir(*directory);
+                 if (!d) {
+                         if (errno == ENOENT)
+                                 continue;
  
-         sl = strlen(s);
-         pl = strlen(postfix);
+                         return log_error_errno(errno, "Failed to open directory %s: %m", *directory);
+                 }
  
-         if (pl == 0)
-                 return (char*) s + sl;
+                 FOREACH_DIRENT(de, d, break) {
+                         _cleanup_free_ char *path = NULL;
+                         pid_t pid;
+                         int r;
  
-         if (sl < pl)
-                 return NULL;
+                         if (!dirent_is_file(de))
+                                 continue;
  
-         if (strcasecmp(s + sl - pl, postfix) != 0)
-                 return NULL;
+                         if (set_contains(seen, de->d_name)) {
+                                 log_debug("%1$s/%2$s skipped (%2$s was already seen).", *directory, de->d_name);
+                                 continue;
+                         }
  
-         return (char*) s + sl - pl;
- }
+                         r = set_put_strdup(seen, de->d_name);
+                         if (r < 0)
+                                 return log_oom();
  
- char* first_word(const char *s, const char *word) {
-         size_t sl, wl;
-         const char *p;
+                         path = strjoin(*directory, "/", de->d_name, NULL);
+                         if (!path)
+                                 return log_oom();
  
-         assert(s);
-         assert(word);
+                         if (null_or_empty_path(path)) {
+                                 log_debug("%s is empty (a mask).", path);
+                                 continue;
+                         }
  
-         /* Checks if the string starts with the specified word, either
-          * followed by NUL or by whitespace. Returns a pointer to the
-          * NUL or the first character after the whitespace. */
+                         pid = fork();
+                         if (pid < 0) {
+                                 log_error_errno(errno, "Failed to fork: %m");
+                                 continue;
+                         } else if (pid == 0) {
+                                 char *_argv[2];
  
-         sl = strlen(s);
-         wl = strlen(word);
+                                 assert_se(prctl(PR_SET_PDEATHSIG, SIGTERM) == 0);
  
-         if (sl < wl)
-                 return NULL;
+                                 if (!argv) {
+                                         _argv[0] = path;
+                                         _argv[1] = NULL;
+                                         argv = _argv;
+                                 } else
+                                         argv[0] = path;
  
-         if (wl == 0)
-                 return (char*) s;
+                                 execv(path, argv);
+                                 return log_error_errno(errno, "Failed to execute %s: %m", path);
+                         }
  
-         if (memcmp(s, word, wl) != 0)
-                 return NULL;
+                         log_debug("Spawned %s as " PID_FMT ".", path, pid);
  
-         p = s + wl;
-         if (*p == 0)
-                 return (char*) p;
+                         r = hashmap_put(pids, PID_TO_PTR(pid), path);
+                         if (r < 0)
+                                 return log_oom();
+                         path = NULL;
+                 }
+         }
  
-         if (!strchr(WHITESPACE, *p))
-                 return NULL;
+         /* Abort execution of this process after the timout. We simply
+          * rely on SIGALRM as default action terminating the process,
+          * and turn on alarm(). */
  
-         p += strspn(p, WHITESPACE);
-         return (char*) p;
- }
+         if (timeout != USEC_INFINITY)
+                 alarm((timeout + USEC_PER_SEC - 1) / USEC_PER_SEC);
  
- size_t cescape_char(char c, char *buf) {
-         char * buf_old = buf;
+         while (!hashmap_isempty(pids)) {
+                 _cleanup_free_ char *path = NULL;
+                 pid_t pid;
  
-         switch (c) {
+                 pid = PTR_TO_PID(hashmap_first_key(pids));
+                 assert(pid > 0);
  
-                 case '\a':
-                         *(buf++) = '\\';
-                         *(buf++) = 'a';
-                         break;
-                 case '\b':
-                         *(buf++) = '\\';
-                         *(buf++) = 'b';
-                         break;
-                 case '\f':
-                         *(buf++) = '\\';
-                         *(buf++) = 'f';
-                         break;
-                 case '\n':
-                         *(buf++) = '\\';
-                         *(buf++) = 'n';
-                         break;
-                 case '\r':
-                         *(buf++) = '\\';
-                         *(buf++) = 'r';
-                         break;
-                 case '\t':
-                         *(buf++) = '\\';
-                         *(buf++) = 't';
-                         break;
-                 case '\v':
-                         *(buf++) = '\\';
-                         *(buf++) = 'v';
-                         break;
-                 case '\\':
-                         *(buf++) = '\\';
-                         *(buf++) = '\\';
-                         break;
-                 case '"':
-                         *(buf++) = '\\';
-                         *(buf++) = '"';
-                         break;
-                 case '\'':
-                         *(buf++) = '\\';
-                         *(buf++) = '\'';
-                         break;
+                 path = hashmap_remove(pids, PID_TO_PTR(pid));
+                 assert(path);
  
-                 default:
-                         /* For special chars we prefer octal over
-                          * hexadecimal encoding, simply because glib's
-                          * g_strescape() does the same */
-                         if ((c < ' ') || (c >= 127)) {
-                                 *(buf++) = '\\';
-                                 *(buf++) = octchar((unsigned char) c >> 6);
-                                 *(buf++) = octchar((unsigned char) c >> 3);
-                                 *(buf++) = octchar((unsigned char) c);
-                         } else
-                                 *(buf++) = c;
-                         break;
+                 wait_for_terminate_and_warn(path, pid, true);
          }
  
-         return buf - buf_old;
+         return 0;
  }
  
- int close_nointr(int fd) {
-         assert(fd >= 0);
-         if (close(fd) >= 0)
-                 return 0;
-         /*
-          * Just ignore EINTR; a retry loop is the wrong thing to do on
-          * Linux.
-          *
-          * http://lkml.indiana.edu/hypermail/linux/kernel/0509.1/0877.html
-          * https://bugzilla.gnome.org/show_bug.cgi?id=682819
-          * http://utcc.utoronto.ca/~cks/space/blog/unix/CloseEINTR
-          * https://sites.google.com/site/michaelsafyan/software-engineering/checkforeintrwheninvokingclosethinkagain
-          */
-         if (errno == EINTR)
-                 return 0;
-         return -errno;
- }
+ void execute_directories(const char* const* directories, usec_t timeout, char *argv[]) {
+         pid_t executor_pid;
+         int r;
+         char *name;
+         char **dirs = (char**) directories;
  
- int safe_close(int fd) {
+         assert(!strv_isempty(dirs));
  
-         /*
-          * Like close_nointr() but cannot fail. Guarantees errno is
-          * unchanged. Is a NOP with negative fds passed, and returns
-          * -1, so that it can be used in this syntax:
-          *
-          * fd = safe_close(fd);
-          */
+         name = basename(dirs[0]);
+         assert(!isempty(name));
  
-         if (fd >= 0) {
-                 PROTECT_ERRNO;
+         /* Executes all binaries in the directories in parallel and waits
+          * for them to finish. Optionally a timeout is applied. If a file
+          * with the same name exists in more than one directory, the
+          * earliest one wins. */
  
-                 /* The kernel might return pretty much any error code
-                  * via close(), but the fd will be closed anyway. The
-                  * only condition we want to check for here is whether
-                  * the fd was invalid at all... */
+         executor_pid = fork();
+         if (executor_pid < 0) {
+                 log_error_errno(errno, "Failed to fork: %m");
+                 return;
  
-                 assert_se(close_nointr(fd) != -EBADF);
+         } else if (executor_pid == 0) {
+                 r = do_execute(dirs, timeout, argv);
+                 _exit(r < 0 ? EXIT_FAILURE : EXIT_SUCCESS);
          }
  
-         return -1;
+         wait_for_terminate_and_warn(name, executor_pid, true);
  }
  
- #if 0 /* NM_IGNORED */
- void close_many(const int fds[], unsigned n_fd) {
-         unsigned i;
-         assert(fds || n_fd <= 0);
-         for (i = 0; i < n_fd; i++)
-                 safe_close(fds[i]);
+ bool plymouth_running(void) {
+         return access("/run/plymouth/pid", F_OK) >= 0;
  }
- #endif /* NM_IGNORED */
- int fclose_nointr(FILE *f) {
-         assert(f);
-         /* Same as close_nointr(), but for fclose() */
-         if (fclose(f) == 0)
-                 return 0;
  
-         if (errno == EINTR)
-                 return 0;
+ bool display_is_local(const char *display) {
+         assert(display);
  
-         return -errno;
+         return
+                 display[0] == ':' &&
+                 display[1] >= '0' &&
+                 display[1] <= '9';
  }
  
FILE* safe_fclose(FILE *f) {
-         /* Same as safe_close(), but for fclose() */
int socket_from_display(const char *display, char **path) {
+         size_t k;
+         char *f, *c;
  
-         if (f) {
-                 PROTECT_ERRNO;
+         assert(display);
+         assert(path);
  
-                 assert_se(fclose_nointr(f) != EBADF);
-         }
+         if (!display_is_local(display))
+                 return -EINVAL;
  
-         return NULL;
- }
+         k = strspn(display+1, "0123456789");
  
- DIR* safe_closedir(DIR *d) {
+         f = new(char, strlen("/tmp/.X11-unix/X") + k + 1);
+         if (!f)
+                 return -ENOMEM;
  
-         if (d) {
-                 PROTECT_ERRNO;
+         c = stpcpy(f, "/tmp/.X11-unix/X");
+         memcpy(c, display+1, k);
+         c[k] = 0;
  
-                 assert_se(closedir(d) >= 0 || errno != EBADF);
-         }
+         *path = f;
  
-         return NULL;
+         return 0;
  }
  
- int unlink_noerrno(const char *path) {
-         PROTECT_ERRNO;
+ int block_get_whole_disk(dev_t d, dev_t *ret) {
+         char *p, *s;
          int r;
+         unsigned n, m;
  
-         r = unlink(path);
-         if (r < 0)
-                 return -errno;
+         assert(ret);
  
-         return 0;
- }
+         /* If it has a queue this is good enough for us */
+         if (asprintf(&p, "/sys/dev/block/%u:%u/queue", major(d), minor(d)) < 0)
+                 return -ENOMEM;
  
- #if 0 /* NM_IGNORED */
- int parse_boolean(const char *v) {
-         assert(v);
+         r = access(p, F_OK);
+         free(p);
  
-         if (streq(v, "1") || strcaseeq(v, "yes") || strcaseeq(v, "y") || strcaseeq(v, "true") || strcaseeq(v, "t") || strcaseeq(v, "on"))
-                 return 1;
-         else if (streq(v, "0") || strcaseeq(v, "no") || strcaseeq(v, "n") || strcaseeq(v, "false") || strcaseeq(v, "f") || strcaseeq(v, "off"))
+         if (r >= 0) {
+                 *ret = d;
                  return 0;
+         }
  
-         return -EINVAL;
- }
- int parse_pid(const char *s, pid_t* ret_pid) {
-         unsigned long ul = 0;
-         pid_t pid;
-         int r;
+         /* If it is a partition find the originating device */
+         if (asprintf(&p, "/sys/dev/block/%u:%u/partition", major(d), minor(d)) < 0)
+                 return -ENOMEM;
  
-         assert(s);
-         assert(ret_pid);
+         r = access(p, F_OK);
+         free(p);
  
-         r = safe_atolu(s, &ul);
          if (r < 0)
-                 return r;
+                 return -ENOENT;
  
-         pid = (pid_t) ul;
+         /* Get parent dev_t */
+         if (asprintf(&p, "/sys/dev/block/%u:%u/../dev", major(d), minor(d)) < 0)
+                 return -ENOMEM;
  
-         if ((unsigned long) pid != ul)
-                 return -ERANGE;
+         r = read_one_line_file(p, &s);
+         free(p);
  
-         if (pid <= 0)
-                 return -ERANGE;
+         if (r < 0)
+                 return r;
  
-         *ret_pid = pid;
-         return 0;
- }
+         r = sscanf(s, "%u:%u", &m, &n);
+         free(s);
  
- bool uid_is_valid(uid_t uid) {
+         if (r != 2)
+                 return -EINVAL;
  
-         /* Some libc APIs use UID_INVALID as special placeholder */
-         if (uid == (uid_t) 0xFFFFFFFF)
-                 return false;
+         /* Only return this if it is really good enough for us. */
+         if (asprintf(&p, "/sys/dev/block/%u:%u/queue", m, n) < 0)
+                 return -ENOMEM;
  
-         /* A long time ago UIDs where 16bit, hence explicitly avoid the 16bit -1 too */
-         if (uid == (uid_t) 0xFFFF)
-                 return false;
+         r = access(p, F_OK);
+         free(p);
  
-         return true;
+         if (r >= 0) {
+                 *ret = makedev(m, n);
+                 return 0;
+         }
+         return -ENOENT;
  }
  
- int parse_uid(const char *s, uid_t* ret_uid) {
-         unsigned long ul = 0;
-         uid_t uid;
-         int r;
+ bool kexec_loaded(void) {
+        bool loaded = false;
+        char *s;
  
-         assert(s);
+        if (read_one_line_file("/sys/kernel/kexec_loaded", &s) >= 0) {
+                if (s[0] == '1')
+                        loaded = true;
+                free(s);
+        }
+        return loaded;
+ }
  
-         r = safe_atolu(s, &ul);
-         if (r < 0)
-                 return r;
+ int prot_from_flags(int flags) {
  
-         uid = (uid_t) ul;
+         switch (flags & O_ACCMODE) {
  
-         if ((unsigned long) uid != ul)
-                 return -ERANGE;
+         case O_RDONLY:
+                 return PROT_READ;
  
-         if (!uid_is_valid(uid))
-                 return -ENXIO; /* we return ENXIO instead of EINVAL
-                                 * here, to make it easy to distuingish
-                                 * invalid numeric uids invalid
-                                 * strings. */
+         case O_WRONLY:
+                 return PROT_WRITE;
  
-         if (ret_uid)
-                 *ret_uid = uid;
+         case O_RDWR:
+                 return PROT_READ|PROT_WRITE;
  
-         return 0;
+         default:
+                 return -EINVAL;
+         }
  }
- #endif /* NM_IGNORED */
- int safe_atou(const char *s, unsigned *ret_u) {
-         char *x = NULL;
-         unsigned long l;
-         assert(s);
-         assert(ret_u);
-         errno = 0;
-         l = strtoul(s, &x, 0);
  
-         if (!x || x == s || *x || errno)
-                 return errno > 0 ? -errno : -EINVAL;
-         if ((unsigned long) (unsigned) l != l)
-                 return -ERANGE;
-         *ret_u = (unsigned) l;
-         return 0;
- }
- #if 0 /* NM_IGNORED */
- int safe_atoi(const char *s, int *ret_i) {
-         char *x = NULL;
-         long l;
-         assert(s);
-         assert(ret_i);
-         errno = 0;
-         l = strtol(s, &x, 0);
-         if (!x || x == s || *x || errno)
-                 return errno > 0 ? -errno : -EINVAL;
-         if ((long) (int) l != l)
-                 return -ERANGE;
-         *ret_i = (int) l;
-         return 0;
- }
- int safe_atou8(const char *s, uint8_t *ret) {
-         char *x = NULL;
-         unsigned long l;
-         assert(s);
-         assert(ret);
-         errno = 0;
-         l = strtoul(s, &x, 0);
-         if (!x || x == s || *x || errno)
-                 return errno > 0 ? -errno : -EINVAL;
-         if ((unsigned long) (uint8_t) l != l)
-                 return -ERANGE;
-         *ret = (uint8_t) l;
-         return 0;
- }
- #endif /* NM_IGNORED */
- int safe_atou16(const char *s, uint16_t *ret) {
-         char *x = NULL;
-         unsigned long l;
-         assert(s);
-         assert(ret);
-         errno = 0;
-         l = strtoul(s, &x, 0);
-         if (!x || x == s || *x || errno)
-                 return errno > 0 ? -errno : -EINVAL;
-         if ((unsigned long) (uint16_t) l != l)
-                 return -ERANGE;
-         *ret = (uint16_t) l;
-         return 0;
- }
- #if 0 /* NM_IGNORED */
- int safe_atoi16(const char *s, int16_t *ret) {
-         char *x = NULL;
-         long l;
-         assert(s);
-         assert(ret);
-         errno = 0;
-         l = strtol(s, &x, 0);
-         if (!x || x == s || *x || errno)
-                 return errno > 0 ? -errno : -EINVAL;
-         if ((long) (int16_t) l != l)
-                 return -ERANGE;
-         *ret = (int16_t) l;
-         return 0;
- }
- int safe_atollu(const char *s, long long unsigned *ret_llu) {
-         char *x = NULL;
-         unsigned long long l;
-         assert(s);
-         assert(ret_llu);
-         errno = 0;
-         l = strtoull(s, &x, 0);
-         if (!x || x == s || *x || errno)
-                 return errno ? -errno : -EINVAL;
-         *ret_llu = l;
-         return 0;
- }
- int safe_atolli(const char *s, long long int *ret_lli) {
-         char *x = NULL;
-         long long l;
-         assert(s);
-         assert(ret_lli);
-         errno = 0;
-         l = strtoll(s, &x, 0);
-         if (!x || x == s || *x || errno)
-                 return errno ? -errno : -EINVAL;
-         *ret_lli = l;
-         return 0;
- }
- int safe_atod(const char *s, double *ret_d) {
-         char *x = NULL;
-         double d = 0;
-         locale_t loc;
-         assert(s);
-         assert(ret_d);
-         loc = newlocale(LC_NUMERIC_MASK, "C", (locale_t) 0);
-         if (loc == (locale_t) 0)
-                 return -errno;
-         errno = 0;
-         d = strtod_l(s, &x, loc);
-         if (!x || x == s || *x || errno) {
-                 freelocale(loc);
-                 return errno ? -errno : -EINVAL;
-         }
-         freelocale(loc);
-         *ret_d = (double) d;
-         return 0;
- }
- #endif /* NM_IGNORED */
- static size_t strcspn_escaped(const char *s, const char *reject) {
-         bool escaped = false;
-         int n;
-         for (n=0; s[n]; n++) {
-                 if (escaped)
-                         escaped = false;
-                 else if (s[n] == '\\')
-                         escaped = true;
-                 else if (strchr(reject, s[n]))
-                         break;
-         }
-         /* if s ends in \, return index of previous char */
-         return n - escaped;
- }
- /* Split a string into words. */
- const char* split(const char **state, size_t *l, const char *separator, bool quoted) {
-         const char *current;
-         current = *state;
-         if (!*current) {
-                 assert(**state == '\0');
-                 return NULL;
-         }
-         current += strspn(current, separator);
-         if (!*current) {
-                 *state = current;
-                 return NULL;
-         }
-         if (quoted && strchr("\'\"", *current)) {
-                 char quotechars[2] = {*current, '\0'};
-                 *l = strcspn_escaped(current + 1, quotechars);
-                 if (current[*l + 1] == '\0' || current[*l + 1] != quotechars[0] ||
-                     (current[*l + 2] && !strchr(separator, current[*l + 2]))) {
-                         /* right quote missing or garbage at the end */
-                         *state = current;
-                         return NULL;
-                 }
-                 *state = current++ + *l + 2;
-         } else if (quoted) {
-                 *l = strcspn_escaped(current, separator);
-                 if (current[*l] && !strchr(separator, current[*l])) {
-                         /* unfinished escape */
-                         *state = current;
-                         return NULL;
-                 }
-                 *state = current + *l;
-         } else {
-                 *l = strcspn(current, separator);
-                 *state = current + *l;
-         }
-         return current;
- }
- int fchmod_umask(int fd, mode_t m) {
-         mode_t u;
-         int r;
-         u = umask(0777);
-         r = fchmod(fd, m & (~u)) < 0 ? -errno : 0;
-         umask(u);
-         return r;
- }
- char *truncate_nl(char *s) {
-         assert(s);
-         s[strcspn(s, NEWLINE)] = 0;
-         return s;
- }
- char *strnappend(const char *s, const char *suffix, size_t b) {
-         size_t a;
-         char *r;
-         if (!s && !suffix)
-                 return strdup("");
-         if (!s)
-                 return strndup(suffix, b);
-         if (!suffix)
-                 return strdup(s);
-         assert(s);
-         assert(suffix);
-         a = strlen(s);
-         if (b > ((size_t) -1) - a)
-                 return NULL;
-         r = new(char, a+b+1);
-         if (!r)
-                 return NULL;
-         memcpy(r, s, a);
-         memcpy(r+a, suffix, b);
-         r[a+b] = 0;
-         return r;
- }
- char *strappend(const char *s, const char *suffix) {
-         return strnappend(s, suffix, suffix ? strlen(suffix) : 0);
- }
- #if 0 /* NM_IGNORED */
- int readlinkat_malloc(int fd, const char *p, char **ret) {
-         size_t l = 100;
-         int r;
-         assert(p);
-         assert(ret);
-         for (;;) {
-                 char *c;
-                 ssize_t n;
-                 c = new(char, l);
-                 if (!c)
-                         return -ENOMEM;
-                 n = readlinkat(fd, p, c, l-1);
-                 if (n < 0) {
-                         r = -errno;
-                         free(c);
-                         return r;
-                 }
-                 if ((size_t) n < l-1) {
-                         c[n] = 0;
-                         *ret = c;
-                         return 0;
-                 }
-                 free(c);
-                 l *= 2;
-         }
- }
- int readlink_malloc(const char *p, char **ret) {
-         return readlinkat_malloc(AT_FDCWD, p, ret);
- }
- int readlink_value(const char *p, char **ret) {
-         _cleanup_free_ char *link = NULL;
-         char *value;
-         int r;
-         r = readlink_malloc(p, &link);
-         if (r < 0)
-                 return r;
-         value = basename(link);
-         if (!value)
-                 return -ENOENT;
-         value = strdup(value);
-         if (!value)
-                 return -ENOMEM;
-         *ret = value;
-         return 0;
- }
- int readlink_and_make_absolute(const char *p, char **r) {
-         _cleanup_free_ char *target = NULL;
-         char *k;
-         int j;
-         assert(p);
-         assert(r);
-         j = readlink_malloc(p, &target);
-         if (j < 0)
-                 return j;
-         k = file_in_same_dir(p, target);
-         if (!k)
-                 return -ENOMEM;
-         *r = k;
-         return 0;
- }
- int readlink_and_canonicalize(const char *p, char **r) {
-         char *t, *s;
-         int j;
-         assert(p);
-         assert(r);
-         j = readlink_and_make_absolute(p, &t);
-         if (j < 0)
-                 return j;
-         s = canonicalize_file_name(t);
-         if (s) {
-                 free(t);
-                 *r = s;
-         } else
-                 *r = t;
-         path_kill_slashes(*r);
-         return 0;
- }
- #endif /* NM_IGNORED */
- char *strstrip(char *s) {
-         char *e;
-         /* Drops trailing whitespace. Modifies the string in
-          * place. Returns pointer to first non-space character */
-         s += strspn(s, WHITESPACE);
-         for (e = strchr(s, 0); e > s; e --)
-                 if (!strchr(WHITESPACE, e[-1]))
-                         break;
-         *e = 0;
-         return s;
- }
- #if 0 /* NM_IGNORED */
- char *delete_chars(char *s, const char *bad) {
-         char *f, *t;
-         /* Drops all whitespace, regardless where in the string */
-         for (f = s, t = s; *f; f++) {
-                 if (strchr(bad, *f))
-                         continue;
-                 *(t++) = *f;
-         }
-         *t = 0;
-         return s;
- }
- char *file_in_same_dir(const char *path, const char *filename) {
-         char *e, *ret;
-         size_t k;
-         assert(path);
-         assert(filename);
-         /* This removes the last component of path and appends
-          * filename, unless the latter is absolute anyway or the
-          * former isn't */
-         if (path_is_absolute(filename))
-                 return strdup(filename);
-         e = strrchr(path, '/');
-         if (!e)
-                 return strdup(filename);
-         k = strlen(filename);
-         ret = new(char, (e + 1 - path) + k + 1);
-         if (!ret)
-                 return NULL;
-         memcpy(mempcpy(ret, path, e + 1 - path), filename, k + 1);
-         return ret;
- }
- int rmdir_parents(const char *path, const char *stop) {
-         size_t l;
-         int r = 0;
-         assert(path);
-         assert(stop);
-         l = strlen(path);
-         /* Skip trailing slashes */
-         while (l > 0 && path[l-1] == '/')
-                 l--;
-         while (l > 0) {
-                 char *t;
-                 /* Skip last component */
-                 while (l > 0 && path[l-1] != '/')
-                         l--;
-                 /* Skip trailing slashes */
-                 while (l > 0 && path[l-1] == '/')
-                         l--;
-                 if (l <= 0)
-                         break;
-                 if (!(t = strndup(path, l)))
-                         return -ENOMEM;
-                 if (path_startswith(stop, t)) {
-                         free(t);
-                         return 0;
-                 }
-                 r = rmdir(t);
-                 free(t);
-                 if (r < 0)
-                         if (errno != ENOENT)
-                                 return -errno;
-         }
-         return 0;
- }
- #endif /* NM_IGNORED */
- char hexchar(int x) {
-         static const char table[16] = "0123456789abcdef";
-         return table[x & 15];
- }
- int unhexchar(char c) {
-         if (c >= '0' && c <= '9')
-                 return c - '0';
-         if (c >= 'a' && c <= 'f')
-                 return c - 'a' + 10;
-         if (c >= 'A' && c <= 'F')
-                 return c - 'A' + 10;
-         return -EINVAL;
- }
- char *hexmem(const void *p, size_t l) {
-         char *r, *z;
-         const uint8_t *x;
-         z = r = malloc(l * 2 + 1);
-         if (!r)
-                 return NULL;
-         for (x = p; x < (const uint8_t*) p + l; x++) {
-                 *(z++) = hexchar(*x >> 4);
-                 *(z++) = hexchar(*x & 15);
-         }
-         *z = 0;
-         return r;
- }
- int unhexmem(const char *p, size_t l, void **mem, size_t *len) {
-         _cleanup_free_ uint8_t *r = NULL;
-         uint8_t *z;
-         const char *x;
-         assert(mem);
-         assert(len);
-         assert(p);
-         z = r = malloc((l + 1) / 2 + 1);
-         if (!r)
-                 return -ENOMEM;
-         for (x = p; x < p + l; x += 2) {
-                 int a, b;
-                 a = unhexchar(x[0]);
-                 if (a < 0)
-                         return a;
-                 else if (x+1 < p + l) {
-                         b = unhexchar(x[1]);
-                         if (b < 0)
-                                 return b;
-                 } else
-                         b = 0;
-                 *(z++) = (uint8_t) a << 4 | (uint8_t) b;
-         }
-         *z = 0;
-         *mem = r;
-         r = NULL;
-         *len = (l + 1) / 2;
-         return 0;
- }
- /* https://tools.ietf.org/html/rfc4648#section-6
-  * Notice that base32hex differs from base32 in the alphabet it uses.
-  * The distinction is that the base32hex representation preserves the
-  * order of the underlying data when compared as bytestrings, this is
-  * useful when representing NSEC3 hashes, as one can then verify the
-  * order of hashes directly from their representation. */
- char base32hexchar(int x) {
-         static const char table[32] = "0123456789"
-                                       "ABCDEFGHIJKLMNOPQRSTUV";
-         return table[x & 31];
- }
- int unbase32hexchar(char c) {
-         unsigned offset;
-         if (c >= '0' && c <= '9')
-                 return c - '0';
-         offset = '9' - '0' + 1;
-         if (c >= 'A' && c <= 'V')
-                 return c - 'A' + offset;
-         return -EINVAL;
- }
- char *base32hexmem(const void *p, size_t l, bool padding) {
-         char *r, *z;
-         const uint8_t *x;
-         size_t len;
-         if (padding)
-                 /* five input bytes makes eight output bytes, padding is added so we must round up */
-                 len = 8 * (l + 4) / 5;
-         else {
-                 /* same, but round down as there is no padding */
-                 len = 8 * l / 5;
-                 switch (l % 5) {
-                 case 4:
-                         len += 7;
-                         break;
-                 case 3:
-                         len += 5;
-                         break;
-                 case 2:
-                         len += 4;
-                         break;
-                 case 1:
-                         len += 2;
-                         break;
-                 }
-         }
-         z = r = malloc(len + 1);
-         if (!r)
-                 return NULL;
-         for (x = p; x < (const uint8_t*) p + (l / 5) * 5; x += 5) {
-                 /* x[0] == XXXXXXXX; x[1] == YYYYYYYY; x[2] == ZZZZZZZZ
-                    x[3] == QQQQQQQQ; x[4] == WWWWWWWW */
-                 *(z++) = base32hexchar(x[0] >> 3);                    /* 000XXXXX */
-                 *(z++) = base32hexchar((x[0] & 7) << 2 | x[1] >> 6);  /* 000XXXYY */
-                 *(z++) = base32hexchar((x[1] & 63) >> 1);             /* 000YYYYY */
-                 *(z++) = base32hexchar((x[1] & 1) << 4 | x[2] >> 4);  /* 000YZZZZ */
-                 *(z++) = base32hexchar((x[2] & 15) << 1 | x[3] >> 7); /* 000ZZZZQ */
-                 *(z++) = base32hexchar((x[3] & 127) >> 2);            /* 000QQQQQ */
-                 *(z++) = base32hexchar((x[3] & 3) << 3 | x[4] >> 5);  /* 000QQWWW */
-                 *(z++) = base32hexchar((x[4] & 31));                  /* 000WWWWW */
-         }
-         switch (l % 5) {
-         case 4:
-                 *(z++) = base32hexchar(x[0] >> 3);                    /* 000XXXXX */
-                 *(z++) = base32hexchar((x[0] & 7) << 2 | x[1] >> 6);  /* 000XXXYY */
-                 *(z++) = base32hexchar((x[1] & 63) >> 1);             /* 000YYYYY */
-                 *(z++) = base32hexchar((x[1] & 1) << 4 | x[2] >> 4);   /* 000YZZZZ */
-                 *(z++) = base32hexchar((x[2] & 15) << 1 | x[3] >> 7); /* 000ZZZZQ */
-                 *(z++) = base32hexchar((x[3] & 127) >> 2);            /* 000QQQQQ */
-                 *(z++) = base32hexchar((x[3] & 3) << 3);              /* 000QQ000 */
-                 if (padding)
-                         *(z++) = '=';
-                 break;
-         case 3:
-                 *(z++) = base32hexchar(x[0] >> 3);                   /* 000XXXXX */
-                 *(z++) = base32hexchar((x[0] & 7) << 2 | x[1] >> 6); /* 000XXXYY */
-                 *(z++) = base32hexchar((x[1] & 63) >> 1);            /* 000YYYYY */
-                 *(z++) = base32hexchar((x[1] & 1) << 4 | x[2] >> 4); /* 000YZZZZ */
-                 *(z++) = base32hexchar((x[2] & 15) << 1);            /* 000ZZZZ0 */
-                 if (padding) {
-                         *(z++) = '=';
-                         *(z++) = '=';
-                         *(z++) = '=';
-                 }
-                 break;
-         case 2:
-                 *(z++) = base32hexchar(x[0] >> 3);                   /* 000XXXXX */
-                 *(z++) = base32hexchar((x[0] & 7) << 2 | x[1] >> 6); /* 000XXXYY */
-                 *(z++) = base32hexchar((x[1] & 63) >> 1);            /* 000YYYYY */
-                 *(z++) = base32hexchar((x[1] & 1) << 4);             /* 000Y0000 */
-                 if (padding) {
-                         *(z++) = '=';
-                         *(z++) = '=';
-                         *(z++) = '=';
-                         *(z++) = '=';
-                 }
-                 break;
-         case 1:
-                 *(z++) = base32hexchar(x[0] >> 3);       /* 000XXXXX */
-                 *(z++) = base32hexchar((x[0] & 7) << 2); /* 000XXX00 */
-                 if (padding) {
-                         *(z++) = '=';
-                         *(z++) = '=';
-                         *(z++) = '=';
-                         *(z++) = '=';
-                         *(z++) = '=';
-                         *(z++) = '=';
-                 }
-                 break;
-         }
-         *z = 0;
-         return r;
- }
- int unbase32hexmem(const char *p, size_t l, bool padding, void **mem, size_t *_len) {
-         _cleanup_free_ uint8_t *r = NULL;
-         int a, b, c, d, e, f, g, h;
-         uint8_t *z;
-         const char *x;
-         size_t len;
-         unsigned pad = 0;
-         assert(p);
-         /* padding ensures any base32hex input has input divisible by 8 */
-         if (padding && l % 8 != 0)
-                 return -EINVAL;
-         if (padding) {
-                 /* strip the padding */
-                 while (l > 0 && p[l - 1] == '=' && pad < 7) {
-                         pad ++;
-                         l --;
-                 }
-         }
-         /* a group of eight input bytes needs five output bytes, in case of
-            padding we need to add some extra bytes */
-         len = (l / 8) * 5;
-         switch (l % 8) {
-         case 7:
-                 len += 4;
-                 break;
-         case 5:
-                 len += 3;
-                 break;
-         case 4:
-                 len += 2;
-                 break;
-         case 2:
-                 len += 1;
-                 break;
-         case 0:
-                 break;
-         default:
-                 return -EINVAL;
-         }
-         z = r = malloc(len + 1);
-         if (!r)
-                 return -ENOMEM;
-         for (x = p; x < p + (l / 8) * 8; x += 8) {
-                 /* a == 000XXXXX; b == 000YYYYY; c == 000ZZZZZ; d == 000WWWWW
-                    e == 000SSSSS; f == 000QQQQQ; g == 000VVVVV; h == 000RRRRR */
-                 a = unbase32hexchar(x[0]);
-                 if (a < 0)
-                         return -EINVAL;
-                 b = unbase32hexchar(x[1]);
-                 if (b < 0)
-                         return -EINVAL;
-                 c = unbase32hexchar(x[2]);
-                 if (c < 0)
-                         return -EINVAL;
-                 d = unbase32hexchar(x[3]);
-                 if (d < 0)
-                         return -EINVAL;
-                 e = unbase32hexchar(x[4]);
-                 if (e < 0)
-                         return -EINVAL;
-                 f = unbase32hexchar(x[5]);
-                 if (f < 0)
-                         return -EINVAL;
-                 g = unbase32hexchar(x[6]);
-                 if (g < 0)
-                         return -EINVAL;
-                 h = unbase32hexchar(x[7]);
-                 if (h < 0)
-                         return -EINVAL;
-                 *(z++) = (uint8_t) a << 3 | (uint8_t) b >> 2;                    /* XXXXXYYY */
-                 *(z++) = (uint8_t) b << 6 | (uint8_t) c << 1 | (uint8_t) d >> 4; /* YYZZZZZW */
-                 *(z++) = (uint8_t) d << 4 | (uint8_t) e >> 1;                    /* WWWWSSSS */
-                 *(z++) = (uint8_t) e << 7 | (uint8_t) f << 2 | (uint8_t) g >> 3; /* SQQQQQVV */
-                 *(z++) = (uint8_t) g << 5 | (uint8_t) h;                         /* VVVRRRRR */
-         }
-         switch (l % 8) {
-         case 7:
-                 a = unbase32hexchar(x[0]);
-                 if (a < 0)
-                         return -EINVAL;
-                 b = unbase32hexchar(x[1]);
-                 if (b < 0)
-                         return -EINVAL;
-                 c = unbase32hexchar(x[2]);
-                 if (c < 0)
-                         return -EINVAL;
-                 d = unbase32hexchar(x[3]);
-                 if (d < 0)
-                         return -EINVAL;
-                 e = unbase32hexchar(x[4]);
-                 if (e < 0)
-                         return -EINVAL;
-                 f = unbase32hexchar(x[5]);
-                 if (f < 0)
-                         return -EINVAL;
-                 g = unbase32hexchar(x[6]);
-                 if (g < 0)
-                         return -EINVAL;
-                 /* g == 000VV000 */
-                 if (g & 7)
-                         return -EINVAL;
-                 *(z++) = (uint8_t) a << 3 | (uint8_t) b >> 2;                    /* XXXXXYYY */
-                 *(z++) = (uint8_t) b << 6 | (uint8_t) c << 1 | (uint8_t) d >> 4; /* YYZZZZZW */
-                 *(z++) = (uint8_t) d << 4 | (uint8_t) e >> 1;                    /* WWWWSSSS */
-                 *(z++) = (uint8_t) e << 7 | (uint8_t) f << 2 | (uint8_t) g >> 3; /* SQQQQQVV */
-                 break;
-         case 5:
-                 a = unbase32hexchar(x[0]);
-                 if (a < 0)
-                         return -EINVAL;
-                 b = unbase32hexchar(x[1]);
-                 if (b < 0)
-                         return -EINVAL;
-                 c = unbase32hexchar(x[2]);
-                 if (c < 0)
-                         return -EINVAL;
-                 d = unbase32hexchar(x[3]);
-                 if (d < 0)
-                         return -EINVAL;
-                 e = unbase32hexchar(x[4]);
-                 if (e < 0)
-                         return -EINVAL;
-                 /* e == 000SSSS0 */
-                 if (e & 1)
-                         return -EINVAL;
-                 *(z++) = (uint8_t) a << 3 | (uint8_t) b >> 2;                    /* XXXXXYYY */
-                 *(z++) = (uint8_t) b << 6 | (uint8_t) c << 1 | (uint8_t) d >> 4; /* YYZZZZZW */
-                 *(z++) = (uint8_t) d << 4 | (uint8_t) e >> 1;                    /* WWWWSSSS */
-                 break;
-         case 4:
-                 a = unbase32hexchar(x[0]);
-                 if (a < 0)
-                         return -EINVAL;
-                 b = unbase32hexchar(x[1]);
-                 if (b < 0)
-                         return -EINVAL;
-                 c = unbase32hexchar(x[2]);
-                 if (c < 0)
-                         return -EINVAL;
-                 d = unbase32hexchar(x[3]);
-                 if (d < 0)
-                         return -EINVAL;
-                 /* d == 000W0000 */
-                 if (d & 15)
-                         return -EINVAL;
-                 *(z++) = (uint8_t) a << 3 | (uint8_t) b >> 2;                    /* XXXXXYYY */
-                 *(z++) = (uint8_t) b << 6 | (uint8_t) c << 1 | (uint8_t) d >> 4; /* YYZZZZZW */
-                 break;
-         case 2:
-                 a = unbase32hexchar(x[0]);
-                 if (a < 0)
-                         return -EINVAL;
-                 b = unbase32hexchar(x[1]);
-                 if (b < 0)
-                         return -EINVAL;
-                 /* b == 000YYY00 */
-                 if (b & 3)
-                         return -EINVAL;
-                 *(z++) = (uint8_t) a << 3 | (uint8_t) b >> 2; /* XXXXXYYY */
-                 break;
-         case 0:
-                 break;
-         default:
-                 return -EINVAL;
-         }
-         *z = 0;
-         *mem = r;
-         r = NULL;
-         *_len = len;
-         return 0;
- }
- /* https://tools.ietf.org/html/rfc4648#section-4 */
- char base64char(int x) {
-         static const char table[64] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-                                       "abcdefghijklmnopqrstuvwxyz"
-                                       "0123456789+/";
-         return table[x & 63];
- }
- int unbase64char(char c) {
-         unsigned offset;
-         if (c >= 'A' && c <= 'Z')
-                 return c - 'A';
-         offset = 'Z' - 'A' + 1;
-         if (c >= 'a' && c <= 'z')
-                 return c - 'a' + offset;
-         offset += 'z' - 'a' + 1;
-         if (c >= '0' && c <= '9')
-                 return c - '0' + offset;
-         offset += '9' - '0' + 1;
-         if (c == '+')
-                 return offset;
-         offset ++;
-         if (c == '/')
-                 return offset;
-         return -EINVAL;
- }
- char *base64mem(const void *p, size_t l) {
-         char *r, *z;
-         const uint8_t *x;
-         /* three input bytes makes four output bytes, padding is added so we must round up */
-         z = r = malloc(4 * (l + 2) / 3 + 1);
-         if (!r)
-                 return NULL;
-         for (x = p; x < (const uint8_t*) p + (l / 3) * 3; x += 3) {
-                 /* x[0] == XXXXXXXX; x[1] == YYYYYYYY; x[2] == ZZZZZZZZ */
-                 *(z++) = base64char(x[0] >> 2);                    /* 00XXXXXX */
-                 *(z++) = base64char((x[0] & 3) << 4 | x[1] >> 4);  /* 00XXYYYY */
-                 *(z++) = base64char((x[1] & 15) << 2 | x[2] >> 6); /* 00YYYYZZ */
-                 *(z++) = base64char(x[2] & 63);                    /* 00ZZZZZZ */
-         }
-         switch (l % 3) {
-         case 2:
-                 *(z++) = base64char(x[0] >> 2);                   /* 00XXXXXX */
-                 *(z++) = base64char((x[0] & 3) << 4 | x[1] >> 4); /* 00XXYYYY */
-                 *(z++) = base64char((x[1] & 15) << 2);            /* 00YYYY00 */
-                 *(z++) = '=';
-                 break;
-         case 1:
-                 *(z++) = base64char(x[0] >> 2);        /* 00XXXXXX */
-                 *(z++) = base64char((x[0] & 3) << 4);  /* 00XX0000 */
-                 *(z++) = '=';
-                 *(z++) = '=';
-                 break;
-         }
-         *z = 0;
-         return r;
- }
- int unbase64mem(const char *p, size_t l, void **mem, size_t *_len) {
-         _cleanup_free_ uint8_t *r = NULL;
-         int a, b, c, d;
-         uint8_t *z;
-         const char *x;
-         size_t len;
-         assert(p);
-         /* padding ensures any base63 input has input divisible by 4 */
-         if (l % 4 != 0)
-                 return -EINVAL;
-         /* strip the padding */
-         if (l > 0 && p[l - 1] == '=')
-                 l --;
-         if (l > 0 && p[l - 1] == '=')
-                 l --;
-         /* a group of four input bytes needs three output bytes, in case of
-            padding we need to add two or three extra bytes */
-         len = (l / 4) * 3 + (l % 4 ? (l % 4) - 1 : 0);
-         z = r = malloc(len + 1);
-         if (!r)
-                 return -ENOMEM;
-         for (x = p; x < p + (l / 4) * 4; x += 4) {
-                 /* a == 00XXXXXX; b == 00YYYYYY; c == 00ZZZZZZ; d == 00WWWWWW */
-                 a = unbase64char(x[0]);
-                 if (a < 0)
-                         return -EINVAL;
-                 b = unbase64char(x[1]);
-                 if (b < 0)
-                         return -EINVAL;
-                 c = unbase64char(x[2]);
-                 if (c < 0)
-                         return -EINVAL;
-                 d = unbase64char(x[3]);
-                 if (d < 0)
-                         return -EINVAL;
-                 *(z++) = (uint8_t) a << 2 | (uint8_t) b >> 4; /* XXXXXXYY */
-                 *(z++) = (uint8_t) b << 4 | (uint8_t) c >> 2; /* YYYYZZZZ */
-                 *(z++) = (uint8_t) c << 6 | (uint8_t) d;      /* ZZWWWWWW */
-         }
-         switch (l % 4) {
-         case 3:
-                 a = unbase64char(x[0]);
-                 if (a < 0)
-                         return -EINVAL;
-                 b = unbase64char(x[1]);
-                 if (b < 0)
-                         return -EINVAL;
-                 c = unbase64char(x[2]);
-                 if (c < 0)
-                         return -EINVAL;
-                 /* c == 00ZZZZ00 */
-                 if (c & 3)
-                         return -EINVAL;
-                 *(z++) = (uint8_t) a << 2 | (uint8_t) b >> 4; /* XXXXXXYY */
-                 *(z++) = (uint8_t) b << 4 | (uint8_t) c >> 2; /* YYYYZZZZ */
-                 break;
-         case 2:
-                 a = unbase64char(x[0]);
-                 if (a < 0)
-                         return -EINVAL;
-                 b = unbase64char(x[1]);
-                 if (b < 0)
-                         return -EINVAL;
-                 /* b == 00YY0000 */
-                 if (b & 15)
-                         return -EINVAL;
-                 *(z++) = (uint8_t) a << 2 | (uint8_t) (b >> 4); /* XXXXXXYY */
-                 break;
-         case 0:
-                 break;
-         default:
-                 return -EINVAL;
-         }
-         *z = 0;
-         *mem = r;
-         r = NULL;
-         *_len = len;
-         return 0;
- }
- char octchar(int x) {
-         return '0' + (x & 7);
- }
- int unoctchar(char c) {
-         if (c >= '0' && c <= '7')
-                 return c - '0';
-         return -EINVAL;
- }
- char decchar(int x) {
-         return '0' + (x % 10);
- }
- int undecchar(char c) {
-         if (c >= '0' && c <= '9')
-                 return c - '0';
-         return -EINVAL;
- }
- char *cescape(const char *s) {
-         char *r, *t;
-         const char *f;
-         assert(s);
-         /* Does C style string escaping. May be reversed with
-          * cunescape(). */
-         r = new(char, strlen(s)*4 + 1);
-         if (!r)
-                 return NULL;
-         for (f = s, t = r; *f; f++)
-                 t += cescape_char(*f, t);
-         *t = 0;
-         return r;
- }
- static int cunescape_one(const char *p, size_t length, char *ret, uint32_t *ret_unicode) {
-         int r = 1;
-         assert(p);
-         assert(*p);
-         assert(ret);
-         /* Unescapes C style. Returns the unescaped character in ret,
-          * unless we encountered a \u sequence in which case the full
-          * unicode character is returned in ret_unicode, instead. */
-         if (length != (size_t) -1 && length < 1)
-                 return -EINVAL;
-         switch (p[0]) {
-         case 'a':
-                 *ret = '\a';
-                 break;
-         case 'b':
-                 *ret = '\b';
-                 break;
-         case 'f':
-                 *ret = '\f';
-                 break;
-         case 'n':
-                 *ret = '\n';
-                 break;
-         case 'r':
-                 *ret = '\r';
-                 break;
-         case 't':
-                 *ret = '\t';
-                 break;
-         case 'v':
-                 *ret = '\v';
-                 break;
-         case '\\':
-                 *ret = '\\';
-                 break;
-         case '"':
-                 *ret = '"';
-                 break;
-         case '\'':
-                 *ret = '\'';
-                 break;
-         case 's':
-                 /* This is an extension of the XDG syntax files */
-                 *ret = ' ';
-                 break;
-         case 'x': {
-                 /* hexadecimal encoding */
-                 int a, b;
-                 if (length != (size_t) -1 && length < 3)
-                         return -EINVAL;
-                 a = unhexchar(p[1]);
-                 if (a < 0)
-                         return -EINVAL;
-                 b = unhexchar(p[2]);
-                 if (b < 0)
-                         return -EINVAL;
-                 /* Don't allow NUL bytes */
-                 if (a == 0 && b == 0)
-                         return -EINVAL;
-                 *ret = (char) ((a << 4U) | b);
-                 r = 3;
-                 break;
-         }
-         case 'u': {
-                 /* C++11 style 16bit unicode */
-                 int a[4];
-                 unsigned i;
-                 uint32_t c;
-                 if (length != (size_t) -1 && length < 5)
-                         return -EINVAL;
-                 for (i = 0; i < 4; i++) {
-                         a[i] = unhexchar(p[1 + i]);
-                         if (a[i] < 0)
-                                 return a[i];
-                 }
-                 c = ((uint32_t) a[0] << 12U) | ((uint32_t) a[1] << 8U) | ((uint32_t) a[2] << 4U) | (uint32_t) a[3];
-                 /* Don't allow 0 chars */
-                 if (c == 0)
-                         return -EINVAL;
-                 if (c < 128)
-                         *ret = c;
-                 else {
-                         if (!ret_unicode)
-                                 return -EINVAL;
-                         *ret = 0;
-                         *ret_unicode = c;
-                 }
-                 r = 5;
-                 break;
-         }
-         case 'U': {
-                 /* C++11 style 32bit unicode */
-                 int a[8];
-                 unsigned i;
-                 uint32_t c;
-                 if (length != (size_t) -1 && length < 9)
-                         return -EINVAL;
-                 for (i = 0; i < 8; i++) {
-                         a[i] = unhexchar(p[1 + i]);
-                         if (a[i] < 0)
-                                 return a[i];
-                 }
-                 c = ((uint32_t) a[0] << 28U) | ((uint32_t) a[1] << 24U) | ((uint32_t) a[2] << 20U) | ((uint32_t) a[3] << 16U) |
-                     ((uint32_t) a[4] << 12U) | ((uint32_t) a[5] <<  8U) | ((uint32_t) a[6] <<  4U) |  (uint32_t) a[7];
-                 /* Don't allow 0 chars */
-                 if (c == 0)
-                         return -EINVAL;
-                 /* Don't allow invalid code points */
-                 if (!unichar_is_valid(c))
-                         return -EINVAL;
-                 if (c < 128)
-                         *ret = c;
-                 else {
-                         if (!ret_unicode)
-                                 return -EINVAL;
-                         *ret = 0;
-                         *ret_unicode = c;
-                 }
-                 r = 9;
-                 break;
-         }
-         case '0':
-         case '1':
-         case '2':
-         case '3':
-         case '4':
-         case '5':
-         case '6':
-         case '7': {
-                 /* octal encoding */
-                 int a, b, c;
-                 uint32_t m;
-                 if (length != (size_t) -1 && length < 3)
-                         return -EINVAL;
-                 a = unoctchar(p[0]);
-                 if (a < 0)
-                         return -EINVAL;
-                 b = unoctchar(p[1]);
-                 if (b < 0)
-                         return -EINVAL;
-                 c = unoctchar(p[2]);
-                 if (c < 0)
-                         return -EINVAL;
-                 /* don't allow NUL bytes */
-                 if (a == 0 && b == 0 && c == 0)
-                         return -EINVAL;
-                 /* Don't allow bytes above 255 */
-                 m = ((uint32_t) a << 6U) | ((uint32_t) b << 3U) | (uint32_t) c;
-                 if (m > 255)
-                         return -EINVAL;
-                 *ret = m;
-                 r = 3;
-                 break;
-         }
-         default:
-                 return -EINVAL;
-         }
-         return r;
- }
- int cunescape_length_with_prefix(const char *s, size_t length, const char *prefix, UnescapeFlags flags, char **ret) {
-         char *r, *t;
-         const char *f;
-         size_t pl;
-         assert(s);
-         assert(ret);
-         /* Undoes C style string escaping, and optionally prefixes it. */
-         pl = prefix ? strlen(prefix) : 0;
-         r = new(char, pl+length+1);
-         if (!r)
-                 return -ENOMEM;
-         if (prefix)
-                 memcpy(r, prefix, pl);
-         for (f = s, t = r + pl; f < s + length; f++) {
-                 size_t remaining;
-                 uint32_t u = 0;
-                 char c;
-                 int k;
-                 remaining = s + length - f;
-                 assert(remaining > 0);
-                 if (*f != '\\') {
-                         /* A literal literal, copy verbatim */
-                         *(t++) = *f;
-                         continue;
-                 }
-                 if (remaining == 1) {
-                         if (flags & UNESCAPE_RELAX) {
-                                 /* A trailing backslash, copy verbatim */
-                                 *(t++) = *f;
-                                 continue;
-                         }
-                         free(r);
-                         return -EINVAL;
-                 }
-                 k = cunescape_one(f + 1, remaining - 1, &c, &u);
-                 if (k < 0) {
-                         if (flags & UNESCAPE_RELAX) {
-                                 /* Invalid escape code, let's take it literal then */
-                                 *(t++) = '\\';
-                                 continue;
-                         }
-                         free(r);
-                         return k;
-                 }
-                 if (c != 0)
-                         /* Non-Unicode? Let's encode this directly */
-                         *(t++) = c;
-                 else
-                         /* Unicode? Then let's encode this in UTF-8 */
-                         t += utf8_encode_unichar(t, u);
-                 f += k;
-         }
-         *t = 0;
-         *ret = r;
-         return t - r;
- }
- #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);
- }
- 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) {
-         char *r, *t;
-         const char *f;
-         /* Escapes all chars in bad, in addition to \ and all special
-          * chars, in \xFF style escaping. May be reversed with
-          * cunescape(). */
-         r = new(char, strlen(s) * 4 + 1);
-         if (!r)
-                 return NULL;
-         for (f = s, t = r; *f; f++) {
-                 if ((*f < ' ') || (*f >= 127) ||
-                     (*f == '\\') || strchr(bad, *f)) {
-                         *(t++) = '\\';
-                         *(t++) = 'x';
-                         *(t++) = hexchar(*f >> 4);
-                         *(t++) = hexchar(*f);
-                 } else
-                         *(t++) = *f;
-         }
-         *t = 0;
-         return r;
- }
- char *ascii_strlower(char *t) {
-         char *p;
-         assert(t);
-         for (p = t; *p; p++)
-                 if (*p >= 'A' && *p <= 'Z')
-                         *p = *p - 'A' + 'a';
-         return t;
- }
- _pure_ static bool hidden_file_allow_backup(const char *filename) {
-         assert(filename);
-         return
-                 filename[0] == '.' ||
-                 streq(filename, "lost+found") ||
-                 streq(filename, "aquota.user") ||
-                 streq(filename, "aquota.group") ||
-                 endswith(filename, ".rpmnew") ||
-                 endswith(filename, ".rpmsave") ||
-                 endswith(filename, ".rpmorig") ||
-                 endswith(filename, ".dpkg-old") ||
-                 endswith(filename, ".dpkg-new") ||
-                 endswith(filename, ".dpkg-tmp") ||
-                 endswith(filename, ".dpkg-dist") ||
-                 endswith(filename, ".dpkg-bak") ||
-                 endswith(filename, ".dpkg-backup") ||
-                 endswith(filename, ".dpkg-remove") ||
-                 endswith(filename, ".swp");
- }
- bool hidden_file(const char *filename) {
-         assert(filename);
-         if (endswith(filename, "~"))
-                 return true;
-         return hidden_file_allow_backup(filename);
- }
- int fd_nonblock(int fd, bool nonblock) {
-         int flags, nflags;
-         assert(fd >= 0);
-         flags = fcntl(fd, F_GETFL, 0);
-         if (flags < 0)
-                 return -errno;
-         if (nonblock)
-                 nflags = flags | O_NONBLOCK;
-         else
-                 nflags = flags & ~O_NONBLOCK;
-         if (nflags == flags)
-                 return 0;
-         if (fcntl(fd, F_SETFL, nflags) < 0)
-                 return -errno;
-         return 0;
- }
- int fd_cloexec(int fd, bool cloexec) {
-         int flags, nflags;
-         assert(fd >= 0);
-         flags = fcntl(fd, F_GETFD, 0);
-         if (flags < 0)
-                 return -errno;
-         if (cloexec)
-                 nflags = flags | FD_CLOEXEC;
-         else
-                 nflags = flags & ~FD_CLOEXEC;
-         if (nflags == flags)
-                 return 0;
-         if (fcntl(fd, F_SETFD, nflags) < 0)
-                 return -errno;
-         return 0;
- }
- _pure_ static bool fd_in_set(int fd, const int fdset[], unsigned n_fdset) {
-         unsigned i;
-         assert(n_fdset == 0 || fdset);
-         for (i = 0; i < n_fdset; i++)
-                 if (fdset[i] == fd)
-                         return true;
-         return false;
- }
- int close_all_fds(const int except[], unsigned n_except) {
-         _cleanup_closedir_ DIR *d = NULL;
-         struct dirent *de;
-         int r = 0;
-         assert(n_except == 0 || except);
-         d = opendir("/proc/self/fd");
-         if (!d) {
-                 int fd;
-                 struct rlimit rl;
-                 /* When /proc isn't available (for example in chroots)
-                  * the fallback is brute forcing through the fd
-                  * table */
-                 assert_se(getrlimit(RLIMIT_NOFILE, &rl) >= 0);
-                 for (fd = 3; fd < (int) rl.rlim_max; fd ++) {
-                         if (fd_in_set(fd, except, n_except))
-                                 continue;
-                         if (close_nointr(fd) < 0)
-                                 if (errno != EBADF && r == 0)
-                                         r = -errno;
-                 }
-                 return r;
-         }
-         while ((de = readdir(d))) {
-                 int fd = -1;
-                 if (hidden_file(de->d_name))
-                         continue;
-                 if (safe_atoi(de->d_name, &fd) < 0)
-                         /* Let's better ignore this, just in case */
-                         continue;
-                 if (fd < 3)
-                         continue;
-                 if (fd == dirfd(d))
-                         continue;
-                 if (fd_in_set(fd, except, n_except))
-                         continue;
-                 if (close_nointr(fd) < 0) {
-                         /* Valgrind has its own FD and doesn't want to have it closed */
-                         if (errno != EBADF && r == 0)
-                                 r = -errno;
-                 }
-         }
-         return r;
- }
- #endif /* NM_IGNORED */
- bool chars_intersect(const char *a, const char *b) {
-         const char *p;
-         /* Returns true if any of the chars in a are in b. */
-         for (p = a; *p; p++)
-                 if (strchr(b, *p))
-                         return true;
-         return false;
- }
- #if 0 /* NM_IGNORED */
- bool fstype_is_network(const char *fstype) {
-         static const char table[] =
-                 "afs\0"
-                 "cifs\0"
-                 "smbfs\0"
-                 "sshfs\0"
-                 "ncpfs\0"
-                 "ncp\0"
-                 "nfs\0"
-                 "nfs4\0"
-                 "gfs\0"
-                 "gfs2\0"
-                 "glusterfs\0";
-         const char *x;
-         x = startswith(fstype, "fuse.");
-         if (x)
-                 fstype = x;
-         return nulstr_contains(table, fstype);
- }
- int flush_fd(int fd) {
-         struct pollfd pollfd = {
-                 .fd = fd,
-                 .events = POLLIN,
-         };
-         for (;;) {
-                 char buf[LINE_MAX];
-                 ssize_t l;
-                 int r;
-                 r = poll(&pollfd, 1, 0);
-                 if (r < 0) {
-                         if (errno == EINTR)
-                                 continue;
-                         return -errno;
-                 } else if (r == 0)
-                         return 0;
-                 l = read(fd, buf, sizeof(buf));
-                 if (l < 0) {
-                         if (errno == EINTR)
-                                 continue;
-                         if (errno == EAGAIN)
-                                 return 0;
-                         return -errno;
-                 } else if (l == 0)
-                         return 0;
-         }
- }
- void safe_close_pair(int p[]) {
-         assert(p);
-         if (p[0] == p[1]) {
-                 /* Special case pairs which use the same fd in both
-                  * directions... */
-                 p[0] = p[1] = safe_close(p[0]);
-                 return;
-         }
-         p[0] = safe_close(p[0]);
-         p[1] = safe_close(p[1]);
- }
- #endif /* NM_IGNORED */
- ssize_t loop_read(int fd, void *buf, size_t nbytes, bool do_poll) {
-         uint8_t *p = buf;
-         ssize_t n = 0;
-         assert(fd >= 0);
-         assert(buf);
-         /* If called with nbytes == 0, let's call read() at least
-          * once, to validate the operation */
-         if (nbytes > (size_t) SSIZE_MAX)
-                 return -EINVAL;
-         do {
-                 ssize_t k;
-                 k = read(fd, p, nbytes);
-                 if (k < 0) {
-                         if (errno == EINTR)
-                                 continue;
-                         if (errno == EAGAIN && do_poll) {
-                                 /* We knowingly ignore any return value here,
-                                  * and expect that any error/EOF is reported
-                                  * via read() */
-                                 (void) fd_wait_for_event(fd, POLLIN, USEC_INFINITY);
-                                 continue;
-                         }
-                         return n > 0 ? n : -errno;
-                 }
-                 if (k == 0)
-                         return n;
-                 assert((size_t) k <= nbytes);
-                 p += k;
-                 nbytes -= k;
-                 n += k;
-         } while (nbytes > 0);
-         return n;
- }
- int loop_read_exact(int fd, void *buf, size_t nbytes, bool do_poll) {
-         ssize_t n;
-         n = loop_read(fd, buf, nbytes, do_poll);
-         if (n < 0)
-                 return (int) n;
-         if ((size_t) n != nbytes)
-                 return -EIO;
-         return 0;
- }
- #if 0 /* NM_IGNORED */
- int loop_write(int fd, const void *buf, size_t nbytes, bool do_poll) {
-         const uint8_t *p = buf;
-         assert(fd >= 0);
-         assert(buf);
-         if (nbytes > (size_t) SSIZE_MAX)
-                 return -EINVAL;
-         do {
-                 ssize_t k;
-                 k = write(fd, p, nbytes);
-                 if (k < 0) {
-                         if (errno == EINTR)
-                                 continue;
-                         if (errno == EAGAIN && do_poll) {
-                                 /* We knowingly ignore any return value here,
-                                  * and expect that any error/EOF is reported
-                                  * via write() */
-                                 (void) fd_wait_for_event(fd, POLLOUT, USEC_INFINITY);
-                                 continue;
-                         }
-                         return -errno;
-                 }
-                 if (_unlikely_(nbytes > 0 && k == 0)) /* Can't really happen */
-                         return -EIO;
-                 assert((size_t) k <= nbytes);
-                 p += k;
-                 nbytes -= k;
-         } while (nbytes > 0);
-         return 0;
- }
- int parse_size(const char *t, uint64_t base, uint64_t *size) {
-         /* Soo, sometimes we want to parse IEC binary suffixes, and
-          * sometimes SI decimal suffixes. This function can parse
-          * both. Which one is the right way depends on the
-          * context. Wikipedia suggests that SI is customary for
-          * hardware metrics and network speeds, while IEC is
-          * customary for most data sizes used by software and volatile
-          * (RAM) memory. Hence be careful which one you pick!
-          *
-          * In either case we use just K, M, G as suffix, and not Ki,
-          * Mi, Gi or so (as IEC would suggest). That's because that's
-          * frickin' ugly. But this means you really need to make sure
-          * to document which base you are parsing when you use this
-          * call. */
-         struct table {
-                 const char *suffix;
-                 unsigned long long factor;
-         };
-         static const struct table iec[] = {
-                 { "E", 1024ULL*1024ULL*1024ULL*1024ULL*1024ULL*1024ULL },
-                 { "P", 1024ULL*1024ULL*1024ULL*1024ULL*1024ULL },
-                 { "T", 1024ULL*1024ULL*1024ULL*1024ULL },
-                 { "G", 1024ULL*1024ULL*1024ULL },
-                 { "M", 1024ULL*1024ULL },
-                 { "K", 1024ULL },
-                 { "B", 1ULL },
-                 { "",  1ULL },
-         };
-         static const struct table si[] = {
-                 { "E", 1000ULL*1000ULL*1000ULL*1000ULL*1000ULL*1000ULL },
-                 { "P", 1000ULL*1000ULL*1000ULL*1000ULL*1000ULL },
-                 { "T", 1000ULL*1000ULL*1000ULL*1000ULL },
-                 { "G", 1000ULL*1000ULL*1000ULL },
-                 { "M", 1000ULL*1000ULL },
-                 { "K", 1000ULL },
-                 { "B", 1ULL },
-                 { "",  1ULL },
-         };
-         const struct table *table;
-         const char *p;
-         unsigned long long r = 0;
-         unsigned n_entries, start_pos = 0;
-         assert(t);
-         assert(base == 1000 || base == 1024);
-         assert(size);
-         if (base == 1000) {
-                 table = si;
-                 n_entries = ELEMENTSOF(si);
-         } else {
-                 table = iec;
-                 n_entries = ELEMENTSOF(iec);
-         }
-         p = t;
-         do {
-                 unsigned long long l, tmp;
-                 double frac = 0;
-                 char *e;
-                 unsigned i;
-                 p += strspn(p, WHITESPACE);
-                 if (*p == '-')
-                         return -ERANGE;
-                 errno = 0;
-                 l = strtoull(p, &e, 10);
-                 if (errno > 0)
-                         return -errno;
-                 if (e == p)
-                         return -EINVAL;
-                 if (*e == '.') {
-                         e++;
-                         /* strtoull() itself would accept space/+/- */
-                         if (*e >= '0' && *e <= '9') {
-                                 unsigned long long l2;
-                                 char *e2;
-                                 l2 = strtoull(e, &e2, 10);
-                                 if (errno > 0)
-                                         return -errno;
-                                 /* Ignore failure. E.g. 10.M is valid */
-                                 frac = l2;
-                                 for (; e < e2; e++)
-                                         frac /= 10;
-                         }
-                 }
-                 e += strspn(e, WHITESPACE);
-                 for (i = start_pos; i < n_entries; i++)
-                         if (startswith(e, table[i].suffix))
-                                 break;
-                 if (i >= n_entries)
-                         return -EINVAL;
-                 if (l + (frac > 0) > ULLONG_MAX / table[i].factor)
-                         return -ERANGE;
-                 tmp = l * table[i].factor + (unsigned long long) (frac * table[i].factor);
-                 if (tmp > ULLONG_MAX - r)
-                         return -ERANGE;
-                 r += tmp;
-                 if ((unsigned long long) (uint64_t) r != r)
-                         return -ERANGE;
-                 p = e + strlen(table[i].suffix);
-                 start_pos = i + 1;
-         } while (*p);
-         *size = r;
-         return 0;
- }
- bool is_device_path(const char *path) {
-         /* Returns true on paths that refer to a device, either in
-          * sysfs or in /dev */
-         return
-                 path_startswith(path, "/dev/") ||
-                 path_startswith(path, "/sys/");
- }
- int dir_is_empty(const char *path) {
-         _cleanup_closedir_ DIR *d;
-         d = opendir(path);
-         if (!d)
-                 return -errno;
-         for (;;) {
-                 struct dirent *de;
-                 errno = 0;
-                 de = readdir(d);
-                 if (!de && errno != 0)
-                         return -errno;
-                 if (!de)
-                         return 1;
-                 if (!hidden_file(de->d_name))
-                         return 0;
-         }
- }
- char* dirname_malloc(const char *path) {
-         char *d, *dir, *dir2;
-         d = strdup(path);
-         if (!d)
-                 return NULL;
-         dir = dirname(d);
-         assert(dir);
-         if (dir != d) {
-                 dir2 = strdup(dir);
-                 free(d);
-                 return dir2;
-         }
-         return dir;
- }
- void rename_process(const char name[8]) {
-         assert(name);
-         /* This is a like a poor man's setproctitle(). It changes the
-          * comm field, argv[0], and also the glibc's internally used
-          * name of the process. For the first one a limit of 16 chars
-          * applies, to the second one usually one of 10 (i.e. length
-          * of "/sbin/init"), to the third one one of 7 (i.e. length of
-          * "systemd"). If you pass a longer string it will be
-          * truncated */
-         prctl(PR_SET_NAME, name);
-         if (program_invocation_name)
-                 strncpy(program_invocation_name, name, strlen(program_invocation_name));
-         if (saved_argc > 0) {
-                 int i;
-                 if (saved_argv[0])
-                         strncpy(saved_argv[0], name, strlen(saved_argv[0]));
-                 for (i = 1; i < saved_argc; i++) {
-                         if (!saved_argv[i])
-                                 break;
-                         memzero(saved_argv[i], strlen(saved_argv[i]));
-                 }
-         }
- }
- char *lookup_uid(uid_t uid) {
-         long bufsize;
-         char *name;
-         _cleanup_free_ char *buf = NULL;
-         struct passwd pwbuf, *pw = NULL;
-         /* Shortcut things to avoid NSS lookups */
-         if (uid == 0)
-                 return strdup("root");
-         bufsize = sysconf(_SC_GETPW_R_SIZE_MAX);
-         if (bufsize <= 0)
-                 bufsize = 4096;
-         buf = malloc(bufsize);
-         if (!buf)
-                 return NULL;
-         if (getpwuid_r(uid, &pwbuf, buf, bufsize, &pw) == 0 && pw)
-                 return strdup(pw->pw_name);
-         if (asprintf(&name, UID_FMT, uid) < 0)
-                 return NULL;
-         return name;
- }
- char* getlogname_malloc(void) {
-         uid_t uid;
-         struct stat st;
-         if (isatty(STDIN_FILENO) && fstat(STDIN_FILENO, &st) >= 0)
-                 uid = st.st_uid;
-         else
-                 uid = getuid();
-         return lookup_uid(uid);
- }
- char *getusername_malloc(void) {
-         const char *e;
-         e = getenv("USER");
-         if (e)
-                 return strdup(e);
-         return lookup_uid(getuid());
- }
- bool is_temporary_fs(const struct statfs *s) {
-         assert(s);
-         return F_TYPE_EQUAL(s->f_type, TMPFS_MAGIC) ||
-                F_TYPE_EQUAL(s->f_type, RAMFS_MAGIC);
- }
- int fd_is_temporary_fs(int fd) {
-         struct statfs s;
-         if (fstatfs(fd, &s) < 0)
-                 return -errno;
-         return is_temporary_fs(&s);
- }
- int chmod_and_chown(const char *path, mode_t mode, uid_t uid, gid_t gid) {
-         assert(path);
-         /* Under the assumption that we are running privileged we
-          * first change the access mode and only then hand out
-          * ownership to avoid a window where access is too open. */
-         if (mode != MODE_INVALID)
-                 if (chmod(path, mode) < 0)
-                         return -errno;
-         if (uid != UID_INVALID || gid != GID_INVALID)
-                 if (chown(path, uid, gid) < 0)
-                         return -errno;
-         return 0;
- }
- int fchmod_and_fchown(int fd, mode_t mode, uid_t uid, gid_t gid) {
-         assert(fd >= 0);
-         /* Under the assumption that we are running privileged we
-          * first change the access mode and only then hand out
-          * ownership to avoid a window where access is too open. */
-         if (mode != MODE_INVALID)
-                 if (fchmod(fd, mode) < 0)
-                         return -errno;
-         if (uid != UID_INVALID || gid != GID_INVALID)
-                 if (fchown(fd, uid, gid) < 0)
-                         return -errno;
-         return 0;
- }
- int files_same(const char *filea, const char *fileb) {
-         struct stat a, b;
-         if (stat(filea, &a) < 0)
-                 return -errno;
-         if (stat(fileb, &b) < 0)
-                 return -errno;
-         return a.st_dev == b.st_dev &&
-                a.st_ino == b.st_ino;
- }
- int running_in_chroot(void) {
-         int ret;
-         ret = files_same("/proc/1/root", "/");
-         if (ret < 0)
-                 return ret;
-         return ret == 0;
- }
- static char *ascii_ellipsize_mem(const char *s, size_t old_length, size_t new_length, unsigned percent) {
-         size_t x;
-         char *r;
-         assert(s);
-         assert(percent <= 100);
-         assert(new_length >= 3);
-         if (old_length <= 3 || old_length <= new_length)
-                 return strndup(s, old_length);
-         r = new0(char, new_length+1);
-         if (!r)
-                 return NULL;
-         x = (new_length * percent) / 100;
-         if (x > new_length - 3)
-                 x = new_length - 3;
-         memcpy(r, s, x);
-         r[x] = '.';
-         r[x+1] = '.';
-         r[x+2] = '.';
-         memcpy(r + x + 3,
-                s + old_length - (new_length - x - 3),
-                new_length - x - 3);
-         return r;
- }
- char *ellipsize_mem(const char *s, size_t old_length, size_t new_length, unsigned percent) {
-         size_t x;
-         char *e;
-         const char *i, *j;
-         unsigned k, len, len2;
-         assert(s);
-         assert(percent <= 100);
-         assert(new_length >= 3);
-         /* if no multibyte characters use ascii_ellipsize_mem for speed */
-         if (ascii_is_valid(s))
-                 return ascii_ellipsize_mem(s, old_length, new_length, percent);
-         if (old_length <= 3 || old_length <= new_length)
-                 return strndup(s, old_length);
-         x = (new_length * percent) / 100;
-         if (x > new_length - 3)
-                 x = new_length - 3;
-         k = 0;
-         for (i = s; k < x && i < s + old_length; i = utf8_next_char(i)) {
-                 int c;
-                 c = utf8_encoded_to_unichar(i);
-                 if (c < 0)
-                         return NULL;
-                 k += unichar_iswide(c) ? 2 : 1;
-         }
-         if (k > x) /* last character was wide and went over quota */
-                 x ++;
-         for (j = s + old_length; k < new_length && j > i; ) {
-                 int c;
-                 j = utf8_prev_char(j);
-                 c = utf8_encoded_to_unichar(j);
-                 if (c < 0)
-                         return NULL;
-                 k += unichar_iswide(c) ? 2 : 1;
-         }
-         assert(i <= j);
-         /* we don't actually need to ellipsize */
-         if (i == j)
-                 return memdup(s, old_length + 1);
-         /* make space for ellipsis */
-         j = utf8_next_char(j);
-         len = i - s;
-         len2 = s + old_length - j;
-         e = new(char, len + 3 + len2 + 1);
-         if (!e)
-                 return NULL;
-         /*
-         printf("old_length=%zu new_length=%zu x=%zu len=%u len2=%u k=%u\n",
-                old_length, new_length, x, len, len2, k);
-         */
-         memcpy(e, s, len);
-         e[len]   = 0xe2; /* tri-dot ellipsis: … */
-         e[len + 1] = 0x80;
-         e[len + 2] = 0xa6;
-         memcpy(e + len + 3, j, len2 + 1);
-         return e;
- }
- char *ellipsize(const char *s, size_t length, unsigned percent) {
-         return ellipsize_mem(s, strlen(s), length, percent);
- }
- int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gid, mode_t mode) {
-         _cleanup_close_ int fd;
-         int r;
-         assert(path);
-         if (parents)
-                 mkdir_parents(path, 0755);
-         fd = open(path, O_WRONLY|O_CREAT|O_CLOEXEC|O_NOCTTY, mode > 0 ? mode : 0644);
-         if (fd < 0)
-                 return -errno;
-         if (mode > 0) {
-                 r = fchmod(fd, mode);
-                 if (r < 0)
-                         return -errno;
-         }
-         if (uid != UID_INVALID || gid != GID_INVALID) {
-                 r = fchown(fd, uid, gid);
-                 if (r < 0)
-                         return -errno;
-         }
-         if (stamp != USEC_INFINITY) {
-                 struct timespec ts[2];
-                 timespec_store(&ts[0], stamp);
-                 ts[1] = ts[0];
-                 r = futimens(fd, ts);
-         } else
-                 r = futimens(fd, NULL);
-         if (r < 0)
-                 return -errno;
-         return 0;
- }
- int touch(const char *path) {
-         return touch_file(path, false, USEC_INFINITY, UID_INVALID, GID_INVALID, 0);
- }
- static char *unquote(const char *s, const char* quotes) {
-         size_t l;
-         assert(s);
-         /* This is rather stupid, simply removes the heading and
-          * trailing quotes if there is one. Doesn't care about
-          * escaping or anything.
-          *
-          * DON'T USE THIS FOR NEW CODE ANYMORE!*/
-         l = strlen(s);
-         if (l < 2)
-                 return strdup(s);
-         if (strchr(quotes, s[0]) && s[l-1] == s[0])
-                 return strndup(s+1, l-2);
-         return strdup(s);
- }
- noreturn void freeze(void) {
-         /* Make sure nobody waits for us on a socket anymore */
-         close_all_fds(NULL, 0);
-         sync();
-         for (;;)
-                 pause();
- }
- bool null_or_empty(struct stat *st) {
-         assert(st);
-         if (S_ISREG(st->st_mode) && st->st_size <= 0)
-                 return true;
-         if (S_ISCHR(st->st_mode) || S_ISBLK(st->st_mode))
-                 return true;
-         return false;
- }
- int null_or_empty_path(const char *fn) {
-         struct stat st;
-         assert(fn);
-         if (stat(fn, &st) < 0)
-                 return -errno;
-         return null_or_empty(&st);
- }
- int null_or_empty_fd(int fd) {
-         struct stat st;
-         assert(fd >= 0);
-         if (fstat(fd, &st) < 0)
-                 return -errno;
-         return null_or_empty(&st);
- }
- DIR *xopendirat(int fd, const char *name, int flags) {
-         int nfd;
-         DIR *d;
-         assert(!(flags & O_CREAT));
-         nfd = openat(fd, name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|flags, 0);
-         if (nfd < 0)
-                 return NULL;
-         d = fdopendir(nfd);
-         if (!d) {
-                 safe_close(nfd);
-                 return NULL;
-         }
-         return d;
- }
- static char *tag_to_udev_node(const char *tagvalue, const char *by) {
-         _cleanup_free_ char *t = NULL, *u = NULL;
-         size_t enc_len;
-         u = unquote(tagvalue, QUOTES);
-         if (!u)
-                 return NULL;
-         enc_len = strlen(u) * 4 + 1;
-         t = new(char, enc_len);
-         if (!t)
-                 return NULL;
-         if (encode_devnode_name(u, t, enc_len) < 0)
-                 return NULL;
-         return strjoin("/dev/disk/by-", by, "/", t, NULL);
- }
- char *fstab_node_to_udev_node(const char *p) {
-         assert(p);
-         if (startswith(p, "LABEL="))
-                 return tag_to_udev_node(p+6, "label");
-         if (startswith(p, "UUID="))
-                 return tag_to_udev_node(p+5, "uuid");
-         if (startswith(p, "PARTUUID="))
-                 return tag_to_udev_node(p+9, "partuuid");
-         if (startswith(p, "PARTLABEL="))
-                 return tag_to_udev_node(p+10, "partlabel");
-         return strdup(p);
- }
- bool dirent_is_file(const struct dirent *de) {
-         assert(de);
-         if (hidden_file(de->d_name))
-                 return false;
-         if (de->d_type != DT_REG &&
-             de->d_type != DT_LNK &&
-             de->d_type != DT_UNKNOWN)
-                 return false;
-         return true;
- }
- bool dirent_is_file_with_suffix(const struct dirent *de, const char *suffix) {
-         assert(de);
-         if (de->d_type != DT_REG &&
-             de->d_type != DT_LNK &&
-             de->d_type != DT_UNKNOWN)
-                 return false;
-         if (hidden_file_allow_backup(de->d_name))
-                 return false;
-         return endswith(de->d_name, suffix);
- }
- static int do_execute(char **directories, usec_t timeout, char *argv[]) {
-         _cleanup_hashmap_free_free_ Hashmap *pids = NULL;
-         _cleanup_set_free_free_ Set *seen = NULL;
-         char **directory;
-         /* We fork this all off from a child process so that we can
-          * somewhat cleanly make use of SIGALRM to set a time limit */
-         (void) reset_all_signal_handlers();
-         (void) reset_signal_mask();
-         assert_se(prctl(PR_SET_PDEATHSIG, SIGTERM) == 0);
-         pids = hashmap_new(NULL);
-         if (!pids)
-                 return log_oom();
-         seen = set_new(&string_hash_ops);
-         if (!seen)
-                 return log_oom();
-         STRV_FOREACH(directory, directories) {
-                 _cleanup_closedir_ DIR *d;
-                 struct dirent *de;
-                 d = opendir(*directory);
-                 if (!d) {
-                         if (errno == ENOENT)
-                                 continue;
-                         return log_error_errno(errno, "Failed to open directory %s: %m", *directory);
-                 }
-                 FOREACH_DIRENT(de, d, break) {
-                         _cleanup_free_ char *path = NULL;
-                         pid_t pid;
-                         int r;
-                         if (!dirent_is_file(de))
-                                 continue;
-                         if (set_contains(seen, de->d_name)) {
-                                 log_debug("%1$s/%2$s skipped (%2$s was already seen).", *directory, de->d_name);
-                                 continue;
-                         }
-                         r = set_put_strdup(seen, de->d_name);
-                         if (r < 0)
-                                 return log_oom();
-                         path = strjoin(*directory, "/", de->d_name, NULL);
-                         if (!path)
-                                 return log_oom();
-                         if (null_or_empty_path(path)) {
-                                 log_debug("%s is empty (a mask).", path);
-                                 continue;
-                         }
-                         pid = fork();
-                         if (pid < 0) {
-                                 log_error_errno(errno, "Failed to fork: %m");
-                                 continue;
-                         } else if (pid == 0) {
-                                 char *_argv[2];
-                                 assert_se(prctl(PR_SET_PDEATHSIG, SIGTERM) == 0);
-                                 if (!argv) {
-                                         _argv[0] = path;
-                                         _argv[1] = NULL;
-                                         argv = _argv;
-                                 } else
-                                         argv[0] = path;
-                                 execv(path, argv);
-                                 return log_error_errno(errno, "Failed to execute %s: %m", path);
-                         }
-                         log_debug("Spawned %s as " PID_FMT ".", path, pid);
-                         r = hashmap_put(pids, UINT_TO_PTR(pid), path);
-                         if (r < 0)
-                                 return log_oom();
-                         path = NULL;
-                 }
-         }
-         /* Abort execution of this process after the timout. We simply
-          * rely on SIGALRM as default action terminating the process,
-          * and turn on alarm(). */
-         if (timeout != USEC_INFINITY)
-                 alarm((timeout + USEC_PER_SEC - 1) / USEC_PER_SEC);
-         while (!hashmap_isempty(pids)) {
-                 _cleanup_free_ char *path = NULL;
-                 pid_t pid;
-                 pid = PTR_TO_UINT(hashmap_first_key(pids));
-                 assert(pid > 0);
-                 path = hashmap_remove(pids, UINT_TO_PTR(pid));
-                 assert(path);
-                 wait_for_terminate_and_warn(path, pid, true);
-         }
-         return 0;
- }
- void execute_directories(const char* const* directories, usec_t timeout, char *argv[]) {
-         pid_t executor_pid;
-         int r;
-         char *name;
-         char **dirs = (char**) directories;
-         assert(!strv_isempty(dirs));
-         name = basename(dirs[0]);
-         assert(!isempty(name));
-         /* Executes all binaries in the directories in parallel and waits
-          * for them to finish. Optionally a timeout is applied. If a file
-          * with the same name exists in more than one directory, the
-          * earliest one wins. */
-         executor_pid = fork();
-         if (executor_pid < 0) {
-                 log_error_errno(errno, "Failed to fork: %m");
-                 return;
-         } else if (executor_pid == 0) {
-                 r = do_execute(dirs, timeout, argv);
-                 _exit(r < 0 ? EXIT_FAILURE : EXIT_SUCCESS);
-         }
-         wait_for_terminate_and_warn(name, executor_pid, true);
- }
- bool nulstr_contains(const char*nulstr, const char *needle) {
-         const char *i;
-         if (!nulstr)
-                 return false;
-         NULSTR_FOREACH(i, nulstr)
-                 if (streq(i, needle))
-                         return true;
-         return false;
- }
- bool plymouth_running(void) {
-         return access("/run/plymouth/pid", F_OK) >= 0;
- }
- #endif /* NM_IGNORED */
- char* strshorten(char *s, size_t l) {
-         assert(s);
-         if (l < strlen(s))
-                 s[l] = 0;
-         return s;
- }
- #if 0 /* NM_IGNORED */
- int pipe_eof(int fd) {
-         struct pollfd pollfd = {
-                 .fd = fd,
-                 .events = POLLIN|POLLHUP,
-         };
-         int r;
-         r = poll(&pollfd, 1, 0);
-         if (r < 0)
-                 return -errno;
-         if (r == 0)
-                 return 0;
-         return pollfd.revents & POLLHUP;
- }
- #endif /* NM_IGNORED */
- int fd_wait_for_event(int fd, int event, usec_t t) {
-         struct pollfd pollfd = {
-                 .fd = fd,
-                 .events = event,
-         };
-         struct timespec ts;
-         int r;
-         r = ppoll(&pollfd, 1, t == USEC_INFINITY ? NULL : timespec_store(&ts, t), NULL);
-         if (r < 0)
-                 return -errno;
-         if (r == 0)
-                 return 0;
-         return pollfd.revents;
- }
- int fopen_temporary(const char *path, FILE **_f, char **_temp_path) {
-         FILE *f;
-         char *t;
-         int r, fd;
-         assert(path);
-         assert(_f);
-         assert(_temp_path);
-         r = tempfn_xxxxxx(path, NULL, &t);
-         if (r < 0)
-                 return r;
-         fd = mkostemp_safe(t, O_WRONLY|O_CLOEXEC);
-         if (fd < 0) {
-                 free(t);
-                 return -errno;
-         }
-         f = fdopen(fd, "we");
-         if (!f) {
-                 unlink_noerrno(t);
-                 free(t);
-                 safe_close(fd);
-                 return -errno;
-         }
-         *_f = f;
-         *_temp_path = t;
-         return 0;
- }
- #if 0 /* NM_IGNORED */
- int symlink_atomic(const char *from, const char *to) {
-         _cleanup_free_ char *t = NULL;
-         int r;
-         assert(from);
-         assert(to);
-         r = tempfn_random(to, NULL, &t);
-         if (r < 0)
-                 return r;
-         if (symlink(from, t) < 0)
-                 return -errno;
-         if (rename(t, to) < 0) {
-                 unlink_noerrno(t);
-                 return -errno;
-         }
-         return 0;
- }
- int symlink_idempotent(const char *from, const char *to) {
-         _cleanup_free_ char *p = NULL;
-         int r;
-         assert(from);
-         assert(to);
-         if (symlink(from, to) < 0) {
-                 if (errno != EEXIST)
-                         return -errno;
-                 r = readlink_malloc(to, &p);
-                 if (r < 0)
-                         return r;
-                 if (!streq(p, from))
-                         return -EINVAL;
-         }
-         return 0;
- }
- int mknod_atomic(const char *path, mode_t mode, dev_t dev) {
-         _cleanup_free_ char *t = NULL;
-         int r;
-         assert(path);
-         r = tempfn_random(path, NULL, &t);
-         if (r < 0)
-                 return r;
-         if (mknod(t, mode, dev) < 0)
-                 return -errno;
-         if (rename(t, path) < 0) {
-                 unlink_noerrno(t);
-                 return -errno;
-         }
-         return 0;
- }
- int mkfifo_atomic(const char *path, mode_t mode) {
-         _cleanup_free_ char *t = NULL;
-         int r;
-         assert(path);
-         r = tempfn_random(path, NULL, &t);
-         if (r < 0)
-                 return r;
-         if (mkfifo(t, mode) < 0)
-                 return -errno;
-         if (rename(t, path) < 0) {
-                 unlink_noerrno(t);
-                 return -errno;
-         }
-         return 0;
- }
- bool display_is_local(const char *display) {
-         assert(display);
-         return
-                 display[0] == ':' &&
-                 display[1] >= '0' &&
-                 display[1] <= '9';
- }
- int socket_from_display(const char *display, char **path) {
-         size_t k;
-         char *f, *c;
-         assert(display);
-         assert(path);
-         if (!display_is_local(display))
-                 return -EINVAL;
-         k = strspn(display+1, "0123456789");
-         f = new(char, strlen("/tmp/.X11-unix/X") + k + 1);
-         if (!f)
-                 return -ENOMEM;
-         c = stpcpy(f, "/tmp/.X11-unix/X");
-         memcpy(c, display+1, k);
-         c[k] = 0;
-         *path = f;
-         return 0;
- }
- int get_user_creds(
-                 const char **username,
-                 uid_t *uid, gid_t *gid,
-                 const char **home,
-                 const char **shell) {
-         struct passwd *p;
-         uid_t u;
-         assert(username);
-         assert(*username);
-         /* We enforce some special rules for uid=0: in order to avoid
-          * NSS lookups for root we hardcode its data. */
-         if (streq(*username, "root") || streq(*username, "0")) {
-                 *username = "root";
-                 if (uid)
-                         *uid = 0;
-                 if (gid)
-                         *gid = 0;
-                 if (home)
-                         *home = "/root";
-                 if (shell)
-                         *shell = "/bin/sh";
-                 return 0;
-         }
-         if (parse_uid(*username, &u) >= 0) {
-                 errno = 0;
-                 p = getpwuid(u);
-                 /* If there are multiple users with the same id, make
-                  * sure to leave $USER to the configured value instead
-                  * of the first occurrence in the database. However if
-                  * the uid was configured by a numeric uid, then let's
-                  * pick the real username from /etc/passwd. */
-                 if (p)
-                         *username = p->pw_name;
-         } else {
-                 errno = 0;
-                 p = getpwnam(*username);
-         }
-         if (!p)
-                 return errno > 0 ? -errno : -ESRCH;
-         if (uid)
-                 *uid = p->pw_uid;
-         if (gid)
-                 *gid = p->pw_gid;
-         if (home)
-                 *home = p->pw_dir;
-         if (shell)
-                 *shell = p->pw_shell;
-         return 0;
- }
- char* uid_to_name(uid_t uid) {
-         struct passwd *p;
-         char *r;
-         if (uid == 0)
-                 return strdup("root");
-         p = getpwuid(uid);
-         if (p)
-                 return strdup(p->pw_name);
-         if (asprintf(&r, UID_FMT, uid) < 0)
-                 return NULL;
-         return r;
- }
- char* gid_to_name(gid_t gid) {
-         struct group *p;
-         char *r;
-         if (gid == 0)
-                 return strdup("root");
-         p = getgrgid(gid);
-         if (p)
-                 return strdup(p->gr_name);
-         if (asprintf(&r, GID_FMT, gid) < 0)
-                 return NULL;
-         return r;
- }
- int get_group_creds(const char **groupname, gid_t *gid) {
-         struct group *g;
-         gid_t id;
-         assert(groupname);
-         /* We enforce some special rules for gid=0: in order to avoid
-          * NSS lookups for root we hardcode its data. */
-         if (streq(*groupname, "root") || streq(*groupname, "0")) {
-                 *groupname = "root";
-                 if (gid)
-                         *gid = 0;
-                 return 0;
-         }
-         if (parse_gid(*groupname, &id) >= 0) {
-                 errno = 0;
-                 g = getgrgid(id);
-                 if (g)
-                         *groupname = g->gr_name;
-         } else {
-                 errno = 0;
-                 g = getgrnam(*groupname);
-         }
-         if (!g)
-                 return errno > 0 ? -errno : -ESRCH;
-         if (gid)
-                 *gid = g->gr_gid;
-         return 0;
- }
- int in_gid(gid_t gid) {
-         gid_t *gids;
-         int ngroups_max, r, i;
-         if (getgid() == gid)
-                 return 1;
-         if (getegid() == gid)
-                 return 1;
-         ngroups_max = sysconf(_SC_NGROUPS_MAX);
-         assert(ngroups_max > 0);
-         gids = alloca(sizeof(gid_t) * ngroups_max);
-         r = getgroups(ngroups_max, gids);
-         if (r < 0)
-                 return -errno;
-         for (i = 0; i < r; i++)
-                 if (gids[i] == gid)
-                         return 1;
-         return 0;
- }
- int in_group(const char *name) {
-         int r;
-         gid_t gid;
-         r = get_group_creds(&name, &gid);
-         if (r < 0)
-                 return r;
-         return in_gid(gid);
- }
- int glob_exists(const char *path) {
-         _cleanup_globfree_ glob_t g = {};
-         int k;
-         assert(path);
-         errno = 0;
-         k = glob(path, GLOB_NOSORT|GLOB_BRACE, NULL, &g);
-         if (k == GLOB_NOMATCH)
-                 return 0;
-         else if (k == GLOB_NOSPACE)
-                 return -ENOMEM;
-         else if (k == 0)
-                 return !strv_isempty(g.gl_pathv);
-         else
-                 return errno ? -errno : -EIO;
- }
- int glob_extend(char ***strv, const char *path) {
-         _cleanup_globfree_ glob_t g = {};
-         int k;
-         char **p;
-         errno = 0;
-         k = glob(path, GLOB_NOSORT|GLOB_BRACE, NULL, &g);
-         if (k == GLOB_NOMATCH)
-                 return -ENOENT;
-         else if (k == GLOB_NOSPACE)
-                 return -ENOMEM;
-         else if (k != 0 || strv_isempty(g.gl_pathv))
-                 return errno ? -errno : -EIO;
-         STRV_FOREACH(p, g.gl_pathv) {
-                 k = strv_extend(strv, *p);
-                 if (k < 0)
-                         break;
-         }
-         return k;
- }
- int dirent_ensure_type(DIR *d, struct dirent *de) {
-         struct stat st;
-         assert(d);
-         assert(de);
-         if (de->d_type != DT_UNKNOWN)
-                 return 0;
-         if (fstatat(dirfd(d), de->d_name, &st, AT_SYMLINK_NOFOLLOW) < 0)
-                 return -errno;
-         de->d_type =
-                 S_ISREG(st.st_mode)  ? DT_REG  :
-                 S_ISDIR(st.st_mode)  ? DT_DIR  :
-                 S_ISLNK(st.st_mode)  ? DT_LNK  :
-                 S_ISFIFO(st.st_mode) ? DT_FIFO :
-                 S_ISSOCK(st.st_mode) ? DT_SOCK :
-                 S_ISCHR(st.st_mode)  ? DT_CHR  :
-                 S_ISBLK(st.st_mode)  ? DT_BLK  :
-                                        DT_UNKNOWN;
-         return 0;
- }
- int get_files_in_directory(const char *path, char ***list) {
-         _cleanup_closedir_ DIR *d = NULL;
-         size_t bufsize = 0, n = 0;
-         _cleanup_strv_free_ char **l = NULL;
-         assert(path);
-         /* Returns all files in a directory in *list, and the number
-          * of files as return value. If list is NULL returns only the
-          * number. */
-         d = opendir(path);
-         if (!d)
-                 return -errno;
-         for (;;) {
-                 struct dirent *de;
-                 errno = 0;
-                 de = readdir(d);
-                 if (!de && errno != 0)
-                         return -errno;
-                 if (!de)
-                         break;
-                 dirent_ensure_type(d, de);
-                 if (!dirent_is_file(de))
-                         continue;
-                 if (list) {
-                         /* one extra slot is needed for the terminating NULL */
-                         if (!GREEDY_REALLOC(l, bufsize, n + 2))
-                                 return -ENOMEM;
-                         l[n] = strdup(de->d_name);
-                         if (!l[n])
-                                 return -ENOMEM;
-                         l[++n] = NULL;
-                 } else
-                         n++;
-         }
-         if (list) {
-                 *list = l;
-                 l = NULL; /* avoid freeing */
-         }
-         return n;
- }
- #endif /* NM_IGNORED */
- char *strjoin(const char *x, ...) {
-         va_list ap;
-         size_t l;
-         char *r, *p;
-         va_start(ap, x);
-         if (x) {
-                 l = strlen(x);
-                 for (;;) {
-                         const char *t;
-                         size_t n;
-                         t = va_arg(ap, const char *);
-                         if (!t)
-                                 break;
-                         n = strlen(t);
-                         if (n > ((size_t) -1) - l) {
-                                 va_end(ap);
-                                 return NULL;
-                         }
-                         l += n;
-                 }
-         } else
-                 l = 0;
-         va_end(ap);
-         r = new(char, l+1);
-         if (!r)
-                 return NULL;
-         if (x) {
-                 p = stpcpy(r, x);
-                 va_start(ap, x);
-                 for (;;) {
-                         const char *t;
-                         t = va_arg(ap, const char *);
-                         if (!t)
-                                 break;
-                         p = stpcpy(p, t);
-                 }
-                 va_end(ap);
-         } else
-                 r[0] = 0;
-         return r;
- }
- #if 0 /* NM_IGNORED */
- bool is_main_thread(void) {
-         static thread_local int cached = 0;
-         if (_unlikely_(cached == 0))
-                 cached = getpid() == gettid() ? 1 : -1;
-         return cached > 0;
- }
- int block_get_whole_disk(dev_t d, dev_t *ret) {
-         char *p, *s;
-         int r;
-         unsigned n, m;
-         assert(ret);
-         /* If it has a queue this is good enough for us */
-         if (asprintf(&p, "/sys/dev/block/%u:%u/queue", major(d), minor(d)) < 0)
-                 return -ENOMEM;
-         r = access(p, F_OK);
-         free(p);
-         if (r >= 0) {
-                 *ret = d;
-                 return 0;
-         }
-         /* If it is a partition find the originating device */
-         if (asprintf(&p, "/sys/dev/block/%u:%u/partition", major(d), minor(d)) < 0)
-                 return -ENOMEM;
-         r = access(p, F_OK);
-         free(p);
-         if (r < 0)
-                 return -ENOENT;
-         /* Get parent dev_t */
-         if (asprintf(&p, "/sys/dev/block/%u:%u/../dev", major(d), minor(d)) < 0)
-                 return -ENOMEM;
-         r = read_one_line_file(p, &s);
-         free(p);
-         if (r < 0)
-                 return r;
-         r = sscanf(s, "%u:%u", &m, &n);
-         free(s);
-         if (r != 2)
-                 return -EINVAL;
-         /* Only return this if it is really good enough for us. */
-         if (asprintf(&p, "/sys/dev/block/%u:%u/queue", m, n) < 0)
-                 return -ENOMEM;
-         r = access(p, F_OK);
-         free(p);
-         if (r >= 0) {
-                 *ret = makedev(m, n);
-                 return 0;
-         }
-         return -ENOENT;
- }
- static const char *const ioprio_class_table[] = {
-         [IOPRIO_CLASS_NONE] = "none",
-         [IOPRIO_CLASS_RT] = "realtime",
-         [IOPRIO_CLASS_BE] = "best-effort",
-         [IOPRIO_CLASS_IDLE] = "idle"
- };
- DEFINE_STRING_TABLE_LOOKUP_WITH_FALLBACK(ioprio_class, int, INT_MAX);
- static const char *const sigchld_code_table[] = {
-         [CLD_EXITED] = "exited",
-         [CLD_KILLED] = "killed",
-         [CLD_DUMPED] = "dumped",
-         [CLD_TRAPPED] = "trapped",
-         [CLD_STOPPED] = "stopped",
-         [CLD_CONTINUED] = "continued",
- };
- DEFINE_STRING_TABLE_LOOKUP(sigchld_code, int);
- static const char *const log_facility_unshifted_table[LOG_NFACILITIES] = {
-         [LOG_FAC(LOG_KERN)] = "kern",
-         [LOG_FAC(LOG_USER)] = "user",
-         [LOG_FAC(LOG_MAIL)] = "mail",
-         [LOG_FAC(LOG_DAEMON)] = "daemon",
-         [LOG_FAC(LOG_AUTH)] = "auth",
-         [LOG_FAC(LOG_SYSLOG)] = "syslog",
-         [LOG_FAC(LOG_LPR)] = "lpr",
-         [LOG_FAC(LOG_NEWS)] = "news",
-         [LOG_FAC(LOG_UUCP)] = "uucp",
-         [LOG_FAC(LOG_CRON)] = "cron",
-         [LOG_FAC(LOG_AUTHPRIV)] = "authpriv",
-         [LOG_FAC(LOG_FTP)] = "ftp",
-         [LOG_FAC(LOG_LOCAL0)] = "local0",
-         [LOG_FAC(LOG_LOCAL1)] = "local1",
-         [LOG_FAC(LOG_LOCAL2)] = "local2",
-         [LOG_FAC(LOG_LOCAL3)] = "local3",
-         [LOG_FAC(LOG_LOCAL4)] = "local4",
-         [LOG_FAC(LOG_LOCAL5)] = "local5",
-         [LOG_FAC(LOG_LOCAL6)] = "local6",
-         [LOG_FAC(LOG_LOCAL7)] = "local7"
- };
- DEFINE_STRING_TABLE_LOOKUP_WITH_FALLBACK(log_facility_unshifted, int, LOG_FAC(~0));
- static const char *const log_level_table[] = {
-         [LOG_EMERG] = "emerg",
-         [LOG_ALERT] = "alert",
-         [LOG_CRIT] = "crit",
-         [LOG_ERR] = "err",
-         [LOG_WARNING] = "warning",
-         [LOG_NOTICE] = "notice",
-         [LOG_INFO] = "info",
-         [LOG_DEBUG] = "debug"
- };
- DEFINE_STRING_TABLE_LOOKUP_WITH_FALLBACK(log_level, int, LOG_DEBUG);
- static const char* const sched_policy_table[] = {
-         [SCHED_OTHER] = "other",
-         [SCHED_BATCH] = "batch",
-         [SCHED_IDLE] = "idle",
-         [SCHED_FIFO] = "fifo",
-         [SCHED_RR] = "rr"
- };
- DEFINE_STRING_TABLE_LOOKUP_WITH_FALLBACK(sched_policy, int, INT_MAX);
- static const char* const rlimit_table[_RLIMIT_MAX] = {
-         [RLIMIT_CPU] = "LimitCPU",
-         [RLIMIT_FSIZE] = "LimitFSIZE",
-         [RLIMIT_DATA] = "LimitDATA",
-         [RLIMIT_STACK] = "LimitSTACK",
-         [RLIMIT_CORE] = "LimitCORE",
-         [RLIMIT_RSS] = "LimitRSS",
-         [RLIMIT_NOFILE] = "LimitNOFILE",
-         [RLIMIT_AS] = "LimitAS",
-         [RLIMIT_NPROC] = "LimitNPROC",
-         [RLIMIT_MEMLOCK] = "LimitMEMLOCK",
-         [RLIMIT_LOCKS] = "LimitLOCKS",
-         [RLIMIT_SIGPENDING] = "LimitSIGPENDING",
-         [RLIMIT_MSGQUEUE] = "LimitMSGQUEUE",
-         [RLIMIT_NICE] = "LimitNICE",
-         [RLIMIT_RTPRIO] = "LimitRTPRIO",
-         [RLIMIT_RTTIME] = "LimitRTTIME"
- };
- DEFINE_STRING_TABLE_LOOKUP(rlimit, int);
- static const char* const ip_tos_table[] = {
-         [IPTOS_LOWDELAY] = "low-delay",
-         [IPTOS_THROUGHPUT] = "throughput",
-         [IPTOS_RELIABILITY] = "reliability",
-         [IPTOS_LOWCOST] = "low-cost",
- };
- DEFINE_STRING_TABLE_LOOKUP_WITH_FALLBACK(ip_tos, int, 0xff);
- bool kexec_loaded(void) {
-        bool loaded = false;
-        char *s;
-        if (read_one_line_file("/sys/kernel/kexec_loaded", &s) >= 0) {
-                if (s[0] == '1')
-                        loaded = true;
-                free(s);
-        }
-        return loaded;
- }
- int prot_from_flags(int flags) {
-         switch (flags & O_ACCMODE) {
-         case O_RDONLY:
-                 return PROT_READ;
-         case O_WRONLY:
-                 return PROT_WRITE;
-         case O_RDWR:
-                 return PROT_READ|PROT_WRITE;
-         default:
-                 return -EINVAL;
-         }
- }
- char *format_bytes(char *buf, size_t l, uint64_t t) {
-         unsigned i;
-         static const struct {
-                 const char *suffix;
-                 uint64_t factor;
-         } table[] = {
-                 { "E", UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024) },
-                 { "P", UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024) },
-                 { "T", UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024) },
-                 { "G", UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024) },
-                 { "M", UINT64_C(1024)*UINT64_C(1024) },
-                 { "K", UINT64_C(1024) },
-         };
-         if (t == (uint64_t) -1)
-                 return NULL;
-         for (i = 0; i < ELEMENTSOF(table); i++) {
-                 if (t >= table[i].factor) {
-                         snprintf(buf, l,
-                                  "%" PRIu64 ".%" PRIu64 "%s",
-                                  t / table[i].factor,
-                                  ((t*UINT64_C(10)) / table[i].factor) % UINT64_C(10),
-                                  table[i].suffix);
-                         goto finish;
-                 }
-         }
-         snprintf(buf, l, "%" PRIu64 "B", t);
- finish:
-         buf[l-1] = 0;
-         return buf;
- }
- #endif /* NM_IGNORED */
- void* memdup(const void *p, size_t l) {
-         void *r;
-         assert(p);
-         r = malloc(l);
-         if (!r)
-                 return NULL;
-         memcpy(r, p, l);
-         return r;
- }
- #if 0 /* NM_IGNORED */
- int fd_inc_sndbuf(int fd, size_t n) {
-         int r, value;
-         socklen_t l = sizeof(value);
-         r = getsockopt(fd, SOL_SOCKET, SO_SNDBUF, &value, &l);
-         if (r >= 0 && l == sizeof(value) && (size_t) value >= n*2)
-                 return 0;
-         /* If we have the privileges we will ignore the kernel limit. */
-         value = (int) n;
-         if (setsockopt(fd, SOL_SOCKET, SO_SNDBUFFORCE, &value, sizeof(value)) < 0)
-                 if (setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &value, sizeof(value)) < 0)
-                         return -errno;
-         return 1;
- }
- int fd_inc_rcvbuf(int fd, size_t n) {
-         int r, value;
-         socklen_t l = sizeof(value);
-         r = getsockopt(fd, SOL_SOCKET, SO_RCVBUF, &value, &l);
-         if (r >= 0 && l == sizeof(value) && (size_t) value >= n*2)
-                 return 0;
-         /* If we have the privileges we will ignore the kernel limit. */
-         value = (int) n;
-         if (setsockopt(fd, SOL_SOCKET, SO_RCVBUFFORCE, &value, sizeof(value)) < 0)
-                 if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &value, sizeof(value)) < 0)
-                         return -errno;
-         return 1;
- }
- int fork_agent(pid_t *pid, const int except[], unsigned n_except, const char *path, ...) {
-         bool stdout_is_tty, stderr_is_tty;
-         pid_t parent_pid, agent_pid;
-         sigset_t ss, saved_ss;
-         unsigned n, i;
-         va_list ap;
-         char **l;
-         assert(pid);
-         assert(path);
-         /* Spawns a temporary TTY agent, making sure it goes away when
-          * we go away */
-         parent_pid = getpid();
-         /* First we temporarily block all signals, so that the new
-          * child has them blocked initially. This way, we can be sure
-          * that SIGTERMs are not lost we might send to the agent. */
-         assert_se(sigfillset(&ss) >= 0);
-         assert_se(sigprocmask(SIG_SETMASK, &ss, &saved_ss) >= 0);
-         agent_pid = fork();
-         if (agent_pid < 0) {
-                 assert_se(sigprocmask(SIG_SETMASK, &saved_ss, NULL) >= 0);
-                 return -errno;
-         }
-         if (agent_pid != 0) {
-                 assert_se(sigprocmask(SIG_SETMASK, &saved_ss, NULL) >= 0);
-                 *pid = agent_pid;
-                 return 0;
-         }
-         /* In the child:
-          *
-          * Make sure the agent goes away when the parent dies */
-         if (prctl(PR_SET_PDEATHSIG, SIGTERM) < 0)
-                 _exit(EXIT_FAILURE);
-         /* Make sure we actually can kill the agent, if we need to, in
-          * case somebody invoked us from a shell script that trapped
-          * SIGTERM or so... */
-         (void) reset_all_signal_handlers();
-         (void) reset_signal_mask();
-         /* Check whether our parent died before we were able
-          * to set the death signal and unblock the signals */
-         if (getppid() != parent_pid)
-                 _exit(EXIT_SUCCESS);
-         /* Don't leak fds to the agent */
-         close_all_fds(except, n_except);
-         stdout_is_tty = isatty(STDOUT_FILENO);
-         stderr_is_tty = isatty(STDERR_FILENO);
-         if (!stdout_is_tty || !stderr_is_tty) {
-                 int fd;
-                 /* Detach from stdout/stderr. and reopen
-                  * /dev/tty for them. This is important to
-                  * ensure that when systemctl is started via
-                  * popen() or a similar call that expects to
-                  * read EOF we actually do generate EOF and
-                  * not delay this indefinitely by because we
-                  * keep an unused copy of stdin around. */
-                 fd = open("/dev/tty", O_WRONLY);
-                 if (fd < 0) {
-                         log_error_errno(errno, "Failed to open /dev/tty: %m");
-                         _exit(EXIT_FAILURE);
-                 }
-                 if (!stdout_is_tty)
-                         dup2(fd, STDOUT_FILENO);
-                 if (!stderr_is_tty)
-                         dup2(fd, STDERR_FILENO);
-                 if (fd > 2)
-                         close(fd);
-         }
-         /* Count arguments */
-         va_start(ap, path);
-         for (n = 0; va_arg(ap, char*); n++)
-                 ;
-         va_end(ap);
-         /* Allocate strv */
-         l = alloca(sizeof(char *) * (n + 1));
-         /* Fill in arguments */
-         va_start(ap, path);
-         for (i = 0; i <= n; i++)
-                 l[i] = va_arg(ap, char*);
-         va_end(ap);
-         execv(path, l);
-         _exit(EXIT_FAILURE);
- }
- int setrlimit_closest(int resource, const struct rlimit *rlim) {
-         struct rlimit highest, fixed;
-         assert(rlim);
-         if (setrlimit(resource, rlim) >= 0)
-                 return 0;
-         if (errno != EPERM)
-                 return -errno;
-         /* So we failed to set the desired setrlimit, then let's try
-          * to get as close as we can */
-         assert_se(getrlimit(resource, &highest) == 0);
-         fixed.rlim_cur = MIN(rlim->rlim_cur, highest.rlim_max);
-         fixed.rlim_max = MIN(rlim->rlim_max, highest.rlim_max);
-         if (setrlimit(resource, &fixed) < 0)
-                 return -errno;
-         return 0;
- }
- bool http_etag_is_valid(const char *etag) {
-         if (isempty(etag))
-                 return false;
-         if (!endswith(etag, "\""))
-                 return false;
-         if (!startswith(etag, "\"") && !startswith(etag, "W/\""))
-                 return false;
-         return true;
- }
- bool http_url_is_valid(const char *url) {
-         const char *p;
-         if (isempty(url))
-                 return false;
-         p = startswith(url, "http://");
-         if (!p)
-                 p = startswith(url, "https://");
-         if (!p)
-                 return false;
-         if (isempty(p))
-                 return false;
-         return ascii_is_valid(p);
- }
- bool documentation_url_is_valid(const char *url) {
-         const char *p;
-         if (isempty(url))
-                 return false;
-         if (http_url_is_valid(url))
-                 return true;
-         p = startswith(url, "file:/");
-         if (!p)
-                 p = startswith(url, "info:");
-         if (!p)
-                 p = startswith(url, "man:");
-         if (isempty(p))
-                 return false;
-         return ascii_is_valid(p);
- }
- bool in_initrd(void) {
-         static int saved = -1;
-         struct statfs s;
-         if (saved >= 0)
-                 return saved;
-         /* We make two checks here:
-          *
-          * 1. the flag file /etc/initrd-release must exist
-          * 2. the root file system must be a memory file system
-          *
-          * The second check is extra paranoia, since misdetecting an
-          * initrd can have bad bad consequences due the initrd
-          * emptying when transititioning to the main systemd.
-          */
-         saved = access("/etc/initrd-release", F_OK) >= 0 &&
-                 statfs("/", &s) >= 0 &&
-                 is_temporary_fs(&s);
-         return saved;
- }
- int get_home_dir(char **_h) {
-         struct passwd *p;
-         const char *e;
-         char *h;
-         uid_t u;
-         assert(_h);
-         /* Take the user specified one */
-         e = secure_getenv("HOME");
-         if (e && path_is_absolute(e)) {
-                 h = strdup(e);
-                 if (!h)
-                         return -ENOMEM;
-                 *_h = h;
-                 return 0;
-         }
-         /* Hardcode home directory for root to avoid NSS */
-         u = getuid();
-         if (u == 0) {
-                 h = strdup("/root");
-                 if (!h)
-                         return -ENOMEM;
-                 *_h = h;
-                 return 0;
-         }
-         /* Check the database... */
-         errno = 0;
-         p = getpwuid(u);
-         if (!p)
-                 return errno > 0 ? -errno : -ESRCH;
-         if (!path_is_absolute(p->pw_dir))
-                 return -EINVAL;
-         h = strdup(p->pw_dir);
-         if (!h)
-                 return -ENOMEM;
-         *_h = h;
-         return 0;
- }
- int get_shell(char **_s) {
-         struct passwd *p;
-         const char *e;
-         char *s;
-         uid_t u;
-         assert(_s);
-         /* Take the user specified one */
-         e = getenv("SHELL");
-         if (e) {
-                 s = strdup(e);
-                 if (!s)
-                         return -ENOMEM;
-                 *_s = s;
-                 return 0;
-         }
-         /* Hardcode home directory for root to avoid NSS */
-         u = getuid();
-         if (u == 0) {
-                 s = strdup("/bin/sh");
-                 if (!s)
-                         return -ENOMEM;
-                 *_s = s;
-                 return 0;
-         }
-         /* Check the database... */
-         errno = 0;
-         p = getpwuid(u);
-         if (!p)
-                 return errno > 0 ? -errno : -ESRCH;
-         if (!path_is_absolute(p->pw_shell))
-                 return -EINVAL;
-         s = strdup(p->pw_shell);
-         if (!s)
-                 return -ENOMEM;
-         *_s = s;
-         return 0;
- }
- #endif /* NM_IGNORED */
- bool filename_is_valid(const char *p) {
-         if (isempty(p))
-                 return false;
-         if (strchr(p, '/'))
-                 return false;
-         if (streq(p, "."))
-                 return false;
-         if (streq(p, ".."))
-                 return false;
-         if (strlen(p) > FILENAME_MAX)
-                 return false;
-         return true;
- }
- #if 0 /* NM_IGNORED */
- bool string_is_safe(const char *p) {
-         const char *t;
-         if (!p)
-                 return false;
-         for (t = p; *t; t++) {
-                 if (*t > 0 && *t < ' ')
-                         return false;
-                 if (strchr("\\\"\'\x7f", *t))
-                         return false;
-         }
-         return true;
- }
- #endif /* NM_IGNORED */
- /**
-  * Check if a string contains control characters. If 'ok' is non-NULL
-  * it may be a string containing additional CCs to be considered OK.
-  */
- bool string_has_cc(const char *p, const char *ok) {
-         const char *t;
-         assert(p);
-         for (t = p; *t; t++) {
-                 if (ok && strchr(ok, *t))
-                         continue;
-                 if (*t > 0 && *t < ' ')
-                         return true;
-                 if (*t == 127)
-                         return true;
-         }
-         return false;
- }
- #if 0 /* NM_IGNORED */
- bool path_is_safe(const char *p) {
-         if (isempty(p))
-                 return false;
-         if (streq(p, "..") || startswith(p, "../") || endswith(p, "/..") || strstr(p, "/../"))
-                 return false;
-         if (strlen(p)+1 > PATH_MAX)
-                 return false;
-         /* The following two checks are not really dangerous, but hey, they still are confusing */
-         if (streq(p, ".") || startswith(p, "./") || endswith(p, "/.") || strstr(p, "/./"))
-                 return false;
-         if (strstr(p, "//"))
-                 return false;
-         return true;
- }
- /* hey glibc, APIs with callbacks without a user pointer are so useless */
- void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size,
-                  int (*compar) (const void *, const void *, void *), void *arg) {
-         size_t l, u, idx;
-         const void *p;
-         int comparison;
-         l = 0;
-         u = nmemb;
-         while (l < u) {
-                 idx = (l + u) / 2;
-                 p = (void *)(((const char *) base) + (idx * size));
-                 comparison = compar(key, p, arg);
-                 if (comparison < 0)
-                         u = idx;
-                 else if (comparison > 0)
-                         l = idx + 1;
-                 else
-                         return (void *)p;
-         }
-         return NULL;
- }
- void init_gettext(void) {
-         setlocale(LC_ALL, "");
-         textdomain(GETTEXT_PACKAGE);
- }
- bool is_locale_utf8(void) {
-         const char *set;
-         static int cached_answer = -1;
-         if (cached_answer >= 0)
-                 goto out;
-         if (!setlocale(LC_ALL, "")) {
-                 cached_answer = true;
-                 goto out;
-         }
-         set = nl_langinfo(CODESET);
-         if (!set) {
-                 cached_answer = true;
-                 goto out;
-         }
-         if (streq(set, "UTF-8")) {
-                 cached_answer = true;
-                 goto out;
-         }
-         /* For LC_CTYPE=="C" return true, because CTYPE is effectly
-          * unset and everything can do to UTF-8 nowadays. */
-         set = setlocale(LC_CTYPE, NULL);
-         if (!set) {
-                 cached_answer = true;
-                 goto out;
-         }
-         /* Check result, but ignore the result if C was set
-          * explicitly. */
-         cached_answer =
-                 STR_IN_SET(set, "C", "POSIX") &&
-                 !getenv("LC_ALL") &&
-                 !getenv("LC_CTYPE") &&
-                 !getenv("LANG");
- out:
-         return (bool) cached_answer;
- }
- const char *draw_special_char(DrawSpecialChar ch) {
-         static const char *draw_table[2][_DRAW_SPECIAL_CHAR_MAX] = {
-                 /* UTF-8 */ {
-                         [DRAW_TREE_VERTICAL]      = "\342\224\202 ",            /* │  */
-                         [DRAW_TREE_BRANCH]        = "\342\224\234\342\224\200", /* ├─ */
-                         [DRAW_TREE_RIGHT]         = "\342\224\224\342\224\200", /* └─ */
-                         [DRAW_TREE_SPACE]         = "  ",                       /*    */
-                         [DRAW_TRIANGULAR_BULLET]  = "\342\200\243",             /* ‣ */
-                         [DRAW_BLACK_CIRCLE]       = "\342\227\217",             /* ● */
-                         [DRAW_ARROW]              = "\342\206\222",             /* → */
-                         [DRAW_DASH]               = "\342\200\223",             /* – */
-                 },
-                 /* ASCII fallback */ {
-                         [DRAW_TREE_VERTICAL]      = "| ",
-                         [DRAW_TREE_BRANCH]        = "|-",
-                         [DRAW_TREE_RIGHT]         = "`-",
-                         [DRAW_TREE_SPACE]         = "  ",
-                         [DRAW_TRIANGULAR_BULLET]  = ">",
-                         [DRAW_BLACK_CIRCLE]       = "*",
-                         [DRAW_ARROW]              = "->",
-                         [DRAW_DASH]               = "-",
-                 }
-         };
-         return draw_table[!is_locale_utf8()][ch];
- }
- char *strreplace(const char *text, const char *old_string, const char *new_string) {
-         const char *f;
-         char *t, *r;
-         size_t l, old_len, new_len;
-         assert(text);
-         assert(old_string);
-         assert(new_string);
-         old_len = strlen(old_string);
-         new_len = strlen(new_string);
-         l = strlen(text);
-         r = new(char, l+1);
-         if (!r)
-                 return NULL;
-         f = text;
-         t = r;
-         while (*f) {
-                 char *a;
-                 size_t d, nl;
-                 if (!startswith(f, old_string)) {
-                         *(t++) = *(f++);
-                         continue;
-                 }
-                 d = t - r;
-                 nl = l - old_len + new_len;
-                 a = realloc(r, nl + 1);
-                 if (!a)
-                         goto oom;
-                 l = nl;
-                 r = a;
-                 t = r + d;
-                 t = stpcpy(t, new_string);
-                 f += old_len;
-         }
-         *t = 0;
-         return r;
- oom:
-         free(r);
-         return NULL;
- }
- char *strip_tab_ansi(char **ibuf, size_t *_isz) {
-         const char *i, *begin = NULL;
-         enum {
-                 STATE_OTHER,
-                 STATE_ESCAPE,
-                 STATE_BRACKET
-         } state = STATE_OTHER;
-         char *obuf = NULL;
-         size_t osz = 0, isz;
-         FILE *f;
-         assert(ibuf);
-         assert(*ibuf);
-         /* Strips ANSI color and replaces TABs by 8 spaces */
-         isz = _isz ? *_isz : strlen(*ibuf);
-         f = open_memstream(&obuf, &osz);
-         if (!f)
-                 return NULL;
-         for (i = *ibuf; i < *ibuf + isz + 1; i++) {
-                 switch (state) {
-                 case STATE_OTHER:
-                         if (i >= *ibuf + isz) /* EOT */
-                                 break;
-                         else if (*i == '\x1B')
-                                 state = STATE_ESCAPE;
-                         else if (*i == '\t')
-                                 fputs("        ", f);
-                         else
-                                 fputc(*i, f);
-                         break;
-                 case STATE_ESCAPE:
-                         if (i >= *ibuf + isz) { /* EOT */
-                                 fputc('\x1B', f);
-                                 break;
-                         } else if (*i == '[') {
-                                 state = STATE_BRACKET;
-                                 begin = i + 1;
-                         } else {
-                                 fputc('\x1B', f);
-                                 fputc(*i, f);
-                                 state = STATE_OTHER;
-                         }
-                         break;
-                 case STATE_BRACKET:
-                         if (i >= *ibuf + isz || /* EOT */
-                             (!(*i >= '0' && *i <= '9') && *i != ';' && *i != 'm')) {
-                                 fputc('\x1B', f);
-                                 fputc('[', f);
-                                 state = STATE_OTHER;
-                                 i = begin-1;
-                         } else if (*i == 'm')
-                                 state = STATE_OTHER;
-                         break;
-                 }
-         }
-         if (ferror(f)) {
-                 fclose(f);
-                 free(obuf);
-                 return NULL;
-         }
-         fclose(f);
-         free(*ibuf);
-         *ibuf = obuf;
-         if (_isz)
-                 *_isz = osz;
-         return obuf;
- }
- int on_ac_power(void) {
-         bool found_offline = false, found_online = false;
-         _cleanup_closedir_ DIR *d = NULL;
-         d = opendir("/sys/class/power_supply");
-         if (!d)
-                 return errno == ENOENT ? true : -errno;
-         for (;;) {
-                 struct dirent *de;
-                 _cleanup_close_ int fd = -1, device = -1;
-                 char contents[6];
-                 ssize_t n;
-                 errno = 0;
-                 de = readdir(d);
-                 if (!de && errno != 0)
-                         return -errno;
-                 if (!de)
-                         break;
-                 if (hidden_file(de->d_name))
-                         continue;
-                 device = openat(dirfd(d), de->d_name, O_DIRECTORY|O_RDONLY|O_CLOEXEC|O_NOCTTY);
-                 if (device < 0) {
-                         if (errno == ENOENT || errno == ENOTDIR)
-                                 continue;
-                         return -errno;
-                 }
-                 fd = openat(device, "type", O_RDONLY|O_CLOEXEC|O_NOCTTY);
-                 if (fd < 0) {
-                         if (errno == ENOENT)
-                                 continue;
-                         return -errno;
-                 }
-                 n = read(fd, contents, sizeof(contents));
-                 if (n < 0)
-                         return -errno;
-                 if (n != 6 || memcmp(contents, "Mains\n", 6))
-                         continue;
-                 safe_close(fd);
-                 fd = openat(device, "online", O_RDONLY|O_CLOEXEC|O_NOCTTY);
-                 if (fd < 0) {
-                         if (errno == ENOENT)
-                                 continue;
-                         return -errno;
-                 }
-                 n = read(fd, contents, sizeof(contents));
-                 if (n < 0)
-                         return -errno;
-                 if (n != 2 || contents[1] != '\n')
-                         return -EIO;
-                 if (contents[0] == '1') {
-                         found_online = true;
-                         break;
-                 } else if (contents[0] == '0')
-                         found_offline = true;
-                 else
-                         return -EIO;
-         }
-         return found_online || !found_offline;
- }
- static int search_and_fopen_internal(const char *path, const char *mode, const char *root, char **search, FILE **_f) {
-         char **i;
-         assert(path);
-         assert(mode);
-         assert(_f);
-         if (!path_strv_resolve_uniq(search, root))
-                 return -ENOMEM;
-         STRV_FOREACH(i, search) {
-                 _cleanup_free_ char *p = NULL;
-                 FILE *f;
-                 if (root)
-                         p = strjoin(root, *i, "/", path, NULL);
-                 else
-                         p = strjoin(*i, "/", path, NULL);
-                 if (!p)
-                         return -ENOMEM;
-                 f = fopen(p, mode);
-                 if (f) {
-                         *_f = f;
-                         return 0;
-                 }
-                 if (errno != ENOENT)
-                         return -errno;
-         }
-         return -ENOENT;
- }
- int search_and_fopen(const char *path, const char *mode, const char *root, const char **search, FILE **_f) {
-         _cleanup_strv_free_ char **copy = NULL;
-         assert(path);
-         assert(mode);
-         assert(_f);
-         if (path_is_absolute(path)) {
-                 FILE *f;
-                 f = fopen(path, mode);
-                 if (f) {
-                         *_f = f;
-                         return 0;
-                 }
-                 return -errno;
-         }
-         copy = strv_copy((char**) search);
-         if (!copy)
-                 return -ENOMEM;
-         return search_and_fopen_internal(path, mode, root, copy, _f);
- }
- int search_and_fopen_nulstr(const char *path, const char *mode, const char *root, const char *search, FILE **_f) {
-         _cleanup_strv_free_ char **s = NULL;
-         if (path_is_absolute(path)) {
-                 FILE *f;
-                 f = fopen(path, mode);
-                 if (f) {
-                         *_f = f;
-                         return 0;
-                 }
-                 return -errno;
-         }
-         s = strv_split_nulstr(search);
-         if (!s)
-                 return -ENOMEM;
-         return search_and_fopen_internal(path, mode, root, s, _f);
- }
- char *strextend(char **x, ...) {
-         va_list ap;
-         size_t f, l;
-         char *r, *p;
-         assert(x);
-         l = f = *x ? strlen(*x) : 0;
-         va_start(ap, x);
-         for (;;) {
-                 const char *t;
-                 size_t n;
-                 t = va_arg(ap, const char *);
-                 if (!t)
-                         break;
-                 n = strlen(t);
-                 if (n > ((size_t) -1) - l) {
-                         va_end(ap);
-                         return NULL;
-                 }
-                 l += n;
-         }
-         va_end(ap);
-         r = realloc(*x, l+1);
-         if (!r)
-                 return NULL;
-         p = r + f;
-         va_start(ap, x);
-         for (;;) {
-                 const char *t;
-                 t = va_arg(ap, const char *);
-                 if (!t)
-                         break;
-                 p = stpcpy(p, t);
-         }
-         va_end(ap);
-         *p = 0;
-         *x = r;
-         return r + l;
- }
- char *strrep(const char *s, unsigned n) {
-         size_t l;
-         char *r, *p;
-         unsigned i;
-         assert(s);
-         l = strlen(s);
-         p = r = malloc(l * n + 1);
-         if (!r)
-                 return NULL;
-         for (i = 0; i < n; i++)
-                 p = stpcpy(p, s);
-         *p = 0;
-         return r;
- }
- #endif /* NM_IGNORED */
- void* greedy_realloc(void **p, size_t *allocated, size_t need, size_t size) {
-         size_t a, newalloc;
-         void *q;
-         assert(p);
-         assert(allocated);
-         if (*allocated >= need)
-                 return *p;
-         newalloc = MAX(need * 2, 64u / size);
-         a = newalloc * size;
-         /* check for overflows */
-         if (a < size * need)
-                 return NULL;
-         q = realloc(*p, a);
-         if (!q)
-                 return NULL;
-         *p = q;
-         *allocated = newalloc;
-         return q;
- }
- void* greedy_realloc0(void **p, size_t *allocated, size_t need, size_t size) {
-         size_t prev;
-         uint8_t *q;
-         assert(p);
-         assert(allocated);
-         prev = *allocated;
-         q = greedy_realloc(p, allocated, need, size);
-         if (!q)
-                 return NULL;
-         if (*allocated > prev)
-                 memzero(q + prev * size, (*allocated - prev) * size);
-         return q;
- }
- #if 0 /* NM_IGNORED */
- bool id128_is_valid(const char *s) {
-         size_t i, l;
-         l = strlen(s);
-         if (l == 32) {
-                 /* Simple formatted 128bit hex string */
-                 for (i = 0; i < l; i++) {
-                         char c = s[i];
-                         if (!(c >= '0' && c <= '9') &&
-                             !(c >= 'a' && c <= 'z') &&
-                             !(c >= 'A' && c <= 'Z'))
-                                 return false;
-                 }
-         } else if (l == 36) {
-                 /* Formatted UUID */
-                 for (i = 0; i < l; i++) {
-                         char c = s[i];
-                         if ((i == 8 || i == 13 || i == 18 || i == 23)) {
-                                 if (c != '-')
-                                         return false;
-                         } else {
-                                 if (!(c >= '0' && c <= '9') &&
-                                     !(c >= 'a' && c <= 'z') &&
-                                     !(c >= 'A' && c <= 'Z'))
-                                         return false;
-                         }
-                 }
-         } else
-                 return false;
-         return true;
- }
- int split_pair(const char *s, const char *sep, char **l, char **r) {
-         char *x, *a, *b;
-         assert(s);
-         assert(sep);
-         assert(l);
-         assert(r);
-         if (isempty(sep))
-                 return -EINVAL;
-         x = strstr(s, sep);
-         if (!x)
-                 return -EINVAL;
-         a = strndup(s, x - s);
-         if (!a)
-                 return -ENOMEM;
-         b = strdup(x + strlen(sep));
-         if (!b) {
-                 free(a);
-                 return -ENOMEM;
-         }
-         *l = a;
-         *r = b;
-         return 0;
- }
- int shall_restore_state(void) {
-         _cleanup_free_ char *value = NULL;
-         int r;
-         r = get_proc_cmdline_key("systemd.restore_state=", &value);
-         if (r < 0)
-                 return r;
-         if (r == 0)
-                 return true;
-         return parse_boolean(value) != 0;
- }
- int proc_cmdline(char **ret) {
-         assert(ret);
-         if (detect_container() > 0)
-                 return get_process_cmdline(1, 0, false, ret);
-         else
-                 return read_one_line_file("/proc/cmdline", ret);
- }
- int parse_proc_cmdline(int (*parse_item)(const char *key, const char *value)) {
-         _cleanup_free_ char *line = NULL;
-         const char *p;
-         int r;
-         assert(parse_item);
-         r = proc_cmdline(&line);
-         if (r < 0)
-                 return r;
-         p = line;
-         for (;;) {
-                 _cleanup_free_ char *word = NULL;
-                 char *value = NULL;
-                 r = extract_first_word(&p, &word, NULL, EXTRACT_QUOTES|EXTRACT_RELAX);
-                 if (r < 0)
-                         return r;
-                 if (r == 0)
-                         break;
-                 /* Filter out arguments that are intended only for the
-                  * initrd */
-                 if (!in_initrd() && startswith(word, "rd."))
-                         continue;
-                 value = strchr(word, '=');
-                 if (value)
-                         *(value++) = 0;
-                 r = parse_item(word, value);
-                 if (r < 0)
-                         return r;
-         }
-         return 0;
- }
- int get_proc_cmdline_key(const char *key, char **value) {
-         _cleanup_free_ char *line = NULL, *ret = NULL;
-         bool found = false;
-         const char *p;
-         int r;
-         assert(key);
-         r = proc_cmdline(&line);
-         if (r < 0)
-                 return r;
-         p = line;
-         for (;;) {
-                 _cleanup_free_ char *word = NULL;
-                 const char *e;
-                 r = extract_first_word(&p, &word, NULL, EXTRACT_QUOTES|EXTRACT_RELAX);
-                 if (r < 0)
-                         return r;
-                 if (r == 0)
-                         break;
-                 /* Filter out arguments that are intended only for the
-                  * initrd */
-                 if (!in_initrd() && startswith(word, "rd."))
-                         continue;
-                 if (value) {
-                         e = startswith(word, key);
-                         if (!e)
-                                 continue;
-                         r = free_and_strdup(&ret, e);
-                         if (r < 0)
-                                 return r;
-                         found = true;
-                 } else {
-                         if (streq(word, key))
-                                 found = true;
-                 }
-         }
-         if (value) {
-                 *value = ret;
-                 ret = NULL;
-         }
-         return found;
- }
- int container_get_leader(const char *machine, pid_t *pid) {
-         _cleanup_free_ char *s = NULL, *class = NULL;
-         const char *p;
-         pid_t leader;
-         int r;
-         assert(machine);
-         assert(pid);
-         if (!machine_name_is_valid(machine))
-                 return -EINVAL;
-         p = strjoina("/run/systemd/machines/", machine);
-         r = parse_env_file(p, NEWLINE, "LEADER", &s, "CLASS", &class, NULL);
-         if (r == -ENOENT)
-                 return -EHOSTDOWN;
-         if (r < 0)
-                 return r;
-         if (!s)
-                 return -EIO;
-         if (!streq_ptr(class, "container"))
-                 return -EIO;
-         r = parse_pid(s, &leader);
-         if (r < 0)
-                 return r;
-         if (leader <= 1)
-                 return -EIO;
-         *pid = leader;
-         return 0;
- }
- int namespace_open(pid_t pid, int *pidns_fd, int *mntns_fd, int *netns_fd, int *userns_fd, int *root_fd) {
-         _cleanup_close_ int pidnsfd = -1, mntnsfd = -1, netnsfd = -1, usernsfd = -1;
-         int rfd = -1;
-         assert(pid >= 0);
-         if (mntns_fd) {
-                 const char *mntns;
-                 mntns = procfs_file_alloca(pid, "ns/mnt");
-                 mntnsfd = open(mntns, O_RDONLY|O_NOCTTY|O_CLOEXEC);
-                 if (mntnsfd < 0)
-                         return -errno;
-         }
-         if (pidns_fd) {
-                 const char *pidns;
-                 pidns = procfs_file_alloca(pid, "ns/pid");
-                 pidnsfd = open(pidns, O_RDONLY|O_NOCTTY|O_CLOEXEC);
-                 if (pidnsfd < 0)
-                         return -errno;
-         }
-         if (netns_fd) {
-                 const char *netns;
-                 netns = procfs_file_alloca(pid, "ns/net");
-                 netnsfd = open(netns, O_RDONLY|O_NOCTTY|O_CLOEXEC);
-                 if (netnsfd < 0)
-                         return -errno;
-         }
-         if (userns_fd) {
-                 const char *userns;
-                 userns = procfs_file_alloca(pid, "ns/user");
-                 usernsfd = open(userns, O_RDONLY|O_NOCTTY|O_CLOEXEC);
-                 if (usernsfd < 0 && errno != ENOENT)
-                         return -errno;
-         }
-         if (root_fd) {
-                 const char *root;
-                 root = procfs_file_alloca(pid, "root");
-                 rfd = open(root, O_RDONLY|O_NOCTTY|O_CLOEXEC|O_DIRECTORY);
-                 if (rfd < 0)
-                         return -errno;
-         }
-         if (pidns_fd)
-                 *pidns_fd = pidnsfd;
-         if (mntns_fd)
-                 *mntns_fd = mntnsfd;
-         if (netns_fd)
-                 *netns_fd = netnsfd;
-         if (userns_fd)
-                 *userns_fd = usernsfd;
-         if (root_fd)
-                 *root_fd = rfd;
-         pidnsfd = mntnsfd = netnsfd = usernsfd = -1;
-         return 0;
- }
- int namespace_enter(int pidns_fd, int mntns_fd, int netns_fd, int userns_fd, int root_fd) {
-         if (userns_fd >= 0) {
-                 /* Can't setns to your own userns, since then you could
-                  * escalate from non-root to root in your own namespace, so
-                  * check if namespaces equal before attempting to enter. */
-                 _cleanup_free_ char *userns_fd_path = NULL;
-                 int r;
-                 if (asprintf(&userns_fd_path, "/proc/self/fd/%d", userns_fd) < 0)
-                         return -ENOMEM;
-                 r = files_same(userns_fd_path, "/proc/self/ns/user");
-                 if (r < 0)
-                         return r;
-                 if (r)
-                         userns_fd = -1;
-         }
-         if (pidns_fd >= 0)
-                 if (setns(pidns_fd, CLONE_NEWPID) < 0)
-                         return -errno;
-         if (mntns_fd >= 0)
-                 if (setns(mntns_fd, CLONE_NEWNS) < 0)
-                         return -errno;
-         if (netns_fd >= 0)
-                 if (setns(netns_fd, CLONE_NEWNET) < 0)
-                         return -errno;
-         if (userns_fd >= 0)
-                 if (setns(userns_fd, CLONE_NEWUSER) < 0)
-                         return -errno;
-         if (root_fd >= 0) {
-                 if (fchdir(root_fd) < 0)
-                         return -errno;
-                 if (chroot(".") < 0)
-                         return -errno;
-         }
-         return reset_uid_gid();
- }
- int getpeercred(int fd, struct ucred *ucred) {
-         socklen_t n = sizeof(struct ucred);
-         struct ucred u;
-         int r;
-         assert(fd >= 0);
-         assert(ucred);
-         r = getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &u, &n);
-         if (r < 0)
-                 return -errno;
-         if (n != sizeof(struct ucred))
-                 return -EIO;
-         /* Check if the data is actually useful and not suppressed due
-          * to namespacing issues */
-         if (u.pid <= 0)
-                 return -ENODATA;
-         if (u.uid == UID_INVALID)
-                 return -ENODATA;
-         if (u.gid == GID_INVALID)
-                 return -ENODATA;
-         *ucred = u;
-         return 0;
- }
- int getpeersec(int fd, char **ret) {
-         socklen_t n = 64;
-         char *s;
-         int r;
-         assert(fd >= 0);
-         assert(ret);
-         s = new0(char, n);
-         if (!s)
-                 return -ENOMEM;
-         r = getsockopt(fd, SOL_SOCKET, SO_PEERSEC, s, &n);
-         if (r < 0) {
-                 free(s);
-                 if (errno != ERANGE)
-                         return -errno;
-                 s = new0(char, n);
-                 if (!s)
-                         return -ENOMEM;
-                 r = getsockopt(fd, SOL_SOCKET, SO_PEERSEC, s, &n);
-                 if (r < 0) {
-                         free(s);
-                         return -errno;
-                 }
-         }
-         if (isempty(s)) {
-                 free(s);
-                 return -EOPNOTSUPP;
-         }
-         *ret = s;
-         return 0;
- }
- #endif /* NM_IGNORED */
- /* This is much like like mkostemp() but is subject to umask(). */
- int mkostemp_safe(char *pattern, int flags) {
-         _cleanup_umask_ mode_t u = 0;
-         int fd;
-         assert(pattern);
-         u = umask(077);
-         fd = mkostemp(pattern, flags);
-         if (fd < 0)
-                 return -errno;
-         return fd;
- }
- #if 0 /* NM_IGNORED */
- int open_tmpfile(const char *path, int flags) {
-         char *p;
-         int fd;
-         assert(path);
- #ifdef O_TMPFILE
-         /* Try O_TMPFILE first, if it is supported */
-         fd = open(path, flags|O_TMPFILE|O_EXCL, S_IRUSR|S_IWUSR);
-         if (fd >= 0)
-                 return fd;
- #endif
-         /* Fall back to unguessable name + unlinking */
-         p = strjoina(path, "/systemd-tmp-XXXXXX");
-         fd = mkostemp_safe(p, flags);
-         if (fd < 0)
-                 return fd;
-         unlink(p);
-         return fd;
- }
- int fd_warn_permissions(const char *path, int fd) {
-         struct stat st;
-         if (fstat(fd, &st) < 0)
-                 return -errno;
-         if (st.st_mode & 0111)
-                 log_warning("Configuration file %s is marked executable. Please remove executable permission bits. Proceeding anyway.", path);
-         if (st.st_mode & 0002)
-                 log_warning("Configuration file %s is marked world-writable. Please remove world writability permission bits. Proceeding anyway.", path);
-         if (getpid() == 1 && (st.st_mode & 0044) != 0044)
-                 log_warning("Configuration file %s is marked world-inaccessible. This has no effect as configuration data is accessible via APIs without restrictions. Proceeding anyway.", path);
-         return 0;
- }
- unsigned long personality_from_string(const char *p) {
-         /* Parse a personality specifier. We introduce our own
-          * identifiers that indicate specific ABIs, rather than just
-          * hints regarding the register size, since we want to keep
-          * things open for multiple locally supported ABIs for the
-          * same register size. We try to reuse the ABI identifiers
-          * used by libseccomp. */
- #if defined(__x86_64__)
-         if (streq(p, "x86"))
-                 return PER_LINUX32;
-         if (streq(p, "x86-64"))
-                 return PER_LINUX;
- #elif defined(__i386__)
-         if (streq(p, "x86"))
-                 return PER_LINUX;
- #elif defined(__s390x__)
-         if (streq(p, "s390"))
-                 return PER_LINUX32;
-         if (streq(p, "s390x"))
-                 return PER_LINUX;
- #elif defined(__s390__)
-         if (streq(p, "s390"))
-                 return PER_LINUX;
- #endif
-         return PERSONALITY_INVALID;
- }
- const char* personality_to_string(unsigned long p) {
- #if defined(__x86_64__)
-         if (p == PER_LINUX32)
-                 return "x86";
-         if (p == PER_LINUX)
-                 return "x86-64";
- #elif defined(__i386__)
-         if (p == PER_LINUX)
-                 return "x86";
- #elif defined(__s390x__)
-         if (p == PER_LINUX)
-                 return "s390x";
-         if (p == PER_LINUX32)
-                 return "s390";
- #elif defined(__s390__)
-         if (p == PER_LINUX)
-                 return "s390";
- #endif
-         return NULL;
- }
- uint64_t physical_memory(void) {
-         long mem;
-         /* We return this as uint64_t in case we are running as 32bit
-          * process on a 64bit kernel with huge amounts of memory */
-         mem = sysconf(_SC_PHYS_PAGES);
-         assert(mem > 0);
-         return (uint64_t) mem * (uint64_t) page_size();
- }
- void hexdump(FILE *f, const void *p, size_t s) {
-         const uint8_t *b = p;
-         unsigned n = 0;
-         assert(s == 0 || b);
-         while (s > 0) {
-                 size_t i;
-                 fprintf(f, "%04x  ", n);
-                 for (i = 0; i < 16; i++) {
-                         if (i >= s)
-                                 fputs("   ", f);
-                         else
-                                 fprintf(f, "%02x ", b[i]);
-                         if (i == 7)
-                                 fputc(' ', f);
-                 }
-                 fputc(' ', f);
-                 for (i = 0; i < 16; i++) {
-                         if (i >= s)
-                                 fputc(' ', f);
-                         else
-                                 fputc(isprint(b[i]) ? (char) b[i] : '.', f);
-                 }
-                 fputc('\n', f);
-                 if (s < 16)
-                         break;
-                 n += 16;
-                 b += 16;
-                 s -= 16;
-         }
- }
- int update_reboot_param_file(const char *param) {
-         int r = 0;
-         if (param) {
-                 r = write_string_file(REBOOT_PARAM_FILE, param, WRITE_STRING_FILE_CREATE);
-                 if (r < 0)
-                         return log_error_errno(r, "Failed to write reboot param to "REBOOT_PARAM_FILE": %m");
-         } else
-                 (void) unlink(REBOOT_PARAM_FILE);
-         return 0;
- }
- int umount_recursive(const char *prefix, int flags) {
-         bool again;
-         int n = 0, r;
-         /* Try to umount everything recursively below a
-          * directory. Also, take care of stacked mounts, and keep
-          * unmounting them until they are gone. */
-         do {
-                 _cleanup_fclose_ FILE *proc_self_mountinfo = NULL;
-                 again = false;
-                 r = 0;
-                 proc_self_mountinfo = fopen("/proc/self/mountinfo", "re");
-                 if (!proc_self_mountinfo)
-                         return -errno;
-                 for (;;) {
-                         _cleanup_free_ char *path = NULL, *p = NULL;
-                         int k;
-                         k = fscanf(proc_self_mountinfo,
-                                    "%*s "       /* (1) mount id */
-                                    "%*s "       /* (2) parent id */
-                                    "%*s "       /* (3) major:minor */
-                                    "%*s "       /* (4) root */
-                                    "%ms "       /* (5) mount point */
-                                    "%*s"        /* (6) mount options */
-                                    "%*[^-]"     /* (7) optional fields */
-                                    "- "         /* (8) separator */
-                                    "%*s "       /* (9) file system type */
-                                    "%*s"        /* (10) mount source */
-                                    "%*s"        /* (11) mount options 2 */
-                                    "%*[^\n]",   /* some rubbish at the end */
-                                    &path);
-                         if (k != 1) {
-                                 if (k == EOF)
-                                         break;
-                                 continue;
-                         }
-                         r = cunescape(path, UNESCAPE_RELAX, &p);
-                         if (r < 0)
-                                 return r;
-                         if (!path_startswith(p, prefix))
-                                 continue;
-                         if (umount2(p, flags) < 0) {
-                                 r = -errno;
-                                 continue;
-                         }
-                         again = true;
-                         n++;
-                         break;
-                 }
-         } while (again);
-         return r ? r : n;
- }
- static int get_mount_flags(const char *path, unsigned long *flags) {
-         struct statvfs buf;
-         if (statvfs(path, &buf) < 0)
-                 return -errno;
-         *flags = buf.f_flag;
-         return 0;
- }
- int bind_remount_recursive(const char *prefix, bool ro) {
-         _cleanup_set_free_free_ Set *done = NULL;
-         _cleanup_free_ char *cleaned = NULL;
-         int r;
-         /* Recursively remount a directory (and all its submounts)
-          * read-only or read-write. If the directory is already
-          * mounted, we reuse the mount and simply mark it
-          * MS_BIND|MS_RDONLY (or remove the MS_RDONLY for read-write
-          * operation). If it isn't we first make it one. Afterwards we
-          * apply MS_BIND|MS_RDONLY (or remove MS_RDONLY) to all
-          * submounts we can access, too. When mounts are stacked on
-          * the same mount point we only care for each individual
-          * "top-level" mount on each point, as we cannot
-          * influence/access the underlying mounts anyway. We do not
-          * have any effect on future submounts that might get
-          * propagated, they migt be writable. This includes future
-          * submounts that have been triggered via autofs. */
-         cleaned = strdup(prefix);
-         if (!cleaned)
-                 return -ENOMEM;
-         path_kill_slashes(cleaned);
-         done = set_new(&string_hash_ops);
-         if (!done)
-                 return -ENOMEM;
-         for (;;) {
-                 _cleanup_fclose_ FILE *proc_self_mountinfo = NULL;
-                 _cleanup_set_free_free_ Set *todo = NULL;
-                 bool top_autofs = false;
-                 char *x;
-                 unsigned long orig_flags;
-                 todo = set_new(&string_hash_ops);
-                 if (!todo)
-                         return -ENOMEM;
-                 proc_self_mountinfo = fopen("/proc/self/mountinfo", "re");
-                 if (!proc_self_mountinfo)
-                         return -errno;
-                 for (;;) {
-                         _cleanup_free_ char *path = NULL, *p = NULL, *type = NULL;
-                         int k;
-                         k = fscanf(proc_self_mountinfo,
-                                    "%*s "       /* (1) mount id */
-                                    "%*s "       /* (2) parent id */
-                                    "%*s "       /* (3) major:minor */
-                                    "%*s "       /* (4) root */
-                                    "%ms "       /* (5) mount point */
-                                    "%*s"        /* (6) mount options (superblock) */
-                                    "%*[^-]"     /* (7) optional fields */
-                                    "- "         /* (8) separator */
-                                    "%ms "       /* (9) file system type */
-                                    "%*s"        /* (10) mount source */
-                                    "%*s"        /* (11) mount options (bind mount) */
-                                    "%*[^\n]",   /* some rubbish at the end */
-                                    &path,
-                                    &type);
-                         if (k != 2) {
-                                 if (k == EOF)
-                                         break;
-                                 continue;
-                         }
-                         r = cunescape(path, UNESCAPE_RELAX, &p);
-                         if (r < 0)
-                                 return r;
-                         /* Let's ignore autofs mounts.  If they aren't
-                          * triggered yet, we want to avoid triggering
-                          * them, as we don't make any guarantees for
-                          * future submounts anyway.  If they are
-                          * already triggered, then we will find
-                          * another entry for this. */
-                         if (streq(type, "autofs")) {
-                                 top_autofs = top_autofs || path_equal(cleaned, p);
-                                 continue;
-                         }
-                         if (path_startswith(p, cleaned) &&
-                             !set_contains(done, p)) {
-                                 r = set_consume(todo, p);
-                                 p = NULL;
-                                 if (r == -EEXIST)
-                                         continue;
-                                 if (r < 0)
-                                         return r;
-                         }
-                 }
-                 /* If we have no submounts to process anymore and if
-                  * the root is either already done, or an autofs, we
-                  * are done */
-                 if (set_isempty(todo) &&
-                     (top_autofs || set_contains(done, cleaned)))
-                         return 0;
-                 if (!set_contains(done, cleaned) &&
-                     !set_contains(todo, cleaned)) {
-                         /* The prefix directory itself is not yet a
-                          * mount, make it one. */
-                         if (mount(cleaned, cleaned, NULL, MS_BIND|MS_REC, NULL) < 0)
-                                 return -errno;
-                         orig_flags = 0;
-                         (void) get_mount_flags(cleaned, &orig_flags);
-                         orig_flags &= ~MS_RDONLY;
-                         if (mount(NULL, prefix, NULL, orig_flags|MS_BIND|MS_REMOUNT|(ro ? MS_RDONLY : 0), NULL) < 0)
-                                 return -errno;
-                         x = strdup(cleaned);
-                         if (!x)
-                                 return -ENOMEM;
-                         r = set_consume(done, x);
-                         if (r < 0)
-                                 return r;
-                 }
-                 while ((x = set_steal_first(todo))) {
-                         r = set_consume(done, x);
-                         if (r == -EEXIST || r == 0)
-                                 continue;
-                         if (r < 0)
-                                 return r;
-                         /* Try to reuse the original flag set, but
-                          * don't care for errors, in case of
-                          * obstructed mounts */
-                         orig_flags = 0;
-                         (void) get_mount_flags(x, &orig_flags);
-                         orig_flags &= ~MS_RDONLY;
-                         if (mount(NULL, x, NULL, orig_flags|MS_BIND|MS_REMOUNT|(ro ? MS_RDONLY : 0), NULL) < 0) {
-                                 /* Deal with mount points that are
-                                  * obstructed by a later mount */
-                                 if (errno != ENOENT)
-                                         return -errno;
-                         }
-                 }
-         }
- }
- #endif /* NM_IGNORED */
- int fflush_and_check(FILE *f) {
-         assert(f);
-         errno = 0;
-         fflush(f);
-         if (ferror(f))
-                 return errno ? -errno : -EIO;
-         return 0;
- }
- int tempfn_xxxxxx(const char *p, const char *extra, char **ret) {
-         const char *fn;
-         char *t;
-         assert(p);
-         assert(ret);
-         /*
-          * Turns this:
-          *         /foo/bar/waldo
-          *
-          * Into this:
-          *         /foo/bar/.#<extra>waldoXXXXXX
-          */
-         fn = basename(p);
-         if (!filename_is_valid(fn))
-                 return -EINVAL;
-         if (extra == NULL)
-                 extra = "";
-         t = new(char, strlen(p) + 2 + strlen(extra) + 6 + 1);
-         if (!t)
-                 return -ENOMEM;
-         strcpy(stpcpy(stpcpy(stpcpy(mempcpy(t, p, fn - p), ".#"), extra), fn), "XXXXXX");
-         *ret = path_kill_slashes(t);
-         return 0;
- }
- #if 0 /* NM_IGNORED */
- int tempfn_random(const char *p, const char *extra, char **ret) {
-         const char *fn;
-         char *t, *x;
-         uint64_t u;
-         unsigned i;
-         assert(p);
-         assert(ret);
-         /*
-          * Turns this:
-          *         /foo/bar/waldo
-          *
-          * Into this:
-          *         /foo/bar/.#<extra>waldobaa2a261115984a9
-          */
-         fn = basename(p);
-         if (!filename_is_valid(fn))
-                 return -EINVAL;
-         if (!extra)
-                 extra = "";
-         t = new(char, strlen(p) + 2 + strlen(extra) + 16 + 1);
-         if (!t)
-                 return -ENOMEM;
-         x = stpcpy(stpcpy(stpcpy(mempcpy(t, p, fn - p), ".#"), extra), fn);
-         u = random_u64();
-         for (i = 0; i < 16; i++) {
-                 *(x++) = hexchar(u & 0xF);
-                 u >>= 4;
-         }
-         *x = 0;
-         *ret = path_kill_slashes(t);
-         return 0;
- }
- int tempfn_random_child(const char *p, const char *extra, char **ret) {
-         char *t, *x;
-         uint64_t u;
-         unsigned i;
-         assert(p);
-         assert(ret);
-         /* Turns this:
-          *         /foo/bar/waldo
-          * Into this:
-          *         /foo/bar/waldo/.#<extra>3c2b6219aa75d7d0
-          */
-         if (!extra)
-                 extra = "";
-         t = new(char, strlen(p) + 3 + strlen(extra) + 16 + 1);
-         if (!t)
-                 return -ENOMEM;
-         x = stpcpy(stpcpy(stpcpy(t, p), "/.#"), extra);
-         u = random_u64();
-         for (i = 0; i < 16; i++) {
-                 *(x++) = hexchar(u & 0xF);
-                 u >>= 4;
-         }
-         *x = 0;
-         *ret = path_kill_slashes(t);
-         return 0;
- }
- int take_password_lock(const char *root) {
-         struct flock flock = {
-                 .l_type = F_WRLCK,
-                 .l_whence = SEEK_SET,
-                 .l_start = 0,
-                 .l_len = 0,
-         };
-         const char *path;
-         int fd, r;
-         /* This is roughly the same as lckpwdf(), but not as awful. We
-          * don't want to use alarm() and signals, hence we implement
-          * our own trivial version of this.
-          *
-          * Note that shadow-utils also takes per-database locks in
-          * addition to lckpwdf(). However, we don't given that they
-          * are redundant as they they invoke lckpwdf() first and keep
-          * it during everything they do. The per-database locks are
-          * awfully racy, and thus we just won't do them. */
-         if (root)
-                 path = strjoina(root, "/etc/.pwd.lock");
-         else
-                 path = "/etc/.pwd.lock";
-         fd = open(path, O_WRONLY|O_CREAT|O_CLOEXEC|O_NOCTTY|O_NOFOLLOW, 0600);
-         if (fd < 0)
-                 return -errno;
-         r = fcntl(fd, F_SETLKW, &flock);
-         if (r < 0) {
-                 safe_close(fd);
-                 return -errno;
-         }
-         return fd;
- }
- int is_symlink(const char *path) {
-         struct stat info;
-         if (lstat(path, &info) < 0)
-                 return -errno;
-         return !!S_ISLNK(info.st_mode);
- }
- int is_dir(const char* path, bool follow) {
-         struct stat st;
-         int r;
-         if (follow)
-                 r = stat(path, &st);
-         else
-                 r = lstat(path, &st);
-         if (r < 0)
-                 return -errno;
-         return !!S_ISDIR(st.st_mode);
- }
- int is_device_node(const char *path) {
-         struct stat info;
-         if (lstat(path, &info) < 0)
-                 return -errno;
-         return !!(S_ISBLK(info.st_mode) || S_ISCHR(info.st_mode));
- }
- int extract_first_word(const char **p, char **ret, const char *separators, ExtractFlags flags) {
-         _cleanup_free_ char *s = NULL;
-         size_t allocated = 0, sz = 0;
-         int r;
-         enum {
-                 START,
-                 VALUE,
-                 VALUE_ESCAPE,
-                 SINGLE_QUOTE,
-                 SINGLE_QUOTE_ESCAPE,
-                 DOUBLE_QUOTE,
-                 DOUBLE_QUOTE_ESCAPE,
-                 SEPARATOR,
-         } state = START;
-         assert(p);
-         assert(ret);
-         if (!separators)
-                 separators = WHITESPACE;
-         /* Bail early if called after last value or with no input */
-         if (!*p)
-                 goto finish_force_terminate;
-         /* Parses the first word of a string, and returns it in
-          * *ret. Removes all quotes in the process. When parsing fails
-          * (because of an uneven number of quotes or similar), leaves
-          * the pointer *p at the first invalid character. */
-         for (;;) {
-                 char c = **p;
-                 switch (state) {
-                 case START:
-                         if (flags & EXTRACT_DONT_COALESCE_SEPARATORS)
-                                 if (!GREEDY_REALLOC(s, allocated, sz+1))
-                                         return -ENOMEM;
-                         if (c == 0)
-                                 goto finish_force_terminate;
-                         else if (strchr(separators, c)) {
-                                 if (flags & EXTRACT_DONT_COALESCE_SEPARATORS) {
-                                         (*p) ++;
-                                         goto finish_force_next;
-                                 }
-                                 break;
-                         }
-                         /* We found a non-blank character, so we will always
-                          * want to return a string (even if it is empty),
-                          * allocate it here. */
-                         if (!GREEDY_REALLOC(s, allocated, sz+1))
-                                 return -ENOMEM;
-                         state = VALUE;
-                         /* fallthrough */
-                 case VALUE:
-                         if (c == 0)
-                                 goto finish_force_terminate;
-                         else if (c == '\'' && (flags & EXTRACT_QUOTES))
-                                 state = SINGLE_QUOTE;
-                         else if (c == '\\')
-                                 state = VALUE_ESCAPE;
-                         else if (c == '\"' && (flags & EXTRACT_QUOTES))
-                                 state = DOUBLE_QUOTE;
-                         else if (strchr(separators, c)) {
-                                 if (flags & EXTRACT_DONT_COALESCE_SEPARATORS) {
-                                         (*p) ++;
-                                         goto finish_force_next;
-                                 }
-                                 state = SEPARATOR;
-                         } else {
-                                 if (!GREEDY_REALLOC(s, allocated, sz+2))
-                                         return -ENOMEM;
-                                 s[sz++] = c;
-                         }
-                         break;
-                 case SINGLE_QUOTE:
-                         if (c == 0) {
-                                 if (flags & EXTRACT_RELAX)
-                                         goto finish_force_terminate;
-                                 return -EINVAL;
-                         } else if (c == '\'')
-                                 state = VALUE;
-                         else if (c == '\\')
-                                 state = SINGLE_QUOTE_ESCAPE;
-                         else {
-                                 if (!GREEDY_REALLOC(s, allocated, sz+2))
-                                         return -ENOMEM;
-                                 s[sz++] = c;
-                         }
-                         break;
-                 case DOUBLE_QUOTE:
-                         if (c == 0)
-                                 return -EINVAL;
-                         else if (c == '\"')
-                                 state = VALUE;
-                         else if (c == '\\')
-                                 state = DOUBLE_QUOTE_ESCAPE;
-                         else {
-                                 if (!GREEDY_REALLOC(s, allocated, sz+2))
-                                         return -ENOMEM;
-                                 s[sz++] = c;
-                         }
-                         break;
-                 case SINGLE_QUOTE_ESCAPE:
-                 case DOUBLE_QUOTE_ESCAPE:
-                 case VALUE_ESCAPE:
-                         if (!GREEDY_REALLOC(s, allocated, sz+7))
-                                 return -ENOMEM;
-                         if (c == 0) {
-                                 if ((flags & EXTRACT_CUNESCAPE_RELAX) &&
-                                     (state == VALUE_ESCAPE || flags & EXTRACT_RELAX)) {
-                                         /* If we find an unquoted trailing backslash and we're in
-                                          * EXTRACT_CUNESCAPE_RELAX mode, keep it verbatim in the
-                                          * output.
-                                          *
-                                          * Unbalanced quotes will only be allowed in EXTRACT_RELAX
-                                          * mode, EXTRACT_CUNESCAPE_RELAX mode does not allow them.
-                                          */
-                                         s[sz++] = '\\';
-                                         goto finish_force_terminate;
-                                 }
-                                 if (flags & EXTRACT_RELAX)
-                                         goto finish_force_terminate;
-                                 return -EINVAL;
-                         }
-                         if (flags & EXTRACT_CUNESCAPE) {
-                                 uint32_t u;
-                                 r = cunescape_one(*p, (size_t) -1, &c, &u);
-                                 if (r < 0) {
-                                         if (flags & EXTRACT_CUNESCAPE_RELAX) {
-                                                 s[sz++] = '\\';
-                                                 s[sz++] = c;
-                                                 goto end_escape;
-                                         }
-                                         return -EINVAL;
-                                 }
-                                 (*p) += r - 1;
-                                 if (c != 0)
-                                         s[sz++] = c; /* normal explicit char */
-                                 else
-                                         sz += utf8_encode_unichar(s + sz, u); /* unicode chars we'll encode as utf8 */
-                         } else
-                                 s[sz++] = c;
- end_escape:
-                         state = (state == SINGLE_QUOTE_ESCAPE) ? SINGLE_QUOTE :
-                                 (state == DOUBLE_QUOTE_ESCAPE) ? DOUBLE_QUOTE :
-                                 VALUE;
-                         break;
-                 case SEPARATOR:
-                         if (c == 0)
-                                 goto finish_force_terminate;
-                         if (!strchr(separators, c))
-                                 goto finish;
-                         break;
-                 }
-                 (*p) ++;
-         }
- finish_force_terminate:
-         *p = NULL;
- finish:
-         if (!s) {
-                 *p = NULL;
-                 *ret = NULL;
-                 return 0;
-         }
- finish_force_next:
-         s[sz] = 0;
-         *ret = s;
-         s = NULL;
-         return 1;
- }
- int extract_first_word_and_warn(
-                 const char **p,
-                 char **ret,
-                 const char *separators,
-                 ExtractFlags flags,
-                 const char *unit,
-                 const char *filename,
-                 unsigned line,
-                 const char *rvalue) {
-         /* Try to unquote it, if it fails, warn about it and try again but this
-          * time using EXTRACT_CUNESCAPE_RELAX to keep the backslashes verbatim
-          * in invalid escape sequences. */
-         const char *save;
-         int r;
-         save = *p;
-         r = extract_first_word(p, ret, separators, flags);
-         if (r < 0 && !(flags & EXTRACT_CUNESCAPE_RELAX)) {
-                 /* Retry it with EXTRACT_CUNESCAPE_RELAX. */
-                 *p = save;
-                 r = extract_first_word(p, ret, separators, flags|EXTRACT_CUNESCAPE_RELAX);
-                 if (r < 0)
-                         log_syntax(unit, LOG_ERR, filename, line, r, "Unbalanced quoting in command line, ignoring: \"%s\"", rvalue);
-                 else
-                         log_syntax(unit, LOG_WARNING, filename, line, 0, "Invalid escape sequences in command line: \"%s\"", rvalue);
-         }
-         return r;
- }
- int extract_many_words(const char **p, const char *separators, ExtractFlags flags, ...) {
-         va_list ap;
-         char **l;
-         int n = 0, i, c, r;
-         /* Parses a number of words from a string, stripping any
-          * quotes if necessary. */
-         assert(p);
-         /* Count how many words are expected */
-         va_start(ap, flags);
-         for (;;) {
-                 if (!va_arg(ap, char **))
-                         break;
-                 n++;
-         }
-         va_end(ap);
-         if (n <= 0)
-                 return 0;
-         /* Read all words into a temporary array */
-         l = newa0(char*, n);
-         for (c = 0; c < n; c++) {
-                 r = extract_first_word(p, &l[c], separators, flags);
-                 if (r < 0) {
-                         int j;
-                         for (j = 0; j < c; j++)
-                                 free(l[j]);
-                         return r;
-                 }
-                 if (r == 0)
-                         break;
-         }
-         /* If we managed to parse all words, return them in the passed
-          * in parameters */
-         va_start(ap, flags);
-         for (i = 0; i < n; i++) {
-                 char **v;
-                 v = va_arg(ap, char **);
-                 assert(v);
-                 *v = l[i];
-         }
-         va_end(ap);
-         return c;
- }
- int free_and_strdup(char **p, const char *s) {
-         char *t;
-         assert(p);
-         /* Replaces a string pointer with an strdup()ed new string,
-          * possibly freeing the old one. */
-         if (streq_ptr(*p, s))
-                 return 0;
-         if (s) {
-                 t = strdup(s);
-                 if (!t)
-                         return -ENOMEM;
-         } else
-                 t = NULL;
-         free(*p);
-         *p = t;
-         return 1;
- }
- int ptsname_malloc(int fd, char **ret) {
-         size_t l = 100;
-         assert(fd >= 0);
-         assert(ret);
-         for (;;) {
-                 char *c;
-                 c = new(char, l);
-                 if (!c)
-                         return -ENOMEM;
-                 if (ptsname_r(fd, c, l) == 0) {
-                         *ret = c;
-                         return 0;
-                 }
-                 if (errno != ERANGE) {
-                         free(c);
-                         return -errno;
-                 }
-                 free(c);
-                 l *= 2;
-         }
- }
- int openpt_in_namespace(pid_t pid, int flags) {
-         _cleanup_close_ int pidnsfd = -1, mntnsfd = -1, usernsfd = -1, rootfd = -1;
-         _cleanup_close_pair_ int pair[2] = { -1, -1 };
-         siginfo_t si;
-         pid_t child;
-         int r;
-         assert(pid > 0);
-         r = namespace_open(pid, &pidnsfd, &mntnsfd, NULL, &usernsfd, &rootfd);
-         if (r < 0)
-                 return r;
-         if (socketpair(AF_UNIX, SOCK_DGRAM, 0, pair) < 0)
-                 return -errno;
-         child = fork();
-         if (child < 0)
-                 return -errno;
-         if (child == 0) {
-                 int master;
-                 pair[0] = safe_close(pair[0]);
-                 r = namespace_enter(pidnsfd, mntnsfd, -1, usernsfd, rootfd);
-                 if (r < 0)
-                         _exit(EXIT_FAILURE);
-                 master = posix_openpt(flags);
-                 if (master < 0)
-                         _exit(EXIT_FAILURE);
-                 if (unlockpt(master) < 0)
-                         _exit(EXIT_FAILURE);
-                 if (send_one_fd(pair[1], master, 0) < 0)
-                         _exit(EXIT_FAILURE);
-                 _exit(EXIT_SUCCESS);
-         }
-         pair[1] = safe_close(pair[1]);
-         r = wait_for_terminate(child, &si);
-         if (r < 0)
-                 return r;
-         if (si.si_code != CLD_EXITED || si.si_status != EXIT_SUCCESS)
-                 return -EIO;
-         return receive_one_fd(pair[0], 0);
- }
- ssize_t fgetxattrat_fake(int dirfd, const char *filename, const char *attribute, void *value, size_t size, int flags) {
-         char fn[strlen("/proc/self/fd/") + DECIMAL_STR_MAX(int) + 1];
-         _cleanup_close_ int fd = -1;
-         ssize_t l;
-         /* The kernel doesn't have a fgetxattrat() command, hence let's emulate one */
-         fd = openat(dirfd, filename, O_RDONLY|O_CLOEXEC|O_NOCTTY|O_PATH|(flags & AT_SYMLINK_NOFOLLOW ? O_NOFOLLOW : 0));
-         if (fd < 0)
-                 return -errno;
-         xsprintf(fn, "/proc/self/fd/%i", fd);
-         l = getxattr(fn, attribute, value, size);
-         if (l < 0)
-                 return -errno;
-         return l;
- }
- static int parse_crtime(le64_t le, usec_t *usec) {
-         uint64_t u;
-         assert(usec);
-         u = le64toh(le);
-         if (u == 0 || u == (uint64_t) -1)
-                 return -EIO;
-         *usec = (usec_t) u;
-         return 0;
- }
- int fd_getcrtime(int fd, usec_t *usec) {
-         le64_t le;
-         ssize_t n;
-         assert(fd >= 0);
-         assert(usec);
-         /* Until Linux gets a real concept of birthtime/creation time,
-          * let's fake one with xattrs */
-         n = fgetxattr(fd, "user.crtime_usec", &le, sizeof(le));
-         if (n < 0)
-                 return -errno;
-         if (n != sizeof(le))
-                 return -EIO;
-         return parse_crtime(le, usec);
- }
- int fd_getcrtime_at(int dirfd, const char *name, usec_t *usec, int flags) {
-         le64_t le;
-         ssize_t n;
-         n = fgetxattrat_fake(dirfd, name, "user.crtime_usec", &le, sizeof(le), flags);
-         if (n < 0)
-                 return -errno;
-         if (n != sizeof(le))
-                 return -EIO;
-         return parse_crtime(le, usec);
- }
- int path_getcrtime(const char *p, usec_t *usec) {
-         le64_t le;
-         ssize_t n;
-         assert(p);
-         assert(usec);
-         n = getxattr(p, "user.crtime_usec", &le, sizeof(le));
-         if (n < 0)
-                 return -errno;
-         if (n != sizeof(le))
-                 return -EIO;
-         return parse_crtime(le, usec);
- }
- int fd_setcrtime(int fd, usec_t usec) {
-         le64_t le;
-         assert(fd >= 0);
-         if (usec <= 0)
-                 usec = now(CLOCK_REALTIME);
-         le = htole64((uint64_t) usec);
-         if (fsetxattr(fd, "user.crtime_usec", &le, sizeof(le), 0) < 0)
-                 return -errno;
-         return 0;
- }
- int same_fd(int a, int b) {
-         struct stat sta, stb;
-         pid_t pid;
-         int r, fa, fb;
-         assert(a >= 0);
-         assert(b >= 0);
-         /* Compares two file descriptors. Note that semantics are
-          * quite different depending on whether we have kcmp() or we
-          * don't. If we have kcmp() this will only return true for
-          * dup()ed file descriptors, but not otherwise. If we don't
-          * have kcmp() this will also return true for two fds of the same
-          * file, created by separate open() calls. Since we use this
-          * call mostly for filtering out duplicates in the fd store
-          * this difference hopefully doesn't matter too much. */
-         if (a == b)
-                 return true;
-         /* Try to use kcmp() if we have it. */
-         pid = getpid();
-         r = kcmp(pid, pid, KCMP_FILE, a, b);
-         if (r == 0)
-                 return true;
-         if (r > 0)
-                 return false;
-         if (errno != ENOSYS)
-                 return -errno;
-         /* We don't have kcmp(), use fstat() instead. */
-         if (fstat(a, &sta) < 0)
-                 return -errno;
-         if (fstat(b, &stb) < 0)
-                 return -errno;
-         if ((sta.st_mode & S_IFMT) != (stb.st_mode & S_IFMT))
-                 return false;
-         /* We consider all device fds different, since two device fds
-          * might refer to quite different device contexts even though
-          * they share the same inode and backing dev_t. */
-         if (S_ISCHR(sta.st_mode) || S_ISBLK(sta.st_mode))
-                 return false;
-         if (sta.st_dev != stb.st_dev || sta.st_ino != stb.st_ino)
-                 return false;
-         /* The fds refer to the same inode on disk, let's also check
-          * if they have the same fd flags. This is useful to
-          * distinguish the read and write side of a pipe created with
-          * pipe(). */
-         fa = fcntl(a, F_GETFL);
-         if (fa < 0)
-                 return -errno;
+ int fork_agent(pid_t *pid, const int except[], unsigned n_except, const char *path, ...) {
+         bool stdout_is_tty, stderr_is_tty;
+         pid_t parent_pid, agent_pid;
+         sigset_t ss, saved_ss;
+         unsigned n, i;
+         va_list ap;
+         char **l;
  
-         fb = fcntl(b, F_GETFL);
-         if (fb < 0)
-                 return -errno;
+         assert(pid);
+         assert(path);
  
-         return fa == fb;
- }
+         /* Spawns a temporary TTY agent, making sure it goes away when
+          * we go away */
  
- int chattr_fd(int fd, unsigned value, unsigned mask) {
-         unsigned old_attr, new_attr;
-         struct stat st;
+         parent_pid = getpid();
  
-         assert(fd >= 0);
+         /* First we temporarily block all signals, so that the new
+          * child has them blocked initially. This way, we can be sure
+          * that SIGTERMs are not lost we might send to the agent. */
+         assert_se(sigfillset(&ss) >= 0);
+         assert_se(sigprocmask(SIG_SETMASK, &ss, &saved_ss) >= 0);
  
-         if (fstat(fd, &st) < 0)
+         agent_pid = fork();
+         if (agent_pid < 0) {
+                 assert_se(sigprocmask(SIG_SETMASK, &saved_ss, NULL) >= 0);
                  return -errno;
+         }
  
-         /* Explicitly check whether this is a regular file or
-          * directory. If it is anything else (such as a device node or
-          * fifo), then the ioctl will not hit the file systems but
-          * possibly drivers, where the ioctl might have different
-          * effects. Notably, DRM is using the same ioctl() number. */
-         if (!S_ISDIR(st.st_mode) && !S_ISREG(st.st_mode))
-                 return -ENOTTY;
-         if (mask == 0)
+         if (agent_pid != 0) {
+                 assert_se(sigprocmask(SIG_SETMASK, &saved_ss, NULL) >= 0);
+                 *pid = agent_pid;
                  return 0;
+         }
  
-         if (ioctl(fd, FS_IOC_GETFLAGS, &old_attr) < 0)
-                 return -errno;
-         new_attr = (old_attr & ~mask) | (value & mask);
-         if (new_attr == old_attr)
-                 return 0;
+         /* In the child:
+          *
+          * Make sure the agent goes away when the parent dies */
+         if (prctl(PR_SET_PDEATHSIG, SIGTERM) < 0)
+                 _exit(EXIT_FAILURE);
  
-         if (ioctl(fd, FS_IOC_SETFLAGS, &new_attr) < 0)
-                 return -errno;
+         /* Make sure we actually can kill the agent, if we need to, in
+          * case somebody invoked us from a shell script that trapped
+          * SIGTERM or so... */
+         (void) reset_all_signal_handlers();
+         (void) reset_signal_mask();
  
-         return 1;
- }
+         /* Check whether our parent died before we were able
+          * to set the death signal and unblock the signals */
+         if (getppid() != parent_pid)
+                 _exit(EXIT_SUCCESS);
  
- int chattr_path(const char *p, unsigned value, unsigned mask) {
-         _cleanup_close_ int fd = -1;
+         /* Don't leak fds to the agent */
+         close_all_fds(except, n_except);
  
-         assert(p);
+         stdout_is_tty = isatty(STDOUT_FILENO);
+         stderr_is_tty = isatty(STDERR_FILENO);
  
-         if (mask == 0)
-                 return 0;
+         if (!stdout_is_tty || !stderr_is_tty) {
+                 int fd;
  
-         fd = open(p, O_RDONLY|O_CLOEXEC|O_NOCTTY|O_NOFOLLOW);
-         if (fd < 0)
-                 return -errno;
+                 /* Detach from stdout/stderr. and reopen
+                  * /dev/tty for them. This is important to
+                  * ensure that when systemctl is started via
+                  * popen() or a similar call that expects to
+                  * read EOF we actually do generate EOF and
+                  * not delay this indefinitely by because we
+                  * keep an unused copy of stdin around. */
+                 fd = open("/dev/tty", O_WRONLY);
+                 if (fd < 0) {
+                         log_error_errno(errno, "Failed to open /dev/tty: %m");
+                         _exit(EXIT_FAILURE);
+                 }
  
-         return chattr_fd(fd, value, mask);
- }
+                 if (!stdout_is_tty)
+                         dup2(fd, STDOUT_FILENO);
  
- int read_attr_fd(int fd, unsigned *ret) {
-         struct stat st;
+                 if (!stderr_is_tty)
+                         dup2(fd, STDERR_FILENO);
  
-         assert(fd >= 0);
+                 if (fd > 2)
+                         close(fd);
+         }
  
-         if (fstat(fd, &st) < 0)
-                 return -errno;
+         /* Count arguments */
+         va_start(ap, path);
+         for (n = 0; va_arg(ap, char*); n++)
+                 ;
+         va_end(ap);
  
-         if (!S_ISDIR(st.st_mode) && !S_ISREG(st.st_mode))
-                 return -ENOTTY;
+         /* Allocate strv */
+         l = alloca(sizeof(char *) * (n + 1));
  
-         if (ioctl(fd, FS_IOC_GETFLAGS, ret) < 0)
-                 return -errno;
+         /* Fill in arguments */
+         va_start(ap, path);
+         for (i = 0; i <= n; i++)
+                 l[i] = va_arg(ap, char*);
+         va_end(ap);
  
-         return 0;
+         execv(path, l);
+         _exit(EXIT_FAILURE);
  }
  
- int read_attr_path(const char *p, unsigned *ret) {
-         _cleanup_close_ int fd = -1;
-         assert(p);
-         assert(ret);
-         fd = open(p, O_RDONLY|O_CLOEXEC|O_NOCTTY|O_NOFOLLOW);
-         if (fd < 0)
-                 return -errno;
-         return read_attr_fd(fd, ret);
- }
+ bool in_initrd(void) {
+         static int saved = -1;
+         struct statfs s;
  
- static size_t nul_length(const uint8_t *p, size_t sz) {
-         size_t n = 0;
+         if (saved >= 0)
+                 return saved;
  
-         while (sz > 0) {
-                 if (*p != 0)
-                         break;
+         /* We make two checks here:
+          *
+          * 1. the flag file /etc/initrd-release must exist
+          * 2. the root file system must be a memory file system
+          *
+          * The second check is extra paranoia, since misdetecting an
+          * initrd can have bad bad consequences due the initrd
+          * emptying when transititioning to the main systemd.
+          */
  
-                 n++;
-                 p++;
-                 sz--;
-         }
+         saved = access("/etc/initrd-release", F_OK) >= 0 &&
+                 statfs("/", &s) >= 0 &&
+                 is_temporary_fs(&s);
  
-         return n;
+         return saved;
  }
  
- ssize_t sparse_write(int fd, const void *p, size_t sz, size_t run_length) {
-         const uint8_t *q, *w, *e;
-         ssize_t l;
-         q = w = p;
-         e = q + sz;
-         while (q < e) {
-                 size_t n;
-                 n = nul_length(q, e - q);
-                 /* If there are more than the specified run length of
-                  * NUL bytes, or if this is the beginning or the end
-                  * of the buffer, then seek instead of write */
-                 if ((n > run_length) ||
-                     (n > 0 && q == p) ||
-                     (n > 0 && q + n >= e)) {
-                         if (q > w) {
-                                 l = write(fd, w, q - w);
-                                 if (l < 0)
-                                         return -errno;
-                                 if (l != q -w)
-                                         return -EIO;
-                         }
-                         if (lseek(fd, n, SEEK_CUR) == (off_t) -1)
-                                 return -errno;
+ /* hey glibc, APIs with callbacks without a user pointer are so useless */
+ void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size,
+                  int (*compar) (const void *, const void *, void *), void *arg) {
+         size_t l, u, idx;
+         const void *p;
+         int comparison;
  
-                         q += n;
-                         w = q;
-                 } else if (n > 0)
-                         q += n;
+         l = 0;
+         u = nmemb;
+         while (l < u) {
+                 idx = (l + u) / 2;
+                 p = (void *)(((const char *) base) + (idx * size));
+                 comparison = compar(key, p, arg);
+                 if (comparison < 0)
+                         u = idx;
+                 else if (comparison > 0)
+                         l = idx + 1;
                  else
-                         q ++;
-         }
-         if (q > w) {
-                 l = write(fd, w, q - w);
-                 if (l < 0)
-                         return -errno;
-                 if (l != q - w)
-                         return -EIO;
+                         return (void *)p;
          }
-         return q - (const uint8_t*) p;
- }
- void sigkill_wait(pid_t *pid) {
-         if (!pid)
-                 return;
-         if (*pid <= 1)
-                 return;
-         if (kill(*pid, SIGKILL) > 0)
-                 (void) wait_for_terminate(*pid, NULL);
+         return NULL;
  }
  
- int syslog_parse_priority(const char **p, int *priority, bool with_facility) {
-         int a = 0, b = 0, c = 0;
-         int k;
-         assert(p);
-         assert(*p);
-         assert(priority);
-         if ((*p)[0] != '<')
-                 return 0;
+ int on_ac_power(void) {
+         bool found_offline = false, found_online = false;
+         _cleanup_closedir_ DIR *d = NULL;
  
-         if (!strchr(*p, '>'))
-                 return 0;
+         d = opendir("/sys/class/power_supply");
+         if (!d)
+                 return errno == ENOENT ? true : -errno;
  
-         if ((*p)[2] == '>') {
-                 c = undecchar((*p)[1]);
-                 k = 3;
-         } else if ((*p)[3] == '>') {
-                 b = undecchar((*p)[1]);
-                 c = undecchar((*p)[2]);
-                 k = 4;
-         } else if ((*p)[4] == '>') {
-                 a = undecchar((*p)[1]);
-                 b = undecchar((*p)[2]);
-                 c = undecchar((*p)[3]);
-                 k = 5;
-         } else
-                 return 0;
+         for (;;) {
+                 struct dirent *de;
+                 _cleanup_close_ int fd = -1, device = -1;
+                 char contents[6];
+                 ssize_t n;
  
-         if (a < 0 || b < 0 || c < 0 ||
-             (!with_facility && (a || b || c > 7)))
-                 return 0;
+                 errno = 0;
+                 de = readdir(d);
+                 if (!de && errno != 0)
+                         return -errno;
  
-         if (with_facility)
-                 *priority = a*100 + b*10 + c;
-         else
-                 *priority = (*priority & LOG_FACMASK) | c;
+                 if (!de)
+                         break;
  
-         *p += k;
-         return 1;
- }
- #endif /* NM_IGNORED */
+                 if (hidden_file(de->d_name))
+                         continue;
  
- ssize_t string_table_lookup(const char * const *table, size_t len, const char *key) {
-         size_t i;
+                 device = openat(dirfd(d), de->d_name, O_DIRECTORY|O_RDONLY|O_CLOEXEC|O_NOCTTY);
+                 if (device < 0) {
+                         if (errno == ENOENT || errno == ENOTDIR)
+                                 continue;
  
-         if (!key)
-                 return -1;
+                         return -errno;
+                 }
  
-         for (i = 0; i < len; ++i)
-                 if (streq_ptr(table[i], key))
-                         return (ssize_t) i;
+                 fd = openat(device, "type", O_RDONLY|O_CLOEXEC|O_NOCTTY);
+                 if (fd < 0) {
+                         if (errno == ENOENT)
+                                 continue;
  
-         return -1;
- }
+                         return -errno;
                }
  
- #if 0 /* NM_IGNORED */
- void cmsg_close_all(struct msghdr *mh) {
-         struct cmsghdr *cmsg;
+                 n = read(fd, contents, sizeof(contents));
+                 if (n < 0)
+                         return -errno;
  
-         assert(mh);
+                 if (n != 6 || memcmp(contents, "Mains\n", 6))
+                         continue;
  
-         CMSG_FOREACH(cmsg, mh)
-                 if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SCM_RIGHTS)
-                         close_many((int*) CMSG_DATA(cmsg), (cmsg->cmsg_len - CMSG_LEN(0)) / sizeof(int));
- }
+                 safe_close(fd);
+                 fd = openat(device, "online", O_RDONLY|O_CLOEXEC|O_NOCTTY);
+                 if (fd < 0) {
+                         if (errno == ENOENT)
+                                 continue;
  
- int rename_noreplace(int olddirfd, const char *oldpath, int newdirfd, const char *newpath) {
-         struct stat buf;
-         int ret;
+                         return -errno;
+                 }
  
-         ret = renameat2(olddirfd, oldpath, newdirfd, newpath, RENAME_NOREPLACE);
-         if (ret >= 0)
-                 return 0;
+                 n = read(fd, contents, sizeof(contents));
+                 if (n < 0)
+                         return -errno;
  
-         /* renameat2() exists since Linux 3.15, btrfs added support for it later.
-          * If it is not implemented, fallback to another method. */
-         if (!IN_SET(errno, EINVAL, ENOSYS))
-                 return -errno;
+                 if (n != 2 || contents[1] != '\n')
+                         return -EIO;
  
-         /* The link()/unlink() fallback does not work on directories. But
-          * renameat() without RENAME_NOREPLACE gives the same semantics on
-          * directories, except when newpath is an *empty* directory. This is
-          * good enough. */
-         ret = fstatat(olddirfd, oldpath, &buf, AT_SYMLINK_NOFOLLOW);
-         if (ret >= 0 && S_ISDIR(buf.st_mode)) {
-                 ret = renameat(olddirfd, oldpath, newdirfd, newpath);
-                 return ret >= 0 ? 0 : -errno;
+                 if (contents[0] == '1') {
+                         found_online = true;
+                         break;
+                 } else if (contents[0] == '0')
+                         found_offline = true;
+                 else
+                         return -EIO;
          }
  
-         /* If it is not a directory, use the link()/unlink() fallback. */
-         ret = linkat(olddirfd, oldpath, newdirfd, newpath, 0);
-         if (ret < 0)
-                 return -errno;
+         return found_online || !found_offline;
+ }
  
-         ret = unlinkat(olddirfd, oldpath, 0);
-         if (ret < 0) {
-                 /* backup errno before the following unlinkat() alters it */
-                 ret = errno;
-                 (void) unlinkat(newdirfd, newpath, 0);
-                 errno = ret;
-                 return -errno;
-         }
+ bool id128_is_valid(const char *s) {
+         size_t i, l;
  
-         return 0;
- }
- #endif /* NM_IGNORED */
+         l = strlen(s);
+         if (l == 32) {
+                 /* Simple formatted 128bit hex string */
  
static char *strcpy_backslash_escaped(char *t, const char *s, const char *bad) {
-         assert(bad);
                for (i = 0; i < l; i++) {
+                         char c = s[i];
  
-         for (; *s; s++) {
-                 if (*s == '\\' || strchr(bad, *s))
-                         *(t++) = '\\';
+                         if (!(c >= '0' && c <= '9') &&
+                             !(c >= 'a' && c <= 'z') &&
+                             !(c >= 'A' && c <= 'Z'))
+                                 return false;
+                 }
  
-                 *(t++) = *s;
-         }
+         } else if (l == 36) {
  
-         return t;
- }
+                 /* Formatted UUID */
  
char *shell_escape(const char *s, const char *bad) {
-         char *r, *t;
                for (i = 0; i < l; i++) {
+                         char c = s[i];
  
-         r = new(char, strlen(s)*2+1);
-         if (!r)
-                 return NULL;
+                         if ((i == 8 || i == 13 || i == 18 || i == 23)) {
+                                 if (c != '-')
+                                         return false;
+                         } else {
+                                 if (!(c >= '0' && c <= '9') &&
+                                     !(c >= 'a' && c <= 'z') &&
+                                     !(c >= 'A' && c <= 'Z'))
+                                         return false;
+                         }
+                 }
  
-         t = strcpy_backslash_escaped(r, s, bad);
-         *t = 0;
+         } else
+                 return false;
  
-         return r;
+         return true;
  }
  
- #if 0 /* NM_IGNORED */
- char *shell_maybe_quote(const char *s) {
+ int container_get_leader(const char *machine, pid_t *pid) {
+         _cleanup_free_ char *s = NULL, *class = NULL;
          const char *p;
-         char *r, *t;
+         pid_t leader;
+         int r;
  
-         assert(s);
+         assert(machine);
+         assert(pid);
  
-         /* Encloses a string in double quotes if necessary to make it
-          * OK as shell string. */
+         if (!machine_name_is_valid(machine))
+                 return -EINVAL;
  
-         for (p = s; *p; p++)
-                 if (*p <= ' ' ||
-                     *p >= 127 ||
-                     strchr(SHELL_NEED_QUOTES, *p))
-                         break;
+         p = strjoina("/run/systemd/machines/", machine);
+         r = parse_env_file(p, NEWLINE, "LEADER", &s, "CLASS", &class, NULL);
+         if (r == -ENOENT)
+                 return -EHOSTDOWN;
+         if (r < 0)
+                 return r;
+         if (!s)
+                 return -EIO;
  
-         if (!*p)
-                 return strdup(s);
+         if (!streq_ptr(class, "container"))
+                 return -EIO;
  
-         r = new(char, 1+strlen(s)*2+1+1);
-         if (!r)
-                 return NULL;
+         r = parse_pid(s, &leader);
+         if (r < 0)
+                 return r;
+         if (leader <= 1)
+                 return -EIO;
  
-         t = r;
-         *(t++) = '"';
-         t = mempcpy(t, s, p - s);
+         *pid = leader;
+         return 0;
+ }
  
-         t = strcpy_backslash_escaped(t, p, SHELL_NEED_ESCAPE);
+ int namespace_open(pid_t pid, int *pidns_fd, int *mntns_fd, int *netns_fd, int *userns_fd, int *root_fd) {
+         _cleanup_close_ int pidnsfd = -1, mntnsfd = -1, netnsfd = -1, usernsfd = -1;
+         int rfd = -1;
  
-         *(t++)= '"';
-         *t = 0;
+         assert(pid >= 0);
  
-         return r;
- }
+         if (mntns_fd) {
+                 const char *mntns;
  
- int parse_mode(const char *s, mode_t *ret) {
-         char *x;
-         long l;
+                 mntns = procfs_file_alloca(pid, "ns/mnt");
+                 mntnsfd = open(mntns, O_RDONLY|O_NOCTTY|O_CLOEXEC);
+                 if (mntnsfd < 0)
+                         return -errno;
+         }
  
-         assert(s);
-         assert(ret);
+         if (pidns_fd) {
+                 const char *pidns;
  
-         errno = 0;
-         l = strtol(s, &x, 8);
-         if (errno != 0)
-                 return -errno;
+                 pidns = procfs_file_alloca(pid, "ns/pid");
+                 pidnsfd = open(pidns, O_RDONLY|O_NOCTTY|O_CLOEXEC);
+                 if (pidnsfd < 0)
+                         return -errno;
+         }
  
-         if (!x || x == s || *x)
-                 return -EINVAL;
-         if (l < 0 || l  > 07777)
-                 return -ERANGE;
+         if (netns_fd) {
+                 const char *netns;
  
-         *ret = (mode_t) l;
-         return 0;
- }
+                 netns = procfs_file_alloca(pid, "ns/net");
+                 netnsfd = open(netns, O_RDONLY|O_NOCTTY|O_CLOEXEC);
+                 if (netnsfd < 0)
+                         return -errno;
+         }
  
int mount_move_root(const char *path) {
-         assert(path);
        if (userns_fd) {
+                 const char *userns;
  
-         if (chdir(path) < 0)
-                 return -errno;
+                 userns = procfs_file_alloca(pid, "ns/user");
+                 usernsfd = open(userns, O_RDONLY|O_NOCTTY|O_CLOEXEC);
+                 if (usernsfd < 0 && errno != ENOENT)
+                         return -errno;
+         }
  
-         if (mount(path, "/", NULL, MS_MOVE, NULL) < 0)
-                 return -errno;
+         if (root_fd) {
+                 const char *root;
  
-         if (chroot(".") < 0)
-                 return -errno;
+                 root = procfs_file_alloca(pid, "root");
+                 rfd = open(root, O_RDONLY|O_NOCTTY|O_CLOEXEC|O_DIRECTORY);
+                 if (rfd < 0)
+                         return -errno;
+         }
  
-         if (chdir("/") < 0)
-                 return -errno;
+         if (pidns_fd)
+                 *pidns_fd = pidnsfd;
  
-         return 0;
- }
+         if (mntns_fd)
+                 *mntns_fd = mntnsfd;
  
- int reset_uid_gid(void) {
+         if (netns_fd)
+                 *netns_fd = netnsfd;
  
-         if (setgroups(0, NULL) < 0)
-                 return -errno;
+         if (userns_fd)
+                 *userns_fd = usernsfd;
  
-         if (setresgid(0, 0, 0) < 0)
-                 return -errno;
+         if (root_fd)
+                 *root_fd = rfd;
  
-         if (setresuid(0, 0, 0) < 0)
-                 return -errno;
+         pidnsfd = mntnsfd = netnsfd = usernsfd = -1;
  
          return 0;
  }
@@@ -6896,31 -838,3 +851,4 @@@ int version(void) 
               SYSTEMD_FEATURES);
          return 0;
  }
- bool fdname_is_valid(const char *s) {
-         const char *p;
-         /* Validates a name for $LISTEN_FDNAMES. We basically allow
-          * everything ASCII that's not a control character. Also, as
-          * special exception the ":" character is not allowed, as we
-          * use that as field separator in $LISTEN_FDNAMES.
-          *
-          * Note that the empty string is explicitly allowed
-          * here. However, we limit the length of the names to 255
-          * characters. */
-         if (!s)
-                 return false;
-         for (p = s; *p; p++) {
-                 if (*p < ' ')
-                         return false;
-                 if (*p >= 127)
-                         return false;
-                 if (*p == ':')
-                         return false;
-         }
-         return p - s < 256;
- }
 +#endif /* NM_IGNORED */
    along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
 +#include "nm-sd-adapt.h"
 +
  #include <alloca.h>
- #include <dirent.h>
  #include <fcntl.h>
  #include <inttypes.h>
  #include <limits.h>
  #include <time.h>
  #include <unistd.h>
  
 +#if 0 /* NM_IGNORED */
  #include "formats-util.h"
 +#endif /* NM_IGNORED */
  #include "macro.h"
 +#if 0 /* NM_IGNORED */
  #include "missing.h"
 +#endif /* NM_IGNORED */
  #include "time-util.h"
  
- /* What is interpreted as whitespace? */
- #define WHITESPACE " \t\n\r"
- #define NEWLINE    "\n\r"
- #define QUOTES     "\"\'"
- #define COMMENTS   "#;"
- #define GLOB_CHARS "*?["
- /* What characters are special in the shell? */
- /* must be escaped outside and inside double-quotes */
- #define SHELL_NEED_ESCAPE "\"\\`$"
- /* can be escaped or double-quoted */
- #define SHELL_NEED_QUOTES SHELL_NEED_ESCAPE GLOB_CHARS "'()<>|&;"
- #define FORMAT_BYTES_MAX 8
  size_t page_size(void) _pure_;
  #define PAGE_ALIGN(l) ALIGN_TO((l), page_size())
  
    along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
 +#include "nm-sd-adapt.h"
 +
  #include <netinet/if_ether.h>
  
- #include "sparse-endian.h"
  #include "socket-util.h"
+ #include "sparse-endian.h"
  
  int arp_network_bind_raw_socket(int index, be32_t address, const struct ether_addr *eth_mac);
  
    along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
- #include "sd-id128.h"
 +#include "nm-sd-adapt.h"
 +
 +#if 0 /* NM_IGNORED */
  #include "libudev.h"
- #include "udev-util.h"
++#endif /* NM_IGNORED */
+ #include "sd-id128.h"
  
- #include "virt.h"
+ #include "dhcp-identifier.h"
+ #include "dhcp6-protocol.h"
+ #include "network-internal.h"
+ #include "siphash24.h"
  #include "sparse-endian.h"
- #include "siphash24.h"
- #include "dhcp6-protocol.h"
- #include "dhcp-identifier.h"
- #include "network-internal.h"
++#if 0 /* NM_IGNORED */
+ #include "udev-util.h"
+ #include "virt.h"
 +#else /* NM_IGNORED */
 +#include <net/if.h>
 +#endif /* NM_IGNORED */
  
  #define SYSTEMD_PEN 43793
  #define HASH_KEY SD_ID128_MAKE(80,11,8c,c2,fe,4a,03,ee,3e,d6,0c,6f,36,39,14,09)
@@@ -63,9 -58,7 +66,8 @@@ int dhcp_identifier_set_duid_en(struct 
          return 0;
  }
  
  int dhcp_identifier_set_iaid(int ifindex, uint8_t *mac, size_t mac_len, void *_id) {
 +#if 0 /* NM_IGNORED */
          /* name is a pointer to memory in the udev_device struct, so must
             have the same scope */
          _cleanup_udev_device_unref_ struct udev_device *device = NULL;
                          name = net_get_name(device);
                  }
          }
 +#else /* NM_IGNORED */
 +        name = if_indextoname(ifindex, name_buf);
 +#endif /* NM_IGNORED */
  
          if (name)
-                 siphash24((uint8_t*)&id, name, strlen(name), HASH_KEY.bytes);
+                 id = siphash24(name, strlen(name), HASH_KEY.bytes);
          else
                  /* fall back to MAC address if no predictable name available */
-                 siphash24((uint8_t*)&id, mac, mac_len, HASH_KEY.bytes);
+                 id = siphash24(mac, mac_len, HASH_KEY.bytes);
+         id = htole64(id);
  
          /* fold into 32 bits */
          unaligned_write_be32(_id, (id & 0xffffffff) ^ (id >> 32));
    along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
 +#include "nm-sd-adapt.h"
 +
+ #include "sd-id128.h"
  #include "macro.h"
  #include "sparse-endian.h"
  #include "unaligned.h"
    along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
- #include <stdint.h>
 +#include "nm-sd-adapt.h"
 +
  #include <linux/if_packet.h>
- #include <net/if_arp.h>
  #include <net/ethernet.h>
- #include "socket-util.h"
+ #include <net/if_arp.h>
+ #include <stdint.h>
  
  #include "sd-dhcp-client.h"
  #include "dhcp-protocol.h"
+ #include "socket-util.h"
  
  int dhcp_network_bind_raw_socket(int index, union sockaddr_union *link,
                                   uint32_t xid, const uint8_t *mac_addr,
    along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
 +#include "nm-sd-adapt.h"
 +
  #include <errno.h>
- #include <sys/socket.h>
- #include <string.h>
- #include <linux/if_packet.h>
- #include <linux/if_infiniband.h>
  #include <net/ethernet.h>
  #include <net/if_arp.h>
  #include <stdio.h>
    along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
- #include <stdint.h>
- #include <string.h>
 +#include "nm-sd-adapt.h"
 +
  #include <errno.h>
+ #include <stdint.h>
  #include <stdio.h>
+ #include <string.h>
  
  #include "dhcp-internal.h"
  
    along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
 +#include "nm-sd-adapt.h"
 +
  #include <errno.h>
- #include <string.h>
  #include <net/ethernet.h>
  #include <net/if_arp.h>
+ #include <string.h>
  
- #include "dhcp-protocol.h"
  #include "dhcp-internal.h"
+ #include "dhcp-protocol.h"
  
  #define DHCP_CLIENT_MIN_OPTIONS_SIZE            312
  
    along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
- #include <netinet/udp.h>
 +#include "nm-sd-adapt.h"
 +
  #include <netinet/ip.h>
+ #include <netinet/udp.h>
  #include <stdint.h>
  
  #include "macro.h"
    along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
 +#include "nm-sd-adapt.h"
 +
  #include <errno.h>
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <string.h>
- #include <linux/if_packet.h>
+ #include <netinet/in.h>
+ #include <netinet/ip6.h>
  #include <stdio.h>
+ #include <string.h>
+ #include <sys/socket.h>
+ #include <sys/types.h>
  #include <unistd.h>
- #include <netinet/ip6.h>
- #include <netinet/icmp6.h>
- #include <netinet/in.h>
- #include "socket-util.h"
+ #include <linux/if_packet.h>
  
  #include "dhcp6-internal.h"
  #include "dhcp6-protocol.h"
    along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
- #include <netinet/in.h>
 +#include "nm-sd-adapt.h"
 +
  #include <errno.h>
+ #include <netinet/in.h>
  #include <string.h>
  
- #include "sparse-endian.h"
- #include "unaligned.h"
- #include "util.h"
- #include "strv.h"
+ #include "alloc-util.h"
  #include "dhcp6-internal.h"
  #include "dhcp6-protocol.h"
  #include "dns-domain.h"
    along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
- #include "lldp-internal.h"
 +#include "nm-sd-adapt.h"
 +
  #include "sd-lldp.h"
  
+ #include "alloc-util.h"
+ #include "lldp-internal.h"
  /* We store maximum 1K chassis entries */
  #define LLDP_MIB_MAX_CHASSIS 1024
  
  
  #pragma once
  
- #include "log.h"
 +#include "nm-sd-adapt.h"
 +
+ #include "sd-event.h"
  #include "list.h"
  #include "lldp-tlv.h"
+ #include "log.h"
  #include "prioq.h"
- #include "sd-event.h"
  
  typedef struct lldp_neighbour_port lldp_neighbour_port;
  typedef struct lldp_chassis lldp_chassis;
    along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
 +#include "nm-sd-adapt.h"
 +
+ #include "alloc-util.h"
  #include "async.h"
- #include "lldp-port.h"
- #include "lldp-network.h"
  #include "lldp-internal.h"
+ #include "lldp-network.h"
+ #include "lldp-port.h"
  
  int lldp_port_start(lldp_port *p) {
          int r;
    along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
- #include <net/ethernet.h>
 +#include "nm-sd-adapt.h"
 +
  #include <arpa/inet.h>
+ #include <net/ethernet.h>
  
- #include "macro.h"
+ #include "alloc-util.h"
  #include "lldp-tlv.h"
+ #include "macro.h"
  
  int tlv_section_new(tlv_section **ret) {
          tlv_section *s;
  
  #pragma once
  
 +#include "nm-sd-adapt.h"
 +
  #include <net/ethernet.h>
  
- #include "util.h"
- #include "lldp.h"
- #include "list.h"
  #include "sd-lldp.h"
  
- typedef struct tlv_packet tlv_packet;
- typedef struct tlv_section tlv_section;
+ #include "list.h"
+ #include "lldp.h"
+ #include "util.h"
+ typedef struct sd_lldp_packet tlv_packet;
+ typedef struct sd_lldp_section tlv_section;
  
  #define LLDP_OUI_LEN 3
  
    along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
- #include <netinet/ether.h>
- #include <linux/if.h>
 +#include "nm-sd-adapt.h"
 +
  #include <arpa/inet.h>
+ #include <linux/if.h>
+ #include <netinet/ether.h>
+ #include "sd-ndisc.h"
  
- #include "strv.h"
- #include "siphash24.h"
+ #include "alloc-util.h"
 +#if 0 /* NM_IGNORED */
+ #include "condition.h"
+ #include "conf-parser.h"
 +#endif /* NM_IGNORED */
  #include "dhcp-lease-internal.h"
- #if 0 /* NM_IGNORED */
+ #include "hexdecoct.h"
  #include "log.h"
+ #include "network-internal.h"
+ #include "parse-util.h"
+ #include "siphash24.h"
+ #include "string-util.h"
+ #include "strv.h"
  #include "utf8.h"
- #endif /* NM_IGNORED */
  #include "util.h"
- #if 0 /* NM_IGNORED */
- #include "conf-parser.h"
- #include "condition.h"
- #endif /* NM_IGNORED */
- #include "network-internal.h"
- #include "sd-icmp6-nd.h"
  
 +#if 0 /* NM_IGNORED */
  const char *net_get_name(struct udev_device *device) {
          const char *name, *field;
  
    along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
 +#include "nm-sd-adapt.h"
 +
  #include <stdbool.h>
  
- #include "udev.h"
 +#if 0 /* NM_IGNORED */
  #include "condition.h"
+ #include "udev.h"
  
  bool net_match_config(const struct ether_addr *match_mac,
                        char * const *match_path,
@@@ -65,9 -62,8 +65,9 @@@ int config_parse_ifalias(const char *un
                           const char *section, unsigned section_line, const char *lvalue,
                           int ltype, const char *rvalue, void *data, void *userdata);
  
- int net_get_unique_predictable_data(struct udev_device *device, uint8_t result[8]);
+ int net_get_unique_predictable_data(struct udev_device *device, uint64_t *result);
  const char *net_get_name(struct udev_device *device);
 +#endif /* NM_IGNORED */
  
  void serialize_in_addrs(FILE *f, const struct in_addr *addresses, size_t size);
  int deserialize_in_addrs(struct in_addr **addresses, const char *string);
    along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
- #include <stdlib.h>
 +#include "nm-sd-adapt.h"
 +
  #include <errno.h>
- #include <string.h>
- #include <stdio.h>
  #include <net/ethernet.h>
  #include <net/if_arp.h>
- #include <linux/if_infiniband.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
  #include <sys/ioctl.h>
+ #include <linux/if_infiniband.h>
  
- #include "util.h"
- #include "random-util.h"
- #include "async.h"
+ #include "sd-dhcp-client.h"
  
- #include "dhcp-protocol.h"
+ #include "alloc-util.h"
+ #include "async.h"
+ #include "dhcp-identifier.h"
  #include "dhcp-internal.h"
  #include "dhcp-lease-internal.h"
- #include "dhcp-identifier.h"
- #include "sd-dhcp-client.h"
+ #include "dhcp-protocol.h"
+ #include "dns-domain.h"
+ #include "hostname-util.h"
+ #include "random-util.h"
+ #include "string-util.h"
+ #include "util.h"
  
  #define MAX_CLIENT_ID_LEN (sizeof(uint32_t) + MAX_DUID_LEN)  /* Arbitrary limit */
  #define MAX_MAC_ADDR_LEN CONST_MAX(INFINIBAND_ALEN, ETH_ALEN)
    along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
- #include <stdlib.h>
 +#include "nm-sd-adapt.h"
 +
+ #include <arpa/inet.h>
  #include <errno.h>
- #include <string.h>
  #include <stdio.h>
- #include <arpa/inet.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include "sd-dhcp-lease.h"
  
+ #include "alloc-util.h"
+ #include "dhcp-lease-internal.h"
+ #include "dhcp-protocol.h"
+ #include "dns-domain.h"
+ #include "fd-util.h"
  #include "fileio.h"
- #include "unaligned.h"
- #include "in-addr-util.h"
+ #include "hexdecoct.h"
  #include "hostname-util.h"
- #include "dns-domain.h"
+ #include "in-addr-util.h"
  #include "network-internal.h"
- #include "dhcp-protocol.h"
- #include "dhcp-lease-internal.h"
- #include "sd-dhcp-lease.h"
+ #include "parse-util.h"
+ #include "string-util.h"
+ #include "unaligned.h"
  
  int sd_dhcp_lease_get_address(sd_dhcp_lease *lease, struct in_addr *addr) {
          assert_return(lease, -EINVAL);
    along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
 +#include "nm-sd-adapt.h"
 +
  #include <errno.h>
  
- #include "strv.h"
- #include "util.h"
+ #include "alloc-util.h"
  #include "dhcp6-lease-internal.h"
  #include "dhcp6-protocol.h"
+ #include "strv.h"
+ #include "util.h"
  
  int dhcp6_lease_clear_timers(DHCP6IA *ia) {
          assert_return(ia, -EINVAL);
    along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
- #include <stdlib.h>
 +#include "nm-sd-adapt.h"
 +
+ #include <arpa/inet.h>
  #include <errno.h>
- #include <string.h>
  #include <stdio.h>
- #include <arpa/inet.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include "sd-ipv4acd.h"
+ #include "sd-ipv4ll.h"
  
+ #include "alloc-util.h"
  #include "event-util.h"
+ #include "in-addr-util.h"
  #include "list.h"
  #include "random-util.h"
  #include "refcnt.h"
      along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
 +#include "nm-sd-adapt.h"
 +
  #include <arpa/inet.h>
  
- #include "siphash24.h"
- #include "hashmap.h"
- #include "lldp-tlv.h"
- #include "lldp-port.h"
  #include "sd-lldp.h"
- #include "prioq.h"
+ #include "alloc-util.h"
+ #include "fd-util.h"
+ #include "fileio.h"
+ #include "hashmap.h"
  #include "lldp-internal.h"
+ #include "lldp-port.h"
+ #include "lldp-tlv.h"
  #include "lldp-util.h"
+ #include "prioq.h"
+ #include "siphash24.h"
+ #include "string-util.h"
  
  typedef enum LLDPAgentRXState {
          LLDP_AGENT_RX_WAIT_PORT_OPERATIONAL = 4,
    along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
- #include "util.h"
 +#include "nm-sd-adapt.h"
 +
  #include "sd-event.h"
  
+ #include "util.h"
  DEFINE_TRIVIAL_CLEANUP_FUNC(sd_event*, sd_event_unref);
  DEFINE_TRIVIAL_CLEANUP_FUNC(sd_event_source*, sd_event_source_unref);
  
  #include <fcntl.h>
  #include <unistd.h>
  
- #include "util.h"
- #include "macro.h"
  #include "sd-id128.h"
+ #include "fd-util.h"
+ #include "hexdecoct.h"
+ #include "io-util.h"
+ #include "macro.h"
  #include "random-util.h"
+ #include "util.h"
  
 +#if 0 /* NM_IGNORED */
  _public_ char *sd_id128_to_string(sd_id128_t id, char s[SD_ID128_STRING_MAX]) {
          unsigned n;
  
@@@ -695,6 -696,6 +699,7 @@@ int dns_name_root(const char *name) 
  
          return r == 0 && *name == 0;
  }
++#endif /* NM_IGNORED */
  
  int dns_name_single_label(const char *name) {
          char label[DNS_LABEL_MAX+1];
@@@ -70,6 -66,6 +70,8 @@@ int dns_name_reverse(int family, const 
  int dns_name_address(const char *p, int *family, union in_addr_union *a);
  
  int dns_name_root(const char *name);
++#endif /* NM_IGNORED */
++
  int dns_name_single_label(const char *name);
  
- #endif /* NM_IGNORED */
+ int dns_name_to_wire_format(const char *domain, uint8_t *buffer, size_t len);
    along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
- #include <netinet/in.h>
 +#include "nm-sd-adapt.h"
 +
+ #include <inttypes.h>
  #include <net/ethernet.h>
+ #include <netinet/in.h>
+ #include <sys/types.h>
  
- #include "sd-event.h"
  #include "sd-dhcp-lease.h"
+ #include "sd-event.h"
+ #include "_sd-common.h"
+ _SD_BEGIN_DECLARATIONS;
  
  enum {
          SD_DHCP_CLIENT_EVENT_STOP               = 0,
    along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
- #include <netinet/in.h>
 +#include "nm-sd-adapt.h"
 +
+ #include <inttypes.h>
  #include <net/ethernet.h>
+ #include <netinet/in.h>
+ #include <sys/types.h>
+ #include "_sd-common.h"
+ _SD_BEGIN_DECLARATIONS;
  
  typedef struct sd_dhcp_lease sd_dhcp_lease;
  struct sd_dhcp_route;
    along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
 +#include "nm-sd-adapt.h"
 +
+ #include <inttypes.h>
  #include <net/ethernet.h>
+ #include <sys/types.h>
  
+ #include "sd-dhcp6-lease.h"
  #include "sd-event.h"
  
- #include "sd-dhcp6-lease.h"
+ #include "_sd-common.h"
+ _SD_BEGIN_DECLARATIONS;
  
  enum {
          SD_DHCP6_CLIENT_EVENT_STOP                      = 0,
    along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
 +#include "nm-sd-adapt.h"
 +
+ #include <inttypes.h>
  #include <netinet/in.h>
  
+ #include "_sd-common.h"
+ _SD_BEGIN_DECLARATIONS;
  typedef struct sd_dhcp6_lease sd_dhcp6_lease;
  
  void sd_dhcp6_lease_reset_address_iter(sd_dhcp6_lease *lease);
    along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
- #include <sys/types.h>
- #include <sys/signalfd.h>
- #include <sys/epoll.h>
 +#include "nm-sd-adapt.h"
 +
  #include <inttypes.h>
  #include <signal.h>
+ #include <sys/epoll.h>
+ #include <sys/signalfd.h>
+ #include <sys/types.h>
  
  #include "_sd-common.h"
  
    along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
- #include <stdbool.h>
- #include <netinet/in.h>
 +#include "nm-sd-adapt.h"
 +
  #include <net/ethernet.h>
+ #include <netinet/in.h>
  
  #include "sd-event.h"
  
    along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
- #include <stdbool.h>
- #include <netinet/in.h>
 +#include "nm-sd-adapt.h"
 +
  #include <net/ethernet.h>
+ #include <netinet/in.h>
  
  #include "sd-event.h"
  
    along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
- #pragma once
 +#include "nm-sd-adapt.h"
 +
+ #include <inttypes.h>
+ #include <net/ethernet.h>
  #include "sd-event.h"
  
+ #include "_sd-common.h"
+ _SD_BEGIN_DECLARATIONS;
  enum {
          SD_LLDP_EVENT_UPDATE_INFO       = 0,
  };
index 0000000,71e65d4..8dc0738
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,84 +1,86 @@@
+ /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+ #ifndef foosdndiscfoo
+ #define foosdndiscfoo
+ /***
+   This file is part of systemd.
+   Copyright (C) 2014 Intel Corporation. All rights reserved.
+   systemd is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 2.1 of the License, or
+   (at your option) any later version.
+   systemd is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+   Lesser General Public License for more details.
+   You should have received a copy of the GNU Lesser General Public License
+   along with systemd; If not, see <http://www.gnu.org/licenses/>.
+ ***/
++#include "nm-sd-adapt.h"
++
+ #include <inttypes.h>
+ #include <net/ethernet.h>
+ #include "sd-event.h"
+ #include "_sd-common.h"
+ _SD_BEGIN_DECLARATIONS;
+ enum {
+         SD_NDISC_EVENT_STOP     = 0,
+         SD_NDISC_EVENT_TIMEOUT  = 1,
+ };
+ typedef struct sd_ndisc sd_ndisc;
+ typedef void(*sd_ndisc_router_callback_t)(sd_ndisc *nd, uint8_t flags, const struct in6_addr *gateway, unsigned lifetime, int pref, void *userdata);
+ typedef void(*sd_ndisc_prefix_onlink_callback_t)(sd_ndisc *nd, const struct in6_addr *prefix, unsigned prefixlen,
+                                                  unsigned lifetime, void *userdata);
+ typedef void(*sd_ndisc_prefix_autonomous_callback_t)(sd_ndisc *nd, const struct in6_addr *prefix, unsigned prefixlen,
+                                                      unsigned lifetime_prefered, unsigned lifetime_valid, void *userdata);
+ typedef void(*sd_ndisc_callback_t)(sd_ndisc *nd, int event, void *userdata);
+ int sd_ndisc_set_callback(sd_ndisc *nd,
+                           sd_ndisc_router_callback_t rcb,
+                           sd_ndisc_prefix_onlink_callback_t plcb,
+                           sd_ndisc_prefix_autonomous_callback_t pacb,
+                           sd_ndisc_callback_t cb,
+                           void *userdata);
+ int sd_ndisc_set_index(sd_ndisc *nd, int interface_index);
+ int sd_ndisc_set_mac(sd_ndisc *nd, const struct ether_addr *mac_addr);
+ int sd_ndisc_attach_event(sd_ndisc *nd, sd_event *event, int priority);
+ int sd_ndisc_detach_event(sd_ndisc *nd);
+ sd_event *sd_ndisc_get_event(sd_ndisc *nd);
+ sd_ndisc *sd_ndisc_ref(sd_ndisc *nd);
+ sd_ndisc *sd_ndisc_unref(sd_ndisc *nd);
+ int sd_ndisc_new(sd_ndisc **ret);
+ int sd_ndisc_get_mtu(sd_ndisc *nd, uint32_t *mtu);
+ int sd_ndisc_stop(sd_ndisc *nd);
+ int sd_ndisc_router_discovery_start(sd_ndisc *nd);
+ #define SD_NDISC_ADDRESS_FORMAT_STR "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x"
+ #define SD_NDISC_ADDRESS_FORMAT_VAL(address) \
+         be16toh((address).s6_addr16[0]),        \
+         be16toh((address).s6_addr16[1]),        \
+         be16toh((address).s6_addr16[2]),        \
+         be16toh((address).s6_addr16[3]),        \
+         be16toh((address).s6_addr16[4]),        \
+         be16toh((address).s6_addr16[5]),        \
+         be16toh((address).s6_addr16[6]),        \
+         be16toh((address).s6_addr16[7])
+ _SD_END_DECLARATIONS;
+ #endif