X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=attribute.c;h=4cb2982860de78dd26b9fc55ad552c73a7ca1b9f;hp=e306aa2e1889b05b8646b650dd0d8e42e1e861de;hb=c257c9c321c6e9494dbcbb6da0af675c3a2aa8e4;hpb=c73d23911d78ed10179c12ef8f79a3fcf3bbcdaf diff --git a/attribute.c b/attribute.c index e306aa2e..4cb29828 100644 --- a/attribute.c +++ b/attribute.c @@ -1,16 +1,23 @@ /* - * 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 "net.h" +#include "ipc.h" +#include "sideband.h" +#include "command.h" static struct osl_table *attribute_table; static int greatest_att_bitnum; @@ -88,11 +95,11 @@ 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; @@ -114,73 +121,63 @@ enum lsatt_flags { }; /** Data passed to the action function of lsatt */ -struct lsatt_action_data { - /** The result buffer. */ - struct para_buffer pb; - /** The given flags for the lsatt command. */ - unsigned flags; -}; - static int print_attribute(struct osl_table *table, struct osl_row *row, const char *name, void *data) { - struct lsatt_action_data *laad = data; + struct afs_callback_arg *aca = data; + unsigned flags = *(unsigned *)aca->query.data; struct osl_object bitnum_obj; int ret; - if (!(laad->flags & LSATT_FLAG_LONG)) { - para_printf(&laad->pb, "%s\n", name); + if (!(flags & LSATT_FLAG_LONG)) { + para_printf(&aca->pbout, "%s\n", name); return 1; } - ret = osl_get_object(table, row, ATTCOL_BITNUM, &bitnum_obj); + ret = osl(osl_get_object(table, row, ATTCOL_BITNUM, &bitnum_obj)); if (ret < 0) { - para_printf(&laad->pb, "%s: %s\n", name, para_strerror(-ret)); + para_printf(&aca->pbout, "%s: %s\n", name, para_strerror(-ret)); return ret; } - para_printf(&laad->pb, "%u\t%s\n", *(unsigned char*)bitnum_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 lsatt_action_data laad = {.flags = *(unsigned *) query->data}; + unsigned flags = *(unsigned *)aca->query.data; + int ret; struct pattern_match_data pmd = { .table = attribute_table, - .loop_col_num = ATTCOL_BITNUM, + .loop_col_num = ATTCOL_NAME, .match_col_num = ATTCOL_NAME, - .patterns = {.data = (char *)query->data + sizeof(laad.flags), - .size = query->size - sizeof(laad.flags)}, + .patterns = {.data = (char *)aca->query.data + sizeof(flags), + .size = aca->query.size - sizeof(flags)}, .pm_flags = PM_NO_PATTERN_MATCHES_EVERYTHING, - .data = &laad, + .data = aca, .action = print_attribute }; - int ret; - - if (laad.flags & LSATT_FLAG_SORT_BY_ID) - pmd.loop_col_num = ATTCOL_NAME; - if (laad.flags & LSATT_FLAG_REVERSE) + if (flags & LSATT_FLAG_SORT_BY_ID) + pmd.loop_col_num = ATTCOL_BITNUM; + if (flags & LSATT_FLAG_REVERSE) pmd.pm_flags |= PM_REVERSE_LOOP; ret = for_each_matching_row(&pmd); if (ret < 0) - para_printf(&laad.pb, "%s\n", para_strerror(-ret)); - if (!laad.pb.buf) - return 0; - result->data = laad.pb.buf; - result->size = laad.pb.size; - return 1; + 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) { unsigned flags = 0; - struct osl_object options = {.data = &flags, .size = sizeof(flags)}, - result; - int ret, i; + 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, "--")) { @@ -200,85 +197,8 @@ int com_lsatt(int fd, int argc, char * const * const argv) continue; } } - ret = send_option_arg_callback_request(&options, argc - i, argv + i, - com_lsatt_callback, &result); - if (ret > 0) { - ret = send_buffer(fd, (char *)result.data); - free(result.data); - } else if (ret < 0) - send_va_buffer(fd, "%s\n", para_strerror(-ret)); - else if (argc > 1) - send_va_buffer(fd, "no matches\n"); - return ret; -} - -static int com_setatt_callback(const struct osl_object *query, - __a_unused struct osl_object *result) -{ - char *p; - uint64_t add_mask = 0, del_mask = 0; - int ret; - 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 afsi_change_event_data aced = {.old_afsi = &old_afsi}; - - len = strlen(p); - ret = aft_get_row_of_path(p, &aced.aft_row); - if (ret < 0) - return ret; - ret = get_afsi_object_of_row(aced.aft_row, &obj); - if (ret < 0) - return ret; - ret = load_afsi(&old_afsi, &obj); - 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 */ - afs_event(AFSI_CHANGE, NULL, &aced); - } - return 1; -} - -int com_setatt(__a_unused int fd, int argc, char * const * const argv) -{ - if (argc < 3) - return -E_ATTR_SYNTAX; - return send_standard_callback_request(argc - 1, argv + 1, com_setatt_callback, - NULL); + return send_option_arg_callback_request(&options, cc->argc - i, cc->argv + i, + com_lsatt_callback, afs_cb_result_handler, cc); } struct addatt_event_data { @@ -287,39 +207,41 @@ struct addatt_event_data { }; -static int com_addatt_callback(const struct osl_object *query, - struct osl_object *result) +static int com_addatt_callback(struct afs_callback_arg *aca) { - char *p = query->data; + char *p; int ret = 1; - struct para_buffer pb = {.size = 0}; size_t len; - for (p = query->data; p < (char *)query->data + query->size; p += len + 1) { + 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; - len = strlen(p); struct addatt_event_data aed; + len = strlen(p); if (!len || p[len - 1] == '-' || p[len - 1] == '+') { - para_printf(&pb, "invalid attribute name: %s\n", p); + para_printf(&aca->pbout, "invalid attribute name: %s\n", p); continue; } ret = get_attribute_bitnum_by_name(p, &bitnum); if (ret >= 0) { - para_printf(&pb, "attribute \"%s\" already exists\n", p); + para_printf(&aca->pbout, "attribute \"%s\" already exists\n", p); continue; } - if (ret != -E_RB_KEY_NOT_FOUND) /* error */ + 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_get_row(attribute_table, ATTCOL_BITNUM, - &objs[ATTCOL_BITNUM], &row); - if (ret == -E_RB_KEY_NOT_FOUND) + 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; @@ -331,163 +253,113 @@ static int com_addatt_callback(const struct osl_object *query, } objs[ATTCOL_NAME].data = p; objs[ATTCOL_NAME].size = len + 1; - ret = osl_add_row(attribute_table, objs); + ret = osl(osl_add_row(attribute_table, objs)); if (ret < 0) goto out; aed.name = p; aed.bitnum = bitnum; - afs_event(ATTRIBUTE_ADD, &pb, &aed); - greatest_att_bitnum = PARA_MAX(greatest_att_bitnum, bitnum); + ret = afs_event(ATTRIBUTE_ADD, &aca->pbout, &aed); + if (ret < 0) + goto out; + greatest_att_bitnum = PARA_MAX(greatest_att_bitnum, (int)bitnum); } out: if (ret < 0) - para_printf(&pb, "%s: %s\n", p, para_strerror(-ret)); - result->data = pb.buf; - result->size = pb.size; - return result->data? 0 : 1; + para_printf(&aca->pbout, "%s: %s\n", p, para_strerror(-ret)); + return ret; } -int com_addatt(int fd, int argc, char * const * const argv) +int com_addatt(struct command_context *cc) { - struct osl_object result; int ret; - if (argc < 2) + if (cc->argc < 2) return -E_ATTR_SYNTAX; - ret = send_standard_callback_request(argc - 1, argv + 1, com_addatt_callback, - &result); - if (!ret) - return 1; + ret = send_standard_callback_request(cc->argc - 1, cc->argv + 1, + com_addatt_callback, afs_cb_result_handler, cc); if (ret < 0) - return ret; - if (!result.data || !result.size) - return 1; - ret = send_va_buffer(fd, "%s", (char *) result.data); - free(result.data); + send_strerror(cc, -ret); return ret; } -static int com_mvatt_callback(const struct osl_object *query, - struct osl_object *result) +static int com_mvatt_callback(struct afs_callback_arg *aca) { - char *old = query->data; + 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; - struct para_buffer pb = {.size = 0}; int ret; - ret = osl_get_row(attribute_table, ATTCOL_NAME, &obj, &row); + ret = osl(osl_get_row(attribute_table, ATTCOL_NAME, &obj, &row)); if (ret < 0) goto out; obj.data = new; obj.size = strlen(new) + 1; - ret = osl_update_object(attribute_table, row, ATTCOL_NAME, &obj); + ret = osl(osl_update_object(attribute_table, row, ATTCOL_NAME, &obj)); out: if (ret < 0) - para_printf(&pb, "%s\n", para_strerror(-ret)); + para_printf(&aca->pbout, "cannot rename %s to %s\n", old, new); else - afs_event(ATTRIBUTE_RENAME, &pb, NULL); - if (!pb.buf) - return 0; - result->data = pb.buf; - result->size = pb.size; - return 1; + ret = afs_event(ATTRIBUTE_RENAME, &aca->pbout, NULL); + return ret; } -int com_mvatt(int fd, int argc, char * const * const argv) +int com_mvatt(struct command_context *cc) { - struct osl_object result; - int ret; - - if (argc != 3) + if (cc->argc != 3) return -E_ATTR_SYNTAX; - ret = send_standard_callback_request(argc - 1, argv + 1, com_mvatt_callback, - &result); - if (!ret) - return 1; - if (ret < 0) - return ret; - if (!result.data || !result.size) - return 1; - ret = send_va_buffer(fd, "%s", (char *) result.data); - free(result.data); - return ret; + return send_standard_callback_request(cc->argc - 1, cc->argv + 1, + com_mvatt_callback, afs_cb_result_handler, cc); } -/** Data passed to the action handler of com_rmatt(). */ -struct remove_attribute_action_data { - /** Message buffer. */ - struct para_buffer pb; - /** Numver of attributes removed. */ - int num_removed; - /** Bitwise "or" of the removed attributes. */ - uint64_t mask_of_removed_atts; -}; - static int remove_attribute(struct osl_table *table, struct osl_row *row, const char *name, void *data) { - struct remove_attribute_action_data *raad = data; + 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(&raad->pb, "%s: %s\n", name, para_strerror(-ret)); - return 1; + para_printf(&aca->pbout, "cannot remove %s\n", name); + return ret; } - ret = osl_del_row(table, row); + para_printf(&aca->pbout, "removing attribute %s\n", name); + ret = osl(osl_del_row(table, row)); if (ret < 0) { - para_printf(&raad->pb, "%s: %s\n", name, para_strerror(-ret)); - return 1; + para_printf(&aca->pbout, "cannot remove %s\n", name); + return ret; } - para_printf(&raad->pb, "removed attribute %s\n", name); - raad->num_removed++; - raad->mask_of_removed_atts |= (1 << red.bitnum); - afs_event(ATTRIBUTE_REMOVE, &raad->pb, &red); - return 1; + return afs_event(ATTRIBUTE_REMOVE, &aca->pbout, &red); } -static int com_rmatt_callback(const struct osl_object *query, - struct osl_object *result) +static int com_rmatt_callback(struct afs_callback_arg *aca) { - struct remove_attribute_action_data raad = {.num_removed = 0}; int ret; struct pattern_match_data pmd = { .table = attribute_table, - .patterns = *query, + .patterns = aca->query, .loop_col_num = ATTCOL_BITNUM, .match_col_num = ATTCOL_NAME, - .data = &raad, + .data = aca, .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) - para_printf(&raad.pb, "no match -- nothing removed\n"); - result->data = raad.pb.buf; - result->size = raad.pb.size; - return 1; + goto out; + if (pmd.num_matches == 0) + ret = -E_NO_MATCH; +out: + return ret; } -int com_rmatt(int fd, int argc, char * const * const argv) +int com_rmatt(struct command_context *cc) { - int ret; - struct osl_object result; - - if (argc < 2) + if (cc->argc < 2) return -E_ATTR_SYNTAX; - 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; + return send_standard_callback_request(cc->argc - 1, cc->argv + 1, + com_rmatt_callback, afs_cb_result_handler, cc); } /** @@ -502,7 +374,7 @@ int com_rmatt(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) @@ -542,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) { @@ -563,12 +435,53 @@ err: return ret; } +static int att_logical_or(struct osl_row *row, void *data) +{ + uint64_t *att_mask = data, one = 1; + struct osl_object bitnum_obj; + int ret = osl_get_object(attribute_table, row, ATTCOL_BITNUM, &bitnum_obj); + + if (ret < 0) + return ret; + *att_mask |= one << *(unsigned char *)bitnum_obj.data; + return 0; +} + +/** + * 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. + * + * \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_close(void) +static void attribute_close(void) { osl_close_table(attribute_table, OSL_MARK_CLEAN); attribute_table = NULL; @@ -577,8 +490,7 @@ void attribute_close(void) /** * 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. * @@ -589,14 +501,14 @@ static int attribute_open(const char *dir) int ret; attribute_table_desc.dir = dir; - ret = osl_open_table(&attribute_table_desc, &attribute_table); + 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 >= 0 || is_errno(-ret, ENOENT)) + if (ret == -OSL_ERRNO_TO_PARA_ERROR(E_OSL_NOENT)) return 1; return ret; } @@ -604,13 +516,16 @@ static int attribute_open(const char *dir) static int attribute_create(const char *dir) { attribute_table_desc.dir = dir; - return osl_create_table(&attribute_table_desc); + 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->name = attribute_table_desc.name; t->open = attribute_open; t->close = attribute_close; t->create = attribute_create;