From b01305511496c759da6580b56a92f44c3ab923ce Mon Sep 17 00:00:00 2001
From: Andre Noll <maan@systemlinux.org>
Date: Fri, 28 Sep 2007 19:14:43 +0200
Subject: [PATCH] attribute.c: Implement pattern matching for com_rmatt().
A straight forward task with the infrastructure already in place.
---
attribute.c | 77 ++++++++++++++++++++++++++++++++++++-----------------
1 file changed, 53 insertions(+), 24 deletions(-)
diff --git a/attribute.c b/attribute.c
index 7c72638f..560e7582 100644
--- a/attribute.c
+++ b/attribute.c
@@ -332,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;
}
/**
--
2.39.5