X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=attribute.c;h=b130ab2989a0a3f0e439fe4942d9cdb5387da7a7;hp=b8d4a5938beb792e5e5c7ebca62548407a91d12a;hb=e63886e85c55c99e9732e5715b7ce641eff09914;hpb=b90c61663c32cdc6cfc0e78070e2a94a14cb2f8e

diff --git a/attribute.c b/attribute.c
index b8d4a593..b130ab29 100644
--- a/attribute.c
+++ b/attribute.c
@@ -7,9 +7,9 @@
 /** \file attribute.c Attribute handling functions. */
 #include "para.h"
 #include "error.h"
+#include "string.h"
 #include "afh.h"
 #include "afs.h"
-#include "string.h"
 #include "net.h"
 
 static struct osl_table *attribute_table;
@@ -99,11 +99,17 @@ int get_attribute_bitnum_by_name(const char *att_name, unsigned char *bitnum)
 	return 1;
 }
 
+/**
+ * Flags used by the lsatt command.
+ *
+ * \param \sa com_lsatt().
+ */
 enum lsatt_flags {
 	/** Whether "-a" was given for the lsatt command. */
 	LSATT_FLAG_SORT_BY_ID = 1,
 	/** Whether "-l" was given for the lsatt command. */
 	LSATT_FLAG_LONG = 2,
+	/** Reverse sort order. */
 	LSATT_FLAG_REVERSE = 4
 };
 
@@ -275,45 +281,37 @@ int com_setatt(__a_unused int fd, int argc, char * const * const argv)
 		NULL);
 }
 
-/* TODO: make it faster by only extracting the attribute member from afsi */
-static int logical_and_attribute(struct osl_row *aft_row, void *attribute_ptr)
-{
-	struct afs_info afsi;
-	uint64_t *att = attribute_ptr;
-	struct osl_object obj;
-	int ret = get_afsi_object_of_row(aft_row, &obj);
-	if (ret < 0)
-		return ret;
-	ret = load_afsi(&afsi, &obj);
-	if (ret < 0)
-		return ret;
-	afsi.attributes &= *att;
-	save_afsi(&afsi, &obj);
-	return 1;
-}
-
 static int com_addatt_callback(const struct osl_object *query,
-		__a_unused struct osl_object *result)
+		struct osl_object *result)
 {
 	char *p = query->data;
-	uint64_t atts_added = 0;
-	int ret;
+	int ret = 1;
+	struct para_buffer pb = {.size = 0};
+	size_t len;
 
-	while (p < (char *)query->data + query->size) {
+	for (p = query->data; p < (char *)query->data + query->size; p += len + 1) {
 		struct osl_object objs[NUM_ATT_COLUMNS];
 		struct osl_row *row;
 		unsigned char bitnum;
+		len = strlen(p);
+		struct addatt_event_data aed;
 
+		if (!len || p[len - 1] == '-' || p[len - 1] == '+') {
+			para_printf(&pb, "invalid attribute name: %s\n", p);
+			continue;
+		}
 		objs[ATTCOL_BITNUM].size = 1;
 		objs[ATTCOL_NAME].data = p;
-		objs[ATTCOL_NAME].size = strlen(p) + 1;
+		objs[ATTCOL_NAME].size = len + 1;
 		ret = osl_get_row(attribute_table, ATTCOL_NAME,
-			&objs[ATTCOL_NAME], &row); /* expected to fail */
-		if (ret >= 0)
-			return -E_ATTR_EXISTS;
+			&objs[ATTCOL_NAME], &row); /* expected to fail FIXME: Use get_attribute_bitnum_by_name() */
+		if (ret >= 0) {
+			para_printf(&pb, "attribute %s already exists\n", p);
+			continue;
+		}
 		if (ret != -E_RB_KEY_NOT_FOUND) /* error */
-			return ret;
-		/* find smallest non-used attribute */
+			goto out;
+		/* find smallest non-used attribute FIXME: Use find_greatest_att_bitnum() */
 		for (bitnum = 0; bitnum < 64; bitnum++) {
 			objs[ATTCOL_BITNUM].data = &bitnum;
 			ret = osl_get_row(attribute_table, ATTCOL_BITNUM,
@@ -321,51 +319,126 @@ static int com_addatt_callback(const struct osl_object *query,
 			if (ret == -E_RB_KEY_NOT_FOUND)
 				break; /* this bitnum is unused, use it */
 			if (ret < 0) /* error */
-				return ret;
+				goto out;
 			/* this bit is already in use, try next bit */
 		}
-		if (bitnum == 64)
-			return -E_ATTR_TABLE_FULL;
+		if (bitnum == 64) {
+			para_printf(&pb, "attribute table full\n");
+			goto out;
+		}
 		ret = osl_add_row(attribute_table, objs);
 		if (ret < 0)
-			return ret;
+			goto out;
+		aed.name = p;
+		aed.bitnum = bitnum;
+		afs_event(ATTRIBUTE_ADD, &pb, &aed);
 		greatest_att_bitnum = PARA_MAX(greatest_att_bitnum, bitnum);
-		atts_added |= 1 << bitnum;
-		p += strlen(p) + 1;
 	}
-	if (!atts_added)
+out:
+	if (ret < 0)
+		para_printf(&pb, "%s: %s\n", p, PARA_STRERROR(-ret));
+	result->data = pb.buf;
+	result->size = pb.size;
+	return result->data? 0 : 1;
+}
+
+int com_addatt(int fd, int argc, char * const * const argv)
+{
+	struct osl_object result;
+	int ret;
+
+	if (argc < 2)
+		return -E_ATTR_SYNTAX;
+	ret = send_standard_callback_request(argc - 1, argv + 1, com_addatt_callback,
+		&result);
+	if (!ret)
 		return 1;
-	atts_added = ~atts_added;
-	ret = audio_file_loop(&atts_added, logical_and_attribute);
 	if (ret < 0)
 		return ret;
-	find_greatest_att_bitnum();
-	return reload_current_mood(); /* FIXME: mood_reload() returns an error */
+	if (!result.data || !result.size)
+		return 1;
+	ret =  send_va_buffer(fd, "%s", (char *) result.data);
+	free(result.data);
+	return ret;
 }
 
-int com_addatt(__a_unused int fd, int argc, char * const * const argv)
+static int com_mvatt_callback(const struct osl_object *query,
+		struct osl_object *result)
 {
-	if (argc < 2)
+	char *old = query->data;
+	size_t size = strlen(old) + 1;
+	char *new = old + size;
+	struct osl_object obj = {.data = old, .size = size};
+	struct osl_row *row;
+	struct para_buffer pb = {.size = 0};
+	int ret;
+
+	ret = osl_get_row(attribute_table, ATTCOL_NAME, &obj, &row);
+	if (ret < 0)
+		goto out;
+	obj.data = new;
+	obj.size = strlen(new) + 1;
+	ret = osl_update_object(attribute_table, row, ATTCOL_NAME, &obj);
+out:
+	if (ret < 0)
+		para_printf(&pb, "%s\n", PARA_STRERROR(-ret));
+	else
+		afs_event(ATTRIBUTE_RENAME, &pb, NULL);
+	if (!pb.buf)
+		return 0;
+	result->data = pb.buf;
+	result->size = pb.size;
+	return 1;
+}
+
+int com_mvatt(int fd, int argc, char * const * const argv)
+{
+	struct osl_object result;
+	int ret;
+
+	if (argc != 3)
 		return -E_ATTR_SYNTAX;
-	return send_standard_callback_request(argc - 1, argv + 1, com_addatt_callback,
-		NULL);
+	ret = send_standard_callback_request(argc - 1, argv + 1, com_mvatt_callback,
+		&result);
+	if (!ret)
+		return 1;
+	if (ret < 0)
+		return ret;
+	if (!result.data || !result.size)
+		return 1;
+	ret =  send_va_buffer(fd, "%s", (char *) result.data);
+	free(result.data);
+	return ret;
 }
+
+
 struct remove_attribute_action_data {
 	struct para_buffer pb;
 	int num_removed;
+	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;
-	int ret = osl_del_row(table, row);
-	if (ret < 0)
+	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));
-	else {
-		para_printf(&raad->pb, "removed %s\n", name);
-		raad->num_removed++;
+		return 1;
+	}
+	ret = osl_del_row(table, row);
+	if (ret < 0) {
+		para_printf(&raad->pb, "%s: %s\n", name, PARA_STRERROR(-ret));
+		return 1;
 	}
+	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;
 }
 
@@ -385,13 +458,7 @@ static int com_rmatt_callback(const struct osl_object *query,
 	ret = for_each_matching_row(&pmd);
 	if (ret < 0)
 		para_printf(&raad.pb, "%s\n", PARA_STRERROR(-ret));
-	if (raad.num_removed) {
-		find_greatest_att_bitnum();
-		ret = reload_current_mood();
-		if (ret < 0)
-			para_printf(&raad.pb, "%s\n", PARA_STRERROR(-ret));
-	}
-	if (!raad.pb.buf)
+	if (!raad.num_removed)
 		para_printf(&raad.pb, "no match -- nothing removed\n");
 	result->data = raad.pb.buf;
 	result->size = raad.pb.size;
@@ -416,7 +483,7 @@ int com_rmatt(int fd, int argc, char * const * const argv)
 }
 
 /**
- * Return a binary representation of the geiven attribute value.
+ * Return a binary representation of the given attribute value.
  *
  * \param atts Pointer to the attribute value.
  * \param buf Result.
@@ -493,9 +560,9 @@ err:
  *
  * \sa osl_close_table().
  */
-void attribute_shutdown(enum osl_close_flags flags)
+void attribute_close(void)
 {
-	osl_close_table(attribute_table, flags);
+	osl_close_table(attribute_table, OSL_MARK_CLEAN);
 	attribute_table = NULL;
 }
 
@@ -509,20 +576,34 @@ void attribute_shutdown(enum osl_close_flags flags)
  *
  * \sa osl_open_table().
  */
-int attribute_init(struct table_info *ti, const char *db)
+static int attribute_open(const char *dir)
 {
 	int ret;
 
-	attribute_table_desc.dir = db;
-	ti->desc = &attribute_table_desc;
-	ret = osl_open_table(ti->desc, &attribute_table);
+	attribute_table_desc.dir = dir;
+	ret = osl_open_table(&attribute_table_desc, &attribute_table);
 	greatest_att_bitnum = -1; /* no atts available */
 	if (ret >= 0) {
 		find_greatest_att_bitnum();
 		return ret;
 	}
 	attribute_table = NULL;
-	if (ret == -E_NOENT)
+	if (ret >= 0 || is_errno(-ret, ENOENT))
 		return 1;
 	return ret;
 }
+
+static int attribute_create(const char *dir)
+{
+	attribute_table_desc.dir = dir;
+	return osl_create_table(&attribute_table_desc);
+}
+
+
+void attribute_init(struct afs_table *t)
+{
+	t->name = attribute_table_desc.name;
+	t->open = attribute_open;
+	t->close = attribute_close;
+	t->create = attribute_create;
+}