http_send.c: Fix another doxygen warning.

[paraslash.git] / attribute.c

diff --git a/attribute.c b/attribute.c
index 3acbadbebc149733287d49be1774e6363fcf83e4..5f7188ee30b58ee84f5800d7059cbfb014e8c09a 100644 (file)
--- a/attribute.c
+++ b/attribute.c
@@ -250,13 +250,13 @@ static int com_setatt_callback(const struct osl_object *query,
                (long long unsigned)del_mask);
        for (; p < (char *)query->data + query->size; p += len + 1) { /* TODO: fnmatch */
                struct afs_info old_afsi, new_afsi;
-               struct osl_row *aft_row;
+               struct afsi_change_event_data aced = {.old_afsi = &old_afsi};
 
                len = strlen(p);
-               ret = aft_get_row_of_path(p, &aft_row);
+               ret = aft_get_row_of_path(p, &aced.aft_row);
                if (ret < 0)
                        return ret;
-               ret = get_afsi_object_of_row(aft_row, &obj);
+               ret = get_afsi_object_of_row(aced.aft_row, &obj);
                if (ret < 0)
                        return ret;
                ret = load_afsi(&old_afsi, &obj);
@@ -266,14 +266,14 @@ static int com_setatt_callback(const struct osl_object *query,
                new_afsi.attributes |= add_mask;
                new_afsi.attributes &= ~del_mask;
                save_afsi(&new_afsi, &obj); /* in-place update */
-               // FIXME: Event?
+               afs_event(AFSI_CHANGE, NULL, &aced);
        }
        return 1;
 }
 
 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;
@@ -530,8 +529,10 @@ int get_attribute_text(uint64_t *atts, const char *delim, char **text)
        const uint64_t one = 1;
 
        *text = NULL;
-       if (greatest_att_bitnum < 0) /* no attributes available */
+       if (greatest_att_bitnum < 0) { /* no attributes available */
+               *text = para_strdup("(no attributes available)");
                return 1;
+       }
        for (i = 0; i <= greatest_att_bitnum; i++) {
                unsigned char bn = i;
                struct osl_object obj = {.data = &bn, .size = 1};