X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=179777ba8c8999dc633cf8578f08951ff7dd995c;hp=266188b5b370a3e7e3e8aaa092ca093aca7c6c04;hb=e8ca7526ddebc98f3023736f77fa13b65034767b;hpb=1c8226eae0e976d940366cd10bd708d8e4d0bca5

diff --git a/aft.c b/aft.c
index 266188b5..179777ba 100644
--- a/aft.c
+++ b/aft.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2014 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -7,8 +7,6 @@
 /** \file aft.c Audio file table functions. */
 
 #include <regex.h>
-#include <dirent.h> /* readdir() */
-#include <openssl/rc4.h>
 #include <sys/mman.h>
 #include <fnmatch.h>
 #include <sys/shm.h>
@@ -20,10 +18,11 @@
 #include "string.h"
 #include "afh.h"
 #include "afs.h"
-#include "net.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;
@@ -110,6 +109,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. */
@@ -162,7 +163,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.
@@ -170,7 +171,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;
 
@@ -185,17 +186,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)
@@ -239,7 +240,7 @@ enum audio_file_table_columns {
  */
 static int aft_hash_compare(const struct osl_object *obj1, const struct osl_object *obj2)
 {
-	return hash_compare((HASH_TYPE *)obj1->data, (HASH_TYPE *)obj2->data);
+	return hash_compare((unsigned char *)obj1->data, (unsigned char *)obj2->data);
 }
 
 static struct osl_column_description aft_cols[] = {
@@ -279,7 +280,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)
 {
 	/*
@@ -486,21 +487,22 @@ int aft_get_row_of_path(const char *path, struct osl_row **row)
  *
  * \return Standard.
  */
-static 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(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 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(osl_get_object(audio_file_table, row, AFTCOL_AFSI, obj));
 }
@@ -540,15 +542,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);
@@ -606,7 +608,7 @@ static int get_hash_object_of_aft_row(const struct osl_row *row,
  * \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);
@@ -725,7 +727,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;
@@ -905,7 +907,7 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 			"%*d "  /* image_id  */
 			"%*d "  /* lyrics_id */
 			"%*d "  /* bitrate */
-			"%s "   /* audio format */
+			"%*s "  /* audio format */
 			"%*d "  /* frequency */
 			"%d "   /* channels */
 			"%s "   /* duration */
@@ -917,6 +919,7 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 			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,
@@ -1027,7 +1030,7 @@ out:
 
 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,
@@ -1040,7 +1043,7 @@ 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 = SHMMAX - 1};
+	struct para_buffer pb = {.max_size = shm_get_shmmax() - 1};
 	time_t current_time;
 	int ret;
 
@@ -1051,7 +1054,7 @@ static int make_status_items(struct audio_file_data *afd,
 	free(status_items);
 	status_items = pb.buf;
 	memset(&pb, 0, sizeof(pb));
-	pb.max_size = SHMMAX - 1;
+	pb.max_size = shm_get_shmmax() - 1;
 	pb.flags = PBF_SIZE_PREFIX;
 	ret = print_list_item(&d, &opts, &pb, current_time);
 	if (ret < 0) {
@@ -1080,7 +1083,7 @@ static int make_status_items(struct audio_file_data *afd,
 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);
@@ -1136,6 +1139,8 @@ int open_and_update_audio_file(struct osl_row *aft_row, long score,
 err:
 	free(afd->afhi.chunk_table);
 	osl_close_disk_object(&chunk_table_obj);
+	if (ret < 0)
+		PARA_ERROR_LOG("%s: %s\n", path, para_strerror(-ret));
 	return ret;
 }
 
@@ -1273,8 +1278,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;
@@ -1329,6 +1336,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 "-") */
@@ -1344,9 +1353,15 @@ 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,
+	struct para_buffer b = {
+		.max_size = shm_get_shmmax(),
 		.flags = (opts->mode == LS_MODE_PARSER)? PBF_SIZE_PREFIX : 0,
-		.max_size_handler = pass_buffer_as_shm, .private_data = &fd};
+		.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;
 
@@ -1365,8 +1380,11 @@ static void com_ls_callback(int fd, const struct osl_object *query)
 			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;
@@ -1385,7 +1403,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);
@@ -1395,7 +1413,7 @@ out:
 /*
  * TODO: flags -h (sort by hash)
  */
-int com_ls(struct rc4_context *rc4c, int argc, char * const * const argv)
+int com_ls(struct command_context *cc)
 {
 	int i, ret;
 	unsigned flags = 0;
@@ -1404,8 +1422,8 @@ int com_ls(struct rc4_context *rc4c, 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, "--")) {
@@ -1505,9 +1523,9 @@ int com_ls(struct rc4_context *rc4c, 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, rc4_send_result, rc4c);
+		cc->argv + i, com_ls_callback, afs_cb_result_handler, cc);
 	return ret;
 }
 
@@ -1525,7 +1543,7 @@ int audio_file_loop(void *private_data, osl_rbtree_loop_func *func)
 		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;
@@ -1557,7 +1575,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)
 {
@@ -1660,18 +1678,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;
 
@@ -1735,7 +1759,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;
@@ -1788,14 +1812,14 @@ 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, including rc4 keys. */
-	struct rc4_context *rc4c;
+	/** The pointer passed to the original command handler. */
+	struct command_context *cc;
 	/** The given add flags. */
 	uint32_t flags;
 };
@@ -1807,24 +1831,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;
 }
 
@@ -1836,7 +1863,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))
@@ -1850,7 +1877,7 @@ static int add_one_audio_file(const char *path, void *private_data)
 	ret = 1;
 	if (pb && (pad->flags & ADD_FLAG_LAZY)) { /* lazy is really cheap */
 		if (pad->flags & ADD_FLAG_VERBOSE)
-			send_ret = rc4_send_va_buffer(pad->rc4c,
+			send_ret = send_sb_va(&pad->cc->scc, SBD_OUTPUT,
 				"lazy-ignore: %s\n", path);
 		goto out_free;
 	}
@@ -1871,7 +1898,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 = rc4_send_va_buffer(pad->rc4c,
+			send_ret = send_sb_va(&pad->cc->scc, SBD_OUTPUT,
 				"%s exists, not forcing update\n", path);
 		goto out_unmap;
 	}
@@ -1889,13 +1916,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 = rc4_send_va_buffer(pad->rc4c, "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, rc4_send_result, pad->rc4c);
+	ret = send_callback_request(com_add_callback, &obj,
+		afs_cb_result_handler, pad->cc);
 	goto out_free;
 
 out_unmap:
@@ -1903,30 +1932,22 @@ out_unmap:
 	munmap(map.data, map.size);
 out_free:
 	if (ret < 0 && send_ret >= 0)
-		send_ret = rc4_send_va_buffer(pad->rc4c,
+		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->techinfo);
-		free(afhi_ptr->tags.artist);
-		free(afhi_ptr->tags.title);
-		free(afhi_ptr->tags.year);
-		free(afhi_ptr->tags.album);
-		free(afhi_ptr->tags.comment);
-	}
+	clear_afhi(afhi_ptr);
 	/* Stop adding files only on send errors. */
 	return send_ret;
 }
 
-int com_add(struct rc4_context *rc4c, int argc, char * const * const argv)
+int com_add(struct command_context *cc)
 {
 	int i, ret;
-	struct private_add_data pad = {.rc4c = rc4c, .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, "--")) {
@@ -1950,21 +1971,22 @@ int com_add(struct rc4_context *rc4c, 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 = rc4_send_va_buffer(rc4c, "%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 = rc4_send_va_buffer(rc4c, "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)
@@ -1977,7 +1999,8 @@ int com_add(struct rc4_context *rc4c, int argc, char * const * const argv)
 		else
 			ret = add_one_audio_file(path, &pad);
 		if (ret < 0) {
-			rc4_send_va_buffer(rc4c, "%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;
 		}
@@ -2021,8 +2044,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,
@@ -2069,7 +2090,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;
@@ -2081,9 +2101,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;
@@ -2101,15 +2121,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(struct rc4_context *rc4c, int argc, char * const * const argv)
+int com_touch(struct command_context *cc)
 {
 	struct com_touch_options cto = {
 		.num_played = -1,
@@ -2122,8 +2141,8 @@ int com_touch(struct rc4_context *rc4c, 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, "--")) {
@@ -2174,12 +2193,12 @@ int com_touch(struct rc4_context *rc4c, 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, rc4_send_result, rc4c);
+	ret = send_option_arg_callback_request(&query, cc->argc - i,
+		cc->argv + i, com_touch_callback, afs_cb_result_handler, cc);
 	if (ret < 0)
-		rc4_send_va_buffer(rc4c, "%s\n", para_strerror(-ret));
+		send_strerror(cc, -ret);
 	return ret;
 }
 
@@ -2199,8 +2218,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,
@@ -2218,8 +2235,6 @@ static int remove_audio_file(__a_unused struct osl_table *table,
 	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;
 }
 
@@ -2227,9 +2242,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;
@@ -2249,26 +2264,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(struct rc4_context *rc4c, 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, "--")) {
@@ -2289,12 +2304,12 @@ int com_rm(struct rc4_context *rc4c, 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, rc4_send_result, rc4c);
+	ret = send_option_arg_callback_request(&query, cc->argc - i,
+		cc->argv + i, com_rm_callback, afs_cb_result_handler, cc);
 	if (ret < 0)
-		rc4_send_va_buffer(rc4c, "%s\n", para_strerror(-ret));
+		send_strerror(cc, -ret);
 	return ret;
 }
 
@@ -2322,8 +2337,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. */
@@ -2355,7 +2368,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)
@@ -2372,9 +2384,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;
@@ -2398,25 +2410,25 @@ out:
 	if (ret < 0)
 		para_printf(&cad.pb, "%s\n", para_strerror(-ret));
 	else if (cad.flags & CPSI_FLAG_VERBOSE) {
-		if (cad.num_copied)
+		if (pmd.num_matches > 0)
 			para_printf(&cad.pb, "copied requested afsi from %s "
-				"to %u files\n", source_path, cad.num_copied);
+				"to %u files\n", source_path, pmd.num_matches);
 		else
 			para_printf(&cad.pb, "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(struct rc4_context *rc4c, 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, "--")) {
@@ -2449,17 +2461,119 @@ int com_cpsi(struct rc4_context *rc4c, int argc,  char * const * const argv)
 		}
 		break;
 	}
-	if (i + 1 >= argc) /* need at least source 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, rc4_send_result, rc4c);
+	ret = send_option_arg_callback_request(&options, cc->argc - i,
+		cc->argv + i, com_cpsi_callback, afs_cb_result_handler, cc);
 	if (ret < 0)
-		rc4_send_va_buffer(rc4c, "%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;
@@ -2468,13 +2582,13 @@ static void afs_stat_callback(int fd, const struct osl_object *query)
 
 	if (!buf)
 		return;
-	pass_buffer_as_shm(buf, strlen(buf), &fd);
+	pass_buffer_as_shm(fd, SBD_OUTPUT, buf, strlen(buf));
 }
 
 /**
- * Get the current afs status items from the afs process and send it using RC4.
+ * Get the current afs status items from the afs process and send it.
  *
- * \param rc4c The rc4 context for data encryption.
+ * \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
@@ -2482,13 +2596,16 @@ static void afs_stat_callback(int fd, const struct osl_object *query)
  * 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 underyling call to \ref send_callback_request().
  */
-int send_afs_status(struct rc4_context *rc4c, int parser_friendly)
+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, rc4_send_result, rc4c);
+	return send_callback_request(afs_stat_callback, &query,
+		afs_cb_result_handler, cc);
 }
 
 /* TODO: optionally fix problems by removing offending rows */
@@ -2544,9 +2661,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");
 
@@ -2554,7 +2674,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);
 }
 
@@ -2569,10 +2689,6 @@ static void aft_close(void)
 {
 	osl_close_table(audio_file_table, OSL_MARK_CLEAN);
 	audio_file_table = NULL;
-	free(status_items);
-	status_items = NULL;
-	free(parser_friendly_status_items);
-	parser_friendly_status_items = NULL;
 }
 
 /**