X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=attribute.c;h=7da525eb90c7f6feef5a8af631e2be06e4b38dca;hp=d94589871562038a7ba96aad85c741de0db05b65;hb=b605df7dcee2c6e642a141aea24e643eb6ca34ec;hpb=eecc102ad0abeb0335fe994bb72031a15b9090d7 diff --git a/attribute.c b/attribute.c index d9458987..7da525eb 100644 --- a/attribute.c +++ b/attribute.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1997-2009 Andre Noll + * Copyright (C) 1997 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -7,7 +7,6 @@ /** \file attribute.c Attribute handling functions. */ #include -#include #include #include "para.h" @@ -16,8 +15,9 @@ #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; @@ -135,25 +135,31 @@ static int print_attribute(struct osl_table *table, struct osl_row *row, struct osl_object bitnum_obj; int ret; - if (!(laad->flags & LSATT_FLAG_LONG)) - return para_printf(&laad->pb, "%s\n", name); + if (!(laad->flags & LSATT_FLAG_LONG)) { + para_printf(&laad->pb, "%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)); return ret; } - return para_printf(&laad->pb, "%u\t%s\n", *(unsigned char*)bitnum_obj.data, + para_printf(&laad->pb, "%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(int fd, const struct osl_object *query) { struct lsatt_action_data laad = { .flags = *(unsigned *) query->data, .pb = { - .max_size = SHMMAX, - .private_data = &fd, - .max_size_handler = pass_buffer_as_shm + .max_size = shm_get_shmmax(), + .private_data = &(struct afs_max_size_handler_data) { + .fd = fd, + .band = SBD_OUTPUT + }, + .max_size_handler = afs_max_size_handler } }; @@ -172,19 +178,18 @@ static void com_lsatt_callback(int fd, const struct osl_object *query) 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(laad.pb.buf, laad.pb.offset, &fd); - free(laad.pb.buf); + flush_and_free_pb(&laad.pb); + return 0; } -int com_lsatt(struct rc4_context *rc4c, 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)}; int ret, 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, "--")) { @@ -204,86 +209,13 @@ int com_lsatt(struct rc4_context *rc4c, int argc, char * const * const argv) continue; } } - ret = send_option_arg_callback_request(&options, argc - i, argv + i, - com_lsatt_callback, rc4_send_result, rc4c); - if (!ret) { - if (argc > 1) - ret = rc4_send_va_buffer(rc4c, "no matches\n"); - } else if (ret < 0) - rc4_send_va_buffer(rc4c, "%s\n", para_strerror(-ret)); - return ret; -} - -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) - 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); - } -out: + ret = send_option_arg_callback_request(&options, cc->argc - i, cc->argv + i, + com_lsatt_callback, afs_cb_result_handler, cc); if (ret < 0) - PARA_NOTICE_LOG("%s\n", para_strerror(-ret)); -} - -int com_setatt(__a_unused struct rc4_context *rc4c, 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, NULL); + send_strerror(cc, -ret); + else if (ret == 0 && cc->argc > 1) + ret = send_sb_va(&cc->scc, SBD_ERROR_LOG, "no matches\n"); + return ret; } struct addatt_event_data { @@ -292,14 +224,17 @@ struct addatt_event_data { }; -static void com_addatt_callback(int fd, const struct osl_object *query) +static int com_addatt_callback(int fd, const struct osl_object *query) { char *p; - int ret = 1, ret2 = 0; + int ret = 1; struct para_buffer pb = { - .max_size = SHMMAX, - .private_data = &fd, - .max_size_handler = pass_buffer_as_shm + .max_size = shm_get_shmmax(), + .private_data = &(struct afs_max_size_handler_data) { + .fd = fd, + .band = SBD_OUTPUT + }, + .max_size_handler = afs_max_size_handler }; size_t len; @@ -311,16 +246,12 @@ static void com_addatt_callback(int fd, const struct osl_object *query) 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; + para_printf(&pb, "invalid attribute name: %s\n", p); continue; } ret = get_attribute_bitnum_by_name(p, &bitnum); if (ret >= 0) { - ret2 = para_printf(&pb, "attribute \"%s\" already exists\n", p); - if (ret2 < 0) - goto out; + para_printf(&pb, "attribute \"%s\" already exists\n", p); continue; } if (ret != -OSL_ERRNO_TO_PARA_ERROR(E_OSL_RB_KEY_NOT_FOUND)) /* error */ @@ -352,27 +283,26 @@ static void com_addatt_callback(int fd, const struct osl_object *query) greatest_att_bitnum = PARA_MAX(greatest_att_bitnum, (int)bitnum); } out: - if (ret < 0 && ret2 >= 0) + if (ret < 0) para_printf(&pb, "%s: %s\n", p, para_strerror(-ret)); - if (pb.offset) - pass_buffer_as_shm(pb.buf, pb.offset, &fd); - free(pb.buf); + flush_and_free_pb(&pb); + return 0; } -int com_addatt(struct rc4_context *rc4c, int argc, char * const * const argv) +int com_addatt(struct command_context *cc) { 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, - rc4_send_result, rc4c); + ret = send_standard_callback_request(cc->argc - 1, cc->argv + 1, + com_addatt_callback, afs_cb_result_handler, cc); if (ret < 0) - rc4_send_va_buffer(rc4c, "%s\n", para_strerror(-ret)); + send_strerror(cc, -ret); return ret; } -static void com_mvatt_callback(int fd, const struct osl_object *query) +static int com_mvatt_callback(int fd, const struct osl_object *query) { char *old = query->data; size_t size = strlen(old) + 1; @@ -380,9 +310,12 @@ static void com_mvatt_callback(int fd, const struct osl_object *query) struct osl_object obj = {.data = old, .size = size}; struct osl_row *row; struct para_buffer pb = { - .max_size = SHMMAX, - .private_data = &fd, - .max_size_handler = pass_buffer_as_shm + .max_size = shm_get_shmmax(), + .private_data = &(struct afs_max_size_handler_data) { + .fd = fd, + .band = SBD_OUTPUT + }, + .max_size_handler = afs_max_size_handler, }; int ret; @@ -397,21 +330,20 @@ out: para_printf(&pb, "%s\n", para_strerror(-ret)); else afs_event(ATTRIBUTE_RENAME, &pb, NULL); - if (pb.offset) - pass_buffer_as_shm(pb.buf, pb.offset, &fd); - free(pb.buf); + flush_and_free_pb(&pb); + return 0; } -int com_mvatt(struct rc4_context *rc4c, int argc, char * const * const argv) +int com_mvatt(struct command_context *cc) { 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, - rc4_send_result, rc4c); + ret = send_standard_callback_request(cc->argc - 1, cc->argv + 1, + com_mvatt_callback, afs_cb_result_handler, cc); if (ret < 0) - rc4_send_va_buffer(rc4c, "%s\n", para_strerror(-ret)); + send_strerror(cc, -ret); return ret; } @@ -419,12 +351,13 @@ int com_mvatt(struct rc4_context *rc4c, int argc, char * const * const argv) struct remove_attribute_action_data { /** Message buffer. */ struct para_buffer pb; - /** Numver of attributes removed. */ + /** Number of attributes removed. */ int num_removed; /** Bitwise "or" of the removed attributes. */ uint64_t mask_of_removed_atts; }; +/* returns succcess even on errors to keep the loop going */ static int remove_attribute(struct osl_table *table, struct osl_row *row, const char *name, void *data) { @@ -433,29 +366,36 @@ static int remove_attribute(struct osl_table *table, struct osl_row *row, 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(&raad->pb, "%s: %s\n", name, para_strerror(-ret)); + return 0; + } 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); + if (ret < 0) { + para_printf(&raad->pb, "%s: %s\n", name, para_strerror(-ret)); + return 0; + } + 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; + return 1; } -static void com_rmatt_callback(int fd, const struct osl_object *query) +static int com_rmatt_callback(int fd, const struct osl_object *query) { struct remove_attribute_action_data raad = { .num_removed = 0, .pb = { - .max_size = SHMMAX, - .private_data = &fd, - .max_size_handler = pass_buffer_as_shm + .max_size = shm_get_shmmax(), + .private_data = &(struct afs_max_size_handler_data) { + .fd = fd, + .band = SBD_OUTPUT + }, + .max_size_handler = afs_max_size_handler, } }; - int ret, ret2 = 0; + int ret; struct pattern_match_data pmd = { .table = attribute_table, .patterns = *query, @@ -466,24 +406,23 @@ static void com_rmatt_callback(int fd, const struct osl_object *query) }; ret = for_each_matching_row(&pmd); if (ret < 0) - ret2 = para_printf(&raad.pb, "%s\n", para_strerror(-ret)); + 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(raad.pb.buf, raad.pb.offset, &fd); - free(raad.pb.buf); + para_printf(&raad.pb, "no match -- nothing removed\n"); + flush_and_free_pb(&raad.pb); + return 0; } -int com_rmatt(struct rc4_context *rc4c, int argc, char * const * const argv) +int com_rmatt(struct command_context *cc) { int ret; - if (argc < 2) + if (cc->argc < 2) return -E_ATTR_SYNTAX; - ret = send_standard_callback_request(argc - 1, argv + 1, com_rmatt_callback, - rc4_send_result, rc4c); + ret = send_standard_callback_request(cc->argc - 1, cc->argv + 1, + com_rmatt_callback, afs_cb_result_handler, cc); if (ret < 0) - rc4_send_va_buffer(rc4c, "%s\n", para_strerror(-ret)); + send_strerror(cc, -ret); return ret; } @@ -499,7 +438,7 @@ int com_rmatt(struct rc4_context *rc4c, 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)