X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=attribute.c;h=f7091727bc5b62518f91436de9428ba6c14b5a86;hp=4cb2982860de78dd26b9fc55ad552c73a7ca1b9f;hb=e8d5da94efd6cbb0aa75f57290c76d9992ff8f47;hpb=de9ce9690ac6194e8e7eaacd10baf21d827e42a4 diff --git a/attribute.c b/attribute.c index 4cb29828..f7091727 100644 --- a/attribute.c +++ b/attribute.c @@ -1,14 +1,12 @@ -/* - * Copyright (C) 1997 Andre Noll - * - * Licensed under the GPL v2. For licencing details see COPYING. - */ +/* Copyright (C) 1997 Andre Noll , see file COPYING. */ /** \file attribute.c Attribute handling functions. */ #include #include +#include +#include "server_cmd.lsg.h" #include "para.h" #include "error.h" #include "crypt.h" @@ -106,30 +104,16 @@ 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 */ static int print_attribute(struct osl_table *table, struct osl_row *row, const char *name, void *data) { struct afs_callback_arg *aca = data; - unsigned flags = *(unsigned *)aca->query.data; + bool l_given = SERVER_CMD_OPT_GIVEN(LSATT, LONG, aca->lpr); struct osl_object bitnum_obj; int ret; - if (!(flags & LSATT_FLAG_LONG)) { + if (!l_given) { para_printf(&aca->pbout, "%s\n", name); return 1; } @@ -145,21 +129,27 @@ static int print_attribute(struct osl_table *table, struct osl_row *row, static int com_lsatt_callback(struct afs_callback_arg *aca) { - unsigned flags = *(unsigned *)aca->query.data; + 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_NAME, .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) + + 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); + + if (i_given) pmd.loop_col_num = ATTCOL_BITNUM; - if (flags & LSATT_FLAG_REVERSE) + if (r_given) pmd.pm_flags |= PM_REVERSE_LOOP; ret = for_each_matching_row(&pmd); if (ret < 0) @@ -167,70 +157,49 @@ static int com_lsatt_callback(struct afs_callback_arg *aca) if (pmd.num_matches == 0) ret = -E_NO_MATCH; out: + lls_free_parse_result(aca->lpr, cmd); return ret; } -int com_lsatt(struct command_context *cc) +static int com_lsatt(struct command_context *cc, struct lls_parse_result *lpr) { - unsigned flags = 0; - struct osl_object options = {.data = &flags, .size = sizeof(flags)}; - int 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; - } - } - return send_option_arg_callback_request(&options, cc->argc - i, cc->argv + i, - com_lsatt_callback, afs_cb_result_handler, cc); + 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 int com_addatt_callback(struct afs_callback_arg *aca) { - char *p; - int ret = 1; + const struct lls_command *cmd = SERVER_CMD_CMD_PTR(ADDATT); + int i, ret = 1; size_t len; + unsigned num_inputs; - for ( - p = aca->query.data; - p < (char *)aca->query.data + aca->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] == '+') { - para_printf(&aca->pbout, "invalid attribute name: %s\n", p); + 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) { - para_printf(&aca->pbout, "attribute \"%s\" already exists\n", p); + 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 */ @@ -251,12 +220,12 @@ static int com_addatt_callback(struct afs_callback_arg *aca) 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; ret = afs_event(ATTRIBUTE_ADD, &aca->pbout, &aed); if (ret < 0) @@ -265,53 +234,67 @@ static int com_addatt_callback(struct afs_callback_arg *aca) } out: if (ret < 0) - para_printf(&aca->pbout, "%s: %s\n", p, para_strerror(-ret)); + 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) - send_strerror(cc, -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 int com_mvatt_callback(struct afs_callback_arg *aca) { - char *old = aca->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; 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(&aca->pbout, "cannot rename %s to %s\n", old, new); else 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) { - if (cc->argc != 3) - return -E_ATTR_SYNTAX; - return send_standard_callback_request(cc->argc - 1, cc->argv + 1, - com_mvatt_callback, afs_cb_result_handler, cc); + 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); } +EXPORT_SERVER_CMD_HANDLER(mvatt); static int remove_attribute(struct osl_table *table, struct osl_row *row, const char *name, void *data) @@ -336,31 +319,41 @@ static int remove_attribute(struct osl_table *table, struct osl_row *row, static int com_rmatt_callback(struct afs_callback_arg *aca) { + const struct lls_command *cmd = SERVER_CMD_CMD_PTR(RMATT); 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 = 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) 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) { - if (cc->argc < 2) - return -E_ATTR_SYNTAX; - return send_standard_callback_request(cc->argc - 1, cc->argv + 1, - com_rmatt_callback, afs_cb_result_handler, cc); + 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 (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. @@ -479,7 +472,7 @@ int attribute_check_callback(struct afs_callback_arg *aca) /** * Close the attribute table. * - * \sa osl_close_table(). + * \sa \ref osl_close_table(). */ static void attribute_close(void) { @@ -494,7 +487,7 @@ static void attribute_close(void) * * \return Positive on success, negative on errors. * - * \sa osl_open_table(). + * \sa \ref osl_open_table(). */ static int attribute_open(const char *dir) {