X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=attribute.c;h=7da525eb90c7f6feef5a8af631e2be06e4b38dca;hp=e73a0e76db5d9ed4052480bb89d360d44d57dc91;hb=b605df7dcee2c6e642a141aea24e643eb6ca34ec;hpb=f167629b3191c57a6b691cd2a6af04a45a74ccb0

diff --git a/attribute.c b/attribute.c
index e73a0e76..7da525eb 100644
--- a/attribute.c
+++ b/attribute.c
@@ -135,18 +135,21 @@ 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)
 {
 	struct lsatt_action_data laad = {
 		.flags = *(unsigned *) query->data,
@@ -175,9 +178,8 @@ static void com_lsatt_callback(int fd, const struct osl_object *query)
 	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);
+	flush_and_free_pb(&laad.pb);
+	return 0;
 }
 
 int com_lsatt(struct command_context *cc)
@@ -222,10 +224,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 +246,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 */
@@ -285,11 +283,10 @@ static void com_addatt_callback(int fd, const struct osl_object *query)
 		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 +302,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;
@@ -333,9 +330,8 @@ out:
 		para_printf(&pb, "%s\n", para_strerror(-ret));
 	else
 		afs_event(ATTRIBUTE_RENAME, &pb, NULL);
-	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_mvatt(struct command_context *cc)
@@ -361,6 +357,7 @@ struct remove_attribute_action_data {
 	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)
 {
@@ -369,19 +366,23 @@ static int remove_attribute(struct osl_table *table, struct osl_row *row,
 	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(&raad->pb, "%s: %s\n", name, para_strerror(-ret));
+		return 0;
+	}
 	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);
+	if (ret < 0) {
+		para_printf(&raad->pb, "%s: %s\n", name, para_strerror(-ret));
+		return 0;
+	}
+	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;
+	return 1;
 }
 
-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,
@@ -394,7 +395,7 @@ static void com_rmatt_callback(int fd, const struct osl_object *query)
 			.max_size_handler = afs_max_size_handler,
 		}
 	};
-	int ret, ret2 = 0;
+	int ret;
 	struct pattern_match_data pmd = {
 		.table = attribute_table,
 		.patterns = *query,
@@ -405,12 +406,11 @@ static void com_rmatt_callback(int fd, const struct osl_object *query)
 	};
 	ret = for_each_matching_row(&pmd);
 	if (ret < 0)
-		ret2 = para_printf(&raad.pb, "%s\n", para_strerror(-ret));
+		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);
+		para_printf(&raad.pb, "no match -- nothing removed\n");
+	flush_and_free_pb(&raad.pb);
+	return 0;
 }
 
 int com_rmatt(struct command_context *cc)