X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=attribute.c;h=cfb7dde0d0c1bc83160f6698bbe304d27007444b;hp=694a962bcd27e53788cd64636b3b165396973e6a;hb=ad6c68022eea0b0962855a2120cf242446bf10b9;hpb=f1aec8cff93dcd636dffb137cd7bdbd5f3c3dcff diff --git a/attribute.c b/attribute.c index 694a962b..cfb7dde0 100644 --- a/attribute.c +++ b/attribute.c @@ -1,16 +1,23 @@ /* - * Copyright (C) 1997-2007 Andre Noll + * Copyright (C) 1997-2009 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ /** \file attribute.c Attribute handling functions. */ + +#include +#include +#include + #include "para.h" #include "error.h" +#include "crypt.h" +#include "string.h" #include "afh.h" #include "afs.h" -#include "string.h" #include "net.h" +#include "ipc.h" static struct osl_table *attribute_table; static int greatest_att_bitnum; @@ -71,7 +78,7 @@ static void find_greatest_att_bitnum(void) return; } } while (c--); - PARA_INFO_LOG("%s\n", "no attributes"); + PARA_INFO_LOG("no attributes\n"); greatest_att_bitnum = -E_NO_ATTRIBUTES; } @@ -88,22 +95,28 @@ 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; 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 }; @@ -122,24 +135,28 @@ 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)) { - para_printf(&laad->pb, "%s\n", name); - return 1; - } - ret = osl_get_object(table, row, ATTCOL_BITNUM, &bitnum_obj); + if (!(laad->flags & LSATT_FLAG_LONG)) + return para_printf(&laad->pb, "%s\n", name); + 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(&laad->pb, "%s: %s\n", name, para_strerror(-ret)); return ret; } - para_printf(&laad->pb, "%u\t%s\n", *(unsigned char*)bitnum_obj.data, + return para_printf(&laad->pb, "%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 void com_lsatt_callback(int fd, const struct osl_object *query) { - struct lsatt_action_data laad = {.flags = *(unsigned *) query->data}; + struct lsatt_action_data laad = { + .flags = *(unsigned *) query->data, + .pb = { + .max_size = SHMMAX, + .private_data = &fd, + .max_size_handler = pass_buffer_as_shm + } + + }; struct pattern_match_data pmd = { .table = attribute_table, .loop_col_num = ATTCOL_BITNUM, @@ -150,27 +167,20 @@ static int com_lsatt_callback(const struct osl_object *query, .data = &laad, .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) 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; + for_each_matching_row(&pmd); + if (laad.pb.offset) + pass_buffer_as_shm(laad.pb.buf, laad.pb.offset, &fd); + free(laad.pb.buf); } -int com_lsatt(int fd, int argc, char * const * const argv) +int com_lsatt(struct rc4_context *rc4c, int argc, char * const * const argv) { unsigned flags = 0; - struct osl_object options = {.data = &flags, .size = sizeof(flags)}, - result; + struct osl_object options = {.data = &flags, .size = sizeof(flags)}; int ret, i; for (i = 1; i < argc; i++) { @@ -194,18 +204,17 @@ 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 - send_va_buffer(fd, "%s\n", PARA_STRERROR(-ret)); + 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 int com_setatt_callback(const struct osl_object *query, - __a_unused struct osl_object *result) +static void com_setatt_callback(__a_unused int fd, const struct osl_object *query) { char *p; uint64_t add_mask = 0, del_mask = 0; @@ -218,137 +227,201 @@ static int com_setatt_callback(const struct osl_object *query, char c; len = strlen(p); + ret = -E_ATTR_SYNTAX; if (!*p) - return -E_ATTR_SYNTAX; + 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); + 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); + goto out; + ret = osl(osl_get_object(attribute_table, row, ATTCOL_BITNUM, + &obj)); if (ret < 0) - return ret; + 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) - return -E_ATTR_SYNTAX; + 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 osl_row *aft_row; + struct afsi_change_event_data aced = {.old_afsi = &old_afsi}; len = strlen(p); - ret = aft_get_row_of_path(p, &aft_row); + ret = aft_get_row_of_path(p, &aced.aft_row); if (ret < 0) - return ret; - ret = get_afsi_object_of_row(aft_row, &obj); + goto out; + ret = get_afsi_object_of_row(aced.aft_row, &obj); if (ret < 0) - return ret; + goto out; ret = load_afsi(&old_afsi, &obj); if (ret < 0) - return ret; + goto out; new_afsi = old_afsi; new_afsi.attributes |= add_mask; new_afsi.attributes &= ~del_mask; save_afsi(&new_afsi, &obj); /* in-place update */ -// ret = mood_update_audio_file(aft_row, &old_afsi); -// if (ret < 0) -// return ret; + afs_event(AFSI_CHANGE, NULL, &aced); } - return 1; +out: + if (ret < 0) + PARA_NOTICE_LOG("%s\n", para_strerror(-ret)); } -int com_setatt(__a_unused int fd, int argc, char * const * const argv) +int com_setatt(__a_unused struct rc4_context *rc4c, int argc, char * const * const argv) { - if (argc < 2) + if (argc < 3) return -E_ATTR_SYNTAX; return send_standard_callback_request(argc - 1, argv + 1, com_setatt_callback, - NULL); + NULL, NULL); } -/* TODO: make it faster by only extracting the attribute member from afsi */ -static int logical_and_attribute(struct osl_row *aft_row, void *attribute_ptr) -{ - struct afs_info afsi; - uint64_t *att = attribute_ptr; - struct osl_object obj; - int ret = get_afsi_object_of_row(aft_row, &obj); - if (ret < 0) - return ret; - ret = load_afsi(&afsi, &obj); - if (ret < 0) - return ret; - afsi.attributes &= *att; - save_afsi(&afsi, &obj); - return 1; -} +struct addatt_event_data { + const char *name; + unsigned char bitnum; +}; + -static int com_addatt_callback(const struct osl_object *query, - __a_unused struct osl_object *result) +static void com_addatt_callback(int fd, const struct osl_object *query) { - char *p = query->data; - unsigned atts_added = 0; - int ret; + char *p; + int ret = 1, ret2 = 0; + struct para_buffer pb = { + .max_size = SHMMAX, + .private_data = &fd, + .max_size_handler = pass_buffer_as_shm + }; + size_t len; - while (p < (char *)query->data + query->size) { + for (p = query->data; p < (char *)query->data + query->size; p += len + 1) { 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; + 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; + continue; + } + if (ret != -OSL_ERRNO_TO_PARA_ERROR(E_OSL_RB_KEY_NOT_FOUND)) /* error */ + goto out; objs[ATTCOL_BITNUM].size = 1; - objs[ATTCOL_NAME].data = p; - objs[ATTCOL_NAME].size = strlen(p) + 1; - ret = osl_get_row(attribute_table, ATTCOL_NAME, - &objs[ATTCOL_NAME], &row); /* expected to fail */ - if (ret >= 0) - return -E_ATTR_EXISTS; - if (ret != -E_RB_KEY_NOT_FOUND) /* error */ - return ret; - /* find smallest non-used attribute */ + /* 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 */ - return ret; + goto out; /* this bit is already in use, try next bit */ } - if (bitnum == 64) - return -E_ATTR_TABLE_FULL; - ret = osl_add_row(attribute_table, objs); + if (bitnum == 64) { + ret = -E_ATT_TABLE_FULL; + goto out; + } + objs[ATTCOL_NAME].data = p; + objs[ATTCOL_NAME].size = len + 1; + ret = osl(osl_add_row(attribute_table, objs)); if (ret < 0) - return ret; - greatest_att_bitnum = PARA_MAX(greatest_att_bitnum, bitnum); - atts_added++; - p += strlen(p) + 1; + goto out; + aed.name = p; + aed.bitnum = bitnum; + afs_event(ATTRIBUTE_ADD, &pb, &aed); + greatest_att_bitnum = PARA_MAX(greatest_att_bitnum, (int)bitnum); } - if (!atts_added) - return 1; - find_greatest_att_bitnum(); - return reload_current_mood(); /* FIXME: returns an error */ +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); + free(pb.buf); } -int com_addatt(__a_unused int fd, int argc, char * const * const argv) +int com_addatt(struct rc4_context *rc4c, int argc, char * const * const argv) { + int ret; + if (argc < 2) return -E_ATTR_SYNTAX; - return send_standard_callback_request(argc - 1, argv + 1, com_addatt_callback, - NULL); + ret = send_standard_callback_request(argc - 1, argv + 1, com_addatt_callback, + rc4_send_result, rc4c); + if (ret < 0) + rc4_send_va_buffer(rc4c, "%s\n", para_strerror(-ret)); + return ret; } + +static void com_mvatt_callback(int fd, const struct osl_object *query) +{ + char *old = 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 = { + .max_size = SHMMAX, + .private_data = &fd, + .max_size_handler = pass_buffer_as_shm + }; + int ret; + + 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(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); + free(pb.buf); +} + +int com_mvatt(struct rc4_context *rc4c, int argc, char * const * const argv) +{ + int ret; + + if (argc != 3) + return -E_ATTR_SYNTAX; + ret = send_standard_callback_request(argc - 1, argv + 1, com_mvatt_callback, + rc4_send_result, rc4c); + if (ret < 0) + rc4_send_va_buffer(rc4c, "%s\n", para_strerror(-ret)); + return ret; +} + +/** 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; }; @@ -356,29 +429,33 @@ static int remove_attribute(struct osl_table *table, struct osl_row *row, const char *name, void *data) { struct remove_attribute_action_data *raad = data; - int ret = osl_del_row(table, row); - unsigned char bitnum; + int ret; + struct rmatt_event_data red = {.name = name}; - if (ret < 0) { - para_printf(&raad->pb, "%s: %s\n", name, PARA_STRERROR(-ret)); - return 1; - } - ret = get_attribute_bitnum_by_name(name, &bitnum); - if (ret < 0) { - para_printf(&raad->pb, "%s: %s\n", name, PARA_STRERROR(-ret)); - return 1; - } - para_printf(&raad->pb, "removed %s\n", 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)); + 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 << bitnum); - return 1; + raad->mask_of_removed_atts |= (1 << red.bitnum); + afs_event(ATTRIBUTE_REMOVE, &raad->pb, &red); + return ret; } -static int com_rmatt_callback(const struct osl_object *query, - struct osl_object *result) +static void com_rmatt_callback(int fd, const struct osl_object *query) { - struct remove_attribute_action_data raad = {.num_removed = 0}; - int ret; + struct remove_attribute_action_data raad = { + .num_removed = 0, + .pb = { + .max_size = SHMMAX, + .private_data = &fd, + .max_size_handler = pass_buffer_as_shm + } + }; + int ret, ret2 = 0; struct pattern_match_data pmd = { .table = attribute_table, .patterns = *query, @@ -389,43 +466,29 @@ static int com_rmatt_callback(const struct osl_object *query, }; ret = for_each_matching_row(&pmd); if (ret < 0) - para_printf(&raad.pb, "%s\n", PARA_STRERROR(-ret)); - if (raad.num_removed) { - uint64_t and_mask = ~raad.mask_of_removed_atts; - ret = audio_file_loop(&and_mask, logical_and_attribute); - if (ret < 0) - para_printf(&raad.pb, "%s\n", PARA_STRERROR(-ret)); - find_greatest_att_bitnum(); - ret = reload_current_mood(); - if (ret < 0) - para_printf(&raad.pb, "%s\n", PARA_STRERROR(-ret)); - } - if (!raad.pb.buf) - para_printf(&raad.pb, "no match -- nothing removed\n"); - result->data = raad.pb.buf; - result->size = raad.pb.size; - return 1; + 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(raad.pb.buf, raad.pb.offset, &fd); + free(raad.pb.buf); } -int com_rmatt(int fd, int argc, char * const * const argv) +int com_rmatt(struct rc4_context *rc4c, int argc, char * const * const argv) { int ret; - struct osl_object result; if (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)); + rc4_send_result, rc4c); + if (ret < 0) + rc4_send_va_buffer(rc4c, "%s\n", para_strerror(-ret)); return ret; } /** - * Return a binary representation of the geiven attribute value. + * Return a binary representation of the given attribute value. * * \param atts Pointer to the attribute value. * \param buf Result. @@ -465,8 +528,10 @@ int get_attribute_text(uint64_t *atts, const char *delim, char **text) const uint64_t one = 1; *text = NULL; - if (greatest_att_bitnum < 0) /* no attributes available */ + if (greatest_att_bitnum < 0) { /* no attributes available */ + *text = para_strdup("(no attributes available)"); return 1; + } for (i = 0; i <= greatest_att_bitnum; i++) { unsigned char bn = i; struct osl_object obj = {.data = &bn, .size = 1}; @@ -474,10 +539,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) { @@ -498,40 +563,54 @@ err: /** * Close the attribute table. * - * \param flags Ususal flags that are passed to osl_close_table(). - * * \sa osl_close_table(). */ -void attribute_shutdown(enum osl_close_flags flags) +void attribute_close(void) { - osl_close_table(attribute_table, flags); + osl_close_table(attribute_table, OSL_MARK_CLEAN); attribute_table = NULL; } /** * 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. * * \sa osl_open_table(). */ -int attribute_init(struct table_info *ti, const char *db) +static int attribute_open(const char *dir) { int ret; - attribute_table_desc.dir = db; - ti->desc = &attribute_table_desc; - ret = osl_open_table(ti->desc, &attribute_table); + attribute_table_desc.dir = dir; + 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 == -E_NOENT) + if (ret >= 0 || ret == -OSL_ERRNO_TO_PARA_ERROR(E_OSL_NOENT)) return 1; return ret; } + +static int attribute_create(const char *dir) +{ + attribute_table_desc.dir = dir; + 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->open = attribute_open; + t->close = attribute_close; + t->create = attribute_create; +}