X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=attribute.c;h=637e1f519b863ed346b9bfba01471eab36bb6b3c;hp=8dcfa28fa6c5f77e4ae8f02cfc045ee0ec401bf6;hb=534a94f441767947874cb15d18211edf758e9277;hpb=d5a9e8c8eefe170b6fb62be563c079c818bd3bf8 diff --git a/attribute.c b/attribute.c index 8dcfa28f..637e1f51 100644 --- a/attribute.c +++ b/attribute.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1997-2012 Andre Noll + * Copyright (C) 1997 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -8,7 +8,9 @@ #include #include +#include +#include "server_cmd.lsg.h" #include "para.h" #include "error.h" #include "crypt.h" @@ -106,225 +108,102 @@ int get_attribute_bitnum_by_name(const char *att_name, unsigned char *bitnum) return 1; } -/** - * 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 -}; - /** 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; + bool l_given = SERVER_CMD_OPT_GIVEN(LSATT, LONG, aca->lpr); struct osl_object bitnum_obj; int ret; - if (!(laad->flags & LSATT_FLAG_LONG)) - return para_printf(&laad->pb, "%s\n", name); + if (!l_given) { + para_printf(&aca->pbout, "%s\n", name); + return 1; + } 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; } - return 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 void com_lsatt_callback(int fd, const struct osl_object *query) +static int com_lsatt_callback(struct afs_callback_arg *aca) { - struct lsatt_action_data laad = { - .flags = *(unsigned *) query->data, - .pb = { - .max_size = shm_get_shmmax(), - .private_data = &(struct afs_max_size_handler_data) { - .fd = fd, - }, - .max_size_handler = afs_max_size_handler - } - - }; + const struct lls_command *cmd = SERVER_CMD_CMD_PTR(LSATT); + bool i_given, r_given; + 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)}, .pm_flags = PM_NO_PATTERN_MATCHES_EVERYTHING, - .data = &laad, + .data = aca, .action = print_attribute }; - if (laad.flags & LSATT_FLAG_SORT_BY_ID) - pmd.loop_col_num = ATTCOL_NAME; - if (laad.flags & LSATT_FLAG_REVERSE) - pmd.pm_flags |= PM_REVERSE_LOOP; - for_each_matching_row(&pmd); - if (laad.pb.offset) - pass_buffer_as_shm(fd, laad.pb.buf, laad.pb.offset); - free(laad.pb.buf); -} -int com_lsatt(struct command_context *cc) -{ - unsigned flags = 0; - struct osl_object options = {.data = &flags, .size = sizeof(flags)}; - int ret, 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, "-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; - } - } - ret = send_option_arg_callback_request(&options, cc->argc - i, cc->argv + i, - com_lsatt_callback, afs_cb_result_handler, cc); - if (!ret) { - if (cc->argc > 1) - ret = sc_send_va_buffer(&cc->scc, "no matches\n"); - } else if (ret < 0) - sc_send_va_buffer(&cc->scc, "%s\n", para_strerror(-ret)); - return ret; -} + ret = lls(lls_deserialize_parse_result(aca->query.data, cmd, &aca->lpr)); + assert(ret >= 0); + pmd.lpr = aca->lpr; + i_given = SERVER_CMD_OPT_GIVEN(LSATT, ID_SORT, aca->lpr); + r_given = SERVER_CMD_OPT_GIVEN(LSATT, REVERSE, aca->lpr); -static void com_setatt_callback(__a_unused int fd, const struct osl_object *query) -{ - 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); - ret = -E_ATTR_SYNTAX; - if (!*p) - goto out; - c = p[len - 1]; - if (c != '+' && c != '-') - break; - p[len - 1] = '\0'; - obj.data = p; - obj.size = len + 1; - ret = osl(osl_get_row(attribute_table, ATTCOL_NAME, &obj, &row)); - if (ret < 0) - goto out; - ret = osl(osl_get_object(attribute_table, row, ATTCOL_BITNUM, - &obj)); - if (ret < 0) - goto out; - if (c == '+') - add_mask |= (1UL << *(unsigned char *)obj.data); - else - del_mask |= (1UL << *(unsigned char *)obj.data); - } - ret = -E_ATTR_SYNTAX; - if (!add_mask && !del_mask) + if (i_given) + pmd.loop_col_num = ATTCOL_BITNUM; + if (r_given) + pmd.pm_flags |= PM_REVERSE_LOOP; + ret = for_each_matching_row(&pmd); + if (ret < 0) goto out; - 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) - goto out; - ret = get_afsi_object_of_row(aced.aft_row, &obj); - if (ret < 0) - goto out; - ret = load_afsi(&old_afsi, &obj); - if (ret < 0) - goto out; - 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); - } + if (pmd.num_matches == 0) + ret = -E_NO_MATCH; out: - if (ret < 0) - PARA_NOTICE_LOG("%s\n", para_strerror(-ret)); + lls_free_parse_result(aca->lpr, cmd); + return ret; } -int com_setatt(struct command_context *cc) +static int com_lsatt(struct command_context *cc, struct lls_parse_result *lpr) { - if (cc->argc < 3) - return -E_ATTR_SYNTAX; - return send_standard_callback_request(cc->argc - 1, cc->argv + 1, - com_setatt_callback, NULL, NULL); + const struct lls_command *cmd = SERVER_CMD_CMD_PTR(LSATT); + return send_lls_callback_request(com_lsatt_callback, cmd, lpr, cc); } +EXPORT_SERVER_CMD_HANDLER(lsatt); struct addatt_event_data { const char *name; unsigned char bitnum; }; - -static void com_addatt_callback(int fd, const struct osl_object *query) +static int com_addatt_callback(struct afs_callback_arg *aca) { - char *p; - int ret = 1, ret2 = 0; - struct para_buffer pb = { - .max_size = shm_get_shmmax(), - .private_data = &(struct afs_max_size_handler_data) { - .fd = fd, - }, - .max_size_handler = afs_max_size_handler - }; + const struct lls_command *cmd = SERVER_CMD_CMD_PTR(ADDATT); + int i, ret = 1; size_t len; + unsigned num_inputs; - for (p = query->data; p < (char *)query->data + query->size; p += len + 1) { + ret = lls(lls_deserialize_parse_result(aca->query.data, cmd, &aca->lpr)); + assert(ret >= 0); + num_inputs = lls_num_inputs(aca->lpr); + for (i = 0; i < num_inputs; i++) { + const char *name = lls_input(i, aca->lpr); struct osl_object objs[NUM_ATT_COLUMNS]; struct osl_row *row; unsigned char bitnum; struct addatt_event_data aed; - len = strlen(p); - if (!len || p[len - 1] == '-' || p[len - 1] == '+') { - ret2 = para_printf(&pb, "invalid attribute name: %s\n", p); - if (ret2 < 0) - goto out; + len = strlen(name); + if (len == 0 || name[len - 1] == '-' || name[len - 1] == '+') { + para_printf(&aca->pbout, + "invalid attribute name: %s\n", name); continue; } - ret = get_attribute_bitnum_by_name(p, &bitnum); + ret = get_attribute_bitnum_by_name(name, &bitnum); if (ret >= 0) { - ret2 = para_printf(&pb, "attribute \"%s\" already exists\n", p); - if (ret2 < 0) - goto out; + para_printf(&aca->pbout, + "attribute \"%s\" already exists\n", name); continue; } if (ret != -OSL_ERRNO_TO_PARA_ERROR(E_OSL_RB_KEY_NOT_FOUND)) /* error */ @@ -345,155 +224,140 @@ static void com_addatt_callback(int fd, const struct osl_object *query) ret = -E_ATT_TABLE_FULL; goto out; } - objs[ATTCOL_NAME].data = p; + objs[ATTCOL_NAME].data = (char *)name; objs[ATTCOL_NAME].size = len + 1; ret = osl(osl_add_row(attribute_table, objs)); if (ret < 0) goto out; - aed.name = p; + aed.name = name; aed.bitnum = bitnum; - afs_event(ATTRIBUTE_ADD, &pb, &aed); + 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 && ret2 >= 0) - para_printf(&pb, "%s: %s\n", p, para_strerror(-ret)); - if (pb.offset) - pass_buffer_as_shm(fd, pb.buf, pb.offset); - free(pb.buf); + if (ret < 0) + para_printf(&aca->pbout, "error while adding %s\n", + lls_input(i, aca->lpr)); + return ret; } -int com_addatt(struct command_context *cc) +static int com_addatt(struct command_context *cc, struct lls_parse_result *lpr) { - int ret; + const struct lls_command *cmd = SERVER_CMD_CMD_PTR(ADDATT); + char *errctx; + int ret = lls(lls_check_arg_count(lpr, 1, 64, &errctx)); - 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) - sc_send_va_buffer(&cc->scc, "%s\n", para_strerror(-ret)); - return ret; + if (ret < 0) { + send_errctx(cc, errctx); + return ret; + } + return send_lls_callback_request(com_addatt_callback, cmd, lpr, cc); } +EXPORT_SERVER_CMD_HANDLER(addatt); -static void com_mvatt_callback(int fd, const struct osl_object *query) +static int com_mvatt_callback(struct afs_callback_arg *aca) { - char *old = query->data; - size_t size = strlen(old) + 1; - char *new = old + size; - struct osl_object obj = {.data = old, .size = size}; + const struct lls_command *cmd = SERVER_CMD_CMD_PTR(MVATT); + const char *old, *new; + struct osl_object obj; struct osl_row *row; - struct para_buffer pb = { - .max_size = shm_get_shmmax(), - .private_data = &(struct afs_max_size_handler_data) { - .fd = fd, - }, - .max_size_handler = afs_max_size_handler, - }; int ret; + ret = lls(lls_deserialize_parse_result(aca->query.data, cmd, &aca->lpr)); + assert(ret >= 0); + old = lls_input(0, aca->lpr); + new = lls_input(1, aca->lpr); + obj.data = (char *)old; + obj.size = strlen(old) + 1; ret = osl(osl_get_row(attribute_table, ATTCOL_NAME, &obj, &row)); if (ret < 0) goto out; - obj.data = new; + obj.data = (char *)new; obj.size = strlen(new) + 1; + /* The update fails if the destination attribute exists. */ 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.offset) - pass_buffer_as_shm(fd, pb.buf, pb.offset); - free(pb.buf); + ret = afs_event(ATTRIBUTE_RENAME, &aca->pbout, NULL); + lls_free_parse_result(aca->lpr, cmd); + return ret; } -int com_mvatt(struct command_context *cc) +static int com_mvatt(struct command_context *cc, struct lls_parse_result *lpr) { - int ret; - - if (cc->argc != 3) - return -E_ATTR_SYNTAX; - ret = send_standard_callback_request(cc->argc - 1, cc->argv + 1, - com_mvatt_callback, afs_cb_result_handler, cc); - if (ret < 0) - sc_send_va_buffer(&cc->scc, "%s\n", para_strerror(-ret)); - return ret; + const struct lls_command *cmd = SERVER_CMD_CMD_PTR(MVATT); + char *errctx; + int ret = lls(lls_check_arg_count(lpr, 2, 2, &errctx)); + if (ret < 0) { + send_errctx(cc, errctx); + return ret; + } + return send_lls_callback_request(com_mvatt_callback, cmd, lpr, 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; -}; +EXPORT_SERVER_CMD_HANDLER(mvatt); 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) - return para_printf(&raad->pb, "%s: %s\n", name, para_strerror(-ret)); + if (ret < 0) { + para_printf(&aca->pbout, "cannot remove %s\n", name); + return ret; + } + para_printf(&aca->pbout, "removing attribute %s\n", name); ret = osl(osl_del_row(table, row)); - if (ret < 0) - return para_printf(&raad->pb, "%s: %s\n", name, para_strerror(-ret)); - 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 ret; + if (ret < 0) { + para_printf(&aca->pbout, "cannot remove %s\n", name); + return ret; + } + return afs_event(ATTRIBUTE_REMOVE, &aca->pbout, &red); } -static void com_rmatt_callback(int fd, const struct osl_object *query) +static int com_rmatt_callback(struct afs_callback_arg *aca) { - struct remove_attribute_action_data raad = { - .num_removed = 0, - .pb = { - .max_size = shm_get_shmmax(), - .private_data = &(struct afs_max_size_handler_data) { - .fd = fd, - }, - .max_size_handler = afs_max_size_handler, - } - }; - int ret, ret2 = 0; + const struct lls_command *cmd = SERVER_CMD_CMD_PTR(RMATT); + int ret; struct pattern_match_data pmd = { .table = attribute_table, - .patterns = *query, .loop_col_num = ATTCOL_BITNUM, .match_col_num = ATTCOL_NAME, - .data = &raad, + .data = aca, .action = remove_attribute }; + ret = lls(lls_deserialize_parse_result(aca->query.data, cmd, &aca->lpr)); + assert(ret >= 0); + pmd.lpr = aca->lpr; ret = for_each_matching_row(&pmd); if (ret < 0) - ret2 = para_printf(&raad.pb, "%s\n", para_strerror(-ret)); - else if (!raad.num_removed) - ret2 = para_printf(&raad.pb, "no match -- nothing removed\n"); - if (ret2 >= 0 && raad.pb.offset) - pass_buffer_as_shm(fd, raad.pb.buf, raad.pb.offset); - free(raad.pb.buf); + goto out; + if (pmd.num_matches == 0) + ret = -E_NO_MATCH; +out: + lls_free_parse_result(aca->lpr, cmd); + return ret; } -int com_rmatt(struct command_context *cc) +static int com_rmatt(struct command_context *cc, struct lls_parse_result *lpr) { - int ret; + const struct lls_command *cmd = SERVER_CMD_CMD_PTR(RMATT); + char *errctx; + int ret = lls(lls_check_arg_count(lpr, 1, INT_MAX, &errctx)); - if (cc->argc < 2) - return -E_ATTR_SYNTAX; - ret = send_standard_callback_request(cc->argc - 1, cc->argv + 1, - com_rmatt_callback, afs_cb_result_handler, cc); - if (ret < 0) - sc_send_va_buffer(&cc->scc, "%s\n", para_strerror(-ret)); - return ret; + if (ret < 0) { + send_errctx(cc, errctx); + return ret; + } + return send_lls_callback_request(com_rmatt_callback, cmd, lpr, cc); } +EXPORT_SERVER_CMD_HANDLER(rmatt); /** * Return a binary representation of the given attribute value. @@ -507,7 +371,7 @@ int com_rmatt(struct command_context *cc) * 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) @@ -568,6 +432,47 @@ 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. * @@ -600,7 +505,7 @@ static int attribute_open(const char *dir) return ret; } attribute_table = NULL; - if (ret >= 0 || ret == -OSL_ERRNO_TO_PARA_ERROR(E_OSL_NOENT)) + if (ret == -OSL_ERRNO_TO_PARA_ERROR(E_OSL_NOENT)) return 1; return ret; }