X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=attribute.c;h=d94589871562038a7ba96aad85c741de0db05b65;hp=df66c9d08de75f1013d6bc3befbe31bfc8022f8a;hb=9ea225a753a04dfda2a5e3c482586861436bb5c1;hpb=133cbbe403c850da3efdaa6dcfc0cf55145d0aa2 diff --git a/attribute.c b/attribute.c index df66c9d0..7777a8dd 100644 --- a/attribute.c +++ b/attribute.c @@ -1,17 +1,23 @@ /* - * Copyright (C) 1997-2009 Andre Noll + * Copyright (C) 1997-2014 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; @@ -89,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; @@ -131,7 +137,7 @@ static int print_attribute(struct osl_table *table, struct osl_row *row, if (!(laad->flags & LSATT_FLAG_LONG)) return para_printf(&laad->pb, "%s\n", name); - 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)); return ret; @@ -145,9 +151,12 @@ static void 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 } }; @@ -167,18 +176,18 @@ static void com_lsatt_callback(int fd, const struct osl_object *query) 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); + pass_buffer_as_shm(fd, SBD_OUTPUT, laad.pb.buf, laad.pb.offset); free(laad.pb.buf); } -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)}; 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, "--")) { @@ -198,86 +207,13 @@ 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, send_result, &fd); - if (!ret) { - if (argc > 1) - ret = send_va_buffer(fd, "no matches\n"); - } else if (ret < 0) - send_va_buffer(fd, "%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_get_row(attribute_table, ATTCOL_NAME, &obj, &row); - if (ret < 0) - goto out; - ret = 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 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, 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 { @@ -291,9 +227,12 @@ static void com_addatt_callback(int fd, const struct osl_object *query) char *p; int ret = 1, ret2 = 0; 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; @@ -317,15 +256,15 @@ static void com_addatt_callback(int fd, const struct osl_object *query) goto out; 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; @@ -337,7 +276,7 @@ static void com_addatt_callback(int fd, 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; @@ -349,20 +288,20 @@ out: if (ret < 0 && ret2 >= 0) para_printf(&pb, "%s: %s\n", p, para_strerror(-ret)); if (pb.offset) - pass_buffer_as_shm(pb.buf, pb.offset, &fd); + pass_buffer_as_shm(fd, SBD_OUTPUT, pb.buf, pb.offset); free(pb.buf); } -int com_addatt(int fd, 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, - send_result, &fd); + ret = send_standard_callback_request(cc->argc - 1, cc->argv + 1, + com_addatt_callback, afs_cb_result_handler, cc); if (ret < 0) - send_va_buffer(fd, "%s\n", para_strerror(-ret)); + send_strerror(cc, -ret); return ret; } @@ -374,38 +313,41 @@ 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; - 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)); else afs_event(ATTRIBUTE_RENAME, &pb, NULL); if (pb.offset) - pass_buffer_as_shm(pb.buf, pb.offset, &fd); + pass_buffer_as_shm(fd, SBD_OUTPUT, pb.buf, pb.offset); free(pb.buf); } -int com_mvatt(int fd, 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, - send_result, &fd); + ret = send_standard_callback_request(cc->argc - 1, cc->argv + 1, + com_mvatt_callback, afs_cb_result_handler, cc); if (ret < 0) - send_va_buffer(fd, "%s\n", para_strerror(-ret)); + send_strerror(cc, -ret); return ret; } @@ -413,7 +355,7 @@ int com_mvatt(int fd, 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; @@ -429,7 +371,7 @@ static int remove_attribute(struct osl_table *table, struct osl_row *row, ret = get_attribute_bitnum_by_name(name, &red.bitnum); if (ret < 0) return para_printf(&raad->pb, "%s: %s\n", name, para_strerror(-ret)); - ret = osl_del_row(table, row); + 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); @@ -444,9 +386,12 @@ static void 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; @@ -464,20 +409,20 @@ static void com_rmatt_callback(int fd, const struct osl_object *query) 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); + pass_buffer_as_shm(fd, SBD_OUTPUT, raad.pb.buf, raad.pb.offset); free(raad.pb.buf); } -int com_rmatt(int fd, 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, - send_result, &fd); + ret = send_standard_callback_request(cc->argc - 1, cc->argv + 1, + com_rmatt_callback, afs_cb_result_handler, cc); if (ret < 0) - send_va_buffer(fd, "%s\n", para_strerror(-ret)); + send_strerror(cc, -ret); return ret; } @@ -493,7 +438,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) @@ -533,10 +478,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) { @@ -559,7 +504,7 @@ err: * * \sa osl_close_table(). */ -void attribute_close(void) +static void attribute_close(void) { osl_close_table(attribute_table, OSL_MARK_CLEAN); attribute_table = NULL; @@ -579,14 +524,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 >= 0 || ret == -OSL_ERRNO_TO_PARA_ERROR(E_OSL_NOENT)) return 1; return ret; } @@ -594,7 +539,7 @@ 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)); } /**