X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=attribute.c;h=5f7188ee30b58ee84f5800d7059cbfb014e8c09a;hp=4acfd515b1160bbbd642893b97e94b1c600c90ac;hb=bbea823f656bff170f190a094b8e3da0cdca2c46;hpb=1040882da196d0829b15cbe186feca445956a58a

diff --git a/attribute.c b/attribute.c
index 4acfd515..5f7188ee 100644
--- a/attribute.c
+++ b/attribute.c
@@ -273,7 +273,7 @@ static int com_setatt_callback(const struct osl_object *query,
 
 int com_setatt(__a_unused int fd, int argc, char * const * const argv)
 {
-	if (argc < 2)
+	if (argc < 3)
 		return -E_ATTR_SYNTAX;
 	return send_standard_callback_request(argc - 1, argv + 1, com_setatt_callback,
 		NULL);
@@ -304,18 +304,15 @@ static int com_addatt_callback(const struct osl_object *query,
 			para_printf(&pb, "invalid attribute name: %s\n", p);
 			continue;
 		}
-		objs[ATTCOL_BITNUM].size = 1;
-		objs[ATTCOL_NAME].data = p;
-		objs[ATTCOL_NAME].size = len + 1;
-		ret = osl_get_row(attribute_table, ATTCOL_NAME,
-			&objs[ATTCOL_NAME], &row); /* expected to fail FIXME: Use get_attribute_bitnum_by_name() */
+		ret = get_attribute_bitnum_by_name(p, &bitnum);
 		if (ret >= 0) {
-			para_printf(&pb, "attribute %s already exists\n", p);
+			para_printf(&pb, "attribute \"%s\" already exists\n", p);
 			continue;
 		}
 		if (ret != -E_RB_KEY_NOT_FOUND) /* error */
 			goto out;
-		/* find smallest non-used attribute FIXME: Use find_greatest_att_bitnum() */
+		objs[ATTCOL_BITNUM].size = 1;
+		/* find smallest unused attribute */
 		for (bitnum = 0; bitnum < 64; bitnum++) {
 			objs[ATTCOL_BITNUM].data = &bitnum;
 			ret = osl_get_row(attribute_table, ATTCOL_BITNUM,
@@ -327,9 +324,11 @@ static int com_addatt_callback(const struct osl_object *query,
 			/* this bit is already in use, try next bit */
 		}
 		if (bitnum == 64) {
-			para_printf(&pb, "attribute table full\n");
+			ret = -E_ATT_TABLE_FULL;
 			goto out;
 		}
+		objs[ATTCOL_NAME].data = p;
+		objs[ATTCOL_NAME].size = len + 1;
 		ret = osl_add_row(attribute_table, objs);
 		if (ret < 0)
 			goto out;