X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=aft.c;h=0207705f858a3beb77c98a6a7e0e6a2c123e68b6;hb=6b9707e20a57b750853358f39e231ce262270b34;hp=42153d46b09bcdc4198d4564290a51cc2f636ebe;hpb=2909afc63e70c46fe4f9384c8d4df10bac60026e;p=paraslash.git

diff --git a/aft.c b/aft.c
index 42153d46..0207705f 100644
--- a/aft.c
+++ b/aft.c
@@ -1291,7 +1291,7 @@ err:
 	return ret;
 }
 
-static void com_ls_callback(int fd, const struct osl_object *query)
+static int 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);
@@ -1323,8 +1323,7 @@ static void com_ls_callback(int fd, const struct osl_object *query)
 	if (ret < 0)
 		goto out;
 	if (opts->num_matching_paths == 0) {
-		if (opts->num_patterns > 0)
-			para_printf(&b, "no matches\n");
+		ret = opts->num_patterns > 0? -E_NO_MATCH : 0;
 		goto out;
 	}
 	ret = sort_matching_paths(opts);
@@ -1344,12 +1343,11 @@ static void com_ls_callback(int fd, const struct osl_object *query)
 				goto out;
 		}
 out:
-	if (b.offset)
-		pass_buffer_as_shm(fd, SBD_OUTPUT, b.buf, b.offset);
-	free(b.buf);
+	flush_and_free_pb(&b);
 	free(opts->data);
 	free(opts->data_ptr);
 	free(opts->patterns);
+	return ret;
 }
 
 /*
@@ -1357,7 +1355,7 @@ out:
  */
 int com_ls(struct command_context *cc)
 {
-	int i, ret;
+	int i;
 	unsigned flags = 0;
 	enum ls_sorting_method sort = LS_SORT_BY_PATH;
 	enum ls_listing_mode mode = LS_MODE_SHORT;
@@ -1466,9 +1464,8 @@ int com_ls(struct command_context *cc)
 	opts.sorting = sort;
 	opts.mode = mode;
 	opts.num_patterns = cc->argc - i;
-	ret = send_option_arg_callback_request(&query, opts.num_patterns,
+	return send_option_arg_callback_request(&query, opts.num_patterns,
 		cc->argv + i, com_ls_callback, afs_cb_result_handler, cc);
-	return ret;
 }
 
 /**
@@ -1614,7 +1611,7 @@ enum com_add_flags {
 	ADD_FLAG_ALL = 8,
 };
 
-static void com_add_callback(int fd, const struct osl_object *query)
+static int com_add_callback(int fd, const struct osl_object *query)
 {
 	char *buf = query->data, *path;
 	struct osl_row *pb, *aft_row;
@@ -1738,10 +1735,9 @@ static void com_add_callback(int fd, const struct osl_object *query)
 	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(fd, SBD_OUTPUT, msg.buf, msg.offset);
-	free(msg.buf);
+		para_printf(&msg, "could not add %s\n", path);
+	flush_and_free_pb(&msg);
+	return ret;
 }
 
 /** Used by com_add(). */
@@ -1752,26 +1748,26 @@ struct private_add_data {
 	uint32_t flags;
 };
 
-static void path_brother_callback(int fd, const struct osl_object *query)
+static int path_brother_callback(int fd, const struct osl_object *query)
 {
 	char *path = query->data;
 	struct osl_row *path_brother;
 	int ret = aft_get_row_of_path(path, &path_brother);
 	if (ret < 0)
-		return;
-	pass_buffer_as_shm(fd, SBD_OUTPUT, (char *)&path_brother,
+		return ret;
+	return 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)
+static int hash_sister_callback(int fd, const struct osl_object *query)
 {
 	unsigned char *hash = query->data;
 	struct osl_row *hash_sister;
 
 	hash_sister = find_hash_sister(hash);
 	if (!hash_sister)
-		return;
-	pass_buffer_as_shm(fd, SBD_OUTPUT, (char *)&hash_sister,
+		return 0;
+	return pass_buffer_as_shm(fd, SBD_OUTPUT, (char *)&hash_sister,
 		sizeof(hash_sister));
 }
 
@@ -1779,7 +1775,9 @@ 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);
+
+	if (band == SBD_OUTPUT)
+		*row = *(struct osl_row **)(result->data);
 	return 1;
 }
 
@@ -1976,12 +1974,12 @@ static int touch_audio_file(__a_unused struct osl_table *table,
 
 	ret = get_afsi_object_of_row(row, &obj);
 	if (ret < 0) {
-		para_printf(&tad->pb, "%s: %s\n", name, para_strerror(-ret));
+		para_printf(&tad->pb, "cannot touch %s\n", name);
 		return ret;
 	}
 	ret = load_afsi(&old_afsi, &obj);
 	if (ret < 0) {
-		para_printf(&tad->pb, "%s: %s\n", name, para_strerror(-ret));
+		para_printf(&tad->pb, "cannot touch %s\n", name);
 		return ret;
 	}
 	new_afsi = old_afsi;
@@ -2013,7 +2011,7 @@ static int touch_audio_file(__a_unused struct osl_table *table,
 	return 1;
 }
 
-static void com_touch_callback(int fd, const struct osl_object *query)
+static int com_touch_callback(int fd, const struct osl_object *query)
 {
 	struct touch_action_data tad = {.cto = query->data,
 		.pb = {
@@ -2038,13 +2036,10 @@ static void com_touch_callback(int fd, const struct osl_object *query)
 	if (tad.cto->flags & TOUCH_FLAG_FNM_PATHNAME)
 		pmd.fnmatch_flags |= FNM_PATHNAME;
 	ret = for_each_matching_row(&pmd);
-	if (ret < 0)
-		para_printf(&tad.pb, "%s\n", para_strerror(-ret));
-	else if (pmd.num_matches == 0)
-		para_printf(&tad.pb, "no matches\n");
-	if (tad.pb.offset)
-		pass_buffer_as_shm(fd, SBD_OUTPUT, tad.pb.buf, tad.pb.offset);
-	free(tad.pb.buf);
+	if (ret >= 0 && pmd.num_matches == 0)
+		ret = -E_NO_MATCH;
+	flush_and_free_pb(&tad.pb);
+	return ret;
 }
 
 int com_touch(struct command_context *cc)
@@ -2114,11 +2109,8 @@ int com_touch(struct command_context *cc)
 	}
 	if (i >= cc->argc)
 		return -E_AFT_SYNTAX;
-	ret = send_option_arg_callback_request(&query, cc->argc - i,
+	return send_option_arg_callback_request(&query, cc->argc - i,
 		cc->argv + i, com_touch_callback, afs_cb_result_handler, cc);
-	if (ret < 0)
-		send_strerror(cc, -ret);
-	return ret;
 }
 
 /** Flags for com_rm(). */
@@ -2150,11 +2142,11 @@ static int remove_audio_file(__a_unused struct osl_table *table,
 	afs_event(AUDIO_FILE_REMOVE, &crd->pb, row);
 	ret = osl(osl_del_row(audio_file_table, row));
 	if (ret < 0)
-		para_printf(&crd->pb, "%s: %s\n", name, para_strerror(-ret));
+		para_printf(&crd->pb, "cannot remove %s\n", name);
 	return ret;
 }
 
-static void com_rm_callback(int fd, const struct osl_object *query)
+static int com_rm_callback(int fd, const struct osl_object *query)
 {
 	struct com_rm_action_data crd = {.flags = *(uint32_t *)query->data,
 		.pb = {
@@ -2179,17 +2171,15 @@ static void com_rm_callback(int fd, const struct osl_object *query)
 	if (crd.flags & RM_FLAG_FNM_PATHNAME)
 		pmd.fnmatch_flags |= FNM_PATHNAME;
 	ret = for_each_matching_row(&pmd);
-	if (ret < 0) {
-		para_printf(&crd.pb, "%s\n", para_strerror(-ret));
-		return;
-	}
-	if ((pmd.num_matches == 0) && !(crd.flags & RM_FLAG_FORCE))
-		para_printf(&crd.pb, "no matches -- nothing removed\n");
+	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 files\n", pmd.num_matches);
-	if (ret >= 0 && crd.pb.offset)
-		pass_buffer_as_shm(fd, SBD_OUTPUT, crd.pb.buf, crd.pb.offset);
-	free(crd.pb.buf);
+		para_printf(&crd.pb, "removed %u file(s)\n", pmd.num_matches);
+out:
+	flush_and_free_pb(&crd.pb);
+	return ret;
 }
 
 /* TODO options: -r (recursive) */
@@ -2197,7 +2187,7 @@ int com_rm(struct command_context *cc)
 {
 	uint32_t flags = 0;
 	struct osl_object query = {.data = &flags, .size = sizeof(flags)};
-	int i, ret;
+	int i;
 
 	for (i = 1; i < cc->argc; i++) {
 		const char *arg = cc->argv[i];
@@ -2223,11 +2213,8 @@ int com_rm(struct command_context *cc)
 	}
 	if (i >= cc->argc)
 		return -E_AFT_SYNTAX;
-	ret = send_option_arg_callback_request(&query, cc->argc - i,
+	return send_option_arg_callback_request(&query, cc->argc - i,
 		cc->argv + i, com_rm_callback, afs_cb_result_handler, cc);
-	if (ret < 0)
-		send_strerror(cc, -ret);
-	return ret;
 }
 
 /**
@@ -2293,7 +2280,7 @@ static int copy_selector_info(__a_unused struct osl_table *table,
 	return 1;
 }
 
-static void com_cpsi_callback(int fd, const struct osl_object *query)
+static int com_cpsi_callback(int fd, const struct osl_object *query)
 {
 	struct cpsi_action_data cad = {
 		.flags = *(unsigned *)query->data,
@@ -2323,24 +2310,23 @@ static void 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(&cad.pb, "updated afsi of %u file(s)\n",
+				pmd.num_matches);
 	} else
-		para_printf(&cad.pb, "no matches - nothing copied\n");
-	if (cad.pb.offset)
-		pass_buffer_as_shm(fd, SBD_OUTPUT, cad.pb.buf, cad.pb.offset);
-	free(cad.pb.buf);
+		ret = -E_NO_MATCH;
+out:
+	flush_and_free_pb(&cad.pb);
+	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++) {
@@ -2381,11 +2367,8 @@ 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 {
@@ -2419,7 +2402,7 @@ static int change_atts(__a_unused struct osl_table *table,
 	return 1;
 }
 
-static void com_setatt_callback(int fd, const struct osl_object *query)
+static int com_setatt_callback(int fd, const struct osl_object *query)
 {
 	char *p;
 	int ret;
@@ -2475,13 +2458,10 @@ static void com_setatt_callback(int fd, const struct osl_object *query)
 	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));
-	if (cad.pb.offset)
-		pass_buffer_as_shm(fd, SBD_OUTPUT, cad.pb.buf, cad.pb.offset);
-	free(cad.pb.buf);
+	flush_and_free_pb(&cad.pb);
+	return ret;
 }
 
 int com_setatt(struct command_context *cc)
@@ -2492,15 +2472,15 @@ int com_setatt(struct command_context *cc)
 		com_setatt_callback, afs_cb_result_handler, cc);
 }
 
-static void afs_stat_callback(int fd, const struct osl_object *query)
+static int 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));
+		return 0;
+	return pass_buffer_as_shm(fd, SBD_OUTPUT, buf, strlen(buf));
 }
 
 /**
@@ -2526,7 +2506,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;
@@ -2538,7 +2518,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));
@@ -2566,12 +2546,13 @@ static int check_audio_file(struct osl_row *row, void *data)
  * \param fd The afs socket.
  * \param query Unused.
  *
- * This function always succeeds.
+ * \return Standard. Inconsistencies are reported but not regarded as an error.
  *
  * \sa com_check().
  */
-void aft_check_callback(int fd, __a_unused const struct osl_object *query)
+int aft_check_callback(int fd, __a_unused const struct osl_object *query)
 {
+	int ret;
 	struct para_buffer pb = {
 		.max_size = shm_get_shmmax(),
 		.private_data = &(struct afs_max_size_handler_data) {
@@ -2581,10 +2562,9 @@ void aft_check_callback(int fd, __a_unused const struct osl_object *query)
 		.max_size_handler = afs_max_size_handler
 	};
 	para_printf(&pb, "checking audio file table...\n");
-	audio_file_loop(&pb, check_audio_file);
-	if (pb.offset)
-		pass_buffer_as_shm(fd, SBD_OUTPUT, pb.buf, pb.offset);
-	free(pb.buf);
+	ret = audio_file_loop(&pb, check_audio_file);
+	flush_and_free_pb(&pb);
+	return ret;
 }
 
 /**