X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=attribute.c;h=e3bd40b5425261c97bdf3ed31700ac52ae83884e;hb=00ae8d84bfe8872be809617a31fc11a35e145995;hp=798a6cc4889fe02c7789fe10b282891fa76bee1f;hpb=0496a19e8ac1afecde726c2292720d415bdb7500;p=paraslash.git diff --git a/attribute.c b/attribute.c index 798a6cc4..e3bd40b5 100644 --- a/attribute.c +++ b/attribute.c @@ -1,16 +1,25 @@ /* - * Copyright (C) 1997-2007 Andre Noll + * Copyright (C) 1997 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ + +/** \file attribute.c Attribute handling functions. */ + +#include +#include + #include "para.h" #include "error.h" +#include "crypt.h" +#include "string.h" #include "afh.h" #include "afs.h" -#include "string.h" -#include "net.h" +#include "ipc.h" +#include "sideband.h" +#include "command.h" -static void *attribute_table; +static struct osl_table *attribute_table; static int greatest_att_bitnum; /** The columns of the attribute table. */ @@ -69,7 +78,7 @@ static void find_greatest_att_bitnum(void) return; } } while (c--); - PARA_INFO_LOG("%s\n", "no attributes"); + PARA_INFO_LOG("no attributes\n"); greatest_att_bitnum = -E_NO_ATTRIBUTES; } @@ -86,288 +95,275 @@ int get_attribute_bitnum_by_name(const char *att_name, unsigned char *bitnum) struct osl_object obj = {.data = (char *)att_name, .size = strlen(att_name) + 1}; struct osl_row *row; - int ret = osl_get_row(attribute_table, ATTCOL_NAME, &obj, &row); + int ret = osl(osl_get_row(attribute_table, ATTCOL_NAME, &obj, &row)); if (ret < 0) return ret; - ret = osl_get_object(attribute_table, row, ATTCOL_BITNUM, &obj); + ret = osl(osl_get_object(attribute_table, row, ATTCOL_BITNUM, &obj)); if (ret < 0) return ret; *bitnum = *(unsigned char *)obj.data; return 1; } -/** Whether "-a" was given for the lsatt command. */ -#define LSATT_FLAG_ALPHA 1 -/** Whether "-l" was given for the lsatt command. */ -#define LSATT_FLAG_LONG 2 - -/** Data passed via osl_rbtree_loop(). */ -struct private_lsatt_data { - /** The given flags for the lsatt command. */ - unsigned flags; - /** The result buffer. */ - struct para_buffer b; +/** + * Flags used by the lsatt command. + * + * \param \sa com_lsatt(). + */ +enum lsatt_flags { + /** Whether "-a" was given for the lsatt command. */ + 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 }; -static int print_attribute(struct osl_row *row, void *private_data) +/** Data passed to the action function of lsatt */ +static int print_attribute(struct osl_table *table, struct osl_row *row, + const char *name, void *data) { - struct private_lsatt_data *pld = private_data; + struct afs_callback_arg *aca = data; + unsigned flags = *(unsigned *)aca->query.data; + struct osl_object bitnum_obj; int ret; - struct osl_object name_obj, bitnum_obj; - ret = osl_get_object(attribute_table, row, ATTCOL_NAME, &name_obj); - if (ret < 0) - return ret; - if (!(pld->flags & LSATT_FLAG_LONG)) { - para_printf(&pld->b, "%s\n", (char *)name_obj.data); + if (!(flags & LSATT_FLAG_LONG)) { + para_printf(&aca->pbout, "%s\n", name); return 1; } - ret = osl_get_object(attribute_table, row, ATTCOL_BITNUM, &bitnum_obj); - if (ret < 0) + ret = osl(osl_get_object(table, row, ATTCOL_BITNUM, &bitnum_obj)); + if (ret < 0) { + para_printf(&aca->pbout, "%s: %s\n", name, para_strerror(-ret)); return ret; - para_printf(&pld->b, "%u\t%s\n", *(unsigned char*)bitnum_obj.data, - (char *)name_obj.data); + } + para_printf(&aca->pbout, "%u\t%s\n", *(unsigned char*)bitnum_obj.data, + name); return 1; } -static int com_lsatt_callback(const struct osl_object *query, - struct osl_object *result) +static int com_lsatt_callback(struct afs_callback_arg *aca) { - struct private_lsatt_data pld = {.flags = *(uint32_t *) query->data}; + unsigned flags = *(unsigned *)aca->query.data; int ret; - - if (pld.flags & LSATT_FLAG_ALPHA) - ret = osl_rbtree_loop(attribute_table, ATTCOL_NAME, - &pld, print_attribute); - else - ret = osl_rbtree_loop(attribute_table, ATTCOL_BITNUM, - &pld, print_attribute); - result->data = pld.b.buf; - result->size = pld.b.size; + struct pattern_match_data pmd = { + .table = attribute_table, + .loop_col_num = ATTCOL_BITNUM, + .match_col_num = ATTCOL_NAME, + .patterns = {.data = (char *)aca->query.data + sizeof(flags), + .size = aca->query.size - sizeof(flags)}, + .pm_flags = PM_NO_PATTERN_MATCHES_EVERYTHING, + .data = aca, + .action = print_attribute + }; + if (flags & LSATT_FLAG_SORT_BY_ID) + pmd.loop_col_num = ATTCOL_NAME; + if (flags & LSATT_FLAG_REVERSE) + pmd.pm_flags |= PM_REVERSE_LOOP; + ret = for_each_matching_row(&pmd); + if (ret < 0) + goto out; + if (pmd.num_matches == 0) + ret = -E_NO_MATCH; +out: return ret; } - -int com_lsatt(int fd, int argc, char * const * const argv) +int com_lsatt(struct command_context *cc) { - int ret, i; - uint32_t flags = 0; - struct osl_object query, result; + unsigned flags = 0; + struct osl_object options = {.data = &flags, .size = sizeof(flags)}; + int i; - for (i = 1; i < argc; i++) { - const char *arg = argv[i]; + for (i = 1; i < cc->argc; i++) { + const char *arg = cc->argv[i]; if (arg[0] != '-') break; if (!strcmp(arg, "--")) { 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")) { flags |= LSATT_FLAG_LONG; continue; } + if (!strcmp(arg, "-r")) { + flags |= LSATT_FLAG_REVERSE; + continue; + } } - if (argc > i) - return -E_ATTR_SYNTAX; - query.data = &flags; - query.size = sizeof(flags); - ret = send_callback_request(com_lsatt_callback, &query, &result); - if (ret > 0) { - ret = send_buffer(fd, (char *)result.data); - free(result.data); - } - return ret; + return send_option_arg_callback_request(&options, cc->argc - i, cc->argv + i, + com_lsatt_callback, afs_cb_result_handler, cc); } -static int com_setatt_callback(const struct osl_object *query, - __a_unused struct osl_object *result) +struct addatt_event_data { + const char *name; + unsigned char bitnum; +}; + + +static int com_addatt_callback(struct afs_callback_arg *aca) { char *p; - uint64_t add_mask = 0, del_mask = 0; - int ret; + int ret = 1; size_t len; - struct osl_object obj; - struct osl_row *row; - for (p = query->data; p < (char *)query->data + query->size; p += len + 1) { - char c; - - len = strlen(p); - if (!*p) - return -E_ATTR_SYNTAX; - c = p[len - 1]; - if (c != '+' && c != '-') - break; - p[len - 1] = '\0'; - obj.data = p; - obj.size = len + 1; - ret = osl_get_row(attribute_table, ATTCOL_NAME, &obj, &row); - if (ret < 0) - return ret; - ret = osl_get_object(attribute_table, row, ATTCOL_BITNUM, - &obj); - if (ret < 0) - return ret; - if (c == '+') - add_mask |= (1UL << *(unsigned char *)obj.data); - else - del_mask |= (1UL << *(unsigned char *)obj.data); - } - if (!add_mask && !del_mask) - return -E_ATTR_SYNTAX; - PARA_DEBUG_LOG("masks: %llx:%llx\n",(long long unsigned)add_mask, - (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; + for ( + p = aca->query.data; + p < (char *)aca->query.data + aca->query.size; + p += len + 1 + ) { + struct osl_object objs[NUM_ATT_COLUMNS]; + struct osl_row *row; + unsigned char bitnum; + struct addatt_event_data aed; len = strlen(p); - ret = aft_get_row_of_path(p, &aft_row); - if (ret < 0) - return ret; - ret = get_afsi_object_of_row(aft_row, &obj); + if (!len || p[len - 1] == '-' || p[len - 1] == '+') { + para_printf(&aca->pbout, "invalid attribute name: %s\n", p); + continue; + } + ret = get_attribute_bitnum_by_name(p, &bitnum); + if (ret >= 0) { + para_printf(&aca->pbout, "attribute \"%s\" already exists\n", p); + continue; + } + if (ret != -OSL_ERRNO_TO_PARA_ERROR(E_OSL_RB_KEY_NOT_FOUND)) /* error */ + goto out; + objs[ATTCOL_BITNUM].size = 1; + /* find smallest unused attribute */ + for (bitnum = 0; bitnum < 64; bitnum++) { + objs[ATTCOL_BITNUM].data = &bitnum; + ret = osl(osl_get_row(attribute_table, ATTCOL_BITNUM, + &objs[ATTCOL_BITNUM], &row)); + if (ret == -OSL_ERRNO_TO_PARA_ERROR(E_OSL_RB_KEY_NOT_FOUND)) + break; /* this bitnum is unused, use it */ + if (ret < 0) /* error */ + goto out; + /* this bit is already in use, try next bit */ + } + if (bitnum == 64) { + ret = -E_ATT_TABLE_FULL; + goto out; + } + objs[ATTCOL_NAME].data = p; + objs[ATTCOL_NAME].size = len + 1; + ret = osl(osl_add_row(attribute_table, objs)); if (ret < 0) - return ret; - ret = load_afsi(&old_afsi, &obj); + goto out; + aed.name = p; + aed.bitnum = bitnum; + ret = afs_event(ATTRIBUTE_ADD, &aca->pbout, &aed); if (ret < 0) - return ret; - new_afsi = old_afsi; - new_afsi.attributes |= add_mask; - new_afsi.attributes &= ~del_mask; - save_afsi(&new_afsi, &obj); /* in-place update */ -// ret = mood_update_audio_file(aft_row, &old_afsi); -// if (ret < 0) -// return ret; + goto out; + greatest_att_bitnum = PARA_MAX(greatest_att_bitnum, (int)bitnum); } - return 1; +out: + if (ret < 0) + para_printf(&aca->pbout, "%s: %s\n", p, para_strerror(-ret)); + return ret; } -int com_setatt(__a_unused int fd, int argc, char * const * const argv) +int com_addatt(struct command_context *cc) { - if (argc < 2) - return -E_ATTR_SYNTAX; - return send_standard_callback_request(argc - 1, argv + 1, com_setatt_callback, - NULL); -} + int ret; -/* TODO: make it faster by only extracting the attribute member from afsi */ -static int logical_and_attribute(struct osl_row *aft_row, void *attribute_ptr) -{ - struct afs_info afsi; - uint64_t *att = attribute_ptr; - struct osl_object obj; - int ret = get_afsi_object_of_row(aft_row, &obj); - if (ret < 0) - return ret; - ret = load_afsi(&afsi, &obj); + if (cc->argc < 2) + return -E_ATTR_SYNTAX; + ret = send_standard_callback_request(cc->argc - 1, cc->argv + 1, + com_addatt_callback, afs_cb_result_handler, cc); if (ret < 0) - return ret; - afsi.attributes &= *att; - save_afsi(&afsi, &obj); - return 1; + send_strerror(cc, -ret); + return ret; } -static int com_addatt_callback(const struct osl_object *query, - __a_unused struct osl_object *result) +static int com_mvatt_callback(struct afs_callback_arg *aca) { - char *p = query->data; - uint64_t atts_added = 0; + char *old = aca->query.data; + size_t size = strlen(old) + 1; + char *new = old + size; + struct osl_object obj = {.data = old, .size = size}; + struct osl_row *row; int ret; - while (p < (char *)query->data + query->size) { - struct osl_object objs[NUM_ATT_COLUMNS]; - struct osl_row *row; - unsigned char bitnum; - - objs[ATTCOL_BITNUM].size = 1; - objs[ATTCOL_NAME].data = p; - objs[ATTCOL_NAME].size = strlen(p) + 1; - ret = osl_get_row(attribute_table, ATTCOL_NAME, - &objs[ATTCOL_NAME], &row); /* expected to fail */ - if (ret >= 0) - return -E_ATTR_EXISTS; - if (ret != -E_RB_KEY_NOT_FOUND) /* error */ - return ret; - /* find smallest non-used attribute */ - for (bitnum = 0; bitnum < 64; bitnum++) { - objs[ATTCOL_BITNUM].data = &bitnum; - ret = osl_get_row(attribute_table, ATTCOL_BITNUM, - &objs[ATTCOL_BITNUM], &row); - if (ret == -E_RB_KEY_NOT_FOUND) - break; /* this bitnum is unused, use it */ - if (ret < 0) /* error */ - return ret; - /* this bit is already in use, try next bit */ - } - if (bitnum == 64) - return -E_ATTR_TABLE_FULL; - ret = osl_add_row(attribute_table, objs); - if (ret < 0) - return ret; - greatest_att_bitnum = PARA_MAX(greatest_att_bitnum, bitnum); - atts_added |= 1 << bitnum; - p += strlen(p) + 1; - } - if (!atts_added) - return 1; - atts_added = ~atts_added; - ret = audio_file_loop(&atts_added, logical_and_attribute); + ret = osl(osl_get_row(attribute_table, ATTCOL_NAME, &obj, &row)); if (ret < 0) - return ret; - find_greatest_att_bitnum(); - return reload_current_mood(); /* FIXME: mood_reload() returns an error */ + goto out; + obj.data = new; + obj.size = strlen(new) + 1; + ret = osl(osl_update_object(attribute_table, row, ATTCOL_NAME, &obj)); +out: + if (ret < 0) + para_printf(&aca->pbout, "cannot rename %s to %s\n", old, new); + else + ret = afs_event(ATTRIBUTE_RENAME, &aca->pbout, NULL); + return ret; } -int com_addatt(__a_unused int fd, int argc, char * const * const argv) +int com_mvatt(struct command_context *cc) { - if (argc < 2) + if (cc->argc != 3) return -E_ATTR_SYNTAX; - return send_standard_callback_request(argc - 1, argv + 1, com_addatt_callback, - NULL); + return send_standard_callback_request(cc->argc - 1, cc->argv + 1, + com_mvatt_callback, afs_cb_result_handler, cc); } -static int com_rmatt_callback(const struct osl_object *query, - __a_unused struct osl_object *result) +static int remove_attribute(struct osl_table *table, struct osl_row *row, + const char *name, void *data) { - 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); - if (ret < 0) - return ret; - atts_removed++; - p += strlen(p) + 1; + struct afs_callback_arg *aca = data; + int ret; + struct rmatt_event_data red = {.name = name}; + + ret = get_attribute_bitnum_by_name(name, &red.bitnum); + if (ret < 0) { + para_printf(&aca->pbout, "cannot remove %s\n", name); + return ret; } - find_greatest_att_bitnum(); - if (!atts_removed) - return 1; - return reload_current_mood(); + para_printf(&aca->pbout, "removing attribute %s\n", name); + ret = osl(osl_del_row(table, row)); + if (ret < 0) { + para_printf(&aca->pbout, "cannot remove %s\n", name); + return ret; + } + return afs_event(ATTRIBUTE_REMOVE, &aca->pbout, &red); } -int com_rmatt(__a_unused int fd, int argc, char * const * const argv) +static int com_rmatt_callback(struct afs_callback_arg *aca) { - if (argc < 2) + int ret; + struct pattern_match_data pmd = { + .table = attribute_table, + .patterns = aca->query, + .loop_col_num = ATTCOL_BITNUM, + .match_col_num = ATTCOL_NAME, + .data = aca, + .action = remove_attribute + }; + ret = for_each_matching_row(&pmd); + if (ret < 0) + goto out; + if (pmd.num_matches == 0) + ret = -E_NO_MATCH; +out: + return ret; +} + +int com_rmatt(struct command_context *cc) +{ + if (cc->argc < 2) return -E_ATTR_SYNTAX; - return send_standard_callback_request(argc - 1, argv + 1, com_rmatt_callback, - NULL); + return send_standard_callback_request(cc->argc - 1, cc->argv + 1, + com_rmatt_callback, afs_cb_result_handler, cc); } /** - * Return a binary representation of the geiven attribute value. + * Return a binary representation of the given attribute value. * * \param atts Pointer to the attribute value. * \param buf Result. @@ -378,7 +374,7 @@ int com_rmatt(__a_unused int fd, int argc, char * const * const argv) * used for unset attributes. * * In practice, not all 64 attributes are defined. In this case, the function - * only prints \a N + 1 charaters where \a N is the greatest id of a defined + * only prints \a N + 1 characters where \a N is the greatest id of a defined * attribute. */ void get_attribute_bitmap(const uint64_t *atts, char *buf) @@ -407,8 +403,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}; @@ -416,10 +414,10 @@ int get_attribute_text(uint64_t *atts, const char *delim, char **text) if (!(*atts & (one << i))) continue; - ret = osl_get_row(attribute_table, ATTCOL_BITNUM, &obj, &row); + ret = osl(osl_get_row(attribute_table, ATTCOL_BITNUM, &obj, &row)); if (ret < 0) goto err; - ret = osl_get_object(attribute_table, row, ATTCOL_NAME, &obj); + ret = osl(osl_get_object(attribute_table, row, ATTCOL_NAME, &obj)); if (ret < 0) goto err; if (*text) { @@ -437,43 +435,98 @@ err: return ret; } +static int att_logical_or(struct osl_row *row, void *data) +{ + uint64_t *att_mask = data; + struct osl_object bitnum_obj; + int ret = osl_get_object(attribute_table, row, ATTCOL_BITNUM, &bitnum_obj); + + if (ret < 0) + return ret; + *att_mask |= 1 << *(unsigned char *)bitnum_obj.data; + return 0; +} + /** - * Close the attribute table. + * Compute the attribute bit mask and check each afs info bitmap. + * + * \param aca The query field of \a aca is ignored. + * + * This iterates over all attributes in the attribute table and computes the + * logical or of 1 << b where b is the bit number of the attribute. The + * resulting bit mask is passed to aft_check_attributes() which performs the + * actual check. * - * \param flags Ususal flags that are passed to osl_close_table(). + * \return Standard. + * + * \sa \ref aft_check_attributes(). + */ +int attribute_check_callback(struct afs_callback_arg *aca) +{ + int ret; + uint64_t att_mask = 0; /* bits corresponding to a attributes */ + + ret = osl_rbtree_loop(attribute_table, ATTCOL_BITNUM, &att_mask, + att_logical_or); + if (ret < 0) { + PARA_ERROR_LOG("attribute table loop failed: %s\n", + para_strerror(-ret)); + return ret; + } + return aft_check_attributes(att_mask, &aca->pbout); +} + +/** + * Close the attribute table. * * \sa osl_close_table(). */ -void attribute_shutdown(enum osl_close_flags flags) +static void attribute_close(void) { - osl_close_table(attribute_table, flags); + osl_close_table(attribute_table, OSL_MARK_CLEAN); attribute_table = NULL; } /** * Open the attribute table. * - * \param ti Gets initialized by this function. - * \param db The database directory. + * \param dir The database directory. * * \return Positive on success, negative on errors. * * \sa osl_open_table(). */ -int attribute_init(struct table_info *ti, const char *db) +static int attribute_open(const char *dir) { int ret; - attribute_table_desc.dir = db; - ti->desc = &attribute_table_desc; - ret = osl_open_table(ti->desc, attribute_table); + attribute_table_desc.dir = dir; + ret = osl(osl_open_table(&attribute_table_desc, &attribute_table)); greatest_att_bitnum = -1; /* no atts available */ if (ret >= 0) { find_greatest_att_bitnum(); return ret; } attribute_table = NULL; - if (ret == -E_NOENT) + if (ret >= 0 || ret == -OSL_ERRNO_TO_PARA_ERROR(E_OSL_NOENT)) return 1; return ret; } + +static int attribute_create(const char *dir) +{ + attribute_table_desc.dir = dir; + return osl(osl_create_table(&attribute_table_desc)); +} + +/** + * Initialize the attribute table structure. + * + * \param t The table structure to initialize. + */ +void attribute_init(struct afs_table *t) +{ + t->open = attribute_open; + t->close = attribute_close; + t->create = attribute_create; +}