release v0.21.6

Closes https://github.com/MusicPlayerDaemon/MPD/issues/465 and
https://github.com/MusicPlayerDaemon/MPD/pull/466

.gitignore

@@ -1,88 +1,8 @@
-*.Plo
-*.Po
-*.a
-*.d
-*.la
-*.lo
-*.o
-*.exe
-
 *~
 
 .#*
 .stgit*
-.deps
-.dirstamp
 
-tags
-
-/Makefile
-/Makefile.in
-/aclocal.m4
-/autom4te.cache
-/config.h
-/config.h.in
-/config.log
-/config.mk
-/config.status
-/config_detected.h
-/config_detected.mk
-/configure
-/configure.lineno
-/depmode
-/libtool
-/ltmain.sh
-/mkinstalldirs
 /output/
-/src/mpd
-/systemd/system/mpd.service
-/systemd/user/mpd.service
-/stamp-h1
-
-/src/dsd2pcm/dsd2pcm
-/src/win32/mpd_win32_rc.rc
-
-/doc/doxygen.conf
-/doc/protocol.html
-/doc/protocol
-/doc/user
-/doc/developer
-/doc/sticker
-/doc/api
-
-/test/software_volume
-/test/run_convert
-/test/run_decoder
-/test/read_tags
-/test/run_filter
-/test/run_encoder
-/test/run_output
-/test/read_conf
-/test/run_input
-/test/read_mixer
-/test/dump_playlist
-/test/run_normalize
-/test/tmp
-/test/run_inotify
-/test/test_queue_priority
-/test/test_protocol
-/test/run_ntp_server
-/test/run_resolver
-/test/run_tcp_connect
-/test/test_pcm
-/test/dump_rva2
-/test/dump_text_file
-/test/test_util
-/test/test_byte_reverse
-/test/test_mixramp
-/test/test_vorbis_encoder
-/test/DumpDatabase
-
-/lib/
-
-/*.tar.gz
-/*.tar.bz2
-/*.tar.xz
-/mpd-*/
 
 __pycache__/

NEWS

@@ -1,3 +1,94 @@
+ver 0.21.6 (2019/03/17)
+* protocol
+  - allow loading playlists specified as absolute filesystem paths
+  - fix negated filter expressions with multiple tag values
+  - fix "list" with filter expression
+  - omit empty playlist names in "listplaylists"
+* input
+  - cdio_paranoia: fix build failure due to missing #include
+* decoder
+  - opus: fix replay gain when there are no other tags
+  - opus: fix seeking to beginning of song
+  - vorbis: fix Tremor conflict resulting in crash
+* output
+  - pulse: work around error with unusual channel count
+  - osx: fix build failure
+* playlist
+  - flac: fix use-after-free bug
+* support abstract sockets on Linux
+* Windows
+  - remove the unused libwinpthread-1.dll dependency
+* Android
+  - enable SLES power saving mode
+
+ver 0.21.5 (2019/02/22)
+* protocol
+  - fix deadlock in "albumart" command
+  - fix "tagtypes disable" command
+* database
+  - simple: fix assertion failure
+  - fix assertion failures with mount points
+* storage
+  - udisks: fix "AlreadyMounted" error
+  - udisks: use relative path from mount URI
+  - fix memory leak
+* input
+  - buffer: fix crash bug when playing remote WAV file
+* tags
+  - ape: map "Album Artist"
+* output
+  - shout: add support for TLS
+* mixer
+  - pulse: add "scale_volume" setting
+
+ver 0.21.4 (2019/01/04)
+* database
+  - inotify: fix crash bug "terminate called after throwing ..."
+  - upnp: implement "list ... group"
+* output
+  - httpd: declare protocol "HTTP/1.1" instead of "ICY"
+* remove libwrap support
+* Windows
+  - fix "Failed to accept connection: unknown error"
+* fix Haiku build
+
+ver 0.21.3 (2018/11/16)
+* output
+  - alsa: fix crash bug
+  - alsa: fix stuttering at start of playback
+  - alsa: fix discarded samples at end of song
+  - alsa: clear error after reopening device
+* log: default to journal if MPD was started as systemd service
+
+ver 0.21.2 (2018/11/12)
+* protocol
+  - operator "=~" matches a regular expression
+  - operator "contains" matches substrings
+* decoder
+  - ffmpeg: require FFmpeg 3.1 or later
+  - ffmpeg: fix broken sound with certain codecs
+* output
+  - alsa: fix high CPU usage with dmix
+  - httpd: fix three crash bugs
+* mixer
+  - alsa: fix more rounding errors
+* fix zlib support
+
+ver 0.21.1 (2018/11/04)
+* protocol
+  - allow escaping quotes in filter expressions
+  - operator "==" never searches substrings in filter expressions
+* decoder
+  - ffmpeg: fix build failure with non-standard FFmpeg installation path
+  - flac: fix linker failure when building without FLAC support
+* encoder
+  - vorbis: fix linker failure when building without Vorbis decoder
+* fix build failure on Linux-PowerPC
+* fix build failure on FreeBSD
+* eliminate DLL dependencies on Windows
+* add warning about buggy Boost version 1.67
+* require Meson 0.47.2 because a Meson 0.47.1 bug breaks our build
+
 ver 0.21 (2018/10/31)
 * configuration
   - add "include" directive, allows including config files

android/.gitignore

@@ -1 +0,0 @@
-/build

android/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="org.musicpd"
           android:installLocation="auto"
-          android:versionCode="23"
-          android:versionName="0.21">
+          android:versionCode="28"
+          android:versionName="0.21.6">
 
   <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="26"/>
 

autogen.sh

@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -e
-
-rm -rf config.cache build
-mkdir build
-
-aclocal -I m4 $ACLOCAL_FLAGS
-autoheader
-automake --add-missing $AUTOMAKE_FLAGS
-autoconf

build/pkg-config.sh

@@ -1,5 +1,9 @@
 #!/bin/sh -e
 
+# This is a wrapper for pkg-config which helps with cross-compiling;
+# it sets up environment variables to pkg-config searches for
+# libraries in the sysroot where a copy of this script is located.
+
 BIN=`dirname $0`
 ROOT=`dirname "$BIN"`
 

doc/.gitignore

@@ -1,2 +0,0 @@
-/html/
-/doctrees/

doc/conf.py

@@ -38,9 +38,9 @@ author = 'Max Kellermann'
 # built documents.
 #
 # The short X.Y version.
-version = '0.21'
+version = '0.21.6'
 # The full version, including alpha/beta/rc tags.
-release = '0.21~git'
+release = version
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

doc/mpdconf.example

@@ -32,7 +32,7 @@
 # settings.
 #
 # The special value "syslog" makes MPD use the local syslog daemon. This
-# setting defaults to logging to syslog, otherwise logging is disabled.
+# setting defaults to logging to syslog.
 #
 #log_file			"~/.mpd/log"
 #

doc/plugins.rst

@@ -87,6 +87,22 @@ Mount file systems (e.g. USB sticks or other removable media) using
 the udisks2 daemon via D-Bus.  To obtain a valid udisks2 URI, consult
 :ref:`the according neighbor plugin <neighbor_plugin>`.
 
+It might be necessary to grant :program:`MPD` privileges to control
+:program:`udisks2` through :program:`policykit`.  To do this, create a
+file called :file:`/usr/share/polkit-1/rules.d/mpd-udisks.rules` with
+the following text::
+
+ polkit.addRule(function(action, subject) {
+   if ((action.id == "org.freedesktop.udisks2.filesystem-mount" ||
+        action.id == "org.freedesktop.udisks2.filesystem-mount-other-seat") &&
+       subject.user == "mpd") {
+       return polkit.Result.YES;
+   }
+ });
+
+If you run MPD as a different user, change ``mpd`` to the name of your
+MPD user.
+
 .. _neighbor_plugin:
 
 Neighbor plugins
@@ -935,6 +951,8 @@ The pulse plugin connects to a `PulseAudio <http://www.freedesktop.org/wiki/Soft
      - Sets the host name of the PulseAudio server. By default, :program:`MPD` connects to the local PulseAudio server.
    * - **sink NAME**
      - Specifies the name of the PulseAudio sink :program:`MPD` should play on.
+   * - **scale_volume FACTOR**
+     - Specifies a linear scaling coefficient (ranging from 0.5 to 5.0) to apply when adjusting volume through :program:`MPD`.  For example, chosing a factor equal to ``"0.7"`` means that setting the volume to 100 in :program:`MPD` will set the PulseAudio volume to 70%, and a factor equal to ``"3.5"`` means that volume 100 in :program:`MPD` corresponds to a 350% PulseAudio volume.
 
 recorder
 ~~~~~~~~
@@ -974,6 +992,8 @@ You must set a format.
      - Set the timeout for the shout connection in seconds. Defaults to 2 seconds.
    * - **protocol icecast2|icecast1|shoutcast**
      - Specifies the protocol that wil be used to connect to the server. The default is "icecast2".
+   * - **tls disabled|auto|auto_no_plain|rfc2818|rfc2817**
+     - Specifies what kind of TLS to use. The default is "disabled" (no TLS).
    * - **mount URI**
      - Mounts the :program:`MPD` stream in the specified URI.
    * - **user USERNAME**

doc/protocol.rst

@@ -8,7 +8,7 @@ General protocol syntax
 Protocol overview
 =================
 
-The ``MPD`` command protocol exchanges
+The :program:`MPD` command protocol exchanges
 line-based text records between client and server over TCP.
 Once the client is connected to the server, they conduct a
 conversation until the client closes the connection. The
@@ -144,18 +144,28 @@ syntax::
 ``EXPRESSION`` is a string enclosed in parantheses which can be one
 of:
 
-- ``(TAG == 'VALUE')``: match a tag value.
-  ``(TAG != 'VALUE')``: mismatch a tag value.
-  The special tag "*any*" checks all
-  tag values.
-  *albumartist* looks for
+- ``(TAG == 'VALUE')``: match a tag value; if there are multiple
+  values of the given type, at least one must match.
+  ``(TAG != 'VALUE')``: mismatch a tag value; if there are multiple
+  values of the given type, none of them must match.
+  The special tag ``any`` checks all
+  tag types.
+  ``AlbumArtist`` looks for
   ``VALUE`` in ``AlbumArtist``
   and falls back to ``Artist`` tags if
   ``AlbumArtist`` does not exist.
-  ``VALUE`` is what to find.  The
-  `find` commands specify an exact value
-  and are case-sensitive; the `search`
-  commands specify a sub string and ignore case.
+  ``VALUE`` is what to find.
+  An empty value string means: match only if the given tag type does
+  not exist at all; this implies that negation with an empty value
+  checks for the existence of the given tag type.
+
+- ``(TAG contains 'VALUE')`` checks if the given value is a substring
+  of the tag value.
+
+- ``(TAG =~ 'VALUE')`` and ``(TAG !~ 'VALUE')`` use a Perl-compatible
+  regular expression instead of doing a simple string comparison.
+  (This feature is only available if :program:`MPD` was compiled with
+  :file:`libpcre`)
 
 - ``(file == 'VALUE')``: match the full song URI
   (relative to the music directory).
@@ -173,24 +183,60 @@ of:
 
 - ``(AudioFormat =~ 'SAMPLERATE:BITS:CHANNELS')``:
   matches the audio format with the given mask (i.e. one
-  or more attributes may be "*").
+  or more attributes may be ``*``).
 
-- ``(!EXPRESSION)``: negate an expression.
+- ``(!EXPRESSION)``: negate an expression.  Note that each expression
+  must be enclosed in parantheses, e.g. :code:`(!(artist == 'VALUE'))`
+  (which is equivalent to :code:`(artist != 'VALUE')`)
 
 - ``(EXPRESSION1 AND EXPRESSION2 ...)``: combine two or
-  more expressions with logical "and".
+  more expressions with logical "and".  Note that each expression must
+  be enclosed in parantheses, e.g. :code:`((artist == 'FOO') AND
+  (album == 'BAR'))`
+
+The :command:`find` commands are case sensitive, which
+:command:`search` and related commands ignore case.
 
 Prior to MPD 0.21, the syntax looked like this::
 
  find TYPE VALUE
 
+Escaping String Values
+----------------------
+
+String values are quoted with single or double quotes, and special
+characters within those values must be escaped with the backslash
+(``\``).  Keep in mind that the backslash is also the escape character
+on the protocol level, which means you may need to use double
+backslash.
+
+Example expression which matches an artist named ``foo'bar"``::
+
+ (Artist == "foo\'bar\"")
+
+At the protocol level, the command must look like this::
+
+ find "(Artist == \"foo\\'bar\\\"\")"
+
+The double quotes enclosing the artist name must be escaped because
+they are inside a double-quoted ``find`` parameter.  The single quote
+inside that artist name must be escaped with two backslashes; one to
+escape the single quote, and another one because the backslash inside
+the string inside the parameter needs to be escaped as well.  The
+double quote has three confusing backslashes: two to build one
+backslash, and another one to escape the double quote on the protocol
+level.  Phew!
+
+To reduce confusion, you should use a library such as `libmpdclient
+<https://www.musicpd.org/libs/libmpdclient/>`_ which escapes command
+arguments for you.
+
 .. _tags:
 
 Tags
 ====
 
-The following tags are supported by
-``MPD``:
+The following tags are supported by :program:`MPD`:
 
 * **artist**: the artist name. Its meaning is not well-defined; see "*composer*" and "*performer*" for more specific tags.
 * **artistsort**: same as artist, but for sorting. This usually omits prefixes such as "The".
@@ -216,7 +262,7 @@ The following tags are supported by
 * **musicbrainz_workid**: the work id in the `MusicBrainz <https://picard.musicbrainz.org/docs/mappings/>`_ database.
 
 There can be multiple values for some of these tags.  For
-example, ``MPD`` may return multiple
+example, :program:`MPD` may return multiple
 lines with a ``performer`` tag.  A tag value is
 a UTF-8 string.
 
@@ -259,16 +305,17 @@ Recipes
 Queuing
 =======
 
-Often, users run ``MPD`` with :ref:`random <command_random>` enabled,
-but want to be able to insert songs "before" the rest of the playlist.
-That is commonly called "queuing".
+Often, users run :program:`MPD` with :ref:`random <command_random>`
+enabled, but want to be able to insert songs "before" the rest of the
+playlist.  That is commonly called "queuing".
 
-``MPD`` implements this by allowing the client to specify a "priority"
-for each song in the playlist (commands :ref:`priod <command_prio>`
-and :ref:`priodid <command_prioid>`).  A higher priority means that
-the song is going to be played before the other songs.
+:program:`MPD` implements this by allowing the client to specify a
+"priority" for each song in the playlist (commands :ref:`priod
+<command_prio>` and :ref:`priodid <command_prioid>`).  A higher
+priority means that the song is going to be played before the other
+songs.
 
-In "random" mode, ``MPD`` maintains an
+In "random" mode, :program:`MPD` maintains an
 internal randomized sequence of songs.  In this sequence,
 songs with a higher priority come first, and all songs with
 the same priority are shuffled (by default, all songs are
@@ -293,9 +340,9 @@ Command reference
    commands using song ids should be used instead of the commands
    that manipulate and control playback based on playlist
    position. Using song ids is a safer method when multiple
-   clients are interacting with ``MPD``.
+   clients are interacting with :program:`MPD`.
 
-Querying ``MPD``'s status
+Querying :program:`MPD`'s status
 ================================
 
 :command:`clearerror`
@@ -310,7 +357,7 @@ Querying ``MPD``'s status
 
 :command:`idle [SUBSYSTEMS...]` [#since_0_14]_
     Waits until there is a noteworthy change in one or more
-    of ``MPD``'s subsystems.  As soon
+    of :program:`MPD`'s subsystems.  As soon
     as there is one, it lists all changed systems in a line
     in the format ``changed:
     SUBSYSTEM``, where SUBSYSTEM is one of the
@@ -319,7 +366,7 @@ Querying ``MPD``'s status
     - ``database``: the song database has been modified after :ref:`update <command_update>`.
     - ``update``: a database update has started or finished.  If the database was modified during the update, the ``database`` event is also emitted.
     - ``stored_playlist``: a stored playlist has been modified, renamed, created or deleted
-    - ``playlist``: the current playlist has been modified
+    - ``playlist``: the queue (i.e. the current playlist) has been modified
     - ``player``: the player has been started, stopped or seeked
     - ``mixer``: the volume has been changed
     - ``output``: an audio output has been added, removed or modified (e.g. renamed, enabled or disabled)
@@ -340,11 +387,11 @@ Querying ``MPD``'s status
     to wait for events as long as mpd runs.  The
     `idle` command can be canceled by
     sending the command `noidle` (no other
-    commands are allowed). ``MPD``
+    commands are allowed). :program:`MPD`
     will then leave `idle` mode and print
     results immediately; might be empty at this time.
     If the optional ``SUBSYSTEMS`` argument
-    is used, ``MPD`` will only send
+    is used, :program:`MPD` will only send
     notifications when something changed in one of the
     specified subsytems.
 
@@ -354,19 +401,21 @@ Querying ``MPD``'s status
     Reports the current status of the player and the volume
     level.
 
-    - ``volume``: ``0-100`` or ``-1`` if the volume cannot be determined
+    - ``volume``: ``0-100`` (deprecated: ``-1`` if the volume cannot
+      be determined)
     - ``repeat``: ``0`` or ``1``
     - ``random``: ``0`` or ``1``
     - ``single`` [#since_0_15]_: ``0``, ``1``, or ``oneshot`` [#since_0_21]_
     - ``consume`` [#since_0_15]_: ``0`` or ``1``
     - ``playlist``: 31-bit unsigned integer, the playlist version number
     - ``playlistlength``: integer, the length of the playlist
-    - ``state``: ``play``, ``stop, or ``pause``
+    - ``state``: ``play``, ``stop``, or ``pause``
     - ``song``: playlist song number of the current song stopped on or playing
     - ``songid``: playlist songid of the current song stopped on or playing
     - ``nextsong`` [#since_0_15]_: playlist song number of the next song to be played
     - ``nextsongid`` [#since_0_15]_: playlist songid of the next song to be played
     - ``time``: total time elapsed (of current playing/paused song)
+      (deprecated, use ``elapsed`` instead)
     - ``elapsed`` [#since_0_16]_: Total time elapsed within the current song, but with higher resolution.
     - ``duration`` [#since_0_20]_: Duration of the current song in seconds.
     - ``bitrate``: instantaneous bitrate in kbps
@@ -377,6 +426,10 @@ Querying ``MPD``'s status
     - ``updating_db``: ``job id``
     - ``error``: if there is an error, returns message here
 
+    :program:`MPD` may omit lines which have no (known) value.  Older
+    :program:`MPD` versions used to have a "magic" value for
+    "unknown", e.g. ":samp:`volume: -1`".
+
 :command:`stats`
     Displays statistics.
 
@@ -490,8 +543,36 @@ Controlling playback
 :command:`stop`
     Stops playing.
 
-The current playlist
-====================
+The Queue
+=========
+
+.. note:: The "queue" used to be called "current playlist" or just
+          "playlist", but that was deemed confusing, because
+          "playlists" are also files containing a sequence of songs.
+          Those "playlist files" or "stored playlists" can be
+          :ref:`loaded into the queue <command_load>` and the queue
+          can be :ref:`saved into a playlist file <command_save>`, but
+          they are not to be confused with the queue.
+
+          Many of the command names in this section reflect the old
+          naming convention, but for the sake of compatibility, we
+          cannot rename commands.
+
+There are two ways to address songs within the queue: by their
+position and by their id.
+
+The position is a 0-based index.  It is unstable by design: if you
+move, delete or insert songs, all following indices will change, and a
+client can never be sure what song is behind a given index/position.
+
+Song ids on the other hand are stable: an id is assigned to a song
+when it is added, and will stay the same, no matter how much it is
+moved around.  Adding the same song twice will assign different ids to
+them, and a deleted-and-readded song will have a new id.  This way, a
+client can always be sure the correct song is being used.
+
+Many commands come in two flavors, one for each address type.
+Whenever possible, ids should be used.
 
 :command:`add {URI}`
     Adds the file ``URI`` to the playlist
@@ -507,7 +588,7 @@ The current playlist
      OK
 
 :command:`clear`
-    Clears the current playlist.
+    Clears the queue.
 
 .. _command_delete:
 
@@ -532,13 +613,13 @@ The current playlist
 
 :command:`playlist`
 
-    Displays the current playlist.
+    Displays the queue.
 
     Do not use this, instead use :ref:`playlistinfo
     <command_playlistinfo>`.
 
 :command:`playlistfind {TAG} {NEEDLE}`
-    Finds songs in the current playlist with strict
+    Finds songs in the queue with strict
     matching.
 
 :command:`playlistid {SONGID}`
@@ -556,7 +637,7 @@ The current playlist
 
 :command:`playlistsearch {TAG} {NEEDLE}`
     Searches case-insensitively for partial matches in the
-    current playlist.
+    queue.
 
 :command:`plchanges {VERSION} [START:END]`
     Displays changed songs currently in the playlist since
@@ -593,7 +674,7 @@ The current playlist
     but address the songs with their id.
 
 :command:`rangeid {ID} {START:END}` [#since_0_19]_
-    Since ``MPD``
+    Since :program:`MPD`
     0.19 Specifies the portion of the
     song that shall be played.  ``START`` and
     ``END`` are offsets in seconds
@@ -603,7 +684,7 @@ The current playlist
     playing cannot be manipulated this way.
 
 :command:`shuffle [START:END]`
-    Shuffles the current playlist.
+    Shuffles the queue.
     ``START:END`` is optional and specifies
     a range of songs.
 
@@ -638,7 +719,9 @@ and without the `.m3u` suffix).
 Some of the commands described in this section can be used to
 run playlist plugins instead of the hard-coded simple
 `m3u` parser.  They can access playlists in
-the music directory (relative path including the suffix) or
+the music directory (relative path including the suffix),
+playlists in arbitrary location (absolute path including the suffix;
+allowed only for clients that are connected via UNIX domain socket), or
 remote playlists (absolute URI with a supported scheme).
 
 :command:`listplaylist {NAME}`
@@ -657,6 +740,8 @@ remote playlists (absolute URI with a supported scheme).
     between clients and the server, clients should not
     compare this value with their local clock.
 
+.. _command_load:
+
 :command:`load {NAME} [START:END]`
     Loads the playlist into the current queue.  Playlist
     plugins are supported.  A range may be specified to load
@@ -687,8 +772,10 @@ remote playlists (absolute URI with a supported scheme).
     Removes the playlist `NAME.m3u` from
     the playlist directory.
 
+.. _command_save:
+
 :command:`save {NAME}`
-    Saves the current playlist to
+    Saves the queue to
     `NAME.m3u` in the playlist directory.
 
 The music database
@@ -773,7 +860,7 @@ The music database
 :command:`list {TYPE} {FILTER} [group {GROUPTYPE}]`
     Lists unique tags values of the specified type.
     ``TYPE`` can be any tag supported by
-    ``MPD`` or
+    :program:`MPD` or
     *file*.
 
     Additional arguments may specify a :ref:`filter <filter_syntax>`.
@@ -792,10 +879,10 @@ The music database
     ``URI``.
 
     Do not use this command.  Do not manage a client-side
-    copy of ``MPD``'s database.  That
+    copy of :program:`MPD`'s database.  That
     is fragile and adds huge overhead.  It will break with
     large databases.  Instead, query
-    ``MPD`` whenever you need
+    :program:`MPD` whenever you need
     something.
 
 .. _command_listallinfo:
@@ -806,16 +893,16 @@ The music database
     as :ref:`lsinfo <command_lsinfo>`
 
     Do not use this command.  Do not manage a client-side
-    copy of ``MPD``'s database.  That
+    copy of :program:`MPD`'s database.  That
     is fragile and adds huge overhead.  It will break with
     large databases.  Instead, query
-    ``MPD`` whenever you need
+    :program:`MPD` whenever you need
     something.
 
 :command:`listfiles {URI}`
     Lists the contents of the directory
     ``URI``, including files are not
-    recognized by ``MPD``.
+    recognized by :program:`MPD`.
     ``URI`` can be a path relative to the
     music directory or an URI understood by one of the
     storage plugins.  The response contains at least one
@@ -829,7 +916,7 @@ The music database
 
 .. _command_lsinfo:
 
-:command:`lsinfo {URI}`
+:command:`lsinfo [URI]`
     Lists the contents of the directory
     ``URI``.  The response contains records
     starting with ``file``,
@@ -922,7 +1009,7 @@ Multiple storages can be "mounted" together, similar to the
 `mount` command on many operating
 systems, but without cooperation from the kernel.  No
 superuser privileges are necessary, beause this mapping exists
-only inside the ``MPD`` process
+only inside the :program:`MPD` process
 
 .. _command_mount:
 
@@ -965,15 +1052,15 @@ Stickers
 
 "Stickers" [#since_0_15]_ are pieces of
 information attached to existing
-``MPD`` objects (e.g. song files,
+:program:`MPD` objects (e.g. song files,
 directories, albums).  Clients can create arbitrary name/value
-pairs.  ``MPD`` itself does not assume
+pairs.  :program:`MPD` itself does not assume
 any special meaning in them.
 
 The goal is to allow clients to share additional (possibly
 dynamic) information about songs, which is neither stored on
 the client (not available to other clients), nor stored in the
-song files (``MPD`` has no write
+song files (:program:`MPD` has no write
 access).
 
 Client developers should create a standard for common sticker
@@ -1015,14 +1102,21 @@ Connection settings
 ===================
 
 :command:`close`
-    Closes the connection to ``MPD``.
-    ``MPD`` will try to send the
+    Closes the connection to :program:`MPD`.
+    :program:`MPD` will try to send the
     remaining output buffer before it actually closes the
     connection, but that cannot be guaranteed.  This command
     will not generate a response.
 
+    Clients should not use this command; instead, they should just
+    close the socket.
+
 :command:`kill`
-    Kills ``MPD``.
+    Kills :program:`MPD`.
+
+    Do not use this command.  Send ``SIGTERM`` to :program:`MPD`
+    instead, or better: let your service manager handle :program:`MPD`
+    shutdown (e.g. :command:`systemctl stop mpd`).
 
 :command:`password {PASSWORD}`
     This is used for authentication with the server.
@@ -1044,7 +1138,7 @@ Connection settings
     ``tagtypes`` sub commands configure this
     list.
 
-:command:`tagtypes disable {NAME...]`
+:command:`tagtypes disable {NAME...}`
     Remove one or more tags from the list of tag types the
     client is interested in.  These will be omitted from
     responses to this client.
@@ -1056,7 +1150,7 @@ Connection settings
 
 :command:`tagtypes clear`
     Clear the list of tag types this client is interested
-    in.  This means that ``MPD`` will
+    in.  This means that :program:`MPD` will
     not send any tags to this client.
 
 :command:`tagtypes all`

doc/user.rst

@@ -54,7 +54,7 @@ Download the source tarball from the `MPD home page <https://musicpd.org>`_ and
 In any case, you need:
 
 * a C++14 compiler (e.g. gcc 6.0 or clang 3.9)
-* `Meson 0.47 <http://mesonbuild.com/>`__ and `Ninja
+* `Meson 0.47.2 <http://mesonbuild.com/>`__ and `Ninja
   <https://ninja-build.org/>`__
 * Boost 1.58
 * pkg-config 
@@ -67,6 +67,7 @@ For example, the following installs a fairly complete list of build dependencies
 .. code-block:: none
 
     apt install g++ \
+      libpcre3-dev \
       libmad0-dev libmpg123-dev libid3tag0-dev \
       libflac-dev libvorbis-dev libopus-dev \
       libadplug-dev libaudiofile-dev libsndfile1-dev libfaad-dev \
@@ -87,7 +88,7 @@ For example, the following installs a fairly complete list of build dependencies
       libupnp-dev \
       libavahi-client-dev \
       libsqlite3-dev \
-      libsystemd-dev libwrap0-dev \
+      libsystemd-dev \
       libgtest-dev \
       libboost-dev \
       libicu-dev
@@ -275,7 +276,9 @@ You can also use multiple storage plugins to assemble a virtual music directory
 Configuring database plugins
 ----------------------------
 
-If a music directory is configured, one database plugin is used. To configure this plugin, add a database block to :file:`mpd.conf`:
+If a music directory is configured, one database plugin is used. To
+configure this plugin, add a :code:`database` block to
+:file:`mpd.conf`:
 
 .. code-block:: none
 
@@ -290,7 +293,9 @@ reference.
 Configuring neighbor plugins
 ----------------------------
 
-All neighbor plugins are disabled by default to avoid unwanted overhead. To enable (and configure) a plugin, add a neighbor block to :file:`mpd.conf`:
+All neighbor plugins are disabled by default to avoid unwanted
+overhead. To enable (and configure) a plugin, add a :code:`neighbor`
+block to :file:`mpd.conf`:
 
 .. code-block:: none
 
@@ -303,7 +308,8 @@ More information can be found in the :ref:`neighbor_plugin` reference.
 Configuring input plugins
 -------------------------
 
-To configure an input plugin, add a input block to :file:`mpd.conf`:
+To configure an input plugin, add an :code:`input` block to
+:file:`mpd.conf`:
 
 .. code-block:: none
 
@@ -331,7 +337,8 @@ More information can be found in the :ref:`input_plugins` reference.
 Configuring decoder plugins
 ---------------------------
 
-Most decoder plugins do not need any special configuration. To configure a decoder, add a decoder block to :file:`mpd.conf`:
+Most decoder plugins do not need any special configuration. To
+configure a decoder, add a :code:`decoder` block to :file:`mpd.conf`:
 
 .. code-block:: none
 
@@ -367,7 +374,8 @@ Configuring audio outputs
 
 Audio outputs are devices which actually play the audio chunks produced by :program:`MPD`. You can configure any number of audio output devices, but there must be at least one. If none is configured, :program:`MPD` attempts to auto-detect. Usually, this works quite well with ALSA, OSS and on Mac OS X.
 
-To configure an audio output manually, add one or more audio_output blocks to :file:`mpd.conf`:
+To configure an audio output manually, add one or more
+:code:`audio_output` blocks to :file:`mpd.conf`:
 
 .. code-block:: none
 
@@ -405,14 +413,21 @@ The following table lists the audio_output options valid for all plugins:
    * - **always_on yes|no**
      - If set to yes, then :program:`MPD` attempts to keep this audio output always open. This may be useful for streaming servers, when you don't want to disconnect all listeners even when playback is accidentally stopped.
    * - **mixer_type hardware|software|null|none**
-     - Specifies which mixer should be used for this audio output: the hardware mixer (available for ALSA :ref:`alsa_plugin`, OSS :ref:`oss_plugin` and PulseAudio :ref:`pulse_plugin`), the software mixer, the "null" mixer (null; allows setting the volume, but with no effect; this can be used as a trick to implement an external mixer :ref:`external_mixer`) or no mixer (none). By default, the hardware mixer is used for devices which support it, and none for the others.
+     - Specifies which mixer should be used for this audio output: the
+       hardware mixer (available for ALSA :ref:`alsa_plugin`, OSS
+       :ref:`oss_plugin` and PulseAudio :ref:`pulse_plugin`), the
+       software mixer, the ":samp:`null`" mixer (allows setting the
+       volume, but with no effect; this can be used as a trick to
+       implement an external mixer :ref:`external_mixer`) or no mixer
+       (:samp:`none`). By default, the hardware mixer is used for
+       devices which support it, and none for the others.
 
 Configuring filters
 -------------------
 
 Filters are plugins which modify an audio stream.
 
-To configure a filter, add a filter block to :file:`mpd.conf`:
+To configure a filter, add a :code:`filter` block to :file:`mpd.conf`:
 
 .. code-block:: none
 
@@ -437,9 +452,12 @@ The following table lists the filter options valid for all plugins:
 Configuring playlist plugins
 ----------------------------
 
-Playlist plugins are used to load remote playlists (protocol commands load, listplaylist and listplaylistinfo). This is not related to :program:`MPD`'s playlist directory.
+Playlist plugins are used to load remote playlists (protocol commands
+load, listplaylist and listplaylistinfo). This is not related to
+:program:`MPD`'s :ref:`playlist directory <stored_playlists>`.
 
-To configure a playlist plugin, add a playlist_plugin block to :file:`mpd.conf`:
+To configure a playlist plugin, add a :code:`playlist_plugin` block to
+:file:`mpd.conf`:
 
 .. code-block:: none
 
@@ -513,6 +531,12 @@ choice::
 
  bind_to_address "/var/run/mpd/socket"
 
+On Linux, local sockets can be bound to a name without a socket inode
+on the filesystem; MPD implements this by prepending ``@`` to the
+address::
+
+ bind_to_address "@mpd"
+
 If no port is specified, the default port is 6600.  This default can
 be changed with the port setting::
 
@@ -816,10 +840,16 @@ The queue
 
 The queue (sometimes called "current playlist") is a list of songs to be played by :program:`MPD`. To play a song, add it to the queue and start playback. Most clients offer an interface to edit the queue.
 
+.. _stored_playlists:
+
 Stored Playlists
 ----------------
 
-Stored playlists are some kind of secondary playlists which can be created, saved, edited and deleted by the client. They are addressed by their names. Its contents can be loaded into the queue, to be played back. The playlist_directory setting specifies where those playlists are stored. 
+Stored playlists are some kind of secondary playlists which can be
+created, saved, edited and deleted by the client. They are addressed
+by their names.  Its contents can be loaded into the queue, to be
+played back.  The :code:`playlist_directory` setting specifies where
+those playlists are stored.
 
 Advanced usage
 **************
@@ -859,9 +889,11 @@ Obey the "format" row, which indicates that the current playback format is 16 bi
 Check list for bit-perfect playback:
 
 * Use the ALSA output plugin.
-* Disable sound processing inside ALSA by configuring a "hardware" device (hw:0,0 or similar).
-* Don't use software volume (setting mixer_type).
-* Don't force :program:`MPD` to use a specific audio format (settings format, audio_output_format).
+* Disable sound processing inside ALSA by configuring a "hardware"
+  device (:samp:`hw:0,0` or similar).
+* Don't use software volume (setting :code:`mixer_type`).
+* Don't force :program:`MPD` to use a specific audio format (settings
+  :code:`format`, :code:`audio_output_format`).
 * Verify that you are really doing bit-perfect playback using :program:`MPD`'s verbose log and :file:`/proc/asound/card*/pcm*p/sub*/hw_params`. Some DACs can also indicate the audio format.
 
 Direct Stream Digital (DSD)
@@ -876,7 +908,11 @@ DSD (`Direct Stream Digital <https://en.wikipedia.org/wiki/Direct_Stream_Digital
 * DoP (DSD over PCM) playback. This wraps DSD inside fake 24 bit PCM according to the DoP standard. Requires a DAC that supports DSD. No support from ALSA and the sound chip required (except for bit-perfect 24 bit PCM support).
 * Convert DSD to PCM on-the-fly. 
 
-Native DSD playback is used automatically if available. DoP is only used if enabled explicitly using the dop option, because there is no way for :program:`MPD` to find out whether the DAC supports it. DSD to PCM conversion is the fallback if DSD cannot be used directly.
+Native DSD playback is used automatically if available. DoP is only
+used if enabled explicitly using the :code:`dop` option, because there
+is no way for :program:`MPD` to find out whether the DAC supports
+it. DSD to PCM conversion is the fallback if DSD cannot be used
+directly.
 
 Client Hacks
 ************
@@ -967,7 +1003,16 @@ All :program:`MPD` crashes are bugs which must be fixed by a developer, and you
 
 A crash bug report needs to contain a "backtrace".
 
-First of all, your :program:`MPD` executable must not be "stripped" (i.e. debug information deleted). The executables shipped with Linux distributions are usually stripped, but some have so-called "debug" packages (package mpd-dbg or mpd-dbgsym on Debian, mpd-debug on other distributions). Make sure this package is installed.
+First of all, your :program:`MPD` executable must not be "stripped"
+(i.e. debug information deleted).  The executables shipped with Linux
+distributions are usually stripped, but some have so-called "debug"
+packages (package :file:`mpd-dbgsym` or :file:`mpd-dbg` on Debian,
+:file:`mpd-debug` on other distributions).  Make sure this package is
+installed.
+
+If you built :program:`MPD` from sources, please recompile with Meson
+option ":code:`--buildtype=debug -Db_ndebug=false`", because this will
+add more helpful information to the backtrace.
 
 You can extract the backtrace from a core dump, or by running :program:`MPD` in a debugger, e.g.:
 
@@ -976,4 +1021,5 @@ You can extract the backtrace from a core dump, or by running :program:`MPD` in
     gdb --args mpd --stdout --no-daemon --verbose
     run
 
-As soon as you have reproduced the crash, type "bt" on the gdb command prompt. Copy the output to your bug report.
+As soon as you have reproduced the crash, type ":command:`bt`" on the
+gdb command prompt. Copy the output to your bug report.

meson.build

@@ -1,8 +1,8 @@
 project(
   'mpd',
   ['c', 'cpp'],
-  version: '0.21',
-  meson_version: '>= 0.47',
+  version: '0.21.6',
+  meson_version: '>= 0.47.2',
   default_options: [
     'c_std=c99',
     'cpp_std=c++14'
@@ -20,7 +20,7 @@ conf.set_quoted('PACKAGE', meson.project_name())
 conf.set_quoted('PACKAGE_NAME', meson.project_name())
 conf.set_quoted('PACKAGE_VERSION', meson.project_version())
 conf.set_quoted('VERSION', meson.project_version())
-conf.set_quoted('PROTOCOL_VERSION', '0.21.0')
+conf.set_quoted('PROTOCOL_VERSION', '0.21.6')
 conf.set_quoted('SYSTEM_CONFIG_FILE_LOCATION', join_paths(get_option('prefix'), get_option('sysconfdir'), 'mpd.conf'))
 
 common_cppflags = [
@@ -99,7 +99,7 @@ is_linux = host_machine.system() == 'linux'
 is_android = get_option('android_ndk') != ''
 is_darwin = host_machine.system() == 'darwin'
 is_windows = host_machine.system() == 'windows'
-is_haiku = host_machine.system() == 'haiku' # TODO is this correct?
+is_haiku = host_machine.system() == 'haiku'
 
 if is_android
   common_cppflags += '-DANDROID'
@@ -172,6 +172,11 @@ inc = include_directories(
 )
 
 boost_dep = dependency('boost', version: '>= 1.58')
+if boost_dep.version() == '1.67'
+  # https://github.com/MusicPlayerDaemon/MPD/pull/384
+  # https://github.com/boostorg/lockfree/commit/12726cda009a855073b9bedbdce57b6ce7763da2
+  warning('Your Boost version 1.67 is known to be buggy, and the MPD build will fail. Please upgrade to Boost 1.68 or later.')
+endif
 
 sources = [
   version_cxx,
@@ -307,9 +312,9 @@ subdir('src/lib/curl')
 subdir('src/lib/expat')
 subdir('src/lib/ffmpeg')
 subdir('src/lib/gcrypt')
-subdir('src/lib/wrap')
 subdir('src/lib/nfs')
 subdir('src/lib/oss')
+subdir('src/lib/pcre')
 subdir('src/lib/pulse')
 subdir('src/lib/sndio')
 subdir('src/lib/sqlite')
@@ -426,7 +431,6 @@ mpd = build_target(
     systemd_dep,
     sqlite_dep,
     zeroconf_dep,
-    libwrap_dep,
     more_deps,
   ],
   link_args: link_args,

meson_options.txt

@@ -128,12 +128,13 @@ option('mpg123', type: 'feature', description: 'MP3 decoder using libmpg123')
 option('opus', type: 'feature', description: 'Opus decoder plugin')
 option('sidplay', type: 'feature', description: 'C64 SID support via libsidplayfp or libsidplay2')
 option('sndfile', type: 'feature', description: 'libsndfile decoder plugin')
+option('tremor', type: 'feature', description: 'Fixed-point vorbis decoder plugin')
 option('vorbis', type: 'feature', description: 'Vorbis decoder plugin')
 option('wavpack', type: 'feature', description: 'WavPack decoder plugin')
 option('wildmidi', type: 'feature', description: 'WildMidi decoder plugin')
 
 #
-# Decoder plugins
+# Encoder plugins
 #
 
 option('vorbisenc', type: 'feature', description: 'Vorbis encoder plugin')
@@ -175,7 +176,7 @@ option('dbus', type: 'feature', description: 'D-Bus support')
 option('expat', type: 'feature', description: 'Expat XML support')
 option('icu', type: 'feature', description: 'Use libicu for Unicode')
 option('iconv', type: 'feature', description: 'Use iconv() for character set conversion')
-option('libwrap', type: 'feature', description: 'libwrap support')
+option('pcre', type: 'feature', description: 'Enable regular expression support (using libpcre)')
 option('sqlite', type: 'feature', description: 'SQLite database support (for stickers)')
 option('yajl', type: 'feature', description: 'libyajl for YAML support')
 option('zlib', type: 'feature', description: 'zlib support (for database compression)')

python/build/libs.py

@@ -112,8 +112,8 @@ liblame = AutotoolsProject(
 )
 
 ffmpeg = FfmpegProject(
-    'http://ffmpeg.org/releases/ffmpeg-4.0.2.tar.xz',
-    'a95c0cc9eb990e94031d2183f2e6e444cc61c99f6f182d1575c433d62afb2f97',
+    'http://ffmpeg.org/releases/ffmpeg-4.1.1.tar.xz',
+    '373749824dfd334d84e55dff406729edfd1606575ee44dd485d97d45ea4d2d86',
     'lib/libavcodec.a',
     [
         '--disable-shared', '--enable-static',
@@ -341,8 +341,8 @@ ffmpeg = FfmpegProject(
 )
 
 curl = AutotoolsProject(
-    'http://curl.haxx.se/download/curl-7.61.1.tar.xz',
-    '3d5913d6a39bd22e68e34dff697fd6e4c3c81563f580c76fca2009315cd81891',
+    'http://curl.haxx.se/download/curl-7.64.0.tar.xz',
+    '2f2f13fa34d44aa29cb444077ad7dc4dc6d189584ad552e0aaeb06e608af6001',
     'lib/libcurl.a',
     [
         '--disable-shared', '--enable-static',
@@ -392,7 +392,7 @@ libnfs = AutotoolsProject(
 )
 
 boost = BoostProject(
-    'http://downloads.sourceforge.net/project/boost/boost/1.68.0/boost_1_68_0.tar.bz2',
-    '7f6130bc3cf65f56a618888ce9d5ea704fa10b462be126ad053e80e553d6d8b7',
+    'http://downloads.sourceforge.net/project/boost/boost/1.69.0/boost_1_69_0.tar.bz2',
+    '8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406',
     'include/boost/version.hpp',
 )

python/build/zlib.py

@@ -18,5 +18,5 @@ class ZlibProject(Project):
             'INCLUDE_PATH='+ os.path.join(toolchain.install_prefix, 'include'),
             'LIBRARY_PATH=' + os.path.join(toolchain.install_prefix, 'lib'),
             'BINARY_PATH=' + os.path.join(toolchain.install_prefix, 'bin'),
-            'SHARED_MODE=1'],
+            ],
             cwd=src, env=toolchain.env)

scripts/check_config_h.rb

@@ -1,47 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This script verifies that every source includes config.h first.
-# This is very important for consistent Large File Support.
-#
-
-def check_file(file)
-    first = true
-    file.each_line do |line|
-        if line =~ /^\#include\s+(\S+)/ then
-            if $1 == '"config.h"'
-                unless first
-                    puts "#{file.path}: config.h included too late"
-                end
-            else
-                if first
-                    puts "#{file.path}: config.h missing"
-                end
-            end
-            first = false
-        end
-    end
-end
-
-def check_path(path)
-    File.open(path) do |file|
-        check_file(file)
-    end
-end
-
-if ARGV.empty?
-    Dir["src/*.c"].each do |path|
-        check_path(path)
-    end
-
-    Dir["src/*/*.c"].each do |path|
-        check_path(path)
-    end
-
-    Dir["test/*.c"].each do |path|
-        check_path(path)
-    end
-else
-    ARGV.each do |path|
-        check_path(path)
-    end
-end

src/AudioParser.cxx

@@ -22,7 +22,6 @@
  *
  */
 
-#include "config.h"
 #include "AudioParser.hxx"
 #include "AudioFormat.hxx"
 #include "util/RuntimeError.hxx"

src/CheckAudioFormat.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "CheckAudioFormat.hxx"
 #include "AudioFormat.hxx"
 #include "util/RuntimeError.hxx"

src/IcyMetaDataParser.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "IcyMetaDataParser.hxx"
 #include "tag/Tag.hxx"
 #include "tag/Builder.hxx"

src/Idle.cxx

@@ -22,7 +22,6 @@
  *
  */
 
-#include "config.h"
 #include "Idle.hxx"
 #include "Main.hxx"
 #include "Instance.hxx"

src/IdleFlags.cxx

@@ -22,7 +22,6 @@
  *
  */
 
-#include "config.h"
 #include "IdleFlags.hxx"
 #include "util/ASCII.hxx"
 

src/Instance.cxx

@@ -30,6 +30,9 @@
 
 #ifdef ENABLE_DATABASE
 #include "db/DatabaseError.hxx"
+#include "db/Interface.hxx"
+#include "db/update/Service.hxx"
+#include "storage/StorageInterface.hxx"
 
 #ifdef ENABLE_SQLITE
 #include "sticker/StickerDatabase.hxx"
@@ -48,7 +51,19 @@ Instance::Instance()
 {
 }
 
-Instance::~Instance() noexcept = default;
+Instance::~Instance() noexcept
+{
+#ifdef ENABLE_DATABASE
+	delete update;
+
+	if (database != nullptr) {
+		database->Close();
+		database.reset();
+	}
+
+	delete storage;
+#endif
+}
 
 Partition *
 Instance::FindPartition(const char *name) noexcept

src/Instance.hxx

@@ -20,7 +20,7 @@
 #ifndef MPD_INSTANCE_HXX
 #define MPD_INSTANCE_HXX
 
-#include "check.h"
+#include "config.h"
 #include "event/Loop.hxx"
 #include "event/Thread.hxx"
 #include "event/MaskMonitor.hxx"
@@ -41,7 +41,7 @@ class NeighborGlue;
 
 #ifdef ENABLE_DATABASE
 #include "db/DatabaseListener.hxx"
-class Database;
+#include "db/Ptr.hxx"
 class Storage;
 class UpdateService;
 #endif
@@ -104,7 +104,7 @@ struct Instance final
 #endif
 
 #ifdef ENABLE_DATABASE
-	Database *database;
+	DatabasePtr database;
 
 	/**
 	 * This is really a #CompositeStorage.  To avoid heavy include
@@ -147,7 +147,6 @@ struct Instance final
 	Partition *FindPartition(const char *name) noexcept;
 
 	void BeginShutdownPartitions() noexcept;
-	void FinishShutdownPartitions() noexcept;
 
 #ifdef ENABLE_DATABASE
 	/**
@@ -156,7 +155,7 @@ struct Instance final
 	 * music_directory was configured).
 	 */
 	Database *GetDatabase() {
-		return database;
+		return database.get();
 	}
 
 	/**
@@ -168,8 +167,6 @@ struct Instance final
 #endif
 
 	void BeginShutdownUpdate() noexcept;
-	void FinishShutdownUpdate() noexcept;
-	void ShutdownDatabase() noexcept;
 
 #ifdef ENABLE_CURL
 	void LookupRemoteTag(const char *uri) noexcept;

src/LocateUri.hxx

@@ -20,7 +20,7 @@
 #ifndef MPD_LOCATE_URI_HXX
 #define MPD_LOCATE_URI_HXX
 
-#include "check.h"
+#include "config.h"
 #include "util/Compiler.h"
 #include "fs/AllocatedPath.hxx"
 

src/Log.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "LogV.hxx"
 #include "util/Domain.hxx"
 

src/LogBackend.cxx

@@ -17,11 +17,11 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "LogBackend.hxx"
 #include "Log.hxx"
 #include "util/Domain.hxx"
 #include "util/StringStrip.hxx"
+#include "config.h"
 
 #include <assert.h>
 #include <stdio.h>

src/LogBackend.hxx

@@ -20,7 +20,6 @@
 #ifndef MPD_LOG_BACKEND_HXX
 #define MPD_LOG_BACKEND_HXX
 
-#include "check.h"
 #include "LogLevel.hxx"
 
 void

src/LogInit.cxx

@@ -30,6 +30,10 @@
 #include "util/RuntimeError.hxx"
 #include "system/Error.hxx"
 
+#ifdef ENABLE_SYSTEMD_DAEMON
+#include <systemd/sd-daemon.h>
+#endif
+
 #include <assert.h>
 #include <string.h>
 #include <fcntl.h>
@@ -105,7 +109,7 @@ parse_log_level(const char *value, int line)
 #endif
 
 void
-log_early_init(bool verbose)
+log_early_init(bool verbose) noexcept
 {
 #ifdef ANDROID
 	(void)verbose;
@@ -139,6 +143,16 @@ log_init(const ConfigData &config, bool verbose, bool use_stdout)
 		if (param == nullptr) {
 			/* no configuration: default to syslog (if
 			   available) */
+#ifdef ENABLE_SYSTEMD_DAEMON
+			if (sd_booted() &&
+			    getenv("NOTIFY_SOCKET") != nullptr) {
+				/* if MPD was started as a systemd
+				   service, default to journal (which
+				   is connected to fd=2) */
+				out_fd = STDOUT_FILENO;
+				return;
+			}
+#endif
 #ifndef HAVE_SYSLOG
 			throw std::runtime_error("config parameter 'log_file' not found");
 #endif
@@ -157,7 +171,7 @@ log_init(const ConfigData &config, bool verbose, bool use_stdout)
 #ifndef ANDROID
 
 static void
-close_log_files(void)
+close_log_files() noexcept
 {
 #ifdef HAVE_SYSLOG
 	LogFinishSysLog();
@@ -167,7 +181,7 @@ close_log_files(void)
 #endif
 
 void
-log_deinit(void)
+log_deinit() noexcept
 {
 #ifndef ANDROID
 	close_log_files();
@@ -199,7 +213,8 @@ void setup_log_output()
 #endif
 }
 
-int cycle_log_files(void)
+int
+cycle_log_files() noexcept
 {
 #ifdef ANDROID
 	return 0;

src/LogInit.hxx

@@ -31,7 +31,7 @@ struct ConfigData;
  * @param verbose true when the program is started with --verbose
  */
 void
-log_early_init(bool verbose);
+log_early_init(bool verbose) noexcept;
 
 /**
  * Throws #std::runtime_error on error.
@@ -40,12 +40,12 @@ void
 log_init(const ConfigData &config, bool verbose, bool use_stdout);
 
 void
-log_deinit();
+log_deinit() noexcept;
 
 void
 setup_log_output();
 
 int
-cycle_log_files();
+cycle_log_files() noexcept;
 
 #endif /* LOG_H */

src/Main.cxx

@@ -185,19 +185,16 @@ InitStorage(const ConfigData &config, EventLoop &event_loop)
 static bool
 glue_db_init_and_load(const ConfigData &config)
 {
-	instance->database =
-		CreateConfiguredDatabase(config, instance->event_loop,
-					 instance->io_thread.GetEventLoop(),
-					 *instance);
-	if (instance->database == nullptr)
+	auto db = CreateConfiguredDatabase(config, instance->event_loop,
+					   instance->io_thread.GetEventLoop(),
+					   *instance);
+	if (!db)
 		return true;
 
-	if (instance->database->GetPlugin().flags & DatabasePlugin::FLAG_REQUIRE_STORAGE) {
+	if (db->GetPlugin().RequireStorage()) {
 		InitStorage(config, instance->io_thread.GetEventLoop());
 
 		if (instance->storage == nullptr) {
-			delete instance->database;
-			instance->database = nullptr;
 			LogDefault(config_domain,
 				   "Found database setting without "
 				   "music_directory - disabling database");
@@ -211,22 +208,24 @@ glue_db_init_and_load(const ConfigData &config)
 	}
 
 	try {
-		instance->database->Open();
+		db->Open();
 	} catch (...) {
 		std::throw_with_nested(std::runtime_error("Failed to open database plugin"));
 	}
 
-	if (!instance->database->IsPlugin(simple_db_plugin))
+	instance->database = std::move(db);
+
+	auto *sdb = dynamic_cast<SimpleDatabase *>(instance->database.get());
+	if (sdb == nullptr)
 		return true;
 
-	SimpleDatabase &db = *(SimpleDatabase *)instance->database;
 	instance->update = new UpdateService(config,
-					     instance->event_loop, db,
+					     instance->event_loop, *sdb,
 					     static_cast<CompositeStorage &>(*instance->storage),
 					     *instance);
 
 	/* run database update after daemonization? */
-	return db.FileExists();
+	return sdb->FileExists();
 }
 
 static bool
@@ -351,27 +350,6 @@ Instance::BeginShutdownUpdate() noexcept
 #endif
 }
 
-inline void
-Instance::FinishShutdownUpdate() noexcept
-{
-#ifdef ENABLE_DATABASE
-	delete update;
-#endif
-}
-
-inline void
-Instance::ShutdownDatabase() noexcept
-{
-#ifdef ENABLE_DATABASE
-	if (instance->database != nullptr) {
-		instance->database->Close();
-		delete instance->database;
-	}
-
-	delete instance->storage;
-#endif
-}
-
 inline void
 Instance::BeginShutdownPartitions() noexcept
 {
@@ -381,12 +359,6 @@ Instance::BeginShutdownPartitions() noexcept
 	}
 }
 
-inline void
-Instance::FinishShutdownPartitions() noexcept
-{
-	partitions.clear();
-}
-
 void
 Instance::OnIdle(unsigned flags)
 {
@@ -523,18 +495,19 @@ static int
 mpd_main_after_fork(const ConfigData &raw_config, const Config &config)
 {
 	ConfigureFS(raw_config);
+	AtScopeExit() { DeinitFS(); };
 
 	glue_mapper_init(raw_config);
 
 	initPermissions(raw_config);
 	spl_global_init(raw_config);
 #ifdef ENABLE_ARCHIVE
-	archive_plugin_init_all();
+	const ScopeArchivePluginsInit archive_plugins_init;
 #endif
 
 	pcm_convert_global_init(raw_config);
 
-	decoder_plugin_init_all(raw_config);
+	const ScopeDecoderPluginsInit decoder_plugins_init(raw_config);
 
 #ifdef ENABLE_DATABASE
 	const bool create_db = InitDatabaseAndStorage(raw_config);
@@ -553,9 +526,9 @@ mpd_main_after_fork(const ConfigData &raw_config, const Config &config)
 	}
 
 	client_manager_init(raw_config);
-	input_stream_global_init(raw_config,
-				 instance->io_thread.GetEventLoop());
-	playlist_list_global_init(raw_config);
+	const ScopeInputPluginsInit input_plugins_init(raw_config,
+						       instance->io_thread.GetEventLoop());
+	const ScopePlaylistPluginsInit playlist_plugins_init(raw_config);
 
 #ifdef ENABLE_DAEMON
 	daemonize_commit();
@@ -564,7 +537,7 @@ mpd_main_after_fork(const ConfigData &raw_config, const Config &config)
 #ifndef ANDROID
 	setup_log_output();
 
-	SignalHandlersInit(instance->event_loop);
+	const ScopeSignalHandlersInit signal_handlers_init(instance->event_loop);
 #endif
 
 	instance->io_thread.Start();
@@ -652,34 +625,10 @@ mpd_main_after_fork(const ConfigData &raw_config, const Config &config)
 	}
 #endif
 
-	instance->FinishShutdownUpdate();
-	instance->ShutdownDatabase();
-
 #ifdef ENABLE_SQLITE
 	sticker_global_finish();
 #endif
 
-	playlist_list_global_finish();
-	input_stream_global_finish();
-
-#ifdef ENABLE_DATABASE
-	mapper_finish();
-#endif
-
-	DeinitFS();
-
-	instance->FinishShutdownPartitions();
-	command_finish();
-	decoder_plugin_deinit_all();
-#ifdef ENABLE_ARCHIVE
-	archive_plugin_deinit_all();
-#endif
-	instance->rtio_thread.Stop();
-	instance->io_thread.Stop();
-#ifndef ANDROID
-	SignalHandlersFinish();
-#endif
-
 	return EXIT_SUCCESS;
 }
 

src/Mapper.cxx

@@ -58,11 +58,6 @@ mapper_init(AllocatedPath &&_playlist_dir)
 		mapper_set_playlist_dir(std::move(_playlist_dir));
 }
 
-void
-mapper_finish() noexcept
-{
-}
-
 #ifdef ENABLE_DATABASE
 
 AllocatedPath

src/Mapper.hxx

@@ -24,9 +24,10 @@
 #ifndef MPD_MAPPER_HXX
 #define MPD_MAPPER_HXX
 
-#include <string>
-
 #include "util/Compiler.h"
+#include "config.h"
+
+#include <string>
 
 #define PLAYLIST_FILE_SUFFIX ".m3u"
 
@@ -36,9 +37,6 @@ class AllocatedPath;
 void
 mapper_init(AllocatedPath &&playlist_dir);
 
-void
-mapper_finish() noexcept;
-
 #ifdef ENABLE_DATABASE
 
 /**

src/MixRampInfo.hxx

@@ -20,7 +20,6 @@
 #ifndef MPD_MIX_RAMP_INFO_HXX
 #define MPD_MIX_RAMP_INFO_HXX
 
-#include "check.h"
 #include "util/Compiler.h"
 
 #include <string>

src/MusicBuffer.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "MusicBuffer.hxx"
 #include "MusicChunk.hxx"
 

src/MusicChunk.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "MusicChunk.hxx"
 #include "AudioFormat.hxx"
 #include "tag/Tag.hxx"

src/MusicChunkPtr.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "MusicChunkPtr.hxx"
 #include "MusicBuffer.hxx"
 

src/MusicChunkPtr.hxx

@@ -20,8 +20,6 @@
 #ifndef MPD_MUSIC_CHUNK_PTR_HXX
 #define MPD_MUSIC_CHUNK_PTR_HXX
 
-#include "check.h"
-
 #include <memory>
 
 struct MusicChunk;

src/MusicPipe.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "MusicPipe.hxx"
 #include "MusicChunk.hxx"
 

src/Partition.hxx

@@ -31,6 +31,7 @@
 #include "SingleMode.hxx"
 #include "Chrono.hxx"
 #include "util/Compiler.h"
+#include "config.h"
 
 #include <string>
 #include <memory>

src/Permission.hxx

@@ -20,7 +20,7 @@
 #ifndef MPD_PERMISSION_HXX
 #define MPD_PERMISSION_HXX
 
-#include "check.h"
+#include "config.h"
 
 struct ConfigData;
 

src/PlaylistDatabase.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "PlaylistDatabase.hxx"
 #include "db/PlaylistVector.hxx"
 #include "fs/io/TextFile.hxx"

src/PlaylistDatabase.hxx

@@ -20,8 +20,6 @@
 #ifndef MPD_PLAYLIST_DATABASE_HXX
 #define MPD_PLAYLIST_DATABASE_HXX
 
-#include "check.h"
-
 #define PLAYLIST_META_BEGIN "playlist_begin: "
 
 class PlaylistVector;

src/PlaylistError.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "PlaylistError.hxx"
 #include "util/Domain.hxx"
 

src/PlaylistFile.cxx

@@ -134,7 +134,9 @@ LoadPlaylistFileInfo(PlaylistInfo &info,
 	const auto *const name_fs_end =
 		FindStringSuffix(name_fs_str,
 				 PATH_LITERAL(PLAYLIST_FILE_SUFFIX));
-	if (name_fs_end == nullptr)
+	if (name_fs_end == nullptr ||
+	    /* no empty playlist names (raw file name = ".m3u") */
+	    name_fs_end == name_fs_str)
 		return false;
 
 	FileInfo fi;

src/PlaylistPrint.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "PlaylistPrint.hxx"
 #include "PlaylistFile.hxx"
 #include "PlaylistError.hxx"

src/RemoteTagCache.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "RemoteTagCache.hxx"
 #include "RemoteTagCacheHandler.hxx"
 #include "input/ScanTags.hxx"

src/RemoteTagCache.hxx

@@ -20,7 +20,6 @@
 #ifndef MPD_REMOTE_TAG_CACHE_HXX
 #define MPD_REMOTE_TAG_CACHE_HXX
 
-#include "check.h"
 #include "input/RemoteTagScanner.hxx"
 #include "tag/Tag.hxx"
 #include "event/DeferEvent.hxx"

src/ReplayGainConfig.hxx

@@ -20,8 +20,6 @@
 #ifndef MPD_REPLAY_GAIN_CONFIG_HXX
 #define MPD_REPLAY_GAIN_CONFIG_HXX
 
-#include "check.h"
-
 struct ReplayGainConfig {
 	static constexpr bool DEFAULT_LIMIT = true;
 

src/ReplayGainGlobal.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ReplayGainGlobal.hxx"
 #include "ReplayGainConfig.hxx"
 #include "config/Param.hxx"

src/ReplayGainGlobal.hxx

@@ -20,8 +20,6 @@
 #ifndef MPD_REPLAY_GAIN_GLOBAL_HXX
 #define MPD_REPLAY_GAIN_GLOBAL_HXX
 
-#include "check.h"
-
 struct ConfigData;
 struct ReplayGainConfig;
 

src/ReplayGainInfo.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ReplayGainInfo.hxx"
 #include "ReplayGainConfig.hxx"
 

src/ReplayGainInfo.hxx

@@ -20,7 +20,6 @@
 #ifndef MPD_REPLAY_GAIN_INFO_HXX
 #define MPD_REPLAY_GAIN_INFO_HXX
 
-#include "check.h"
 #include "util/Compiler.h"
 #include "ReplayGainMode.hxx"
 

src/SongLoader.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "SongLoader.hxx"
 #include "LocateUri.hxx"
 #include "client/Client.hxx"
@@ -25,6 +24,7 @@
 #include "storage/StorageInterface.hxx"
 #include "song/DetachedSong.hxx"
 #include "PlaylistError.hxx"
+#include "config.h"
 
 #include <assert.h>
 

src/SongLoader.hxx

@@ -20,8 +20,8 @@
 #ifndef MPD_SONG_LOADER_HXX
 #define MPD_SONG_LOADER_HXX
 
-#include "check.h"
 #include "util/Compiler.h"
+#include "config.h"
 
 #include <cstddef>
 

src/SongPrint.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "SongPrint.hxx"
 #include "song/LightSong.hxx"
 #include "Partition.hxx"

src/SongSave.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "SongSave.hxx"
 #include "AudioParser.hxx"
 #include "db/plugins/simple/Song.hxx"

src/StateFile.cxx

@@ -119,7 +119,7 @@ try {
 	TextFile file(config.path);
 
 #ifdef ENABLE_DATABASE
-	const SongLoader song_loader(partition.instance.database,
+	const SongLoader song_loader(partition.instance.GetDatabase(),
 				     partition.instance.storage);
 #else
 	const SongLoader song_loader(nullptr, nullptr);

src/StateFile.hxx

@@ -24,6 +24,7 @@
 #include "event/TimerEvent.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "util/Compiler.h"
+#include "config.h"
 
 #include <string>
 #include <chrono>

src/StateFileConfig.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "StateFileConfig.hxx"
 #include "config/Data.hxx"
 

src/StateFileConfig.hxx

@@ -20,7 +20,6 @@
 #ifndef MPD_STATE_FILE_CONFIG_HXX
 #define MPD_STATE_FILE_CONFIG_HXX
 
-#include "check.h"
 #include "fs/AllocatedPath.hxx"
 
 #include <chrono>

src/Stats.cxx

@@ -124,7 +124,7 @@ stats_print(Response &r, const Partition &partition)
 		 std::lround(partition.pc.GetTotalPlayTime().count()));
 
 #ifdef ENABLE_DATABASE
-	const Database *db = partition.instance.database;
+	const Database *db = partition.instance.GetDatabase();
 	if (db != nullptr)
 		db_stats_print(r, *db);
 #endif

src/TagArchive.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "TagArchive.hxx"
 #include "TagStream.hxx"
 #include "archive/ArchiveFile.hxx"

src/TagArchive.hxx

@@ -20,8 +20,6 @@
 #ifndef MPD_TAG_ARCHIVE_HXX
 #define MPD_TAG_ARCHIVE_HXX
 
-#include "check.h"
-
 class ArchiveFile;
 class TagHandler;
 class TagBuilder;

src/TagFile.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "TagFile.hxx"
 #include "tag/Generic.hxx"
 #include "tag/Handler.hxx"

src/TagFile.hxx

@@ -20,8 +20,6 @@
 #ifndef MPD_TAG_FILE_HXX
 #define MPD_TAG_FILE_HXX
 
-#include "check.h"
-
 struct AudioFormat;
 class Path;
 class TagHandler;

src/TagPrint.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "TagPrint.hxx"
 #include "tag/Tag.hxx"
 #include "tag/Settings.hxx"
@@ -26,8 +25,9 @@
 void
 tag_print_types(Response &r) noexcept
 {
+	const auto tag_mask = global_tag_mask & r.GetTagMask();
 	for (unsigned i = 0; i < TAG_NUM_OF_ITEM_TYPES; i++)
-		if (IsTagEnabled(i))
+		if (tag_mask.Test(TagType(i)))
 			r.Format("tagtype: %s\n", tag_item_names[i]);
 }
 

src/TagSave.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "TagSave.hxx"
 #include "tag/Tag.hxx"
 #include "fs/io/BufferedOutputStream.hxx"

src/TagStream.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "TagStream.hxx"
 #include "tag/Generic.hxx"
 #include "tag/Handler.hxx"

src/TagStream.hxx

@@ -20,8 +20,6 @@
 #ifndef MPD_TAG_STREAM_HXX
 #define MPD_TAG_STREAM_HXX
 
-#include "check.h"
-
 struct AudioFormat;
 class InputStream;
 class TagHandler;

src/TimePrint.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "TimePrint.hxx"
 #include "client/Response.hxx"
 #include "util/TimeISO8601.hxx"

src/android/Context.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Context.hxx"
 #include "java/Class.hxx"
 #include "java/File.hxx"

src/android/Environment.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Environment.hxx"
 #include "java/Class.hxx"
 #include "java/String.hxx"

src/android/LogListener.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "LogListener.hxx"
 #include "java/Class.hxx"
 #include "java/String.hxx"

src/archive/ArchiveList.cxx

@@ -49,7 +49,7 @@ static bool archive_plugins_enabled[ARRAY_SIZE(archive_plugins) - 1];
 		if (archive_plugins_enabled[archive_plugin_iterator - archive_plugins])
 
 const ArchivePlugin *
-archive_plugin_from_suffix(const char *suffix)
+archive_plugin_from_suffix(const char *suffix) noexcept
 {
 	if (suffix == nullptr)
 		return nullptr;
@@ -63,7 +63,7 @@ archive_plugin_from_suffix(const char *suffix)
 }
 
 const ArchivePlugin *
-archive_plugin_from_name(const char *name)
+archive_plugin_from_name(const char *name) noexcept
 {
 	archive_plugins_for_each_enabled(plugin)
 		if (strcmp(plugin->name, name) == 0)
@@ -81,7 +81,8 @@ void archive_plugin_init_all(void)
 	}
 }
 
-void archive_plugin_deinit_all(void)
+void
+archive_plugin_deinit_all() noexcept
 {
 	archive_plugins_for_each_enabled(plugin)
 		if (plugin->finish != nullptr)

src/archive/ArchiveList.hxx

@@ -33,10 +33,10 @@ extern const ArchivePlugin *const archive_plugins[];
 /* interface for using plugins */
 
 const ArchivePlugin *
-archive_plugin_from_suffix(const char *suffix);
+archive_plugin_from_suffix(const char *suffix) noexcept;
 
 const ArchivePlugin *
-archive_plugin_from_name(const char *name);
+archive_plugin_from_name(const char *name) noexcept;
 
 /* this is where we "load" all the "plugins" ;-) */
 void
@@ -44,6 +44,17 @@ archive_plugin_init_all();
 
 /* this is where we "unload" all the "plugins" */
 void
-archive_plugin_deinit_all();
+archive_plugin_deinit_all() noexcept;
+
+class ScopeArchivePluginsInit {
+public:
+	ScopeArchivePluginsInit() {
+		archive_plugin_init_all();
+	}
+
+	~ScopeArchivePluginsInit() noexcept {
+		archive_plugin_deinit_all();
+	}
+};
 
 #endif

src/archive/ArchiveLookup.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h" /* must be first for large file support */
 #include "ArchiveLookup.hxx"
 #include "ArchiveDomain.hxx"
 #include "Log.hxx"

src/archive/ArchivePlugin.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ArchivePlugin.hxx"
 #include "ArchiveFile.hxx"
 #include "fs/Path.hxx"

src/archive/plugins/Bzip2ArchivePlugin.cxx

@@ -21,7 +21,6 @@
   * single bz2 archive handling (requires libbz2)
   */
 
-#include "config.h"
 #include "Bzip2ArchivePlugin.hxx"
 #include "../ArchivePlugin.hxx"
 #include "../ArchiveFile.hxx"

src/archive/plugins/Iso9660ArchivePlugin.cxx

@@ -21,7 +21,6 @@
   * iso archive handling (requires cdio, and iso9660)
   */
 
-#include "config.h"
 #include "Iso9660ArchivePlugin.hxx"
 #include "../ArchivePlugin.hxx"
 #include "../ArchiveFile.hxx"

src/archive/plugins/ZzipArchivePlugin.cxx

@@ -21,7 +21,6 @@
   * zip archive handling (requires zziplib)
   */
 
-#include "config.h"
 #include "ZzipArchivePlugin.hxx"
 #include "../ArchivePlugin.hxx"
 #include "../ArchiveFile.hxx"

src/client/Client.cxx

@@ -17,11 +17,11 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ClientInternal.hxx"
-#include "util/Domain.hxx"
 #include "Partition.hxx"
 #include "Instance.hxx"
+#include "util/Domain.hxx"
+#include "config.h"
 
 const Domain client_domain("client");
 

src/client/Client.hxx

@@ -20,7 +20,6 @@
 #ifndef MPD_CLIENT_H
 #define MPD_CLIENT_H
 
-#include "check.h"
 #include "ClientMessage.hxx"
 #include "command/CommandListBuilder.hxx"
 #include "tag/Mask.hxx"

src/client/ClientEvent.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Client.hxx"
 #include "Log.hxx"
 

src/client/ClientExpire.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ClientInternal.hxx"
 #include "Log.hxx"
 

src/client/ClientFile.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Client.hxx"
 #include "protocol/Ack.hxx"
 #include "fs/Path.hxx"

src/client/ClientGlobal.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ClientInternal.hxx"
 #include "config/Data.hxx"
 

src/client/ClientIdle.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ClientInternal.hxx"
 #include "Response.hxx"
 #include "Idle.hxx"

src/client/ClientInternal.hxx

@@ -20,7 +20,6 @@
 #ifndef MPD_CLIENT_INTERNAL_HXX
 #define MPD_CLIENT_INTERNAL_HXX
 
-#include "check.h"
 #include "Client.hxx"
 #include "command/CommandResult.hxx"
 

src/client/ClientList.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ClientList.hxx"
 #include "ClientInternal.hxx"
 #include "util/DeleteDisposer.hxx"

src/client/ClientNew.cxx

@@ -35,10 +35,6 @@
 #include <sys/socket.h>
 #endif
 
-#ifdef HAVE_LIBWRAP
-#include <tcpd.h>
-#endif
-
 static constexpr char GREETING[] = "OK MPD " PROTOCOL_VERSION "\n";
 
 Client::Client(EventLoop &_loop, Partition &_partition,
@@ -66,27 +62,6 @@ client_new(EventLoop &loop, Partition &partition,
 
 	assert(fd.IsDefined());
 
-#ifdef HAVE_LIBWRAP
-	if (address.GetFamily() != AF_LOCAL) {
-		// TODO: shall we obtain the program name from argv[0]?
-		const char *progname = "mpd";
-
-		struct request_info req;
-		request_init(&req, RQ_FILE, fd.Get(), RQ_DAEMON, progname, 0);
-
-		fromhost(&req);
-
-		if (!hosts_access(&req)) {
-			/* tcp wrappers says no */
-			FormatWarning(client_domain,
-				      "libwrap refused connection (libwrap=%s) from %s",
-				      progname, remote.c_str());
-
-			return;
-		}
-	}
-#endif	/* HAVE_WRAP */
-
 	ClientList &client_list = *partition.instance.client_list;
 	if (client_list.IsFull()) {
 		LogWarning(client_domain, "Max connections reached");

src/client/ClientProcess.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ClientInternal.hxx"
 #include "protocol/Result.hxx"
 #include "command/AllCommands.hxx"

src/client/ClientRead.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ClientInternal.hxx"
 #include "Partition.hxx"
 #include "Instance.hxx"

src/client/ClientSubscribe.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ClientInternal.hxx"
 #include "Partition.hxx"
 #include "Idle.hxx"

src/client/ClientWrite.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Client.hxx"
 
 #include <string.h>

src/client/Listener.cxx

@@ -17,12 +17,12 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Listener.hxx"
 #include "Client.hxx"
 #include "Permission.hxx"
 #include "net/UniqueSocketDescriptor.hxx"
 #include "net/SocketAddress.hxx"
+#include "config.h"
 
 static unsigned
 GetPermissions(SocketAddress address, int uid) noexcept

src/client/Listener.hxx

@@ -20,7 +20,6 @@
 #ifndef MPD_CLIENT_LISTENER_HXX
 #define MPD_CLIENT_LISTENER_HXX
 
-#include "check.h"
 #include "event/ServerSocket.hxx"
 
 struct Partition;

src/client/Response.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Response.hxx"
 #include "Client.hxx"
 #include "util/FormatString.hxx"

src/client/Response.hxx

@@ -20,7 +20,6 @@
 #ifndef MPD_RESPONSE_HXX
 #define MPD_RESPONSE_HXX
 
-#include "check.h"
 #include "protocol/Ack.hxx"
 #include "util/Compiler.h"
 

src/command/AllCommands.cxx

@@ -285,11 +285,6 @@ command_init()
 #endif
 }
 
-void
-command_finish()
-{
-}
-
 static const struct command *
 command_lookup(const char *name)
 {