X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=attribute.c;h=e0a7392fdc99d86f6225c5ac43e1ab690e0bce50;hp=c8c6b07f8c26ef9b93be76d257b4ec19c27d4c3a;hb=c458b9d45e7c6ddda6285fca3797fddff815bd0a;hpb=55aa4090d742d0c6357a7c53f32e1fd778e76276

diff --git a/attribute.c b/attribute.c
index c8c6b07f..e0a7392f 100644
--- a/attribute.c
+++ b/attribute.c
@@ -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_ALPHA = 1,
+	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
 };
 
@@ -129,7 +135,7 @@ static int print_attribute(struct osl_table *table, struct osl_row *row,
 	ret = osl_get_object(table, row, ATTCOL_BITNUM, &bitnum_obj);
 	if (ret < 0) {
 		para_printf(&laad->pb, "%s: %s\n", name, PARA_STRERROR(-ret));
-		return 1;
+		return ret;
 	}
 	para_printf(&laad->pb, "%u\t%s\n", *(unsigned char*)bitnum_obj.data,
 		name);
@@ -140,7 +146,6 @@ static int com_lsatt_callback(const struct osl_object *query,
 		struct osl_object *result)
 {
 	struct lsatt_action_data laad = {.flags = *(unsigned *) query->data};
-	int ret;
 	struct pattern_match_data pmd = {
 		.table = attribute_table,
 		.loop_col_num = ATTCOL_BITNUM,
@@ -151,8 +156,9 @@ static int com_lsatt_callback(const struct osl_object *query,
 		.data = &laad,
 		.action = print_attribute
 	};
+	int ret;
 
-	if (laad.flags & LSATT_FLAG_ALPHA)
+	if (laad.flags & LSATT_FLAG_SORT_BY_ID)
 		pmd.loop_col_num = ATTCOL_NAME;
 	if (laad.flags & LSATT_FLAG_REVERSE)
 		pmd.pm_flags |= PM_REVERSE_LOOP;
@@ -160,7 +166,7 @@ static int com_lsatt_callback(const struct osl_object *query,
 	if (ret < 0)
 		para_printf(&laad.pb, "%s\n", PARA_STRERROR(-ret));
 	if (!laad.pb.buf)
-		para_printf(&laad.pb, "no match\n");
+		return 0;
 	result->data = laad.pb.buf;
 	result->size = laad.pb.size;
 	return 1;
@@ -181,8 +187,8 @@ int com_lsatt(int fd, int argc, char * const * const argv)
 			i++;
 			break;
 		}
-		if (!strcmp(arg, "-a")) {
-			flags |= LSATT_FLAG_ALPHA;
+		if (!strcmp(arg, "-i")) {
+			flags |= LSATT_FLAG_SORT_BY_ID;
 			continue;
 		}
 		if (!strcmp(arg, "-l")) {
@@ -296,7 +302,7 @@ static int com_addatt_callback(const struct osl_object *query,
 		__a_unused struct osl_object *result)
 {
 	char *p = query->data;
-	uint64_t atts_added = 0;
+	unsigned atts_added = 0;
 	int ret;
 
 	while (p < (char *)query->data + query->size) {
@@ -330,17 +336,13 @@ static int com_addatt_callback(const struct osl_object *query,
 		if (ret < 0)
 			return ret;
 		greatest_att_bitnum = PARA_MAX(greatest_att_bitnum, bitnum);
-		atts_added |= 1 << bitnum;
+		atts_added++;
 		p += strlen(p) + 1;
 	}
 	if (!atts_added)
 		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 */
+	return reload_current_mood(); /* FIXME: returns an error */
 }
 
 int com_addatt(__a_unused int fd, int argc, char * const * const argv)
@@ -353,19 +355,29 @@ int com_addatt(__a_unused int fd, int argc, char * const * const argv)
 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)
+	unsigned char bitnum;
+	int ret;
+
+	ret = get_attribute_bitnum_by_name(name, &bitnum);
+	if (ret < 0) {
+		para_printf(&raad->pb, "%s: %s\n", name, PARA_STRERROR(-ret));
+		return 1;
+	}
+	ret = osl_del_row(table, row);
+	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;
 	}
+	para_printf(&raad->pb, "removed %s\n", name);
+	raad->num_removed++;
+	raad->mask_of_removed_atts |= (1 << bitnum);
 	return 1;
 }
 
@@ -386,6 +398,10 @@ static int com_rmatt_callback(const struct osl_object *query,
 	if (ret < 0)
 		para_printf(&raad.pb, "%s\n", PARA_STRERROR(-ret));
 	if (raad.num_removed) {
+		uint64_t and_mask = ~raad.mask_of_removed_atts;
+		ret = audio_file_loop(&and_mask, logical_and_attribute);
+		if (ret < 0)
+			para_printf(&raad.pb, "%s\n", PARA_STRERROR(-ret));
 		find_greatest_att_bitnum();
 		ret = reload_current_mood();
 		if (ret < 0)
@@ -522,7 +538,7 @@ int attribute_init(struct table_info *ti, const char *db)
 		return ret;
 	}
 	attribute_table = NULL;
-	if (ret == -E_NOENT)
+	if (ret >= 0 || is_errno(-ret, ENOENT))
 		return 1;
 	return ret;
 }