X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=a5da1a929e8c5c34920aab8d798d1a7f64cb3e68;hp=bfee23d9790ba6b10b115edfbdf01ff72cc23a39;hb=c27a8644af6d285ca6bfd39be9b923ef9f911f78;hpb=b02b7155f01bbe802883e4085b93f146e06cc386

diff --git a/aft.c b/aft.c
index bfee23d9..a5da1a92 100644
--- a/aft.c
+++ b/aft.c
@@ -1072,7 +1072,9 @@ again:
 	 * No need to update the status items as the AFSI_CHANGE event will
 	 * recreate them.
 	 */
-	afs_event(AFSI_CHANGE, NULL, &aced);
+	ret = afs_event(AFSI_CHANGE, NULL, &aced);
+	if (ret < 0)
+		goto out;
 	ret = save_afd(afd);
 out:
 	free(afd->afhi.chunk_table);
@@ -1291,22 +1293,14 @@ err:
 	return ret;
 }
 
-static int com_ls_callback(int fd, const struct osl_object *query)
+static int com_ls_callback(struct afs_callback_arg *aca)
 {
-	struct ls_options *opts = query->data;
-	char *p, *pattern_start = (char *)query->data + sizeof(*opts);
-	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
-		}
-	};
+	struct ls_options *opts = aca->query.data;
+	char *p, *pattern_start = (char *)aca->query.data + sizeof(*opts);
 	int i = 0, ret;
 	time_t current_time;
 
+	aca->pbout.flags = (opts->mode == LS_MODE_PARSER)? PBF_SIZE_PREFIX : 0;
 	if (opts->num_patterns) {
 		opts->patterns = para_malloc(opts->num_patterns * sizeof(char *));
 		for (i = 0, p = pattern_start; i < opts->num_patterns; i++) {
@@ -1332,18 +1326,19 @@ static int com_ls_callback(int fd, const struct osl_object *query)
 	time(&current_time);
 	if (opts->flags & LS_FLAG_REVERSE)
 		for (i = opts->num_matching_paths - 1; i >= 0; i--) {
-			ret = print_list_item(opts->data_ptr[i], opts, &b, current_time);
+			ret = print_list_item(opts->data_ptr[i], opts,
+				&aca->pbout, current_time);
 			if (ret < 0)
 				goto out;
 		}
 	else
 		for (i = 0; i < opts->num_matching_paths; i++) {
-			ret = print_list_item(opts->data_ptr[i], opts, &b, current_time);
+			ret = print_list_item(opts->data_ptr[i], opts,
+				&aca->pbout, current_time);
 			if (ret < 0)
 				goto out;
 		}
 out:
-	flush_and_free_pb(&b);
 	free(opts->data);
 	free(opts->data_ptr);
 	free(opts->patterns);
@@ -1482,13 +1477,22 @@ int audio_file_loop(void *private_data, osl_rbtree_loop_func *func)
 		func));
 }
 
-static struct osl_row *find_hash_sister(unsigned char *hash)
+static int find_hash_sister(unsigned char *hash, struct osl_row **result)
 {
-	const struct osl_object obj = {.data = hash, .size = HASH_SIZE};
-	struct osl_row *row;
+	int ret = aft_get_row_of_hash(hash, result);
 
-	osl_get_row(audio_file_table, AFTCOL_HASH, &obj, &row);
-	return row;
+	if (ret == -OSL_ERRNO_TO_PARA_ERROR(E_OSL_RB_KEY_NOT_FOUND))
+		return 0;
+	return ret;
+}
+
+static int find_path_brother(const char *path, struct osl_row **result)
+{
+	int ret = aft_get_row_of_path(path, result);
+
+	if (ret == -OSL_ERRNO_TO_PARA_ERROR(E_OSL_RB_KEY_NOT_FOUND))
+		return 0;
+	return ret;
 }
 
 /** The format of the data stored by save_audio_file_data(). */
@@ -1611,9 +1615,9 @@ enum com_add_flags {
 	ADD_FLAG_ALL = 8,
 };
 
-static int com_add_callback(int fd, const struct osl_object *query)
+static int com_add_callback(struct afs_callback_arg *aca)
 {
-	char *buf = query->data, *path;
+	char *buf = aca->query.data, *path;
 	struct osl_row *pb, *aft_row;
 	struct osl_row *hs;
 	struct osl_object objs[NUM_AFT_COLUMNS];
@@ -1623,14 +1627,6 @@ static int com_add_callback(int fd, const struct osl_object *query)
 	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 = 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 = (unsigned char *)buf + CAB_HASH_OFFSET;
@@ -1643,13 +1639,15 @@ static int com_add_callback(int fd, const struct osl_object *query)
 	objs[AFTCOL_PATH].size = strlen(path) + 1;
 
 	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 != -OSL_ERRNO_TO_PARA_ERROR(E_OSL_RB_KEY_NOT_FOUND))
+	ret = find_hash_sister(hash, &hs);
+	if (ret < 0)
+		goto out;
+	ret = find_path_brother(path, &pb);
+	if (ret < 0)
 		goto out;
 	if (hs && pb && hs == pb && !(flags & ADD_FLAG_FORCE)) {
 		if (flags & ADD_FLAG_VERBOSE)
-			para_printf(&msg, "ignoring duplicate\n");
+			para_printf(&aca->pbout, "ignoring duplicate\n");
 		ret = 1;
 		goto out;
 	}
@@ -1657,8 +1655,10 @@ static int 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)
-				para_printf(&msg, "removing %s\n", path);
-			afs_event(AUDIO_FILE_REMOVE, &msg, pb);
+				para_printf(&aca->pbout, "removing %s\n", path);
+			ret = afs_event(AUDIO_FILE_REMOVE, &aca->pbout, pb);
+			if (ret < 0)
+				goto out;
 			ret = osl(osl_del_row(audio_file_table, pb));
 			if (ret < 0)
 				goto out;
@@ -1670,13 +1670,16 @@ static int com_add_callback(int fd, const struct osl_object *query)
 				AFTCOL_PATH, &obj));
 			if (ret < 0)
 				goto out;
-			para_printf(&msg, "renamed from %s\n", (char *)obj.data);
+			para_printf(&aca->pbout, "renamed from %s\n",
+				(char *)obj.data);
 		}
 		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);
+		ret = afs_event(AUDIO_FILE_RENAME, &aca->pbout, hs);
+		if (ret < 0)
+			goto out;
 		if (!(flags & ADD_FLAG_FORCE))
 			goto out;
 	}
@@ -1690,7 +1693,7 @@ static int com_add_callback(int fd, const struct osl_object *query)
 	if (!objs[AFTCOL_AFHI].size) /* "impossible" */
 		goto out;
 	objs[AFTCOL_CHUNKS].data = buf + chunks_offset;
-	objs[AFTCOL_CHUNKS].size = query->size - chunks_offset;
+	objs[AFTCOL_CHUNKS].size = aca->query.size - chunks_offset;
 	if (pb && !hs) { /* update pb's hash */
 		char old_asc[2 * HASH_SIZE + 1];
 		unsigned char *old_hash;
@@ -1699,8 +1702,8 @@ static int com_add_callback(int fd, const struct osl_object *query)
 			goto out;
 		hash_to_asc(old_hash, old_asc);
 		if (flags & ADD_FLAG_VERBOSE)
-			para_printf(&msg, "file change: %s -> %s\n", old_asc,
-				asc);
+			para_printf(&aca->pbout, "file change: %s -> %s\n",
+				old_asc, asc);
 		ret = osl_update_object(audio_file_table, pb, AFTCOL_HASH,
 			&objs[AFTCOL_HASH]);
 		if (ret < 0)
@@ -1710,7 +1713,8 @@ static int com_add_callback(int fd, const struct osl_object *query)
 		struct osl_row *row = pb? pb : hs;
 		/* update afhi and chunk_table */
 		if (flags & ADD_FLAG_VERBOSE)
-			para_printf(&msg, "updating afhi and chunk table\n");
+			para_printf(&aca->pbout,
+				"updating afhi and chunk table\n");
 		ret = osl(osl_update_object(audio_file_table, row, AFTCOL_AFHI,
 			&objs[AFTCOL_AFHI]));
 		if (ret < 0)
@@ -1719,12 +1723,14 @@ static int com_add_callback(int fd, const struct osl_object *query)
 			&objs[AFTCOL_CHUNKS]));
 		if (ret < 0)
 			goto out;
-		afs_event(AFHI_CHANGE, &msg, row);
+		ret = afs_event(AFHI_CHANGE, &aca->pbout, row);
+		if (ret < 0)
+			goto out;
 		goto out;
 	}
 	/* new entry, use default afsi */
 	if (flags & ADD_FLAG_VERBOSE)
-		para_printf(&msg, "new file\n");
+		para_printf(&aca->pbout, "new file\n");
 	default_afsi.last_played = time(NULL) - 365 * 24 * 60 * 60;
 	default_afsi.audio_format_id = read_u8(buf + CAB_AUDIO_FORMAT_OFFSET);
 
@@ -1732,11 +1738,10 @@ static int com_add_callback(int fd, const struct osl_object *query)
 	objs[AFTCOL_AFSI].size = AFSI_SIZE;
 	save_afsi(&default_afsi, &objs[AFTCOL_AFSI]);
 	ret = osl(osl_add_and_get_row(audio_file_table, objs, &aft_row));
-	afs_event(AUDIO_FILE_ADD, &msg, aft_row);
+	ret = afs_event(AUDIO_FILE_ADD, &aca->pbout, aft_row);
 out:
 	if (ret < 0)
-		para_printf(&msg, "could not add %s\n", path);
-	flush_and_free_pb(&msg);
+		para_printf(&aca->pbout, "could not add %s\n", path);
 	return ret;
 }
 
@@ -1748,26 +1753,26 @@ struct private_add_data {
 	uint32_t flags;
 };
 
-static int path_brother_callback(int fd, const struct osl_object *query)
+static int path_brother_callback(struct afs_callback_arg *aca)
 {
-	char *path = query->data;
+	char *path = aca->query.data;
 	struct osl_row *path_brother;
-	int ret = aft_get_row_of_path(path, &path_brother);
-	if (ret < 0)
+	int ret = find_path_brother(path, &path_brother);
+	if (ret <= 0)
 		return ret;
-	return pass_buffer_as_shm(fd, SBD_OUTPUT, (char *)&path_brother,
+	return pass_buffer_as_shm(aca->fd, SBD_OUTPUT, (char *)&path_brother,
 		sizeof(path_brother));
 }
 
-static int hash_sister_callback(int fd, const struct osl_object *query)
+static int hash_sister_callback(struct afs_callback_arg *aca)
 {
-	unsigned char *hash = query->data;
+	unsigned char *hash = aca->query.data;
 	struct osl_row *hash_sister;
+	int ret = find_hash_sister(hash, &hash_sister);
 
-	hash_sister = find_hash_sister(hash);
-	if (!hash_sister)
-		return 0;
-	return pass_buffer_as_shm(fd, SBD_OUTPUT, (char *)&hash_sister,
+	if (ret <= 0)
+		return ret;
+	return pass_buffer_as_shm(aca->fd, SBD_OUTPUT, (char *)&hash_sister,
 		sizeof(hash_sister));
 }
 
@@ -1954,91 +1959,77 @@ struct com_touch_options {
 	unsigned flags;
 };
 
-/** Data passed to the action handler of com_touch(). */
-struct touch_action_data {
-	/** Command line options (see \ref com_touch_options). */
-	struct com_touch_options *cto;
-	/** Message buffer. */
-	struct para_buffer pb;
-};
-
 static int touch_audio_file(__a_unused struct osl_table *table,
 		struct osl_row *row, const char *name, void *data)
 {
-	struct touch_action_data *tad = data;
+	struct afs_callback_arg *aca = data;
+	struct com_touch_options *cto = aca->query.data;
 	struct osl_object obj;
 	struct afs_info old_afsi, new_afsi;
-	int ret, no_options = tad->cto->num_played < 0 && tad->cto->last_played < 0 &&
-		tad->cto->lyrics_id < 0 && tad->cto->image_id < 0 && tad->cto->amp < 0;
+	int ret, no_options = cto->num_played < 0 && cto->last_played < 0 &&
+		cto->lyrics_id < 0 && cto->image_id < 0 && cto->amp < 0;
 	struct afsi_change_event_data aced;
 
 	ret = get_afsi_object_of_row(row, &obj);
 	if (ret < 0) {
-		para_printf(&tad->pb, "cannot touch %s\n", name);
+		para_printf(&aca->pbout, "cannot touch %s\n", name);
 		return ret;
 	}
 	ret = load_afsi(&old_afsi, &obj);
 	if (ret < 0) {
-		para_printf(&tad->pb, "cannot touch %s\n", name);
+		para_printf(&aca->pbout, "cannot touch %s\n", name);
 		return ret;
 	}
 	new_afsi = old_afsi;
 	if (no_options) {
 		new_afsi.num_played++;
 		new_afsi.last_played = time(NULL);
-		if (tad->cto->flags & TOUCH_FLAG_VERBOSE)
-			para_printf(&tad->pb, "%s: num_played = %u, "
+		if (cto->flags & TOUCH_FLAG_VERBOSE)
+			para_printf(&aca->pbout, "%s: num_played = %u, "
 				"last_played = now()\n", name,
 				new_afsi.num_played);
 	} else {
-		if (tad->cto->flags & TOUCH_FLAG_VERBOSE)
-			para_printf(&tad->pb, "touching %s\n", name);
-		if (tad->cto->lyrics_id >= 0)
-			new_afsi.lyrics_id = tad->cto->lyrics_id;
-		if (tad->cto->image_id >= 0)
-			new_afsi.image_id = tad->cto->image_id;
-		if (tad->cto->num_played >= 0)
-			new_afsi.num_played = tad->cto->num_played;
-		if (tad->cto->last_played >= 0)
-			new_afsi.last_played = tad->cto->last_played;
-		if (tad->cto->amp >= 0)
-			new_afsi.amp = tad->cto->amp;
+		if (cto->flags & TOUCH_FLAG_VERBOSE)
+			para_printf(&aca->pbout, "touching %s\n", name);
+		if (cto->lyrics_id >= 0)
+			new_afsi.lyrics_id = cto->lyrics_id;
+		if (cto->image_id >= 0)
+			new_afsi.image_id = cto->image_id;
+		if (cto->num_played >= 0)
+			new_afsi.num_played = cto->num_played;
+		if (cto->last_played >= 0)
+			new_afsi.last_played = cto->last_played;
+		if (cto->amp >= 0)
+			new_afsi.amp = cto->amp;
 	}
 	save_afsi(&new_afsi, &obj); /* in-place update */
 	aced.aft_row = row;
 	aced.old_afsi = &old_afsi;
-	afs_event(AFSI_CHANGE, &tad->pb, &aced);
-	return 1;
+	return afs_event(AFSI_CHANGE, &aca->pbout, &aced);
 }
 
-static int com_touch_callback(int fd, const struct osl_object *query)
+static int com_touch_callback(struct afs_callback_arg *aca)
 {
-	struct touch_action_data tad = {.cto = query->data,
-		.pb = {
-			.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;
+	struct com_touch_options *cto = aca->query.data;
 	struct pattern_match_data pmd = {
 		.table = audio_file_table,
 		.loop_col_num = AFTCOL_HASH,
 		.match_col_num = AFTCOL_PATH,
-		.patterns = {.data = (char *)query->data + sizeof(*tad.cto),
-			.size = query->size - sizeof(*tad.cto)},
-		.data = &tad,
+		.patterns = {
+			.data = (char *)aca->query.data
+				+ sizeof(struct com_touch_options),
+			.size = aca->query.size
+				- sizeof(struct com_touch_options)
+		},
+		.data = aca,
 		.action = touch_audio_file
 	};
-	if (tad.cto->flags & TOUCH_FLAG_FNM_PATHNAME)
+	if (cto->flags & TOUCH_FLAG_FNM_PATHNAME)
 		pmd.fnmatch_flags |= FNM_PATHNAME;
 	ret = for_each_matching_row(&pmd);
 	if (ret >= 0 && pmd.num_matches == 0)
 		ret = -E_NO_MATCH;
-	flush_and_free_pb(&tad.pb);
 	return ret;
 }
 
@@ -2123,62 +2114,49 @@ enum rm_flags {
 	RM_FLAG_FNM_PATHNAME = 4
 };
 
-/** Data passed to the action handler of com_rm(). */
-struct com_rm_action_data {
-	/** Command line flags ((see \ref rm_flags). */
-	uint32_t flags;
-	/** Message buffer. */
-	struct para_buffer pb;
-};
-
 static int remove_audio_file(__a_unused struct osl_table *table,
 		struct osl_row *row, const char *name, void *data)
 {
-	struct com_rm_action_data *crd = data;
+	struct afs_callback_arg *aca = data;
+	uint32_t flags =*(uint32_t *)aca->query.data;
 	int ret;
 
-	if (crd->flags & RM_FLAG_VERBOSE)
-		para_printf(&crd->pb, "removing %s\n", name);
-	afs_event(AUDIO_FILE_REMOVE, &crd->pb, row);
+	if (flags & RM_FLAG_VERBOSE)
+		para_printf(&aca->pbout, "removing %s\n", name);
+	ret = afs_event(AUDIO_FILE_REMOVE, &aca->pbout, row);
+	if (ret < 0)
+		return ret;
 	ret = osl(osl_del_row(audio_file_table, row));
 	if (ret < 0)
-		para_printf(&crd->pb, "cannot remove %s\n", name);
+		para_printf(&aca->pbout, "cannot remove %s\n", name);
 	return ret;
 }
 
-static int com_rm_callback(int fd, const struct osl_object *query)
+static int com_rm_callback(struct afs_callback_arg *aca)
 {
-	struct com_rm_action_data crd = {.flags = *(uint32_t *)query->data,
-		.pb = {
-			.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;
+	uint32_t flags = *(uint32_t *)aca->query.data;
 	struct pattern_match_data pmd = {
 		.table = audio_file_table,
 		.loop_col_num = AFTCOL_HASH,
 		.match_col_num = AFTCOL_PATH,
-		.patterns = {.data = (char *)query->data + sizeof(uint32_t),
-			.size = query->size - sizeof(uint32_t)},
-		.data = &crd,
+		.patterns = {.data = (char *)aca->query.data + sizeof(uint32_t),
+			.size = aca->query.size - sizeof(uint32_t)},
+		.data = aca,
 		.action = remove_audio_file
 	};
-	if (crd.flags & RM_FLAG_FNM_PATHNAME)
+	if (flags & RM_FLAG_FNM_PATHNAME)
 		pmd.fnmatch_flags |= FNM_PATHNAME;
 	ret = for_each_matching_row(&pmd);
 	if (ret < 0)
 		goto out;
-	if (pmd.num_matches == 0)
-		ret = -E_NO_MATCH;
-	else if (crd.flags & RM_FLAG_VERBOSE)
-		para_printf(&crd.pb, "removed %u file(s)\n", pmd.num_matches);
+	if (pmd.num_matches == 0) {
+		if (!(flags & RM_FLAG_FORCE))
+			ret = -E_NO_MATCH;
+	} else if (flags & RM_FLAG_VERBOSE)
+		para_printf(&aca->pbout, "removed %u file(s)\n",
+			pmd.num_matches);
 out:
-	flush_and_free_pb(&crd.pb);
 	return ret;
 }
 
@@ -2241,10 +2219,10 @@ enum cpsi_flags {
 struct cpsi_action_data {
 	/** command line flags (see \ref cpsi_flags). */
 	unsigned flags;
-	/** Message buffer. */
-	struct para_buffer pb;
 	/** Values are copied from here. */
 	struct afs_info source_afsi;
+	/** What was passed to com_cpsi_callback(). */
+	struct afs_callback_arg *aca;
 };
 
 static int copy_selector_info(__a_unused struct osl_table *table,
@@ -2273,34 +2251,26 @@ static int copy_selector_info(__a_unused struct osl_table *table,
 		target_afsi.attributes = cad->source_afsi.attributes;
 	save_afsi(&target_afsi, &target_afsi_obj); /* in-place update */
 	if (cad->flags & CPSI_FLAG_VERBOSE)
-		para_printf(&cad->pb, "copied afsi to %s\n", name);
+		para_printf(&cad->aca->pbout, "copied afsi to %s\n", name);
 	aced.aft_row = row;
 	aced.old_afsi = &old_afsi;
-	afs_event(AFSI_CHANGE, &cad->pb, &aced);
-	return 1;
+	return afs_event(AFSI_CHANGE, &cad->aca->pbout, &aced);
 }
 
-static int com_cpsi_callback(int fd, const struct osl_object *query)
+static int com_cpsi_callback(struct afs_callback_arg *aca)
 {
 	struct cpsi_action_data cad = {
-		.flags = *(unsigned *)query->data,
-		.pb = {
-			.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
-		}
+		.flags = *(unsigned *)aca->query.data,
+		.aca = aca
 	};
 	int ret;
-	char *source_path = (char *)query->data + sizeof(cad.flags);
+	char *source_path = (char *)aca->query.data + sizeof(cad.flags);
 	struct pattern_match_data pmd = {
 		.table = audio_file_table,
 		.loop_col_num = AFTCOL_HASH,
 		.match_col_num = AFTCOL_PATH,
 		.patterns = {.data = source_path + strlen(source_path) + 1,
-			.size = query->size - sizeof(cad.flags)
+			.size = aca->query.size - sizeof(cad.flags)
 				- strlen(source_path) - 1},
 		.data = &cad,
 		.action = copy_selector_info
@@ -2310,23 +2280,22 @@ static int com_cpsi_callback(int fd, const struct osl_object *query)
 	if (ret < 0)
 		goto out;
 	ret = for_each_matching_row(&pmd);
-out:
 	if (ret < 0)
-		para_printf(&cad.pb, "%s\n", para_strerror(-ret));
-	else if (pmd.num_matches > 0) {
+		goto out;
+	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, pmd.num_matches);
+			para_printf(&aca->pbout, "updated afsi of %u file(s)\n",
+				pmd.num_matches);
 	} else
-		para_printf(&cad.pb, "no matches - nothing copied\n");
-	flush_and_free_pb(&cad.pb);
-	return 0;
+		ret = -E_NO_MATCH;
+out:
+	return ret;
 }
 
 int com_cpsi(struct command_context *cc)
 {
 	unsigned flags = 0;
-	int i, ret;
+	int i;
 	struct osl_object options = {.data = &flags, .size = sizeof(flags)};
 
 	for (i = 1; i < cc->argc; i++) {
@@ -2367,16 +2336,13 @@ int com_cpsi(struct command_context *cc)
 		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, cc->argc - i,
+	return send_option_arg_callback_request(&options, cc->argc - i,
 		cc->argv + i, com_cpsi_callback, afs_cb_result_handler, cc);
-	if (ret < 0)
-		send_strerror(cc, -ret);
-	return ret;
 }
 
 struct change_atts_data {
 	uint64_t add_mask, del_mask;
-	struct para_buffer pb;
+	struct afs_callback_arg *aca;
 };
 
 static int change_atts(__a_unused struct osl_table *table,
@@ -2401,25 +2367,15 @@ static int change_atts(__a_unused struct osl_table *table,
 	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;
+	return afs_event(AFSI_CHANGE, &cad->aca->pbout, &aced);
 }
 
-static int com_setatt_callback(int fd, const struct osl_object *query)
+static int com_setatt_callback(struct afs_callback_arg *aca)
 {
 	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 change_atts_data cad = {.aca = aca};
 	struct pattern_match_data pmd = {
 		.table = audio_file_table,
 		.loop_col_num = AFTCOL_HASH,
@@ -2429,7 +2385,11 @@ static int com_setatt_callback(int fd, const struct osl_object *query)
 		.action = change_atts
 	};
 
-	for (p = query->data; p < (char *)query->data + query->size; p += len + 1) {
+	for (
+		p = aca->query.data;
+		p < (char *)aca->query.data + aca->query.size;
+		p += len + 1
+	) {
 		char c;
 		unsigned char bitnum;
 
@@ -2443,7 +2403,7 @@ static int com_setatt_callback(int fd, const struct osl_object *query)
 		p[len - 1] = '\0';
 		ret = get_attribute_bitnum_by_name(p, &bitnum);
 		if (ret < 0) {
-			para_printf(&cad.pb, "attribute not found: %s\n", p);
+			para_printf(&aca->pbout, "attribute not found: %s\n", p);
 			goto out;
 		}
 		if (c == '+')
@@ -2455,18 +2415,15 @@ static int com_setatt_callback(int fd, const struct osl_object *query)
 	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;
+	assert(p < (char *)aca->query.data + aca->query.size);
+	pmd.patterns.size = (char *)aca->query.data + aca->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");
+		ret = -E_NO_MATCH;
 out:
-	if (ret < 0)
-		para_printf(&cad.pb, "%s\n", para_strerror(-ret));
-	flush_and_free_pb(&cad.pb);
-	return 0;
+	return ret;
 }
 
 int com_setatt(struct command_context *cc)
@@ -2477,15 +2434,15 @@ int com_setatt(struct command_context *cc)
 		com_setatt_callback, afs_cb_result_handler, cc);
 }
 
-static int afs_stat_callback(int fd, const struct osl_object *query)
+static int afs_stat_callback(struct afs_callback_arg *aca)
 {
-	int *parser_friendly = query->data;
+	int *parser_friendly = aca->query.data;
 	char *buf = *parser_friendly?
 		parser_friendly_status_items : status_items;
 
 	if (!buf)
 		return 0;
-	return pass_buffer_as_shm(fd, SBD_OUTPUT, buf, strlen(buf));
+	return pass_buffer_as_shm(aca->fd, SBD_OUTPUT, buf, strlen(buf));
 }
 
 /**
@@ -2511,7 +2468,7 @@ int send_afs_status(struct command_context *cc, int parser_friendly)
 		afs_cb_result_handler, cc);
 }
 
-/* returns success even on errors to keep the loop going */
+/* returns success on non-fatal errors to keep the loop going */
 static int check_audio_file(struct osl_row *row, void *data)
 {
 	char *path;
@@ -2523,7 +2480,7 @@ static int check_audio_file(struct osl_row *row, void *data)
 
 	if (ret < 0) {
 		para_printf(pb, "%s\n", para_strerror(-ret));
-		return 0;
+		return ret;
 	}
 	if (stat(path, &statbuf) < 0)
 		para_printf(pb, "%s: stat error (%s)\n", path, strerror(errno));
@@ -2548,27 +2505,72 @@ static int check_audio_file(struct osl_row *row, void *data)
 /**
  * Check the audio file table for inconsistencies.
  *
- * \param fd The afs socket.
- * \param query Unused.
+ * \param aca Only ->pbout is used for diagnostics.
  *
- * \return This function always returns zero.
+ * \return Standard. Inconsistencies are reported but not regarded as an error.
  *
  * \sa com_check().
  */
-int aft_check_callback(int fd, __a_unused const struct osl_object *query)
+int aft_check_callback(struct afs_callback_arg *aca)
 {
-	struct para_buffer pb = {
-		.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
-	};
-	para_printf(&pb, "checking audio file table...\n");
-	audio_file_loop(&pb, check_audio_file);
-	flush_and_free_pb(&pb);
-	return 0;
+	para_printf(&aca->pbout, "checking audio file table...\n");
+	return audio_file_loop(&aca->pbout, check_audio_file);
+}
+
+struct aft_check_atts_data {
+	uint64_t att_mask;
+	struct para_buffer *pb;
+};
+
+static int check_atts_of_audio_file(struct osl_row *row, void *data)
+{
+	struct aft_check_atts_data *acad = data;
+	int ret;
+	struct afs_info afsi;
+	char *path;
+	uint64_t bad_bits;
+
+	ret = get_afsi_of_row(row, &afsi);
+	if (ret < 0) {
+		para_printf(acad->pb, "cannot get afsi\n");
+		return ret;
+	}
+	bad_bits = afsi.attributes & ~acad->att_mask;
+	if (bad_bits == 0) /* OK */
+		return 0;
+	ret = get_audio_file_path_of_row(row, &path);
+	if (ret < 0) {
+		para_printf(acad->pb, "cannot get path\n");
+		return ret;
+	}
+	para_printf(acad->pb, "invalid attribute bits (%" PRIu64 "): %s\n",
+		bad_bits, path);
+	/* return success to keep looping */
+	return 1;
+}
+
+/**
+ * Iterate over all audio files and check the attribute bit mask.
+ *
+ * \param att_mask The mask of all valid attributes.
+ * \param pb Used for reporting inconsistencies.
+ *
+ * This reads the attribute bit mask of each audio file from the afs info
+ * structure stored in the audio file table and verifies that all set bits are
+ * also turned on in \a att_mask, i.e., correspond to an attribute of the
+ * attribute table. Audio files for which this is not the case are reported via
+ * \a pb.
+ *
+ * \return Standard. Inconsistencies are not regarded as errors.
+ *
+ * \sa \ref attribute_check_callback().
+ */
+int aft_check_attributes(uint64_t att_mask, struct para_buffer *pb)
+{
+	struct aft_check_atts_data acad = {.att_mask = att_mask, .pb = pb};
+
+	para_printf(pb, "checking attributes, mask: %" PRIx64 "\n", att_mask);
+	return audio_file_loop(&acad, check_atts_of_audio_file);
 }
 
 /**