X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=f01f1868e60b1592c9bde8f0d371234edd60d23a;hp=d2113f1c0d327825b1ebf91ca934f69752cccf4d;hb=c4bfb18b78b3935b8dbf68f70b219cfb2a192979;hpb=f48194d3ff2a3983f21cab1553fbe29529f2e790

diff --git a/aft.c b/aft.c
index d2113f1c..f01f1868 100644
--- a/aft.c
+++ b/aft.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2012 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -21,6 +21,8 @@
 #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;
@@ -1275,8 +1277,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;
@@ -1348,9 +1352,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 = shm_get_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;
 
@@ -1392,7 +1402,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);
@@ -1402,7 +1412,7 @@ out:
 /*
  * TODO: flags -h (sort by hash)
  */
-int com_ls(struct stream_cipher_context *scc, int argc, char * const * const argv)
+int com_ls(struct command_context *cc)
 {
 	int i, ret;
 	unsigned flags = 0;
@@ -1411,8 +1421,8 @@ int com_ls(struct stream_cipher_context *scc, int argc, char * const * const arg
 	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, "--")) {
@@ -1512,9 +1522,9 @@ int com_ls(struct stream_cipher_context *scc, int argc, char * const * const arg
 	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, sc_send_result, scc);
+		cc->argv + i, com_ls_callback, afs_cb_result_handler, cc);
 	return ret;
 }
 
@@ -1673,8 +1683,14 @@ static void 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 = 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 = (unsigned char *)buf + CAB_HASH_OFFSET;
@@ -1795,14 +1811,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 stream cipher keys. */
-	struct stream_cipher_context *scc;
+	/** The pointer passed to the original command handler. */
+	struct command_context *cc;
 	/** The given add flags. */
 	uint32_t flags;
 };
@@ -1814,7 +1830,8 @@ 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)
@@ -1825,10 +1842,12 @@ static void hash_sister_callback(int fd, const struct osl_object *query)
 	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 = *(struct osl_row **)(result->data);
@@ -1857,8 +1876,12 @@ 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 = sc_send_va_buffer(pad->scc,
-				"lazy-ignore: %s\n", path);
+			send_ret = pad->cc->use_sideband?
+				send_sb_va(&pad->cc->scc, SBD_OUTPUT,
+					"lazy-ignore: %s\n", path)
+			:
+				sc_send_va_buffer(&pad->cc->scc,
+					"lazy-ignore: %s\n", path);
 		goto out_free;
 	}
 	/* We still want to add this file. Compute its hash. */
@@ -1878,8 +1901,12 @@ 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 = sc_send_va_buffer(pad->scc,
-				"%s exists, not forcing update\n", path);
+			send_ret = pad->cc->use_sideband?
+				send_sb_va(&pad->cc->scc, SBD_OUTPUT,
+					"%s exists, not forcing update\n", path)
+			:
+				sc_send_va_buffer(&pad->cc->scc,
+					"%s exists, not forcing update\n", path);
 		goto out_unmap;
 	}
 	/*
@@ -1896,13 +1923,19 @@ 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 = sc_send_va_buffer(pad->scc, "adding %s\n", path);
+		send_ret = pad->cc->use_sideband?
+			send_sb_va(&pad->cc->scc, SBD_OUTPUT,
+				"adding %s\n", path)
+		:
+			sc_send_va_buffer(&pad->cc->scc,
+				"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, sc_send_result, pad->scc);
+	ret = send_callback_request(com_add_callback, &obj,
+		afs_cb_result_handler, pad->cc);
 	goto out_free;
 
 out_unmap:
@@ -1910,30 +1943,28 @@ out_unmap:
 	munmap(map.data, map.size);
 out_free:
 	if (ret < 0 && send_ret >= 0)
-		send_ret = sc_send_va_buffer(pad->scc,
-			"failed to add %s (%s)\n", path, para_strerror(-ret));
+		send_ret = pad->cc->use_sideband?
+			send_sb_va(&pad->cc->scc, SBD_ERROR_LOG,
+				"failed to add %s (%s)\n", path,
+				para_strerror(-ret))
+		:
+			sc_send_va_buffer(&pad->cc->scc,
+				"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 stream_cipher_context *scc, int argc, char * const * const argv)
+int com_add(struct command_context *cc)
 {
 	int i, ret;
-	struct private_add_data pad = {.scc = scc, .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, "--")) {
@@ -1957,22 +1988,32 @@ int com_add(struct stream_cipher_context *scc, int argc, char * const * const ar
 			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 = sc_send_va_buffer(scc, "%s: %s\n", argv[i],
-				para_strerror(-ret));
+			ret = cc->use_sideband?
+				send_sb_va(&cc->scc, SBD_ERROR_LOG, "%s: %s\n",
+				cc->argv[i], para_strerror(-ret))
+			:
+				sc_send_va_buffer(&cc->scc, "%s: %s\n",
+				cc->argv[i], para_strerror(-ret));
 			if (ret < 0)
 				return ret;
 			continue;
 		}
 		ret = stat(path, &statbuf);
 		if (ret < 0) {
-			ret = sc_send_va_buffer(scc, "failed to stat %s (%s)\n", path,
-				strerror(errno));
+			ret = cc->use_sideband?
+				send_sb_va(&cc->scc, SBD_ERROR_LOG,
+					"failed to stat %s (%s)\n", path,
+					strerror(errno))
+				:
+				sc_send_va_buffer(&cc->scc,
+					"failed to stat %s (%s)\n", path,
+					strerror(errno));
 			free(path);
 			if (ret < 0)
 				return ret;
@@ -1984,7 +2025,12 @@ int com_add(struct stream_cipher_context *scc, int argc, char * const * const ar
 		else
 			ret = add_one_audio_file(path, &pad);
 		if (ret < 0) {
-			sc_send_va_buffer(scc, "%s: %s\n", path, para_strerror(-ret));
+			if (cc->use_sideband)
+				send_sb_va(&cc->scc, SBD_OUTPUT, "%s: %s\n", path,
+					para_strerror(-ret));
+			else
+				sc_send_va_buffer(&cc->scc, "%s: %s\n", path,
+					para_strerror(-ret));
 			free(path);
 			return ret;
 		}
@@ -2087,7 +2133,7 @@ static void com_touch_callback(int fd, const struct osl_object *query)
 		.pb = {
 			.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;
@@ -2108,11 +2154,11 @@ static void com_touch_callback(int fd, const struct osl_object *query)
 	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 stream_cipher_context *scc, int argc, char * const * const argv)
+int com_touch(struct command_context *cc)
 {
 	struct com_touch_options cto = {
 		.num_played = -1,
@@ -2125,8 +2171,8 @@ int com_touch(struct stream_cipher_context *scc, int argc, char * const * const
 	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, "--")) {
@@ -2177,12 +2223,12 @@ int com_touch(struct stream_cipher_context *scc, int argc, char * const * const
 		}
 		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, sc_send_result, scc);
+	ret = send_option_arg_callback_request(&query, cc->argc - i,
+		cc->argv + i, com_touch_callback, afs_cb_result_handler, cc);
 	if (ret < 0)
-		sc_send_va_buffer(scc, "%s\n", para_strerror(-ret));
+		send_strerror(cc, -ret);
 	return ret;
 }
 
@@ -2228,7 +2274,7 @@ static void com_rm_callback(int fd, const struct osl_object *query)
 		.pb = {
 			.max_size = shm_get_shmmax(),
 			.private_data = &fd,
-			.max_size_handler = pass_buffer_as_shm
+			.max_size_handler = afs_max_size_handler
 		}
 	};
 	int ret;
@@ -2255,19 +2301,19 @@ static void com_rm_callback(int fd, const struct osl_object *query)
 			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 stream_cipher_context *scc, 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, "--")) {
@@ -2288,12 +2334,12 @@ int com_rm(struct stream_cipher_context *scc, int argc,  char * const * const ar
 		}
 		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, sc_send_result, scc);
+	ret = send_option_arg_callback_request(&query, cc->argc - i,
+		cc->argv + i, com_rm_callback, afs_cb_result_handler, cc);
 	if (ret < 0)
-		sc_send_va_buffer(scc, "%s\n", para_strerror(-ret));
+		send_strerror(cc, -ret);
 	return ret;
 }
 
@@ -2370,7 +2416,7 @@ static void com_cpsi_callback(int fd, const struct osl_object *query)
 		.pb = {
 			.max_size = shm_get_shmmax(),
 			.private_data = &fd,
-			.max_size_handler = pass_buffer_as_shm
+			.max_size_handler = afs_max_size_handler
 		}
 	};
 	int ret;
@@ -2401,18 +2447,18 @@ out:
 			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 stream_cipher_context *scc, 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, "--")) {
@@ -2445,14 +2491,14 @@ int com_cpsi(struct stream_cipher_context *scc, int argc,  char * const * const
 		}
 		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, sc_send_result, scc);
+	ret = send_option_arg_callback_request(&options, cc->argc - i,
+		cc->argv + i, com_cpsi_callback, afs_cb_result_handler, cc);
 	if (ret < 0)
-		sc_send_va_buffer(scc, "%s\n", para_strerror(-ret));
+		send_strerror(cc, -ret);
 	return ret;
 }
 
@@ -2464,13 +2510,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.
  *
- * \param scc The stream cipher 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
@@ -2481,12 +2527,13 @@ static void afs_stat_callback(int fd, const struct osl_object *query)
  *
  * \return The return value of the underyling call to \ref send_callback_request().
  */
-int send_afs_status(struct stream_cipher_context *scc, 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, sc_send_result, scc);
+	return send_callback_request(afs_stat_callback, &query,
+		afs_cb_result_handler, cc);
 }
 
 /* TODO: optionally fix problems by removing offending rows */
@@ -2543,8 +2590,11 @@ void aft_check_callback(int fd, __a_unused const struct osl_object *query)
 {
 	struct para_buffer pb = {
 		.max_size = shm_get_shmmax(),
-		.private_data = &fd,
-		.max_size_handler = pass_buffer_as_shm
+		.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");
 
@@ -2552,7 +2602,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);
 }