attribute.c: Implement pattern matching for com_rmatt().

[paraslash.git] / attribute.c

diff --git a/attribute.c b/attribute.c
index 798a6cc4889fe02c7789fe10b282891fa76bee1f..560e758272dfa3c4b59c78cabc6a1a8a77dade68 100644 (file)
--- a/attribute.c
+++ b/attribute.c
@@ -3,6 +3,8 @@
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
+
+/** \file attribute.c Attribute handling functions. */
 #include "para.h"
 #include "error.h"
 #include "afh.h"
@@ -10,7 +12,7 @@
 #include "string.h"
 #include "net.h"
 
-static void *attribute_table;
+static struct osl_table *attribute_table;
 static int greatest_att_bitnum;
 
 /** The columns of the attribute table. */
@@ -330,40 +332,69 @@ int com_addatt(__a_unused int fd, int argc, char * const * const argv)
        return send_standard_callback_request(argc - 1, argv + 1, com_addatt_callback,
                NULL);
 }
+struct remove_attribute_action_data {
+       struct para_buffer pb;
+       int num_removed;
+};
+
+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)
+               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;
+}
 
 static int com_rmatt_callback(const struct osl_object *query,
-               __a_unused struct osl_object *result)
+               struct osl_object *result)
 {
-       char *p = query->data;
-       int ret, atts_removed = 0;
-       while (p < (char *)query->data + query->size) {
-               struct osl_object obj = {
-                       .data = p,
-                       .size = strlen(p) + 1
-               };
-               struct osl_row *row;
-               ret = osl_get_row(attribute_table, ATTCOL_NAME,
-                       &obj, &row);
-               if (ret < 0)
-                       return ret;
-               ret = osl_del_row(attribute_table, row);
+       struct remove_attribute_action_data raad = {.num_removed = 0};
+       int ret;
+       struct pattern_match_data pmd = {
+               .table = attribute_table,
+               .patterns = *query,
+               .loop_col_num = ATTCOL_BITNUM,
+               .match_col_num = ATTCOL_NAME,
+               .data = &raad,
+               .action = remove_attribute
+       };
+       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)
-                       return ret;
-               atts_removed++;
-               p += strlen(p) + 1;
+                       para_printf(&raad.pb, "%s\n", PARA_STRERROR(-ret));
        }
-       find_greatest_att_bitnum();
-       if (!atts_removed)
-               return 1;
-       return reload_current_mood();
+       if (!raad.pb.buf)
+               para_printf(&raad.pb, "no match -- nothing removed\n");
+       result->data = raad.pb.buf;
+       result->size = raad.pb.size;
+       return 1;
 }
 
-int com_rmatt(__a_unused int fd, int argc, char * const * const argv)
+int com_rmatt(int fd, int argc, char * const * const argv)
 {
+       int ret;
+       struct osl_object result;
+
        if (argc < 2)
                return -E_ATTR_SYNTAX;
-       return send_standard_callback_request(argc - 1, argv + 1, com_rmatt_callback,
-               NULL);
+       ret = send_standard_callback_request(argc - 1, argv + 1, com_rmatt_callback,
+               &result);
+       if (ret > 0) {
+               send_buffer(fd, (char *)result.data);
+               free(result.data);
+       } else
+               send_va_buffer(fd, "%s\n", PARA_STRERROR(-ret));
+       return ret;
 }
 
 /**
@@ -466,7 +497,7 @@ int attribute_init(struct table_info *ti, const char *db)
 
        attribute_table_desc.dir = db;
        ti->desc = &attribute_table_desc;
-       ret = osl_open_table(ti->desc, attribute_table);
+       ret = osl_open_table(ti->desc, &attribute_table);
        greatest_att_bitnum = -1; /* no atts available */
        if (ret >= 0) {
                find_greatest_att_bitnum();