Merge branch 'maint'

Was cooking for a week and seems to be regression-free.

	aft: Generate a remove event when adding duplicate files.
	command.c: Add missing items to EMPTY_STATUS_ITEMS.
	aft.c: Don't call osl_close_disk_object() on failure.
	Add missing osl() wrapper calls.
	fd.c: Add missing va_end().

The conflict in aft.c was trivial to fix up.

diff --cc aft.c
index c61d3820083bd0ff9c5fbfbf773f49fc5c04a51a,301da7c7687ab1a461ec6e157ba44717f21135f0..727292c7001cf5b175eb8ef43b063540fc25d4d7
--- 1/aft.c
--- 2/aft.c
+++ b/aft.c
@@@ -1105,11 -1106,12 +1105,11 @@@ int open_and_update_audio_file(struct o
        if (ret < 0)
                return ret;
        afd->afhi.chunk_table = NULL;
-       ret = osl_open_disk_object(audio_file_table, aft_row,
-               AFTCOL_CHUNKS, &chunk_table_obj);
+       ret = osl(osl_open_disk_object(audio_file_table, aft_row,
+               AFTCOL_CHUNKS, &chunk_table_obj));
        if (ret < 0)
-               goto err;
+               return ret;
 -      ret = mmap_full_file(path, O_RDONLY, &map.data,
 -              &map.size, &afd->fd);
 +      ret = mmap_full_file(path, O_RDONLY, &map.data, &map.size, &afd->fd);
        if (ret < 0)
                goto err;
        hash_function(map.data, map.size, file_hash);

diff --cc blob.c
Simple merge

diff --cc command.c
index 43f85ca67a5e7b35c56d430f7da75cfdb64c7f94,2e733c5c6151b87eff0a9ac1c16b65ab64cbf5ad..2ef9c5a87b54760ed38fc41e4f3b83391a4aa3f5
--- 1/command.c
--- 2/command.c
+++ b/command.c
@@@ -416,9 -434,12 +416,10 @@@ static int com_version(struct command_c
        if (cc->argc != 1)
                return -E_COMMAND_SYNTAX;
        len = xasprintf(&msg, "%s", version_text("server"));
 -      if (cc->use_sideband)
 -              return send_sb(&cc->scc, msg, len, SBD_OUTPUT, false);
 -      return sc_send_bin_buffer(&cc->scc, msg, len);
 +      return send_sb(&cc->scc, msg, len, SBD_OUTPUT, false);
  }
  
+ /** These status items are cleared if no audio file is currently open. */
  #define EMPTY_STATUS_ITEMS \
        ITEM(PATH) \
        ITEM(DIRECTORY) \

diff --cc fd.c
Simple merge