X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=8d32516d22f3c2526926eba5bdcb46717c5c662e;hp=5fb0480707e094327688c5aad7adeddec35879a8;hb=eeeab4239843e716b3fd4dd259985a4cd4c487a5;hpb=46fe4817f70aef9b87b82a5539008aaed350be39

diff --git a/aft.c b/aft.c
index 5fb04807..8d32516d 100644
--- a/aft.c
+++ b/aft.c
@@ -1,28 +1,32 @@
 /*
- * Copyright (C) 2007-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file aft.c Audio file table functions. */
 
-#include <dirent.h> /* readdir() */
-#include "para.h"
-#include "error.h"
-#include "string.h"
+#include <regex.h>
 #include <sys/mman.h>
 #include <fnmatch.h>
 #include <sys/shm.h>
+#include <osl.h>
 
+#include "para.h"
+#include "error.h"
+#include "crypt.h"
+#include "string.h"
 #include "afh.h"
 #include "afs.h"
-#include "net.h"
-#include "vss.h"
 #include "fd.h"
 #include "ipc.h"
 #include "portable_io.h"
+#include "sideband.h"
+#include "command.h"
 
 static struct osl_table *audio_file_table;
+static char *status_items;
+static char *parser_friendly_status_items;
 
 /** The different sorting methods of the ls command. */
 enum ls_sorting_method {
@@ -63,7 +67,23 @@ enum ls_listing_mode {
 	/** -lm */
 	LS_MODE_MBOX,
 	/** -lc */
-	LS_MODE_CHUNKS
+	LS_MODE_CHUNKS,
+	/** -lp */
+	LS_MODE_PARSER,
+};
+
+/* Data about one audio file. Needed for ls and stat output. */
+struct ls_data {
+	/* Usual audio format handler information. */
+	struct afh_info afhi;
+	/* Audio file selector information. */
+	struct afs_info afsi;
+	/* The full path of the audio file. */
+	char *path;
+	/* The score value (if -a was given). */
+	long score;
+	/* The hash value of the audio file data. */
+	unsigned char *hash;
 };
 
 /** The flags accepted by the ls command. */
@@ -81,10 +101,9 @@ enum ls_flags {
 /**
  * The size of the individual output fields of the ls command.
  *
- * These depend on the actual content being listed. If, for instance only files
- * with duration less than an hour are being listed, then the duration with is
- * made smaller because then the duration is listed as mm:ss rather than
- * hh:mm:ss.
+ * These depend on the content being listed. For example, if each listed file
+ * is shorter than an hour, the duration format is set to mm:ss. Otherwise it
+ * is set to hh:mm:ss.
  */
 struct ls_widths {
 	/** size of the score field. */
@@ -103,6 +122,8 @@ struct ls_widths {
 	unsigned short num_played_width;
 	/** size of the amp field. */
 	unsigned short amp_width;
+	/** size of the audio format field. */
+	unsigned short audio_format_width;
 };
 
 /** Data passed from the ls command handler to its callback function. */
@@ -155,7 +176,7 @@ enum afsi_offsets {
 	AFSI_SIZE = 32
 };
 
-/**
+/*
  * Convert a struct afs_info to an osl object.
  *
  * \param afsi Pointer to the audio file info to be converted.
@@ -163,7 +184,7 @@ enum afsi_offsets {
  *
  * \sa load_afsi().
  */
-void save_afsi(struct afs_info *afsi, struct osl_object *obj)
+static void save_afsi(struct afs_info *afsi, struct osl_object *obj)
 {
 	char *buf = obj->data;
 
@@ -178,17 +199,17 @@ void save_afsi(struct afs_info *afsi, struct osl_object *obj)
 	memset(buf + AFSI_AUDIO_FORMAT_UNUSED_OFFSET, 0, 2);
 }
 
-/**
- *  Get the audio file selector info struct stored in an osl object.
+/*
+ * Get the audio file selector info struct stored in an osl object.
  *
  * \param afsi Points to the audio_file info structure to be filled in.
  * \param obj The osl object holding the data.
  *
- * \return Positive on success, negative on errors. Possible errors: \p E_BAD_AFS.
+ * \return Standard.
  *
  * \sa save_afsi().
  */
-int load_afsi(struct afs_info *afsi, struct osl_object *obj)
+static int load_afsi(struct afs_info *afsi, struct osl_object *obj)
 {
 	char *buf = obj->data;
 	if (obj->size < AFSI_SIZE)
@@ -220,12 +241,27 @@ enum audio_file_table_columns {
 	NUM_AFT_COLUMNS
 };
 
+/**
+ * Compare two osl objects pointing to hash values.
+ *
+ * \param obj1 Pointer to the first hash object.
+ * \param obj2 Pointer to the second hash object.
+ *
+ * \return The values required for an osl compare function.
+ *
+ * \sa osl_compare_func, uint32_compare().
+ */
+static int aft_hash_compare(const struct osl_object *obj1, const struct osl_object *obj2)
+{
+	return hash_compare((unsigned char *)obj1->data, (unsigned char *)obj2->data);
+}
+
 static struct osl_column_description aft_cols[] = {
 	[AFTCOL_HASH] = {
 		.storage_type = OSL_MAPPED_STORAGE,
 		.storage_flags = OSL_RBTREE | OSL_FIXED_SIZE | OSL_UNIQUE,
 		.name = "hash",
-		.compare_function = osl_hash_compare,
+		.compare_function = aft_hash_compare,
 		.data_size = HASH_SIZE
 	},
 	[AFTCOL_PATH] = {
@@ -257,7 +293,7 @@ static struct osl_table_description audio_file_table_desc = {
 	.column_descriptions = aft_cols
 };
 
-/* We don't want * dot or dot-dot anywhere. */
+/* We don't want dot or dot-dot anywhere. */
 static int verify_dotfile(const char *rest)
 {
 	/*
@@ -322,54 +358,66 @@ enum afhi_offsets {
 	AFHI_BITRATE_OFFSET = 4,
 	/** Position of the frequency. */
 	AFHI_FREQUENCY_OFFSET = 8,
-	/** Location of the audio file header. */
-	AFHI_HEADER_OFFSET_OFFSET = 12,
+	/** Was: Location of the audio file header. */
+	AFHI_UNUSED1_OFFSET = 12,
 	/* Length of the audio file header. Zero means: No header. */
 	AFHI_HEADER_LEN_OFFSET = 16,
 	/** The total number of chunks (4 bytes). */
 	CHUNKS_TOTAL_OFFSET = 20,
 	/** The length of the audio file header (4 bytes). */
 	HEADER_LEN_OFFSET = 24,
-	/** The start of the audio file header (4 bytes). */
-	HEADER_OFFSET_OFFSET = 28,
+	/** Was: The start of the audio file header (4 bytes). */
+	AFHI_UNUSED2_OFFSET = 28,
 	/** The seconds part of the chunk time (4 bytes). */
 	CHUNK_TV_TV_SEC_OFFSET = 32,
 	/** The microseconds part of the chunk time (4 bytes). */
 	CHUNK_TV_TV_USEC_OFFSET = 36,
 	/** Number of channels is stored here. (1 byte) */
 	AFHI_CHANNELS_OFFSET = 40,
-	/** EOF timeout in ms. (2 byte) */
-	AFHI_EOF_OFFSET = 41,
 	/** The tag info position. */
-	AFHI_INFO_STRING_OFFSET = 43,
+	AFHI_INFO_STRING_OFFSET = 41,
 	/** Minimal on-disk size of a valid afhi struct. */
-	MIN_AFHI_SIZE = 44
+	MIN_AFHI_SIZE = 47, /* at least 6 null bytes for techinfo/tags */
 };
 
 static unsigned sizeof_afhi_buf(const struct afh_info *afhi)
 {
 	if (!afhi)
 		return 0;
-	return strlen(afhi->info_string) + MIN_AFHI_SIZE;
+	return MIN_AFHI_SIZE
+		+ strlen(afhi->techinfo)
+		+ strlen(afhi->tags.artist)
+		+ strlen(afhi->tags.title)
+		+ strlen(afhi->tags.year)
+		+ strlen(afhi->tags.album)
+		+ strlen(afhi->tags.comment);
 }
 
 static void save_afhi(struct afh_info *afhi, char *buf)
 {
+	char *p;
+
 	if (!afhi)
 		return;
 	write_u32(buf + AFHI_SECONDS_TOTAL_OFFSET, afhi->seconds_total);
 	write_u32(buf + AFHI_BITRATE_OFFSET, afhi->bitrate);
 	write_u32(buf + AFHI_FREQUENCY_OFFSET, afhi->frequency);
-	write_u32(buf + AFHI_HEADER_OFFSET_OFFSET, afhi->header_offset);
+	write_u32(buf + AFHI_UNUSED1_OFFSET, 0);
 	write_u32(buf + AFHI_HEADER_LEN_OFFSET, afhi->header_len);
 	write_u8(buf + AFHI_CHANNELS_OFFSET, afhi->channels);
 	write_u32(buf + CHUNKS_TOTAL_OFFSET, afhi->chunks_total);
 	write_u32(buf + HEADER_LEN_OFFSET, afhi->header_len);
-	write_u32(buf + HEADER_OFFSET_OFFSET, afhi->header_offset);
+	write_u32(buf + AFHI_UNUSED2_OFFSET, 0);
 	write_u32(buf + CHUNK_TV_TV_SEC_OFFSET, afhi->chunk_tv.tv_sec);
 	write_u32(buf + CHUNK_TV_TV_USEC_OFFSET, afhi->chunk_tv.tv_usec);
-	write_u16(buf + AFHI_EOF_OFFSET, tv2ms(&afhi->eof_tv));
-	strcpy(buf + AFHI_INFO_STRING_OFFSET, afhi->info_string); /* OK */
+	p = buf + AFHI_INFO_STRING_OFFSET;
+	/* The sprintf's below are OK as our caller made sure that buf is large enough */
+	p += sprintf(p, "%s", afhi->techinfo) + 1;
+	p += sprintf(p, "%s", afhi->tags.artist) + 1;
+	p += sprintf(p, "%s", afhi->tags.title) + 1;
+	p += sprintf(p, "%s", afhi->tags.year) + 1;
+	p += sprintf(p, "%s", afhi->tags.album) + 1;
+	sprintf(p, "%s", afhi->tags.comment);
 }
 
 static void load_afhi(const char *buf, struct afh_info *afhi)
@@ -377,16 +425,18 @@ static void load_afhi(const char *buf, struct afh_info *afhi)
 	afhi->seconds_total = read_u32(buf + AFHI_SECONDS_TOTAL_OFFSET);
 	afhi->bitrate = read_u32(buf + AFHI_BITRATE_OFFSET);
 	afhi->frequency = read_u32(buf + AFHI_FREQUENCY_OFFSET);
-	afhi->header_offset = read_u32(buf + AFHI_HEADER_OFFSET_OFFSET);
 	afhi->header_len = read_u32(buf + AFHI_HEADER_LEN_OFFSET);
 	afhi->channels = read_u8(buf + AFHI_CHANNELS_OFFSET);
 	afhi->chunks_total = read_u32(buf + CHUNKS_TOTAL_OFFSET);
 	afhi->header_len = read_u32(buf + HEADER_LEN_OFFSET);
-	afhi->header_offset = read_u32(buf + HEADER_OFFSET_OFFSET);
 	afhi->chunk_tv.tv_sec = read_u32(buf + CHUNK_TV_TV_SEC_OFFSET);
 	afhi->chunk_tv.tv_usec = read_u32(buf + CHUNK_TV_TV_USEC_OFFSET);
-	ms2tv(read_u16(buf + AFHI_EOF_OFFSET), &afhi->eof_tv);
-	afhi->info_string = para_strdup(buf + AFHI_INFO_STRING_OFFSET);
+	afhi->techinfo = (char *)buf + AFHI_INFO_STRING_OFFSET;
+	afhi->tags.artist = afhi->techinfo + strlen(afhi->techinfo) + 1;
+	afhi->tags.title = afhi->tags.artist + strlen(afhi->tags.artist) + 1;
+	afhi->tags.year = afhi->tags.title + strlen(afhi->tags.title) + 1;
+	afhi->tags.album = afhi->tags.year + strlen(afhi->tags.year) + 1;
+	afhi->tags.comment = afhi->tags.album + strlen(afhi->tags.album) + 1;
 }
 
 static unsigned sizeof_chunk_table(struct afh_info *afhi)
@@ -396,12 +446,26 @@ static unsigned sizeof_chunk_table(struct afh_info *afhi)
 	return 4 * (afhi->chunks_total + 1);
 }
 
-static void save_chunk_table(struct afh_info *afhi, char *buf)
+static uint32_t save_chunk_table(struct afh_info *afhi, char *buf)
 {
 	int i;
-
-	for (i = 0; i <= afhi->chunks_total; i++)
-		write_u32(buf + 4 * i, afhi->chunk_table[i]);
+	uint32_t max = 0, old = 0;
+
+	for (i = 0; i <= afhi->chunks_total; i++) {
+		uint32_t val = afhi->chunk_table[i];
+		write_u32(buf + 4 * i, val);
+		/*
+		 * If the first chunk is the header, do not consider it for the
+		 * calculation of the largest chunk size.
+		 */
+		if (i == 0 || (i == 1 && afhi->header_len > 0)) {
+			old = val;
+			continue;
+		}
+		max = PARA_MAX(max, val - old);
+		old = val;
+	}
+	return max;
 }
 
 static void load_chunk_table(struct afh_info *afhi, char *buf)
@@ -419,40 +483,41 @@ static void load_chunk_table(struct afh_info *afhi, char *buf)
  * \param path The full path of the audio file.
  * \param row Result pointer.
  *
- * \return The return value of the underlying call to osl_get_row().
+ * \return Standard.
  */
 int aft_get_row_of_path(const char *path, struct osl_row **row)
 {
 	struct osl_object obj = {.data = (char *)path, .size = strlen(path) + 1};
 
-	return osl_get_row(audio_file_table, AFTCOL_PATH, &obj, row);
+	return osl(osl_get_row(audio_file_table, AFTCOL_PATH, &obj, row));
 }
 
 /**
  * Get the row of the audio file table corresponding to the given hash value.
  *
  * \param hash The hash value of the desired audio file.
- * \param row resul pointer.
+ * \param row Result pointer.
  *
- * \return The return value of the underlying call to osl_get_row().
+ * \return Standard.
  */
-int aft_get_row_of_hash(HASH_TYPE *hash, struct osl_row **row)
+static int aft_get_row_of_hash(unsigned char *hash, struct osl_row **row)
 {
 	const struct osl_object obj = {.data = hash, .size = HASH_SIZE};
-	return osl_get_row(audio_file_table, AFTCOL_HASH, &obj, row);
+	return osl(osl_get_row(audio_file_table, AFTCOL_HASH, &obj, row));
 }
 
-/**
- * Get the osl object holding the audio file selector info of a row.
+/*
+ * Get the audio file selector info object of a row.
  *
  * \param row Pointer to a row in the audio file table.
  * \param obj Result pointer.
  *
- * \return The return value of the underlying call to osl_get_object().
+ * \return Standard.
  */
-int get_afsi_object_of_row(const struct osl_row *row, struct osl_object *obj)
+static int get_afsi_object_of_row(const struct osl_row *row,
+		struct osl_object *obj)
 {
-	return osl_get_object(audio_file_table, row, AFTCOL_AFSI, obj);
+	return osl(osl_get_object(audio_file_table, row, AFTCOL_AFSI, obj));
 }
 
 /**
@@ -464,7 +529,7 @@ int get_afsi_object_of_row(const struct osl_row *row, struct osl_object *obj)
  *
  * \return Positive on success, negative on errors.
  */
-int get_afsi_object_of_path(const char *path, struct osl_object *obj)
+static int get_afsi_object_of_path(const char *path, struct osl_object *obj)
 {
 	struct osl_row *row;
 	int ret = aft_get_row_of_path(path, &row);
@@ -490,15 +555,15 @@ int get_afsi_of_row(const struct osl_row *row, struct afs_info *afsi)
 	return load_afsi(afsi, &obj);
 }
 
-/**
+/*
  * Get the audio file selector info, given the path of an audio table.
  *
  * \param path The full path of the audio file.
  * \param afsi Result pointer.
  *
- * \return Positive on success, negative on errors.
+ * \return Standard.
  */
-int get_afsi_of_path(const char *path, struct afs_info *afsi)
+static int get_afsi_of_path(const char *path, struct afs_info *afsi)
 {
 	struct osl_object obj;
 	int ret = get_afsi_object_of_path(path, &obj);
@@ -521,8 +586,8 @@ int get_afsi_of_path(const char *path, struct afs_info *afsi)
 int get_audio_file_path_of_row(const struct osl_row *row, char **path)
 {
 	struct osl_object path_obj;
-	int ret = osl_get_object(audio_file_table, row, AFTCOL_PATH,
-		&path_obj);
+	int ret = osl(osl_get_object(audio_file_table, row, AFTCOL_PATH,
+		&path_obj));
 	if (ret < 0)
 		return ret;
 	*path = path_obj.data;
@@ -539,9 +604,10 @@ int get_audio_file_path_of_row(const struct osl_row *row, char **path)
  *
  * \sa get_hash_of_row().
  */
-static int get_hash_object_of_aft_row(const struct osl_row *row, struct osl_object *obj)
+static int get_hash_object_of_aft_row(const struct osl_row *row,
+		struct osl_object *obj)
 {
-	return osl_get_object(audio_file_table, row, AFTCOL_HASH, obj);
+	return osl(osl_get_object(audio_file_table, row, AFTCOL_HASH, obj));
 }
 
 /**
@@ -555,7 +621,7 @@ static int get_hash_object_of_aft_row(const struct osl_row *row, struct osl_obje
  * \return The return value of the underlying call to
  * get_hash_object_of_aft_row().
  */
-static int get_hash_of_row(const struct osl_row *row, HASH_TYPE **hash)
+static int get_hash_of_row(const struct osl_row *row, unsigned char **hash)
 {
 	struct osl_object obj;
 	int ret = get_hash_object_of_aft_row(row, &obj);
@@ -579,8 +645,8 @@ static int get_hash_of_row(const struct osl_row *row, HASH_TYPE **hash)
 int get_afhi_of_row(const struct osl_row *row, struct afh_info *afhi)
 {
 	struct osl_object obj;
-	int ret = osl_get_object(audio_file_table, row, AFTCOL_AFHI,
-		&obj);
+	int ret = osl(osl_get_object(audio_file_table, row, AFTCOL_AFHI,
+		&obj));
 	if (ret < 0)
 		return ret;
 	load_afhi(obj.data, afhi);
@@ -601,10 +667,10 @@ static int save_afd(struct audio_file_data *afd)
 	ret = shm_attach(shmid, ATTACH_RW, &shm_afd);
 	if (ret < 0)
 		goto err;
-	*(struct audio_file_data *)shm_afd = *afd;
 	buf = shm_afd;
 	buf += sizeof(*afd);
-	save_chunk_table(&afd->afhi, buf);
+	afd->max_chunk_size = save_chunk_table(&afd->afhi, buf);
+	*(struct audio_file_data *)shm_afd = *afd;
 	shm_detach(shm_afd);
 	return shmid;
 err:
@@ -612,6 +678,18 @@ err:
 	return ret;
 }
 
+/**
+ * Extract a afd stored in a shared memory area.
+ *
+ * Attach the shared memory area given by \a shmid, load the audio file data
+ * stored therein and detach the area afterwards.  Called by vss, after
+ * receiving a positive response to the request for the next audio file.
+ +
+ * \param shmid The identifier of the shared memory area containing the afd.
+ * \param afd Result pointer.
+ *
+ * \return Standard.
+ */
 int load_afd(int shmid, struct audio_file_data *afd)
 {
 	void *shm_afd;
@@ -662,7 +740,7 @@ static int get_local_time(uint64_t *seconds, char *buf, size_t size,
 		} \
 	}
 
-static short unsigned get_duration_width(int seconds)
+__a_const static short unsigned get_duration_width(int seconds)
 {
 	short unsigned width;
 	unsigned hours = seconds / 3600, mins = (seconds % 3600) / 60;
@@ -691,56 +769,67 @@ static void get_duration_buf(int seconds, char *buf, struct ls_options *opts)
 	}
 }
 
-static char *make_attribute_lines(const char *att_bitmap, struct afs_info *afsi)
+static int write_attribute_items(struct para_buffer *b,
+		const char *att_bitmap, struct afs_info *afsi)
 {
-	char *att_text, *att_lines;
+	char *att_text;
+	int ret;
 
-	get_attribute_text(&afsi->attributes, " ", &att_text);
-	if (!att_text)
-		return para_strdup(att_bitmap);
-	att_lines = make_message("%s: %s\n%s: %s",
-		status_item_list[SI_ATTRIBUTES_BITMAP], att_bitmap,
-		status_item_list[SI_ATTRIBUTES_TXT], att_text);
+	ret = WRITE_STATUS_ITEM(b, SI_ATTRIBUTES_BITMAP, "%s\n", att_bitmap);
+	if (ret < 0)
+		return ret;
+	ret = get_attribute_text(&afsi->attributes, " ", &att_text);
+	if (ret < 0)
+		return ret;
+	ret = WRITE_STATUS_ITEM(b, SI_ATTRIBUTES_TXT, "%s\n", att_text);
 	free(att_text);
-	return att_lines;
+	return ret;
 }
 
-static char *make_lyrics_lines(struct afs_info *afsi)
+static int write_lyrics_items(struct para_buffer *b, struct afs_info *afsi)
 {
 	char *lyrics_name;
+	int ret;
 
+	ret = WRITE_STATUS_ITEM(b, SI_LYRICS_ID, "%u\n", afsi->lyrics_id);
+	if (ret < 0)
+		return ret;
 	lyr_get_name_by_id(afsi->lyrics_id, &lyrics_name);
-	return make_message("%s: %u\n%s: %s\n",
-		status_item_list[SI_LYRICS_ID], afsi->lyrics_id,
-		status_item_list[SI_LYRICS_NAME], lyrics_name?
-			lyrics_name : "(none)");
+	return WRITE_STATUS_ITEM(b, SI_LYRICS_NAME, "%s\n", lyrics_name?
+		lyrics_name : "(none)");
 }
 
-static char *make_image_lines(struct afs_info *afsi)
+static int write_image_items(struct para_buffer *b, struct afs_info *afsi)
 {
 	char *image_name;
+	int ret;
+
+	ret = WRITE_STATUS_ITEM(b, SI_IMAGE_ID, "%u\n", afsi->image_id);
+	if (ret < 0)
+		return ret;
 	img_get_name_by_id(afsi->image_id, &image_name);
-	return make_message("%s: %u\n%s: %s\n",
-		status_item_list[SI_IMAGE_ID], afsi->image_id,
-		status_item_list[SI_IMAGE_NAME], image_name?
-			image_name : "(none)");
+	return WRITE_STATUS_ITEM(b, SI_IMAGE_NAME, "%s\n", image_name?
+		image_name : "(none)");
 }
 
-static char *make_filename_lines(const char *path, unsigned flags)
+static int write_filename_items(struct para_buffer *b, const char *path,
+		unsigned flags)
 {
-	char *dirname, *ret;
-	const char *basename;
+	char *val;
+	int ret;
 
 	if (!(flags & LS_FLAG_FULL_PATH))
-		return make_message("%s: %s\n",
-			status_item_list[SI_BASENAME], path);
-	basename = para_basename(path),
-	dirname = para_dirname(path);
-	ret = make_message("%s: %s\n%s: %s\n%s: %s\n",
-		status_item_list[SI_PATH], path,
-		status_item_list[SI_DIRECTORY], dirname? dirname : "?",
-		status_item_list[SI_BASENAME], basename? basename : "?");
-	free(dirname);
+		return WRITE_STATUS_ITEM(b, SI_BASENAME, "%s\n", path);
+	ret = WRITE_STATUS_ITEM(b, SI_PATH, "%s\n", path);
+	if (ret < 0)
+		return ret;
+	val = para_basename(path);
+	ret = WRITE_STATUS_ITEM(b, SI_BASENAME, "%s\n", val? val : "");
+	if (ret < 0)
+		return ret;
+	val = para_dirname(path);
+	ret = WRITE_STATUS_ITEM(b, SI_DIRECTORY, "%s\n", val? val : "");
+	free(val);
 	return ret;
 }
 
@@ -754,8 +843,8 @@ static int print_chunk_table(struct ls_data *d, struct para_buffer *b)
 	ret = aft_get_row_of_hash(d->hash, &aft_row);
 	if (ret < 0)
 		return ret;
-	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)
 		return ret;
 	ret = para_printf(b, "%s\n"
@@ -778,6 +867,14 @@ out:
 	return ret;
 }
 
+static int write_score(struct para_buffer *b, struct ls_data *d,
+		struct ls_options *opts)
+{
+	if (!(opts->flags & LS_FLAG_ADMISSIBLE_ONLY)) /* no score*/
+		return 0;
+	return WRITE_STATUS_ITEM(b, SI_SCORE, "%li\n", d->score);
+}
+
 static int print_list_item(struct ls_data *d, struct ls_options *opts,
 	struct para_buffer *b, time_t current_time)
 {
@@ -785,13 +882,9 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 	char att_buf[65];
 	char last_played_time[30];
 	char duration_buf[30]; /* nobody has an audio file long enough to overflow this */
-	char score_buf[30] = "";
 	struct afs_info *afsi = &d->afsi;
 	struct afh_info *afhi = &d->afhi;
-	struct ls_widths *w = &opts->widths;
-	int have_score = opts->flags & LS_FLAG_ADMISSIBLE_ONLY;
 	char asc_hash[2 * HASH_SIZE + 1];
-	char *att_lines, *lyrics_lines, *image_lines, *filename_lines;
 
 	if (opts->mode == LS_MODE_SHORT) {
 		ret = para_printf(b, "%s\n", d->path);
@@ -812,34 +905,33 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 			goto out;
 	}
 	get_duration_buf(afhi->seconds_total, duration_buf, opts);
-	if (have_score) {
-		if (opts->mode == LS_MODE_LONG)
-			sprintf(score_buf, "%*li ", w->score_width, d->score);
-		else
-			sprintf(score_buf, "%li ", d->score);
-	}
-
 	if (opts->mode == LS_MODE_LONG) {
+		struct ls_widths *w = &opts->widths;
+		if (opts->flags & LS_FLAG_ADMISSIBLE_ONLY) {
+			ret = para_printf(b, "%*li ",
+				opts->widths.score_width, d->score);
+			if (ret < 0)
+				goto out;
+		}
 		ret = para_printf(b,
-			"%s"    /* score */
 			"%s "   /* attributes */
 			"%*u "  /* amp */
 			"%*d "  /* image_id  */
 			"%*d "  /* lyrics_id */
 			"%*d "  /* bitrate */
-			"%s "   /* audio format */
+			"%*s "  /* audio format */
 			"%*d "  /* frequency */
 			"%d "   /* channels */
 			"%s "   /* duration */
 			"%*d "  /* num_played */
 			"%s "   /* last_played */
 			"%s\n", /* path */
-			score_buf,
 			att_buf,
 			w->amp_width, afsi->amp,
 			w->image_id_width, afsi->image_id,
 			w->lyrics_id_width, afsi->lyrics_id,
 			w->bitrate_width, afhi->bitrate,
+			w->audio_format_width,
 			audio_format_name(afsi->audio_format_id),
 			w->frequency_width, afhi->frequency,
 			afhi->channels,
@@ -850,11 +942,6 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 		);
 		goto out;
 	}
-	hash_to_asc(d->hash, asc_hash);
-	att_lines = make_attribute_lines(att_buf, afsi);
-	lyrics_lines = make_lyrics_lines(afsi);
-	image_lines = make_image_lines(afsi);
-	filename_lines = make_filename_lines(d->path, opts->flags);
 	if (opts->mode == LS_MODE_MBOX) {
 		const char *bn = para_basename(d->path);
 		ret = para_printf(b,
@@ -866,47 +953,78 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 		if (ret < 0)
 			goto out;
 	}
-	ret = para_printf(b,
-		"%s" /* filename stuff */
-		"%s%s%s%s" /* score */
-		"%s\n" /* attributes */
-		"%s: %s\n" /* hash */
-		"%s" /* image id, image name */
-		"%s" /* lyrics */
-		"%s: %dkbit/s\n" /* bitrate */
-		"%s: %s\n" /* format */
-		"%s: %dHz\n" /* frequency */
-		"%s: %d\n" /* channels */
-		"%s: %s\n" /* duration */
-		"%s: %lu\n" /* seconds total */
-		"%s: %s\n" /* last played time */
-		"%s: %d\n" /* num_played */
-		"%s: %u\n" /* ampplification */
-		"%s" /* tag info */
-		"%s: %lu\n" /* chunk time */
-		"%s: %lu\n", /* num chunks */
-		filename_lines,
-		have_score? status_item_list[SI_SCORE] : "",
-			have_score? ": " : "",
-			score_buf,
-			have_score? "\n" : "",
-		att_lines,
-		status_item_list[SI_HASH], asc_hash,
-		image_lines,
-		lyrics_lines,
-		status_item_list[SI_BITRATE], afhi->bitrate,
-		status_item_list[SI_FORMAT], audio_format_name(afsi->audio_format_id),
-		status_item_list[SI_FREQUENCY], afhi->frequency,
-		status_item_list[SI_CHANNELS], afhi->channels,
-		status_item_list[SI_DURATION], duration_buf,
-		status_item_list[SI_SECONDS_TOTAL], afhi->seconds_total,
-		status_item_list[SI_LAST_PLAYED], last_played_time,
-		status_item_list[SI_NUM_PLAYED], afsi->num_played,
-		status_item_list[SI_AMPLIFICATION], afsi->amp,
-		afhi->info_string,
-		status_item_list[SI_CHUNK_TIME], tv2ms(&afhi->chunk_tv),
-		status_item_list[SI_NUM_CHUNKS], afhi->chunks_total
-	);
+	ret = write_filename_items(b, d->path, opts->flags);
+	if (ret < 0)
+		goto out;
+	ret = write_score(b, d, opts);
+	if (ret < 0)
+		goto out;
+	ret = write_attribute_items(b, att_buf, afsi);
+	if (ret < 0)
+		goto out;
+	ret = write_image_items(b, afsi);
+	if (ret < 0)
+		goto out;
+	ret = write_lyrics_items(b, afsi);
+	if (ret < 0)
+		goto out;
+	hash_to_asc(d->hash, asc_hash);
+	ret = WRITE_STATUS_ITEM(b, SI_HASH, "%s\n", asc_hash);
+	if (ret < 0)
+		goto out;
+	ret = WRITE_STATUS_ITEM(b, SI_BITRATE, "%dkbit/s\n", afhi->bitrate);
+	if (ret < 0)
+		goto out;
+	ret = WRITE_STATUS_ITEM(b, SI_FORMAT, "%s\n",
+		audio_format_name(afsi->audio_format_id));
+	if (ret < 0)
+		goto out;
+	ret = WRITE_STATUS_ITEM(b, SI_FREQUENCY, "%dHz\n", afhi->frequency);
+	if (ret < 0)
+		goto out;
+	ret = WRITE_STATUS_ITEM(b, SI_CHANNELS, "%d\n", afhi->channels);
+	if (ret < 0)
+		goto out;
+	ret = WRITE_STATUS_ITEM(b, SI_DURATION, "%s\n", duration_buf);
+	if (ret < 0)
+		goto out;
+	ret = WRITE_STATUS_ITEM(b, SI_SECONDS_TOTAL, "%lu\n",
+		afhi->seconds_total);
+	if (ret < 0)
+		goto out;
+	ret = WRITE_STATUS_ITEM(b, SI_LAST_PLAYED, "%s\n", last_played_time);
+	if (ret < 0)
+		goto out;
+	ret = WRITE_STATUS_ITEM(b, SI_NUM_PLAYED, "%d\n", afsi->num_played);
+	if (ret < 0)
+		goto out;
+	ret = WRITE_STATUS_ITEM(b, SI_AMPLIFICATION, "%u\n", afsi->amp);
+	if (ret < 0)
+		goto out;
+	ret = WRITE_STATUS_ITEM(b, SI_CHUNK_TIME, "%lu\n",
+		tv2ms(&afhi->chunk_tv));
+	if (ret < 0)
+		goto out;
+	ret = WRITE_STATUS_ITEM(b, SI_NUM_CHUNKS, "%lu\n",
+		afhi->chunks_total);
+	if (ret < 0)
+		goto out;
+	ret = WRITE_STATUS_ITEM(b, SI_TECHINFO, "%s\n", afhi->techinfo);
+	if (ret < 0)
+		goto out;
+	ret = WRITE_STATUS_ITEM(b, SI_ARTIST, "%s\n", afhi->tags.artist);
+	if (ret < 0)
+		goto out;
+	ret = WRITE_STATUS_ITEM(b, SI_TITLE, "%s\n", afhi->tags.title);
+	if (ret < 0)
+		goto out;
+	ret = WRITE_STATUS_ITEM(b, SI_YEAR, "%s\n", afhi->tags.year);
+	if (ret < 0)
+		goto out;
+	ret = WRITE_STATUS_ITEM(b, SI_ALBUM, "%s\n", afhi->tags.album);
+	if (ret < 0)
+		goto out;
+	ret = WRITE_STATUS_ITEM(b, SI_COMMENT, "%s\n", afhi->tags.comment);
 	if (ret < 0)
 		goto out;
 	if (opts->mode == LS_MODE_MBOX) {
@@ -918,132 +1036,13 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 			osl_close_disk_object(&lyrics_def);
 		}
 	}
-	free(att_lines);
-	free(lyrics_lines);
-	free(image_lines);
-	free(filename_lines);
 out:
-	free(afhi->info_string);
 	return ret;
 }
 
-/**
- * Write a list of audio-file related status items with empty values.
- *
- * \param buf Result pointer.
- *
- * This is used by vss when currently no audio file is open.
- */
-void make_empty_status_items(char *buf)
-{
-	sprintf(buf,
-		"%s: \n" /* path */
-		"%s: \n" /* dirname */
-		"%s: \n" /* basename */
-		"%s: \n" /* score */
-		"%s: \n" /* attributes bitmap */
-		"%s: \n" /* attributes txt */
-		"%s: \n" /* hash */
-		"%s: \n" /* image id */
-		"%s: \n" /* image name */
-		"%s: \n" /* lyrics id */
-		"%s: \n" /* lyrics name */
-		"%s: \n" /* bitrate */
-		"%s: \n" /* format */
-		"%s: \n" /* frequency */
-		"%s: \n" /* channels */
-		"%s: \n" /* duration */
-		"%s: \n" /* seconds total */
-		"%s: \n" /* num played */
-		"%s: \n" /* last played */
-		"%s: \n" /* audio file info */
-		"%s: \n" /* taginfo1 */
-		"%s: \n" /* taginfo2 */
-		"%s: \n" /* amplification */
-		,
-		status_item_list[SI_PATH],
-		status_item_list[SI_DIRECTORY],
-		status_item_list[SI_BASENAME],
-		status_item_list[SI_SCORE],
-		status_item_list[SI_ATTRIBUTES_BITMAP],
-		status_item_list[SI_ATTRIBUTES_TXT],
-		status_item_list[SI_HASH],
-		status_item_list[SI_IMAGE_ID],
-		status_item_list[SI_IMAGE_NAME],
-		status_item_list[SI_LYRICS_ID],
-		status_item_list[SI_LYRICS_NAME],
-		status_item_list[SI_BITRATE],
-		status_item_list[SI_FORMAT],
-		status_item_list[SI_FREQUENCY],
-		status_item_list[SI_CHANNELS],
-		status_item_list[SI_DURATION],
-		status_item_list[SI_SECONDS_TOTAL],
-		status_item_list[SI_NUM_PLAYED],
-		status_item_list[SI_LAST_PLAYED],
-		status_item_list[SI_AUDIO_FILE_INFO],
-		status_item_list[SI_TAGINFO1],
-		status_item_list[SI_TAGINFO2],
-		status_item_list[SI_AMPLIFICATION]
-	);
-}
-
-static void fixup_taginfo(char *begin, char *end)
-{
-	char *p = begin;
-
-	for (;;) {
-		p = strchr(p, '\n');
-		if (!p)
-			break;
-		if (p >= end - 1)
-			break;
-		*p = ' ';
-		p++;
-	}
-}
-
-/* crap, remove this ASAP. */
-static int fixup_info_string(char *info_string)
-{
-	char *t1, *t2, *end;
-
-	if (strncmp(info_string, "audio_file_info:", 16))
-		return -ERRNO_TO_PARA_ERROR(EINVAL);
-	t1 = strstr(info_string, "\ntaginfo1:");
-	if (!t1)
-		return -ERRNO_TO_PARA_ERROR(EINVAL);
-	t2 = strstr(info_string, "\ntaginfo2: ");
-	if (!t2)
-		return -ERRNO_TO_PARA_ERROR(EINVAL);
-
-	end = t2 + strlen(t2);
-	fixup_taginfo(info_string + 16, t1);
-	fixup_taginfo(t1 + 10, t2);
-	fixup_taginfo(t2 + 10, end);
-
-	if (t1 - info_string < 80 && t2 - t1 < 80 && end - t2 < 80)
-		return 0;
-	if (t1 - info_string >= 80) {
-		memmove(info_string + 80, t1, end - t1);
-		t1 = info_string + 80;
-		t2 -= t1 - info_string - 80;
-		end -= t1 - info_string - 80;
-	}
-	if (t2 - t1 >= 80) {
-		memmove(t1 + 80, t2, end - t2);
-		end -= t2 - t1 - 80;
-		t2 = t1 + 80;
-	}
-	if (end - t2 >= 80) {
-		t2[78] = '\n';
-		t2[79] = '\0';
-	}
-	return 1;
-}
-
 static int make_status_items(struct audio_file_data *afd,
 		struct afs_info *afsi, char *path, long score,
-		HASH_TYPE *hash)
+		unsigned char *hash)
 {
 	struct ls_data d = {
 		.afhi = afd->afhi,
@@ -1056,26 +1055,28 @@ static int make_status_items(struct audio_file_data *afd,
 		.flags = LS_FLAG_FULL_PATH | LS_FLAG_ADMISSIBLE_ONLY,
 		.mode = LS_MODE_VERBOSE,
 	};
-	struct para_buffer pb = {.max_size = VERBOSE_LS_OUTPUT_SIZE - 1};
+	struct para_buffer pb = {.max_size = shm_get_shmmax() - 1};
 	time_t current_time;
 	int ret;
 
-	ret = fixup_info_string(afd->afhi.info_string);
-	if (ret < 0) {
-		PARA_WARNING_LOG("ignoring invalid tag info\n");
-		afd->afhi.info_string[0] = '\0';
-	} else if (ret)
-		PARA_NOTICE_LOG("truncated overlong tag info\n");
 	time(&current_time);
-	ret = print_list_item(&d, &opts, &pb, current_time); /* frees info string */
-	afd->afhi.info_string = NULL;
+	ret = print_list_item(&d, &opts, &pb, current_time);
 	if (ret < 0)
-		goto out;
-	strncpy(afd->verbose_ls_output, pb.buf, VERBOSE_LS_OUTPUT_SIZE);
-	afd->verbose_ls_output[VERBOSE_LS_OUTPUT_SIZE - 1] = '\0';
-out:
-	free(pb.buf);
-	return ret;
+		return ret;
+	free(status_items);
+	status_items = pb.buf;
+	memset(&pb, 0, sizeof(pb));
+	pb.max_size = shm_get_shmmax() - 1;
+	pb.flags = PBF_SIZE_PREFIX;
+	ret = print_list_item(&d, &opts, &pb, current_time);
+	if (ret < 0) {
+		free(status_items);
+		status_items = NULL;
+		return ret;
+	}
+	free(parser_friendly_status_items);
+	parser_friendly_status_items = pb.buf;
+	return 1;
 }
 
 /**
@@ -1094,7 +1095,7 @@ out:
 int open_and_update_audio_file(struct osl_row *aft_row, long score,
 	struct audio_file_data *afd)
 {
-	HASH_TYPE *aft_hash, file_hash[HASH_SIZE];
+	unsigned char *aft_hash, file_hash[HASH_SIZE];
 	struct osl_object afsi_obj;
 	struct afs_info old_afsi, new_afsi;
 	int ret = get_hash_of_row(aft_row, &aft_hash);
@@ -1107,6 +1108,7 @@ int open_and_update_audio_file(struct osl_row *aft_row, long score,
 	ret = get_audio_file_path_of_row(aft_row, &path);
 	if (ret < 0)
 		return ret;
+	PARA_NOTICE_LOG("%s\n", path);
 	ret = get_afsi_object_of_row(aft_row, &afsi_obj);
 	if (ret < 0)
 		return ret;
@@ -1117,38 +1119,39 @@ int open_and_update_audio_file(struct osl_row *aft_row, long score,
 	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;
-	ret = mmap_full_file(path, O_RDONLY, &map.data,
-		&map.size, &afd->fd);
+		return ret;
+	ret = mmap_full_file(path, O_RDONLY, &map.data, &map.size, &afd->fd);
 	if (ret < 0)
-		goto err;
+		goto out;
 	hash_function(map.data, map.size, file_hash);
 	ret = hash_compare(file_hash, aft_hash);
 	para_munmap(map.data, map.size);
 	if (ret) {
 		ret = -E_HASH_MISMATCH;
-		goto err;
+		goto out;
 	}
 	new_afsi = old_afsi;
 	new_afsi.num_played++;
 	new_afsi.last_played = time(NULL);
 	save_afsi(&new_afsi, &afsi_obj); /* in-place update */
 
+	afd->audio_format_id = old_afsi.audio_format_id;
 	load_chunk_table(&afd->afhi, chunk_table_obj.data);
 	ret = make_status_items(afd, &old_afsi, path, score, file_hash);
 	if (ret < 0)
-		goto err;
+		goto out;
 	aced.aft_row = aft_row;
 	aced.old_afsi = &old_afsi;
 	afs_event(AFSI_CHANGE, NULL, &aced);
 	ret = save_afd(afd);
-err:
+out:
 	free(afd->afhi.chunk_table);
-	free(afd->afhi.info_string);
 	osl_close_disk_object(&chunk_table_obj);
+	if (ret < 0)
+		PARA_ERROR_LOG("%s: %s\n", path, para_strerror(-ret));
 	return ret;
 }
 
@@ -1286,8 +1289,10 @@ static int prepare_ls_row(struct osl_row *row, void *ls_opts)
 		ret = get_score_and_aft_row(row, &score, &aft_row);
 		if (ret < 0)
 			return ret;
-	} else
+	} else {
 		aft_row = row;
+		score = 0;
+	}
 	ret = get_audio_file_path_of_row(aft_row, &path);
 	if (ret < 0)
 		return ret;
@@ -1342,6 +1347,8 @@ static int prepare_ls_row(struct osl_row *row, void *ls_opts)
 	w->duration_width = PARA_MAX(w->duration_width, num_digits);
 	GET_NUM_DIGITS(d->afsi.amp, &num_digits);
 	w->amp_width = PARA_MAX(w->amp_width, num_digits);
+	num_digits = strlen(audio_format_name(d->afsi.audio_format_id));
+	w->audio_format_width = PARA_MAX(w->audio_format_width, num_digits);
 	if (options->flags & LS_FLAG_ADMISSIBLE_ONLY) {
 		GET_NUM_DIGITS(score, &num_digits);
 		num_digits++; /* add one for the sign (space or "-") */
@@ -1350,7 +1357,6 @@ static int prepare_ls_row(struct osl_row *row, void *ls_opts)
 	}
 	return 1;
 err:
-	free(d->afhi.info_string);
 	return ret;
 }
 
@@ -1358,12 +1364,18 @@ static void com_ls_callback(int fd, const struct osl_object *query)
 {
 	struct ls_options *opts = query->data;
 	char *p, *pattern_start = (char *)query->data + sizeof(*opts);
-	struct para_buffer b = {.max_size = SHMMAX,
-		.max_size_handler = pass_buffer_as_shm, .private_data = &fd};
+	struct para_buffer b = {
+		.max_size = shm_get_shmmax(),
+		.flags = (opts->mode == LS_MODE_PARSER)? PBF_SIZE_PREFIX : 0,
+		.max_size_handler = afs_max_size_handler,
+		.private_data = &(struct afs_max_size_handler_data) {
+			.fd = fd,
+			.band = SBD_OUTPUT
+		}
+	};
 	int i = 0, ret;
 	time_t current_time;
 
-
 	if (opts->num_patterns) {
 		opts->patterns = para_malloc(opts->num_patterns * sizeof(char *));
 		for (i = 0, p = pattern_start; i < opts->num_patterns; i++) {
@@ -1375,12 +1387,15 @@ static void com_ls_callback(int fd, const struct osl_object *query)
 	if (opts->flags & LS_FLAG_ADMISSIBLE_ONLY)
 		ret = admissible_file_loop(opts, prepare_ls_row);
 	else
-		ret = osl_rbtree_loop(audio_file_table, AFTCOL_PATH, opts,
-			prepare_ls_row);
+		ret = osl(osl_rbtree_loop(audio_file_table, AFTCOL_PATH, opts,
+			prepare_ls_row));
 	if (ret < 0)
 		goto out;
-	if (!opts->num_matching_paths)
+	if (opts->num_matching_paths == 0) {
+		if (opts->num_patterns > 0)
+			para_printf(&b, "no matches\n");
 		goto out;
+	}
 	ret = sort_matching_paths(opts);
 	if (ret < 0)
 		goto out;
@@ -1399,7 +1414,7 @@ static void com_ls_callback(int fd, const struct osl_object *query)
 		}
 out:
 	if (b.offset)
-		pass_buffer_as_shm(b.buf, b.offset, &fd);
+		pass_buffer_as_shm(fd, SBD_OUTPUT, b.buf, b.offset);
 	free(b.buf);
 	free(opts->data);
 	free(opts->data_ptr);
@@ -1409,7 +1424,7 @@ out:
 /*
  * TODO: flags -h (sort by hash)
  */
-int com_ls(int fd, int argc, char * const * const argv)
+int com_ls(struct command_context *cc)
 {
 	int i, ret;
 	unsigned flags = 0;
@@ -1418,8 +1433,8 @@ int com_ls(int fd, int argc, char * const * const argv)
 	struct ls_options opts = {.patterns = NULL};
 	struct osl_object query = {.data = &opts, .size = sizeof(opts)};
 
-	for (i = 1; i < argc; i++) {
-		const char *arg = argv[i];
+	for (i = 1; i < cc->argc; i++) {
+		const char *arg = cc->argv[i];
 		if (arg[0] != '-')
 			break;
 		if (!strcmp(arg, "--")) {
@@ -1449,6 +1464,9 @@ int com_ls(int fd, int argc, char * const * const argv)
 			case 'c':
 				mode = LS_MODE_CHUNKS;
 				continue;
+			case 'p':
+				mode = LS_MODE_PARSER;
+				continue;
 			default:
 				return -E_AFT_SYNTAX;
 			}
@@ -1516,9 +1534,9 @@ int com_ls(int fd, int argc, char * const * const argv)
 	opts.flags = flags;
 	opts.sorting = sort;
 	opts.mode = mode;
-	opts.num_patterns = argc - i;
+	opts.num_patterns = cc->argc - i;
 	ret = send_option_arg_callback_request(&query, opts.num_patterns,
-		argv + i, com_ls_callback, send_result, &fd);
+		cc->argv + i, com_ls_callback, afs_cb_result_handler, cc);
 	return ret;
 }
 
@@ -1528,15 +1546,15 @@ int com_ls(int fd, int argc, char * const * const argv)
  * \param private_data An arbitrary data pointer, passed to \a func.
  * \param func The custom function to be called.
  *
- * \return The return value of the underlying call to osl_rbtree_loop().
+ * \return Standard.
  */
 int audio_file_loop(void *private_data, osl_rbtree_loop_func *func)
 {
-	return osl_rbtree_loop(audio_file_table, AFTCOL_HASH, private_data,
-		func);
+	return osl(osl_rbtree_loop(audio_file_table, AFTCOL_HASH, private_data,
+		func));
 }
 
-static struct osl_row *find_hash_sister(HASH_TYPE *hash)
+static struct osl_row *find_hash_sister(unsigned char *hash)
 {
 	const struct osl_object obj = {.data = hash, .size = HASH_SIZE};
 	struct osl_row *row;
@@ -1568,7 +1586,7 @@ enum com_add_buffer_offsets {
  * It's OK to call this with afhi == NULL. In this case, the audio format
  * handler info won't be stored in the buffer.
  */
-static void save_add_callback_buffer(HASH_TYPE *hash, const char *path,
+static void save_add_callback_buffer(unsigned char *hash, const char *path,
 		struct afh_info *afhi, uint32_t flags,
 		uint8_t audio_format_num, struct osl_object *obj)
 {
@@ -1671,18 +1689,24 @@ static void com_add_callback(int fd, const struct osl_object *query)
 	struct osl_row *pb, *aft_row;
 	struct osl_row *hs;
 	struct osl_object objs[NUM_AFT_COLUMNS];
-	HASH_TYPE *hash;
+	unsigned char *hash;
 	char asc[2 * HASH_SIZE + 1];
 	int ret;
 	char afsi_buf[AFSI_SIZE];
 	uint32_t flags = read_u32(buf + CAB_FLAGS_OFFSET);
 	struct afs_info default_afsi = {.last_played = 0};
-	struct para_buffer msg = {.max_size = SHMMAX,
-		.max_size_handler = pass_buffer_as_shm, .private_data = &fd};
+	struct para_buffer msg = {
+		.max_size = shm_get_shmmax(),
+		.max_size_handler = afs_max_size_handler,
+		.private_data = &(struct afs_max_size_handler_data) {
+			.fd = fd,
+			.band = SBD_OUTPUT
+		}
+	};
 	uint16_t afhi_offset, chunks_offset;
 
-	hash = (HASH_TYPE *)buf + CAB_HASH_OFFSET;
-	hash_to_asc(hash, asc);;
+	hash = (unsigned char *)buf + CAB_HASH_OFFSET;
+	hash_to_asc(hash, asc);
 	objs[AFTCOL_HASH].data = buf + CAB_HASH_OFFSET;
 	objs[AFTCOL_HASH].size = HASH_SIZE;
 
@@ -1693,7 +1717,7 @@ static void com_add_callback(int fd, const struct osl_object *query)
 	PARA_INFO_LOG("request to add %s\n", path);
 	hs = find_hash_sister(hash);
 	ret = aft_get_row_of_path(path, &pb);
-	if (ret < 0 && ret != -E_RB_KEY_NOT_FOUND)
+	if (ret < 0 && ret != -OSL_ERRNO_TO_PARA_ERROR(E_OSL_RB_KEY_NOT_FOUND))
 		goto out;
 	if (hs && pb && hs == pb && !(flags & ADD_FLAG_FORCE)) {
 		if (flags & ADD_FLAG_VERBOSE)
@@ -1706,27 +1730,28 @@ static void com_add_callback(int fd, const struct osl_object *query)
 		struct osl_object obj;
 		if (pb) { /* hs trumps pb, remove pb */
 			if (flags & ADD_FLAG_VERBOSE) {
-				ret = para_printf(&msg, "removing path brother\n");
+				ret = para_printf(&msg, "removing %s\n", path);
 				if (ret < 0)
 					goto out;
 			}
-			ret = osl_del_row(audio_file_table, pb);
+			afs_event(AUDIO_FILE_REMOVE, &msg, pb);
+			ret = osl(osl_del_row(audio_file_table, pb));
 			if (ret < 0)
 				goto out;
 			pb = NULL;
 		}
 		/* file rename, update hs' path */
 		if (flags & ADD_FLAG_VERBOSE) {
-			ret = osl_get_object(audio_file_table, hs,
-				AFTCOL_PATH, &obj);
+			ret = osl(osl_get_object(audio_file_table, hs,
+				AFTCOL_PATH, &obj));
 			if (ret < 0)
 				goto out;
 			ret = para_printf(&msg, "renamed from %s\n", (char *)obj.data);
 			if (ret < 0)
 				goto out;
 		}
-		ret = osl_update_object(audio_file_table, hs, AFTCOL_PATH,
-			&objs[AFTCOL_PATH]);
+		ret = osl(osl_update_object(audio_file_table, hs, AFTCOL_PATH,
+			&objs[AFTCOL_PATH]));
 		if (ret < 0)
 			goto out;
 		afs_event(AUDIO_FILE_RENAME, &msg, hs);
@@ -1746,7 +1771,7 @@ static void com_add_callback(int fd, const struct osl_object *query)
 	objs[AFTCOL_CHUNKS].size = query->size - chunks_offset;
 	if (pb && !hs) { /* update pb's hash */
 		char old_asc[2 * HASH_SIZE + 1];
-		HASH_TYPE *old_hash;
+		unsigned char *old_hash;
 		ret = get_hash_of_row(pb, &old_hash);
 		if (ret < 0)
 			goto out;
@@ -1770,12 +1795,12 @@ static void com_add_callback(int fd, const struct osl_object *query)
 			if (ret < 0)
 				goto out;
 		}
-		ret = osl_update_object(audio_file_table, row, AFTCOL_AFHI,
-			&objs[AFTCOL_AFHI]);
+		ret = osl(osl_update_object(audio_file_table, row, AFTCOL_AFHI,
+			&objs[AFTCOL_AFHI]));
 		if (ret < 0)
 			goto out;
-		ret = osl_update_object(audio_file_table, row, AFTCOL_CHUNKS,
-			&objs[AFTCOL_CHUNKS]);
+		ret = osl(osl_update_object(audio_file_table, row, AFTCOL_CHUNKS,
+			&objs[AFTCOL_CHUNKS]));
 		if (ret < 0)
 			goto out;
 		afs_event(AFHI_CHANGE, &msg, row);
@@ -1793,20 +1818,20 @@ static void com_add_callback(int fd, const struct osl_object *query)
 	objs[AFTCOL_AFSI].data = &afsi_buf;
 	objs[AFTCOL_AFSI].size = AFSI_SIZE;
 	save_afsi(&default_afsi, &objs[AFTCOL_AFSI]);
-	ret = osl_add_and_get_row(audio_file_table, objs, &aft_row);
+	ret = osl(osl_add_and_get_row(audio_file_table, objs, &aft_row));
 	afs_event(AUDIO_FILE_ADD, &msg, aft_row);
 out:
 	if (ret < 0)
 		para_printf(&msg, "%s\n", para_strerror(-ret));
 	if (msg.offset)
-		pass_buffer_as_shm(msg.buf, msg.offset, &fd);
+		pass_buffer_as_shm(fd, SBD_OUTPUT, msg.buf, msg.offset);
 	free(msg.buf);
 }
 
 /** Used by com_add(). */
 struct private_add_data {
-	/** The socket file descriptor. */
-	int fd;
+	/** The pointer passed to the original command handler. */
+	struct command_context *cc;
 	/** The given add flags. */
 	uint32_t flags;
 };
@@ -1818,24 +1843,27 @@ static void path_brother_callback(int fd, const struct osl_object *query)
 	int ret = aft_get_row_of_path(path, &path_brother);
 	if (ret < 0)
 		return;
-	pass_buffer_as_shm((char *)&path_brother, sizeof(path_brother), &fd);
+	pass_buffer_as_shm(fd, SBD_OUTPUT, (char *)&path_brother,
+		sizeof(path_brother));
 }
 
 static void hash_sister_callback(int fd, const struct osl_object *query)
 {
-	HASH_TYPE *hash = query->data;
+	unsigned char *hash = query->data;
 	struct osl_row *hash_sister;
 
 	hash_sister = find_hash_sister(hash);
 	if (!hash_sister)
 		return;
-	pass_buffer_as_shm((char *)&hash_sister, sizeof(hash_sister), &fd);
+	pass_buffer_as_shm(fd, SBD_OUTPUT, (char *)&hash_sister,
+		sizeof(hash_sister));
 }
 
-static int get_row_pointer_from_result(struct osl_object *result, void *private)
+static int get_row_pointer_from_result(struct osl_object *result,
+		__a_unused uint8_t band, void *private)
 {
 	struct osl_row **row = private;
-	*row = result->data;
+	*row = *(struct osl_row **)(result->data);
 	return 1;
 }
 
@@ -1847,7 +1875,7 @@ static int add_one_audio_file(const char *path, void *private_data)
 	struct afh_info afhi, *afhi_ptr = NULL;
 	struct osl_row *pb = NULL, *hs = NULL; /* path brother/hash sister */
 	struct osl_object map, obj = {.data = NULL}, query;
-	HASH_TYPE hash[HASH_SIZE];
+	unsigned char hash[HASH_SIZE];
 
 	ret = guess_audio_format(path);
 	if (ret < 0 && !(pad->flags & ADD_FLAG_ALL))
@@ -1856,12 +1884,13 @@ static int add_one_audio_file(const char *path, void *private_data)
 	query.size = strlen(path) + 1;
 	ret = send_callback_request(path_brother_callback, &query,
 		get_row_pointer_from_result, &pb);
-	if (ret < 0 && ret != -E_RB_KEY_NOT_FOUND)
+	if (ret < 0 && ret != -OSL_ERRNO_TO_PARA_ERROR(E_OSL_RB_KEY_NOT_FOUND))
 		goto out_free;
 	ret = 1;
 	if (pb && (pad->flags & ADD_FLAG_LAZY)) { /* lazy is really cheap */
 		if (pad->flags & ADD_FLAG_VERBOSE)
-			send_ret = send_va_buffer(pad->fd, "lazy-ignore: %s\n", path);
+			send_ret = send_sb_va(&pad->cc->scc, SBD_OUTPUT,
+				"lazy-ignore: %s\n", path);
 		goto out_free;
 	}
 	/* We still want to add this file. Compute its hash. */
@@ -1881,7 +1910,7 @@ static int add_one_audio_file(const char *path, void *private_data)
 	ret = 1;
 	if (pb && hs && hs == pb && !(pad->flags & ADD_FLAG_FORCE)) {
 		if (pad->flags & ADD_FLAG_VERBOSE)
-			send_ret = send_va_buffer(pad->fd,
+			send_ret = send_sb_va(&pad->cc->scc, SBD_OUTPUT,
 				"%s exists, not forcing update\n", path);
 		goto out_unmap;
 	}
@@ -1899,13 +1928,15 @@ static int add_one_audio_file(const char *path, void *private_data)
 	munmap(map.data, map.size);
 	close(fd);
 	if (pad->flags & ADD_FLAG_VERBOSE) {
-		send_ret = send_va_buffer(pad->fd, "adding %s\n", path);
+		send_ret = send_sb_va(&pad->cc->scc, SBD_OUTPUT,
+			"adding %s\n", path);
 		if (send_ret < 0)
 			goto out_free;
 	}
 	save_add_callback_buffer(hash, path, afhi_ptr, pad->flags, format_num, &obj);
 	/* Ask afs to consider this entry for adding. */
-	ret = send_callback_request(com_add_callback, &obj, send_result, &pad->fd);
+	ret = send_callback_request(com_add_callback, &obj,
+		afs_cb_result_handler, pad->cc);
 	goto out_free;
 
 out_unmap:
@@ -1913,25 +1944,22 @@ out_unmap:
 	munmap(map.data, map.size);
 out_free:
 	if (ret < 0 && send_ret >= 0)
-		send_ret = send_va_buffer(pad->fd, "failed to add %s (%s)\n", path,
-			para_strerror(-ret));
+		send_ret = send_sb_va(&pad->cc->scc, SBD_ERROR_LOG,
+			"failed to add %s (%s)\n", path, para_strerror(-ret));
 	free(obj.data);
-	if (afhi_ptr) {
-		free(afhi_ptr->chunk_table);
-		free(afhi_ptr->info_string);
-	}
+	clear_afhi(afhi_ptr);
 	/* Stop adding files only on send errors. */
 	return send_ret;
 }
 
-int com_add(int fd, int argc, char * const * const argv)
+int com_add(struct command_context *cc)
 {
 	int i, ret;
-	struct private_add_data pad = {.fd = fd, .flags = 0};
+	struct private_add_data pad = {.cc = cc, .flags = 0};
 	struct stat statbuf;
 
-	for (i = 1; i < argc; i++) {
-		const char *arg = argv[i];
+	for (i = 1; i < cc->argc; i++) {
+		const char *arg = cc->argv[i];
 		if (arg[0] != '-')
 			break;
 		if (!strcmp(arg, "--")) {
@@ -1955,21 +1983,22 @@ int com_add(int fd, int argc, char * const * const argv)
 			continue;
 		}
 	}
-	if (argc <= i)
+	if (cc->argc <= i)
 		return -E_AFT_SYNTAX;
-	for (; i < argc; i++) {
+	for (; i < cc->argc; i++) {
 		char *path;
-		ret = verify_path(argv[i], &path);
+		ret = verify_path(cc->argv[i], &path);
 		if (ret < 0) {
-			ret = send_va_buffer(fd, "%s: %s\n", argv[i],
-				para_strerror(-ret));
+			ret = send_sb_va(&cc->scc, SBD_ERROR_LOG, "%s: %s\n",
+				cc->argv[i], para_strerror(-ret));
 			if (ret < 0)
 				return ret;
 			continue;
 		}
 		ret = stat(path, &statbuf);
 		if (ret < 0) {
-			ret = send_va_buffer(fd, "failed to stat %s (%s)\n", path,
+			ret = send_sb_va(&cc->scc, SBD_ERROR_LOG,
+				"failed to stat %s (%s)\n", path,
 				strerror(errno));
 			free(path);
 			if (ret < 0)
@@ -1982,14 +2011,14 @@ int com_add(int fd, int argc, char * const * const argv)
 		else
 			ret = add_one_audio_file(path, &pad);
 		if (ret < 0) {
-			send_va_buffer(fd, "%s: %s\n", path, para_strerror(-ret));
+			send_sb_va(&cc->scc, SBD_OUTPUT, "%s: %s\n", path,
+				para_strerror(-ret));
 			free(path);
 			return ret;
 		}
 		free(path);
 	}
 	return 1;
-
 }
 
 /**
@@ -2026,8 +2055,6 @@ struct touch_action_data {
 	struct com_touch_options *cto;
 	/** Message buffer. */
 	struct para_buffer pb;
-	/** How many audio files matched the given pattern. */
-	unsigned num_matches;
 };
 
 static int touch_audio_file(__a_unused struct osl_table *table,
@@ -2074,7 +2101,6 @@ static int touch_audio_file(__a_unused struct osl_table *table,
 		if (tad->cto->amp >= 0)
 			new_afsi.amp = tad->cto->amp;
 	}
-	tad->num_matches++;
 	save_afsi(&new_afsi, &obj); /* in-place update */
 	aced.aft_row = row;
 	aced.old_afsi = &old_afsi;
@@ -2086,9 +2112,9 @@ static void com_touch_callback(int fd, const struct osl_object *query)
 {
 	struct touch_action_data tad = {.cto = query->data,
 		.pb = {
-			.max_size = SHMMAX,
+			.max_size = shm_get_shmmax(),
 			.private_data = &fd,
-			.max_size_handler = pass_buffer_as_shm
+			.max_size_handler = afs_max_size_handler
 		}
 	};
 	int ret, ret2 = 0;
@@ -2106,15 +2132,14 @@ static void com_touch_callback(int fd, const struct osl_object *query)
 	ret = for_each_matching_row(&pmd);
 	if (ret < 0)
 		ret2 = para_printf(&tad.pb, "%s\n", para_strerror(-ret));
-	else
-		if (!tad.num_matches)
-			ret2 = para_printf(&tad.pb, "no matches\n");
+	else if (pmd.num_matches == 0)
+		ret2 = para_printf(&tad.pb, "no matches\n");
 	if (ret2 >= 0 && tad.pb.offset)
-		pass_buffer_as_shm(tad.pb.buf, tad.pb.offset, &fd);
+		pass_buffer_as_shm(fd, SBD_OUTPUT, tad.pb.buf, tad.pb.offset);
 	free(tad.pb.buf);
 }
 
-int com_touch(int fd, int argc, char * const * const argv)
+int com_touch(struct command_context *cc)
 {
 	struct com_touch_options cto = {
 		.num_played = -1,
@@ -2127,41 +2152,41 @@ int com_touch(int fd, int argc, char * const * const argv)
 	int i, ret;
 
 
-	for (i = 1; i < argc; i++) {
-		const char *arg = argv[i];
+	for (i = 1; i < cc->argc; i++) {
+		const char *arg = cc->argv[i];
 		if (arg[0] != '-')
 			break;
 		if (!strcmp(arg, "--")) {
 			i++;
 			break;
 		}
-		if (!strncmp(arg, "-n", 2)) {
-			ret = para_atoi32(arg + 2, &cto.num_played);
+		if (!strncmp(arg, "-n=", 3)) {
+			ret = para_atoi32(arg + 3, &cto.num_played);
 			if (ret < 0)
 				return ret;
 			continue;
 		}
-		if (!strncmp(arg, "-l", 2)) {
-			ret = para_atoi64(arg + 2, &cto.last_played);
+		if (!strncmp(arg, "-l=", 3)) {
+			ret = para_atoi64(arg + 3, &cto.last_played);
 			if (ret < 0)
 				return ret;
 			continue;
 		}
-		if (!strncmp(arg, "-y", 2)) {
-			ret = para_atoi32(arg + 2, &cto.lyrics_id);
+		if (!strncmp(arg, "-y=", 3)) {
+			ret = para_atoi32(arg + 3, &cto.lyrics_id);
 			if (ret < 0)
 				return ret;
 			continue;
 		}
-		if (!strncmp(arg, "-i", 2)) {
-			ret = para_atoi32(arg + 2, &cto.image_id);
+		if (!strncmp(arg, "-i=", 3)) {
+			ret = para_atoi32(arg + 3, &cto.image_id);
 			if (ret < 0)
 				return ret;
 			continue;
 		}
-		if (!strncmp(arg, "-a", 2)) {
+		if (!strncmp(arg, "-a=", 3)) {
 			int32_t val;
-			ret = para_atoi32(arg + 2, &val);
+			ret = para_atoi32(arg + 3, &val);
 			if (ret < 0)
 				return ret;
 			if (val < 0 || val > 255)
@@ -2179,12 +2204,12 @@ int com_touch(int fd, int argc, char * const * const argv)
 		}
 		break; /* non-option starting with dash */
 	}
-	if (i >= argc)
+	if (i >= cc->argc)
 		return -E_AFT_SYNTAX;
-	ret = send_option_arg_callback_request(&query, argc - i,
-		argv + i, com_touch_callback, send_result, &fd);
+	ret = send_option_arg_callback_request(&query, cc->argc - i,
+		cc->argv + i, com_touch_callback, afs_cb_result_handler, cc);
 	if (ret < 0)
-		send_va_buffer(fd, "%s\n", para_strerror(-ret));
+		send_strerror(cc, -ret);
 	return ret;
 }
 
@@ -2204,8 +2229,6 @@ struct com_rm_action_data {
 	uint32_t flags;
 	/** Message buffer. */
 	struct para_buffer pb;
-	/** Number of audio files removed. */
-	unsigned num_removed;
 };
 
 static int remove_audio_file(__a_unused struct osl_table *table,
@@ -2220,11 +2243,9 @@ static int remove_audio_file(__a_unused struct osl_table *table,
 			return ret;
 	}
 	afs_event(AUDIO_FILE_REMOVE, &crd->pb, row);
-	ret = osl_del_row(audio_file_table, row);
+	ret = osl(osl_del_row(audio_file_table, row));
 	if (ret < 0)
 		para_printf(&crd->pb, "%s: %s\n", name, para_strerror(-ret));
-	else
-		crd->num_removed++;
 	return ret;
 }
 
@@ -2232,9 +2253,9 @@ static void com_rm_callback(int fd, const struct osl_object *query)
 {
 	struct com_rm_action_data crd = {.flags = *(uint32_t *)query->data,
 		.pb = {
-			.max_size = SHMMAX,
+			.max_size = shm_get_shmmax(),
 			.private_data = &fd,
-			.max_size_handler = pass_buffer_as_shm
+			.max_size_handler = afs_max_size_handler
 		}
 	};
 	int ret;
@@ -2254,26 +2275,26 @@ static void com_rm_callback(int fd, const struct osl_object *query)
 		para_printf(&crd.pb, "%s\n", para_strerror(-ret));
 		return;
 	}
-	if (!crd.num_removed && !(crd.flags & RM_FLAG_FORCE))
+	if ((pmd.num_matches == 0) && !(crd.flags & RM_FLAG_FORCE))
 		ret = para_printf(&crd.pb, "no matches -- nothing removed\n");
-	else {
-		if (crd.flags & RM_FLAG_VERBOSE)
-			ret = para_printf(&crd.pb, "removed %u files\n", crd.num_removed);
+	else if (crd.flags & RM_FLAG_VERBOSE) {
+		ret = para_printf(&crd.pb, "removed %u files\n",
+			pmd.num_matches);
 	}
 	if (ret >= 0 && crd.pb.offset)
-		pass_buffer_as_shm(crd.pb.buf, crd.pb.offset, &fd);
+		pass_buffer_as_shm(fd, SBD_OUTPUT, crd.pb.buf, crd.pb.offset);
 	free(crd.pb.buf);
 }
 
 /* TODO options: -r (recursive) */
-int com_rm(int fd, int argc,  char * const * const argv)
+int com_rm(struct command_context *cc)
 {
 	uint32_t flags = 0;
 	struct osl_object query = {.data = &flags, .size = sizeof(flags)};
 	int i, ret;
 
-	for (i = 1; i < argc; i++) {
-		const char *arg = argv[i];
+	for (i = 1; i < cc->argc; i++) {
+		const char *arg = cc->argv[i];
 		if (arg[0] != '-')
 			break;
 		if (!strcmp(arg, "--")) {
@@ -2294,12 +2315,12 @@ int com_rm(int fd, int argc,  char * const * const argv)
 		}
 		break;
 	}
-	if (i >= argc)
+	if (i >= cc->argc)
 		return -E_AFT_SYNTAX;
-	ret = send_option_arg_callback_request(&query, argc - i, argv + i,
-		com_rm_callback, send_result, &fd);
+	ret = send_option_arg_callback_request(&query, cc->argc - i,
+		cc->argv + i, com_rm_callback, afs_cb_result_handler, cc);
 	if (ret < 0)
-		send_va_buffer(fd, "%s\n", para_strerror(-ret));
+		send_strerror(cc, -ret);
 	return ret;
 }
 
@@ -2327,8 +2348,6 @@ enum cpsi_flags {
 struct cpsi_action_data {
 	/** command line flags (see \ref cpsi_flags). */
 	unsigned flags;
-	/** Number of audio files changed. */
-	unsigned num_copied;
 	/** Message buffer. */
 	struct para_buffer pb;
 	/** Values are copied from here. */
@@ -2360,7 +2379,6 @@ static int copy_selector_info(__a_unused struct osl_table *table,
 	if (cad->flags & CPSI_FLAG_COPY_ATTRIBUTES)
 		target_afsi.attributes = cad->source_afsi.attributes;
 	save_afsi(&target_afsi, &target_afsi_obj); /* in-place update */
-	cad->num_copied++;
 	if (cad->flags & CPSI_FLAG_VERBOSE) {
 		ret = para_printf(&cad->pb, "copied afsi to %s\n", name);
 		if (ret < 0)
@@ -2377,9 +2395,9 @@ static void com_cpsi_callback(int fd, const struct osl_object *query)
 	struct cpsi_action_data cad = {
 		.flags = *(unsigned *)query->data,
 		.pb = {
-			.max_size = SHMMAX,
+			.max_size = shm_get_shmmax(),
 			.private_data = &fd,
-			.max_size_handler = pass_buffer_as_shm
+			.max_size_handler = afs_max_size_handler
 		}
 	};
 	int ret;
@@ -2402,26 +2420,25 @@ static void com_cpsi_callback(int fd, const struct osl_object *query)
 out:
 	if (ret < 0)
 		para_printf(&cad.pb, "%s\n", para_strerror(-ret));
-	else if (cad.flags & CPSI_FLAG_VERBOSE) {
-		if (cad.num_copied)
+	else if (pmd.num_matches > 0) {
+		if (cad.flags & CPSI_FLAG_VERBOSE)
 			para_printf(&cad.pb, "copied requested afsi from %s "
-				"to %u files\n", source_path, cad.num_copied);
-		else
-			para_printf(&cad.pb, "nothing copied\n");
-	}
+				"to %u files\n", source_path, pmd.num_matches);
+	} else
+		para_printf(&cad.pb, "no matches - nothing copied\n");
 	if (cad.pb.offset)
-		pass_buffer_as_shm(cad.pb.buf, cad.pb.offset, &fd);
+		pass_buffer_as_shm(fd, SBD_OUTPUT, cad.pb.buf, cad.pb.offset);
 	free(cad.pb.buf);
 }
 
-int com_cpsi(int fd, int argc,  char * const * const argv)
+int com_cpsi(struct command_context *cc)
 {
 	unsigned flags = 0;
 	int i, ret;
 	struct osl_object options = {.data = &flags, .size = sizeof(flags)};
 
-	for (i = 1; i < argc; i++) {
-		const char *arg = argv[i];
+	for (i = 1; i < cc->argc; i++) {
+		const char *arg = cc->argv[i];
 		if (arg[0] != '-')
 			break;
 		if (!strcmp(arg, "--")) {
@@ -2454,17 +2471,153 @@ int com_cpsi(int fd, int argc,  char * const * const argv)
 		}
 		break;
 	}
-	if (i + 1 >= argc) /* need at least souce file and pattern */
+	if (i + 1 >= cc->argc) /* need at least source file and pattern */
 		return -E_AFT_SYNTAX;
 	if (!(flags & ~CPSI_FLAG_VERBOSE)) /* no copy flags given */
 		flags = ~(unsigned)CPSI_FLAG_VERBOSE | flags;
-	ret = send_option_arg_callback_request(&options, argc - i, argv + i,
-		com_cpsi_callback, send_result, &fd);
+	ret = send_option_arg_callback_request(&options, cc->argc - i,
+		cc->argv + i, com_cpsi_callback, afs_cb_result_handler, cc);
 	if (ret < 0)
-		send_va_buffer(fd, "%s\n", para_strerror(-ret));
+		send_strerror(cc, -ret);
 	return ret;
 }
 
+struct change_atts_data {
+	uint64_t add_mask, del_mask;
+	struct para_buffer pb;
+};
+
+static int change_atts(__a_unused struct osl_table *table,
+		struct osl_row *row, __a_unused const char *name, void *data)
+{
+	int ret;
+	struct osl_object obj;
+	struct afs_info old_afsi, new_afsi;
+	struct afsi_change_event_data aced = {
+		.aft_row = row,
+		.old_afsi = &old_afsi
+	};
+	struct change_atts_data *cad = data;
+
+	ret = get_afsi_object_of_row(row, &obj);
+	if (ret < 0)
+		return ret;
+	ret = load_afsi(&old_afsi, &obj);
+	if (ret < 0)
+		return ret;
+	new_afsi = old_afsi;
+	new_afsi.attributes |= cad->add_mask;
+	new_afsi.attributes &= ~cad->del_mask;
+	save_afsi(&new_afsi, &obj); /* in-place update */
+	afs_event(AFSI_CHANGE, &cad->pb, &aced);
+	return 1;
+}
+
+static void com_setatt_callback(int fd, const struct osl_object *query)
+{
+	char *p;
+	int ret;
+	size_t len;
+	struct change_atts_data cad = {
+		.pb = {
+			.max_size = shm_get_shmmax(),
+			.max_size_handler = afs_max_size_handler,
+			.private_data = &(struct afs_max_size_handler_data) {
+				.fd = fd,
+				.band = SBD_OUTPUT
+			}
+		}
+	};
+	struct pattern_match_data pmd = {
+		.table = audio_file_table,
+		.loop_col_num = AFTCOL_HASH,
+		.match_col_num = AFTCOL_PATH,
+		.pm_flags = PM_SKIP_EMPTY_NAME,
+		.data = &cad,
+		.action = change_atts
+	};
+
+	for (p = query->data; p < (char *)query->data + query->size; p += len + 1) {
+		char c;
+		unsigned char bitnum;
+
+		len = strlen(p);
+		ret = -E_ATTR_SYNTAX;
+		if (len == 0)
+			goto out;
+		c = p[len - 1];
+		if (c != '+' && c != '-')
+			break;
+		p[len - 1] = '\0';
+		ret = get_attribute_bitnum_by_name(p, &bitnum);
+		if (ret < 0)
+			goto out;
+		if (c == '+')
+			cad.add_mask |= (1UL << bitnum);
+		else
+			cad.del_mask |= (1UL << bitnum);
+	}
+	ret = -E_ATTR_SYNTAX;
+	if (!cad.add_mask && !cad.del_mask)
+		goto out;
+	pmd.patterns.data = p;
+	assert(p < (char *)query->data + query->size);
+	pmd.patterns.size = (char *)query->data + query->size - p;
+	ret = for_each_matching_row(&pmd);
+	if (ret < 0)
+		goto out;
+	if (pmd.num_matches == 0)
+		para_printf(&cad.pb, "no matches\n");
+out:
+	if (ret < 0)
+		para_printf(&cad.pb, "%s\n", para_strerror(-ret));
+	if (cad.pb.offset)
+		pass_buffer_as_shm(fd, SBD_OUTPUT, cad.pb.buf, cad.pb.offset);
+	free(cad.pb.buf);
+}
+
+int com_setatt(struct command_context *cc)
+{
+	if (cc->argc < 3)
+		return -E_ATTR_SYNTAX;
+	return send_standard_callback_request(cc->argc - 1, cc->argv + 1,
+		com_setatt_callback, afs_cb_result_handler, cc);
+}
+
+static void afs_stat_callback(int fd, const struct osl_object *query)
+{
+	int *parser_friendly = query->data;
+	char *buf = *parser_friendly?
+		parser_friendly_status_items : status_items;
+
+	if (!buf)
+		return;
+	pass_buffer_as_shm(fd, SBD_OUTPUT, buf, strlen(buf));
+}
+
+/**
+ * Get the current afs status items from the afs process and send it.
+ *
+ * \param cc The command context, used e.g. for data encryption.
+ * \param parser_friendly Whether parser-friendly output format should be used.
+ *
+ * As the contents of the afs status items change in time and the command
+ * handler only has a COW version created at fork time, it can not send
+ * up-to-date afs status items directly. Therefore the usual callback mechanism
+ * is used to pass the status items from the afs process to the command handler
+ * via a shared memory area and a pipe.
+ *
+ * \return The return value of the underlying call to \ref send_callback_request().
+ */
+int send_afs_status(struct command_context *cc, int parser_friendly)
+{
+	struct osl_object query = {.data = &parser_friendly,
+		.size = sizeof(parser_friendly)};
+
+	return send_callback_request(afs_stat_callback, &query,
+		afs_cb_result_handler, cc);
+}
+
 /* TODO: optionally fix problems by removing offending rows */
 static int check_audio_file(struct osl_row *row, void *data)
 {
@@ -2518,9 +2671,12 @@ static int check_audio_file(struct osl_row *row, void *data)
 void aft_check_callback(int fd, __a_unused const struct osl_object *query)
 {
 	struct para_buffer pb = {
-		.max_size = SHMMAX,
-		.private_data = &fd,
-		.max_size_handler = pass_buffer_as_shm
+		.max_size = shm_get_shmmax(),
+		.private_data = &(struct afs_max_size_handler_data) {
+			.fd = fd,
+			.band = SBD_OUTPUT
+		},
+		.max_size_handler = afs_max_size_handler
 	};
 	int ret = para_printf(&pb, "checking audio file table...\n");
 
@@ -2528,7 +2684,7 @@ void aft_check_callback(int fd, __a_unused const struct osl_object *query)
 		return;
 	audio_file_loop(&pb, check_audio_file);
 	if (pb.offset)
-		pass_buffer_as_shm(pb.buf, pb.offset, &fd);
+		pass_buffer_as_shm(fd, SBD_OUTPUT, pb.buf, pb.offset);
 	free(pb.buf);
 }
 
@@ -2559,7 +2715,7 @@ static int aft_open(const char *dir)
 	int ret;
 
 	audio_file_table_desc.dir = dir;
-	ret = osl_open_table(&audio_file_table_desc, &audio_file_table);
+	ret = osl(osl_open_table(&audio_file_table_desc, &audio_file_table));
 	if (ret >= 0) {
 		unsigned num;
 		osl_get_num_rows(audio_file_table, &num);
@@ -2568,7 +2724,7 @@ static int aft_open(const char *dir)
 	}
 	PARA_INFO_LOG("failed to open audio file table\n");
 	audio_file_table = NULL;
-	if (ret >= 0 || is_errno(-ret, ENOENT))
+	if (ret >= 0 || ret == -OSL_ERRNO_TO_PARA_ERROR(E_OSL_NOENT))
 		return 1;
 	return ret;
 }
@@ -2576,7 +2732,7 @@ static int aft_open(const char *dir)
 static int aft_create(const char *dir)
 {
 	audio_file_table_desc.dir = dir;
-	return osl_create_table(&audio_file_table_desc);
+	return osl(osl_create_table(&audio_file_table_desc));
 }
 
 static int clear_attribute(struct osl_row *row, void *data)
@@ -2602,7 +2758,7 @@ static int aft_event_handler(enum afs_events event, struct para_buffer *pb,
 {
 	int ret;
 
-	switch(event) {
+	switch (event) {
 	case ATTRIBUTE_REMOVE: {
 		const struct rmatt_event_data *red = data;
 		ret = para_printf(pb, "clearing attribute %s (bit %u) from all "
@@ -2617,6 +2773,11 @@ static int aft_event_handler(enum afs_events event, struct para_buffer *pb,
 	}
 }
 
+/**
+ * Initialize the audio file table.
+ *
+ * \param t Pointer to the structure to be initialized.
+ */
 void aft_init(struct afs_table *t)
 {
 	t->open = aft_open;