X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=attribute.c;h=5bb14ed43d813b8dc01498c29541e8410d4262b4;hp=ffe841025c1f7776e0bf33e35a951953abc48160;hb=fe282244d61b83eb1f285259dd1d55992a96288f;hpb=027f2c1237051d2d569d6be7f381c886f659bac3

diff --git a/attribute.c b/attribute.c
index ffe84102..5bb14ed4 100644
--- a/attribute.c
+++ b/attribute.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2014 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -135,19 +135,23 @@ static int print_attribute(struct osl_table *table, struct osl_row *row,
 	struct osl_object bitnum_obj;
 	int ret;
 
-	if (!(laad->flags & LSATT_FLAG_LONG))
-		return para_printf(&laad->pb, "%s\n", name);
+	if (!(laad->flags & LSATT_FLAG_LONG)) {
+		para_printf(&laad->pb, "%s\n", name);
+		return 1;
+	}
 	ret = osl(osl_get_object(table, row, ATTCOL_BITNUM, &bitnum_obj));
 	if (ret < 0) {
 		para_printf(&laad->pb, "%s: %s\n", name, para_strerror(-ret));
 		return ret;
 	}
-	return para_printf(&laad->pb, "%u\t%s\n", *(unsigned char*)bitnum_obj.data,
+	para_printf(&laad->pb, "%u\t%s\n", *(unsigned char*)bitnum_obj.data,
 		name);
+	return 1;
 }
 
-static void com_lsatt_callback(int fd, const struct osl_object *query)
+static int com_lsatt_callback(int fd, const struct osl_object *query)
 {
+	int ret;
 	struct lsatt_action_data laad = {
 		.flags = *(unsigned *) query->data,
 		.pb = {
@@ -174,17 +178,21 @@ static void com_lsatt_callback(int fd, const struct osl_object *query)
 		pmd.loop_col_num = ATTCOL_NAME;
 	if (laad.flags & LSATT_FLAG_REVERSE)
 		pmd.pm_flags |= PM_REVERSE_LOOP;
-	for_each_matching_row(&pmd);
-	if (laad.pb.offset)
-		pass_buffer_as_shm(fd, SBD_OUTPUT, laad.pb.buf, laad.pb.offset);
-	free(laad.pb.buf);
+	ret = for_each_matching_row(&pmd);
+	if (ret < 0)
+		goto out;
+	if (pmd.num_matches == 0)
+		ret = -E_NO_MATCH;
+out:
+	flush_and_free_pb(&laad.pb);
+	return ret;
 }
 
 int com_lsatt(struct command_context *cc)
 {
 	unsigned flags = 0;
 	struct osl_object options = {.data = &flags, .size = sizeof(flags)};
-	int ret, i;
+	int i;
 
 	for (i = 1; i < cc->argc; i++) {
 		const char *arg = cc->argv[i];
@@ -207,13 +215,8 @@ int com_lsatt(struct command_context *cc)
 			continue;
 		}
 	}
-	ret = send_option_arg_callback_request(&options, cc->argc - i, cc->argv + i,
+	return send_option_arg_callback_request(&options, cc->argc - i, cc->argv + i,
 		com_lsatt_callback, afs_cb_result_handler, cc);
-	if (ret < 0)
-		send_strerror(cc, -ret);
-	else if (ret == 0 && cc->argc > 1)
-		ret = send_sb_va(&cc->scc, SBD_ERROR_LOG, "no matches\n");
-	return ret;
 }
 
 struct addatt_event_data {
@@ -222,10 +225,10 @@ struct addatt_event_data {
 };
 
 
-static void com_addatt_callback(int fd, const struct osl_object *query)
+static int com_addatt_callback(int fd, const struct osl_object *query)
 {
 	char *p;
-	int ret = 1, ret2 = 0;
+	int ret = 1;
 	struct para_buffer pb = {
 		.max_size = shm_get_shmmax(),
 		.private_data = &(struct afs_max_size_handler_data) {
@@ -244,16 +247,12 @@ static void com_addatt_callback(int fd, const struct osl_object *query)
 
 		len = strlen(p);
 		if (!len || p[len - 1] == '-' || p[len - 1] == '+') {
-			ret2 = para_printf(&pb, "invalid attribute name: %s\n", p);
-			if (ret2 < 0)
-				goto out;
+			para_printf(&pb, "invalid attribute name: %s\n", p);
 			continue;
 		}
 		ret = get_attribute_bitnum_by_name(p, &bitnum);
 		if (ret >= 0) {
-			ret2 = para_printf(&pb, "attribute \"%s\" already exists\n", p);
-			if (ret2 < 0)
-				goto out;
+			para_printf(&pb, "attribute \"%s\" already exists\n", p);
 			continue;
 		}
 		if (ret != -OSL_ERRNO_TO_PARA_ERROR(E_OSL_RB_KEY_NOT_FOUND)) /* error */
@@ -281,15 +280,16 @@ static void com_addatt_callback(int fd, const struct osl_object *query)
 			goto out;
 		aed.name = p;
 		aed.bitnum = bitnum;
-		afs_event(ATTRIBUTE_ADD, &pb, &aed);
+		ret = afs_event(ATTRIBUTE_ADD, &pb, &aed);
+		if (ret < 0)
+			goto out;
 		greatest_att_bitnum = PARA_MAX(greatest_att_bitnum, (int)bitnum);
 	}
 out:
-	if (ret < 0 && ret2 >= 0)
+	if (ret < 0)
 		para_printf(&pb, "%s: %s\n", p, para_strerror(-ret));
-	if (pb.offset)
-		pass_buffer_as_shm(fd, SBD_OUTPUT, pb.buf, pb.offset);
-	free(pb.buf);
+	flush_and_free_pb(&pb);
+	return 0;
 }
 
 int com_addatt(struct command_context *cc)
@@ -305,7 +305,7 @@ int com_addatt(struct command_context *cc)
 	return ret;
 }
 
-static void com_mvatt_callback(int fd, const struct osl_object *query)
+static int com_mvatt_callback(int fd, const struct osl_object *query)
 {
 	char *old = query->data;
 	size_t size = strlen(old) + 1;
@@ -330,100 +330,77 @@ static void com_mvatt_callback(int fd, const struct osl_object *query)
 	ret = osl(osl_update_object(attribute_table, row, ATTCOL_NAME, &obj));
 out:
 	if (ret < 0)
-		para_printf(&pb, "%s\n", para_strerror(-ret));
+		para_printf(&pb, "cannot rename %s to %s\n", old, new);
 	else
-		afs_event(ATTRIBUTE_RENAME, &pb, NULL);
-	if (pb.offset)
-		pass_buffer_as_shm(fd, SBD_OUTPUT, pb.buf, pb.offset);
-	free(pb.buf);
+		ret = afs_event(ATTRIBUTE_RENAME, &pb, NULL);
+	flush_and_free_pb(&pb);
+	return ret;
 }
 
 int com_mvatt(struct command_context *cc)
 {
-	int ret;
-
 	if (cc->argc != 3)
 		return -E_ATTR_SYNTAX;
-	ret = send_standard_callback_request(cc->argc - 1, cc->argv + 1,
+	return send_standard_callback_request(cc->argc - 1, cc->argv + 1,
 		com_mvatt_callback, afs_cb_result_handler, cc);
-	if (ret < 0)
-		send_strerror(cc, -ret);
-	return ret;
 }
 
-/** Data passed to the action handler of com_rmatt(). */
-struct remove_attribute_action_data {
-	/** Message buffer. */
-	struct para_buffer pb;
-	/** Numver of attributes removed. */
-	int num_removed;
-	/** Bitwise "or" of the removed attributes. */
-	uint64_t mask_of_removed_atts;
-};
-
 static int remove_attribute(struct osl_table *table, struct osl_row *row,
 		const char *name, void *data)
 {
-	struct remove_attribute_action_data *raad = data;
+	struct para_buffer *pb = data;
 	int ret;
 	struct rmatt_event_data red = {.name = name};
 
 	ret = get_attribute_bitnum_by_name(name, &red.bitnum);
-	if (ret < 0)
-		return para_printf(&raad->pb, "%s: %s\n", name, para_strerror(-ret));
+	if (ret < 0) {
+		para_printf(pb, "cannot remove %s\n", name);
+		return ret;
+	}
+	para_printf(pb, "removing attribute %s\n", name);
 	ret = osl(osl_del_row(table, row));
-	if (ret < 0)
-		return para_printf(&raad->pb, "%s: %s\n", name, para_strerror(-ret));
-	ret = para_printf(&raad->pb, "removed attribute %s\n", name);
-	raad->num_removed++;
-	raad->mask_of_removed_atts |= (1 << red.bitnum);
-	afs_event(ATTRIBUTE_REMOVE, &raad->pb, &red);
-	return ret;
+	if (ret < 0) {
+		para_printf(pb, "cannot remove %s\n", name);
+		return ret;
+	}
+	return afs_event(ATTRIBUTE_REMOVE, pb, &red);
 }
 
-static void com_rmatt_callback(int fd, const struct osl_object *query)
+static int com_rmatt_callback(int fd, const struct osl_object *query)
 {
-	struct remove_attribute_action_data raad = {
-		.num_removed = 0,
-		.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,
-		}
+	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,
 	};
-	int ret, ret2 = 0;
+	int ret;
 	struct pattern_match_data pmd = {
 		.table = attribute_table,
 		.patterns = *query,
 		.loop_col_num = ATTCOL_BITNUM,
 		.match_col_num = ATTCOL_NAME,
-		.data = &raad,
+		.data = &pb,
 		.action = remove_attribute
 	};
 	ret = for_each_matching_row(&pmd);
 	if (ret < 0)
-		ret2 = para_printf(&raad.pb, "%s\n", para_strerror(-ret));
-	else if (!raad.num_removed)
-		ret2 = para_printf(&raad.pb, "no match -- nothing removed\n");
-	if (ret2 >= 0 && raad.pb.offset)
-		pass_buffer_as_shm(fd, SBD_OUTPUT, raad.pb.buf, raad.pb.offset);
-	free(raad.pb.buf);
+		goto out;
+	if (pmd.num_matches == 0)
+		ret = -E_NO_MATCH;
+out:
+	flush_and_free_pb(&pb);
+	return ret;
 }
 
 int com_rmatt(struct command_context *cc)
 {
-	int ret;
-
 	if (cc->argc < 2)
 		return -E_ATTR_SYNTAX;
-	ret = send_standard_callback_request(cc->argc - 1, cc->argv + 1,
+	return send_standard_callback_request(cc->argc - 1, cc->argv + 1,
 		com_rmatt_callback, afs_cb_result_handler, cc);
-	if (ret < 0)
-		send_strerror(cc, -ret);
-	return ret;
 }
 
 /**
@@ -438,7 +415,7 @@ int com_rmatt(struct command_context *cc)
  * used for unset attributes.
  *
  * In practice, not all 64 attributes are defined. In this case, the function
- * only prints \a N + 1 charaters where \a N is the greatest id of a defined
+ * only prints \a N + 1 characters where \a N is the greatest id of a defined
  * attribute.
  */
 void get_attribute_bitmap(const uint64_t *atts, char *buf)