X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=attribute.c;h=f31da53a22c94ec15fd4a6b0f8d2bad439d1e1e3;hb=e469622d99718d49158d5da649eb02180269b4c8;hp=70e35ae58f572308cb1a4a32266e122007e5a05c;hpb=a3ea3e74e59bc6cff452542ff9b422af647c189d;p=paraslash.git

diff --git a/attribute.c b/attribute.c
index 70e35ae5..f31da53a 100644
--- a/attribute.c
+++ b/attribute.c
@@ -280,7 +280,9 @@ static int 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:
@@ -330,7 +332,7 @@ out:
 	if (ret < 0)
 		para_printf(&pb, "cannot rename %s to %s\n", old, new);
 	else
-		afs_event(ATTRIBUTE_RENAME, &pb, NULL);
+		ret = afs_event(ATTRIBUTE_RENAME, &pb, NULL);
 	flush_and_free_pb(&pb);
 	return ret;
 }
@@ -343,53 +345,36 @@ int com_mvatt(struct command_context *cc)
 		com_mvatt_callback, afs_cb_result_handler, cc);
 }
 
-/** Data passed to the action handler of com_rmatt(). */
-struct remove_attribute_action_data {
-	/** Message buffer. */
-	struct para_buffer pb;
-	/** Number of attributes removed. */
-	int num_removed;
-	/** Bitwise "or" of the removed attributes. */
-	uint64_t mask_of_removed_atts;
-};
-
-/* returns succcess even on errors to keep the loop going */
 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) {
-		para_printf(&raad->pb, "%s: %s\n", name, para_strerror(-ret));
-		return 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) {
-		para_printf(&raad->pb, "%s: %s\n", name, para_strerror(-ret));
-		return 0;
+		para_printf(pb, "cannot remove %s\n", name);
+		return 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 1;
+	return afs_event(ATTRIBUTE_REMOVE, pb, &red);
 }
 
 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;
 	struct pattern_match_data pmd = {
@@ -397,29 +382,25 @@ static int com_rmatt_callback(int fd, const struct osl_object *query)
 		.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)
-		para_printf(&raad.pb, "%s\n", para_strerror(-ret));
-	else if (!raad.num_removed)
-		para_printf(&raad.pb, "no match -- nothing removed\n");
-	flush_and_free_pb(&raad.pb);
-	return 0;
+		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;
 }
 
 /**
@@ -495,6 +476,58 @@ err:
 	return ret;
 }
 
+static int att_logical_or(struct osl_row *row, void *data)
+{
+	uint64_t *att_mask = data;
+	struct osl_object bitnum_obj;
+	int ret = osl_get_object(attribute_table, row, ATTCOL_BITNUM, &bitnum_obj);
+
+	if (ret < 0)
+		return ret;
+	*att_mask |= 1 << *(unsigned char *)bitnum_obj.data;
+	return 0;
+}
+
+/**
+ * Compute the attribute bit mask and check each afs info bitmap.
+ *
+ * \param fd Needed for the para buffer.
+ * \param query Unused.
+ *
+ * This iterates over all attributes in the attribute table and computes the
+ * logical or of 1 << b where b is the bit number of the attribute. The
+ * resulting bit mask is passed to aft_check_attributes() which performs the
+ * actual check.
+ *
+ * \return Standard.
+ *
+ * \sa \ref aft_check_attributes().
+ */
+int attribute_check_callback(int fd, __a_unused const struct osl_object *query)
+{
+	int ret;
+	uint64_t att_mask = 0; /* bits corresponding to a attributes */
+	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,
+	};
+
+	ret = osl_rbtree_loop(attribute_table, ATTCOL_BITNUM, &att_mask,
+		att_logical_or);
+	if (ret < 0) {
+		PARA_ERROR_LOG("attribute table loop failed: %s\n",
+			para_strerror(-ret));
+		return ret;
+	}
+	ret = aft_check_attributes(att_mask, &pb);
+	flush_and_free_pb(&pb);
+	return ret;
+}
+
 /**
  * Close the attribute table.
  *