X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=blob.c;h=cd571d74e5d40f71286ef8dc19aca635778f9429;hp=5ab5c1ce48fafd5ad3cbf4b0189202ef34aaa996;hb=53fe3c3cca7caef5565750181daf70aa0598c2a9;hpb=9e1a0bd6a42c4c5eed10728b3a765187bd408b49 diff --git a/blob.c b/blob.c index 5ab5c1ce..e10b522f 100644 --- a/blob.c +++ b/blob.c @@ -1,19 +1,43 @@ -/* - * Copyright (C) 2007-2009 Andre Noll - * - * Licensed under the GPL v2. For licencing details see COPYING. - */ +/* Copyright (C) 2007 Andre Noll , see file COPYING. */ /** \file blob.c Macros and functions for blob handling. */ +#include #include +#include +#include + +#include "server_cmd.lsg.h" #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 "portable_io.h" +#include "sideband.h" +#include "command.h" + +/** + * Compare two osl objects pointing to unsigned integers of 32 bit size. + * + * \param obj1 Pointer to the first integer. + * \param obj2 Pointer to the second integer. + * + * \return The values required for an osl compare function. + */ +static int uint32_compare(const struct osl_object *obj1, const struct osl_object *obj2) +{ + uint32_t d1 = read_u32(obj1->data); + uint32_t d2 = read_u32(obj2->data); + + if (d1 < d2) + return 1; + if (d1 > d2) + return -1; + return 0; +} static struct osl_column_description blob_cols[] = { [BLOBCOL_ID] = { @@ -36,238 +60,217 @@ static struct osl_column_description blob_cols[] = { } }; -/** \cond doxygen isn't smart enough to recognize these */ +/** Define an osl table description for a blob table. */ +#define DEFINE_BLOB_TABLE_DESC(table_name) \ + static struct osl_table_description table_name ## _table_desc = { \ + .name = #table_name, \ + .num_columns = NUM_BLOB_COLUMNS, \ + .flags = OSL_LARGE_TABLE, \ + .column_descriptions = blob_cols \ + }; + +/** Define a pointer to an osl blob table with a canonical name. */ +#define DEFINE_BLOB_TABLE_PTR(table_name) struct osl_table *table_name ## _table; + +/** Define a blob table. */ +#define INIT_BLOB_TABLE(table_name) \ + DEFINE_BLOB_TABLE_DESC(table_name); \ + DEFINE_BLOB_TABLE_PTR(table_name); + +/* doxygen isn't smart enough to recognize these */ +/** \cond blob_table */ INIT_BLOB_TABLE(lyrics); INIT_BLOB_TABLE(images); INIT_BLOB_TABLE(moods); INIT_BLOB_TABLE(playlists); -/** \endcond */ - -/** Flags that may be passed to the \p ls functions of each blob type. */ -enum blob_ls_flags { - /** List both id and name. */ - BLOB_LS_FLAG_LONG = 1, - /** Reverse sort order. */ - BLOB_LS_FLAG_REVERSE = 2, - /** Sort by id instead of name. */ - BLOB_LS_FLAG_SORT_BY_ID = 4, -}; - -/** Structure passed to the \p print_blob function. */ -struct lsblob_action_data { - /** The flags given at the command line. */ - uint32_t flags; - /** Message buffer. */ - struct para_buffer pb; -}; +/** \endcond blob_table */ static int print_blob(struct osl_table *table, struct osl_row *row, const char *name, void *data) { - struct lsblob_action_data *lbad = data; + struct afs_callback_arg *aca = data; + bool l_given = SERVER_CMD_OPT_GIVEN(LSMOOD, LONG, aca->lpr); struct osl_object obj; uint32_t id; int ret; - if (!(lbad->flags & BLOB_LS_FLAG_LONG)) - return para_printf(&lbad->pb, "%s\n", name); - ret = osl_get_object(table, row, BLOBCOL_ID, &obj); + if (!l_given) { + para_printf(&aca->pbout, "%s\n", name); + return 0; + } + ret = osl(osl_get_object(table, row, BLOBCOL_ID, &obj)); if (ret < 0) { - para_printf(&lbad->pb, "%s: %s\n", name, para_strerror(-ret)); + para_printf(&aca->pbout, "cannot list %s\n", name); return ret; } id = *(uint32_t *)obj.data; - return para_printf(&lbad->pb, "%u\t%s\n", id, name); + para_printf(&aca->pbout, "%u\t%s\n", id, name); + return 1; } -static void com_lsblob_callback(struct osl_table *table, - int fd, const struct osl_object *query) +static int com_lsblob_callback(const struct lls_command * const cmd, + struct osl_table *table, struct afs_callback_arg *aca) { - struct lsblob_action_data lbad = { - .flags = *(uint32_t *)query->data, - .pb = { - .max_size = SHMMAX, - .private_data = &fd, - .max_size_handler = pass_buffer_as_shm - } - }; + bool i_given, r_given; struct pattern_match_data pmd = { .table = table, - .patterns = {.data = (char *)query->data + sizeof(uint32_t), - .size = query->size - sizeof(uint32_t)}, .pm_flags = PM_NO_PATTERN_MATCHES_EVERYTHING | PM_SKIP_EMPTY_NAME, .match_col_num = BLOBCOL_NAME, - .data = &lbad, + .data = aca, .action = print_blob, }; int ret; - if (lbad.flags & BLOB_LS_FLAG_REVERSE) + ret = lls_deserialize_parse_result(aca->query.data, cmd, &aca->lpr); + pmd.lpr = aca->lpr; + assert(ret >= 0); + i_given = SERVER_CMD_OPT_GIVEN(LSMOOD, ID_SORT, aca->lpr); + r_given = SERVER_CMD_OPT_GIVEN(LSMOOD, REVERSE, aca->lpr); + + if (r_given) pmd.pm_flags |= PM_REVERSE_LOOP; - if (!(lbad.flags & BLOB_LS_FLAG_SORT_BY_ID)) - pmd.loop_col_num = BLOBCOL_NAME; - else + if (i_given) pmd.loop_col_num = BLOBCOL_ID; + else + pmd.loop_col_num = BLOBCOL_NAME; ret = for_each_matching_row(&pmd); if (ret < 0) - para_printf(&lbad.pb, "%s\n", para_strerror(-ret)); - if (lbad.pb.offset) - pass_buffer_as_shm(lbad.pb.buf, lbad.pb.offset, &fd); - free(lbad.pb.buf); + goto out; + if (pmd.num_matches == 0 && lls_num_inputs(aca->lpr) > 0) + ret = -E_NO_MATCH; +out: + lls_free_parse_result(aca->lpr, cmd); + return ret; } -static int com_lsblob(callback_function *f, int fd, int argc, char * const * const argv) +static int com_lsblob(afs_callback *f, const struct lls_command * const cmd, + struct command_context *cc, struct lls_parse_result *lpr) { - uint32_t flags = 0; - struct osl_object options = {.data = &flags, .size = sizeof(flags)}; - int i; - - for (i = 1; i < argc; i++) { - const char *arg = argv[i]; - if (arg[0] != '-') - break; - if (!strcmp(arg, "--")) { - i++; - break; - } - if (!strcmp(arg, "-l")) { - flags |= BLOB_LS_FLAG_LONG; - continue; - } - if (!strcmp(arg, "-i")) { - flags |= BLOB_LS_FLAG_SORT_BY_ID; - continue; - } - if (!strcmp(arg, "-r")) { - flags |= BLOB_LS_FLAG_REVERSE; - continue; - } - break; - } -// if (argc > i) -// return -E_BLOB_SYNTAX; - return send_option_arg_callback_request(&options, argc - i, - argv + i, f, send_result, &fd); + return send_lls_callback_request(f, cmd, lpr, cc); } static int cat_blob(struct osl_table *table, struct osl_row *row, __a_unused const char *name, void *data) { - int ret = 0, ret2; + int ret = 0, ret2, fd = *(int *)data; struct osl_object obj; - ret = osl_open_disk_object(table, row, BLOBCOL_DEF, &obj); + ret = osl(osl_open_disk_object(table, row, BLOBCOL_DEF, &obj)); if (ret < 0) - return ret; - if (obj.size) - ret = pass_buffer_as_shm(obj.data, obj.size, data); - ret2 = osl_close_disk_object(&obj); + return (ret == osl(-E_OSL_EMPTY))? 0 : ret; + assert(obj.size > 0); + ret = pass_buffer_as_shm(fd, SBD_OUTPUT, obj.data, obj.size); + ret2 = osl(osl_close_disk_object(&obj)); return (ret < 0)? ret : ret2; } -static void com_catblob_callback(struct osl_table *table, int fd, - const struct osl_object *query) +static int com_catblob_callback(const struct lls_command * const cmd, + struct osl_table *table, struct afs_callback_arg *aca) { + int ret; struct pattern_match_data pmd = { .table = table, - .patterns = *query, .loop_col_num = BLOBCOL_NAME, .match_col_num = BLOBCOL_NAME, .pm_flags = PM_SKIP_EMPTY_NAME, - .data = &fd, + .data = &aca->fd, .action = cat_blob }; - for_each_matching_row(&pmd); + + ret = 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; } -static int com_catblob(callback_function *f, int fd, int argc, - char * const * const argv) +static int com_catblob(afs_callback *f, const struct lls_command * const cmd, + struct command_context *cc, struct lls_parse_result *lpr) { - if (argc < 2) - return -E_BLOB_SYNTAX; - return send_standard_callback_request(argc - 1, argv + 1, f, send_result, &fd); -} + char *errctx; + int ret = lls(lls_check_arg_count(lpr, 1, INT_MAX, &errctx)); -/** Used for removing rows from a blob table. */ -struct rmblob_data { - /** Message buffer. */ - struct para_buffer pb; - /** Number of removed blobs. */ - unsigned num_removed; -}; + if (ret < 0) { + send_errctx(cc, errctx); + return ret; + } + return send_lls_callback_request(f, cmd, lpr, cc); +} static int remove_blob(struct osl_table *table, struct osl_row *row, const char *name, void *data) { - struct rmblob_data *rmbd = data; - int ret = osl_del_row(table, row); + struct afs_callback_arg *aca = data; + int ret = osl(osl_del_row(table, row)); + if (ret < 0) { - para_printf(&rmbd->pb, "%s: %s\n", name, para_strerror(-ret)); + para_printf(&aca->pbout, "cannot remove %s\n", name); return ret; } - rmbd->num_removed++; return 1; } -static void com_rmblob_callback(struct osl_table *table, int fd, - const struct osl_object *query) +static int com_rmblob_callback(const struct lls_command * const cmd, + struct osl_table *table, struct afs_callback_arg *aca) { - int ret, ret2 = 0; - struct rmblob_data rmbd = { - .num_removed = 0, - .pb = { - .max_size = SHMMAX, - .private_data = &fd, - .max_size_handler = pass_buffer_as_shm - } - }; + int ret; struct pattern_match_data pmd = { .table = table, - .patterns = *query, .loop_col_num = BLOBCOL_NAME, .match_col_num = BLOBCOL_NAME, .pm_flags = PM_SKIP_EMPTY_NAME, - .data = &rmbd, + .data = aca, .action = remove_blob }; + + ret = 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(&rmbd.pb, "%s\n", para_strerror(-ret)); - if (ret2 < 0) - goto out; - } - if (!rmbd.num_removed) - ret2 = para_printf(&rmbd.pb, "no matches, nothing removed\n"); + if (ret < 0) + goto out; + if (pmd.num_matches == 0) + ret = -E_NO_MATCH; else { - ret2 = para_printf(&rmbd.pb, "removed %d blobs\n", rmbd.num_removed); - afs_event(BLOB_RENAME, NULL, table); + para_printf(&aca->pbout, "removed %u blob(s)\n", + pmd.num_matches); + ret = afs_event(BLOB_REMOVE, NULL, table); } out: - if (ret2 >= 0 && rmbd.pb.offset) - pass_buffer_as_shm(rmbd.pb.buf, rmbd.pb.offset, &fd); - free(rmbd.pb.buf); + lls_free_parse_result(aca->lpr, cmd); + return ret; } -static int com_rmblob(callback_function *f, int fd, int argc, - char * const * const argv) +static int com_rmblob(afs_callback *f, const struct lls_command * const cmd, + struct command_context *cc, struct lls_parse_result *lpr) { - if (argc < 2) - return -E_MOOD_SYNTAX; - return send_option_arg_callback_request(NULL, argc - 1, argv + 1, f, - send_result, &fd); + 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(f, cmd, lpr, cc); } -static void com_addblob_callback(struct osl_table *table, __a_unused int fd, - const struct osl_object *query) +static int com_addblob_callback(__a_unused const struct lls_command * const cmd, + struct osl_table *table, struct afs_callback_arg *aca) { struct osl_object objs[NUM_BLOB_COLUMNS]; - char *name = query->data; + char *name = aca->query.data; size_t name_len = strlen(name) + 1; uint32_t id; unsigned num_rows; int ret; - ret = osl_get_num_rows(table, &num_rows); + ret = osl(osl_get_num_rows(table, &num_rows)); if (ret < 0) goto out; if (!num_rows) { /* this is the first entry ever added */ @@ -279,34 +282,38 @@ static void com_addblob_callback(struct osl_table *table, __a_unused int fd, objs[BLOBCOL_NAME].size = 1; objs[BLOBCOL_DEF].data = ""; objs[BLOBCOL_DEF].size = 1; - ret = osl_add_row(table, objs); + ret = osl(osl_add_row(table, objs)); if (ret < 0) goto out; } else { /* check if name already exists */ struct osl_row *row; struct osl_object obj = {.data = name, .size = name_len}; - ret = osl_get_row(table, BLOBCOL_NAME, &obj, &row); - if (ret < 0 && ret != -E_RB_KEY_NOT_FOUND) + ret = osl(osl_get_row(table, BLOBCOL_NAME, &obj, &row)); + if (ret < 0 && ret != -OSL_ERRNO_TO_PARA_ERROR(E_OSL_RB_KEY_NOT_FOUND)) goto out; if (ret >= 0) { /* we already have a blob with this name */ + ret = osl(osl_get_object(table, row, BLOBCOL_ID, &obj)); + if (ret < 0) + goto out; + id = *(uint32_t *)obj.data; obj.data = name + name_len; - obj.size = query->size - name_len; - ret = osl_update_object(table, row, BLOBCOL_DEF, &obj); + obj.size = aca->query.size - name_len; + ret = osl(osl_update_object(table, row, BLOBCOL_DEF, &obj)); goto out; } /* new blob, get id of the dummy row and increment it */ obj.data = ""; obj.size = 1; - ret = osl_get_row(table, BLOBCOL_NAME, &obj, &row); + ret = osl(osl_get_row(table, BLOBCOL_NAME, &obj, &row)); if (ret < 0) goto out; - ret = osl_get_object(table, row, BLOBCOL_ID, &obj); + ret = osl(osl_get_object(table, row, BLOBCOL_ID, &obj)); if (ret < 0) goto out; id = *(uint32_t *)obj.data + 1; obj.data = &id; - ret = osl_update_object(table, row, BLOBCOL_ID, &obj); + ret = osl(osl_update_object(table, row, BLOBCOL_ID, &obj)); if (ret < 0) goto out; } @@ -316,71 +323,163 @@ static void com_addblob_callback(struct osl_table *table, __a_unused int fd, objs[BLOBCOL_NAME].data = name; objs[BLOBCOL_NAME].size = name_len; objs[BLOBCOL_DEF].data = name + name_len; - objs[BLOBCOL_DEF].size = query->size - name_len; - ret = osl_add_row(table, objs); + objs[BLOBCOL_DEF].size = aca->query.size - name_len; + ret = osl(osl_add_row(table, objs)); if (ret < 0) goto out; - afs_event(BLOB_ADD, NULL, table); + ret = afs_event(BLOB_ADD, NULL, table); out: if (ret < 0) - PARA_NOTICE_LOG("%s\n", para_strerror(-ret)); + para_printf(&aca->pbout, "cannot add %s\n", name); + else + para_printf(&aca->pbout, "added %s as id %u\n", name, id); + return ret; } -static int com_addblob(callback_function *f, int fd, int argc, - char * const * const argv) +/* Write input from fd to dynamically allocated buffer, but maximal 10M. */ +static int fd2buf(struct stream_cipher_context *scc, struct osl_object *obj) { - struct osl_object arg_obj; + size_t max_size = 10 * 1024 * 1024; + int ret; + struct iovec iov; - if (argc != 2) - return -E_BLOB_SYNTAX; - if (!*argv[1]) /* empty name is reserved for the dummy row */ + obj->data = NULL; + obj->size = 0; +again: + do { + ret = recv_sb(scc, SBD_BLOB_DATA, max_size, &iov); + } while (ret == 0); + + if (ret < 0) { + free(obj->data); + obj->data = NULL; + obj->size = 0; + return ret; + } + if (iov.iov_len == 0) /* end of blob */ + return 1; + if (!obj->data) { + obj->data = iov.iov_base; + obj->size = iov.iov_len; + } else { + obj->data = para_realloc(obj->data, obj->size + iov.iov_len); + memcpy(obj->data + obj->size, iov.iov_base, iov.iov_len); + obj->size += iov.iov_len; + free(iov.iov_base); + max_size -= iov.iov_len; + } + goto again; + return 1; +} + +/* + * Read blob from a file descriptor and send it to afs. + * + * This function is called from the addblob command handlers to instruct the + * afs process to store the input in a blob table. Input is read and decrypted + * from the file descriptor given by cc and appended to a buffer which also contains + * the name of the blob to create. The combined buffer is made available to the + * afs process via the callback method. + */ +static int stdin_command(struct command_context *cc, + struct lls_parse_result *lpr, afs_callback *f) +{ + struct osl_object query, stdin_obj; + int ret; + size_t len = strlen(lls_input(0, lpr)); + + ret = send_sb(&cc->scc, NULL, 0, SBD_AWAITING_DATA, false); + if (ret < 0) + return ret; + ret = fd2buf(&cc->scc, &stdin_obj); + if (ret < 0) + return ret; + query.size = len + 1 + stdin_obj.size; + query.data = para_malloc(query.size); + memcpy(query.data, lls_input(0, lpr), len + 1); + if (stdin_obj.size > 0) + memcpy((char *)query.data + len + 1, stdin_obj.data, + stdin_obj.size); + free(stdin_obj.data); + ret = send_callback_request(f, &query, afs_cb_result_handler, cc); + free(query.data); + return ret; +} + +static int com_addblob(afs_callback *f, __a_unused const struct lls_command * const cmd, + struct command_context *cc, struct lls_parse_result *lpr) +{ + char *errctx; + int ret = lls(lls_check_arg_count(lpr, 1, 1, &errctx)); + + if (ret < 0) { + send_errctx(cc, errctx); + return ret; + } + if (!lls_input(0, lpr)[0]) /* empty name is reserved for the dummy row */ return -E_BLOB_SYNTAX; - arg_obj.size = strlen(argv[1]) + 1; - arg_obj.data = (char *)argv[1]; - return stdin_command(fd, &arg_obj, f, 10 * 1024 * 1024, NULL, NULL); + return stdin_command(cc, lpr, f); } -/* FIXME: Print output to client, not to log file */ -static void com_mvblob_callback(struct osl_table *table, __a_unused int fd, - const struct osl_object *query) +static int com_mvblob_callback(const struct lls_command * const cmd, + struct osl_table *table, struct afs_callback_arg *aca) { - char *src = (char *) query->data; - struct osl_object obj = {.data = src, .size = strlen(src) + 1}; - char *dest = src + obj.size; + const char *src, *dest; + struct osl_object obj; struct osl_row *row; - int ret = osl_get_row(table, BLOBCOL_NAME, &obj, &row); + int ret; - if (ret < 0) + ret = lls_deserialize_parse_result(aca->query.data, cmd, &aca->lpr); + assert(ret >= 0); + src = lls_input(0, aca->lpr); + dest = lls_input(1, aca->lpr); + obj.data = (char *)src; + obj.size = strlen(src) + 1; + ret = osl(osl_get_row(table, BLOBCOL_NAME, &obj, &row)); + + if (ret < 0) { + para_printf(&aca->pbout, "cannot find source blob %s\n", src); goto out; - obj.data = dest; + } + obj.data = (char *)dest; obj.size = strlen(dest) + 1; - ret = osl_update_object(table, row, BLOBCOL_NAME, &obj); - if (ret < 0) + ret = osl(osl_update_object(table, row, BLOBCOL_NAME, &obj)); + if (ret < 0) { + para_printf(&aca->pbout, "cannot rename blob %s to %s\n", + src, dest); goto out; - afs_event(BLOB_RENAME, NULL, table); + } + ret = afs_event(BLOB_RENAME, NULL, table); out: - if (ret < 0) - PARA_NOTICE_LOG("%s\n", para_strerror(-ret)); + lls_free_parse_result(aca->lpr, cmd); + return ret; } -static int com_mvblob(callback_function *f, __a_unused int fd, - int argc, char * const * const argv) +static int com_mvblob(afs_callback *f, const struct lls_command * const cmd, + struct command_context *cc, struct lls_parse_result *lpr) { - if (argc != 3) - return -E_MOOD_SYNTAX; - return send_option_arg_callback_request(NULL, argc - 1, argv + 1, f, - NULL, NULL); + 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(f, cmd, lpr, cc); } -#define DEFINE_BLOB_COMMAND(cmd_name, table_name, cmd_prefix) \ - static void com_ ## cmd_name ## cmd_prefix ## _callback(int fd, const struct osl_object *query) \ +#define DEFINE_BLOB_COMMAND(cmd_name, c_cmd_name, table_name, short_name, c_short_name) \ + static int com_ ## cmd_name ## short_name ## _callback(struct afs_callback_arg *aca) \ { \ - return com_ ## cmd_name ## blob_callback(table_name ## _table, fd, query); \ + const struct lls_command *cmd = SERVER_CMD_CMD_PTR(c_cmd_name ## c_short_name); \ + return com_ ## cmd_name ## blob_callback(cmd, table_name ## _table, aca); \ } \ - int com_ ## cmd_name ## cmd_prefix(int fd, int argc, char * const * const argv) \ + static int com_ ## cmd_name ## short_name(struct command_context *cc, struct lls_parse_result *lpr) \ { \ - return com_ ## cmd_name ## blob(com_ ## cmd_name ## cmd_prefix ## _callback, fd, argc, argv); \ - } + const struct lls_command *cmd = SERVER_CMD_CMD_PTR(c_cmd_name ## c_short_name); \ + return com_ ## cmd_name ## blob(com_ ## cmd_name ## short_name ## _callback, cmd, cc, lpr); \ + } \ + EXPORT_SERVER_CMD_HANDLER(cmd_name ## short_name); static int blob_get_name_by_id(struct osl_table *table, uint32_t id, char **name) @@ -389,16 +488,20 @@ static int blob_get_name_by_id(struct osl_table *table, uint32_t id, struct osl_object obj = {.data = &id, .size = sizeof(id)}; int ret; - *name = NULL; + if (name) + *name = NULL; if (!id) return 1; - ret = osl_get_row(table, BLOBCOL_ID, &obj, &row); + ret = osl(osl_get_row(table, BLOBCOL_ID, &obj, &row)); if (ret < 0) return ret; - ret = osl_get_object(table, row, BLOBCOL_NAME, &obj); + ret = osl(osl_get_object(table, row, BLOBCOL_NAME, &obj)); if (ret < 0) return ret; - *name = (char *)obj.data; + if (*(char *)obj.data == '\0') + return -E_DUMMY_ROW; + if (name) + *name = (char *)obj.data; return 1; } @@ -409,7 +512,6 @@ static int blob_get_name_by_id(struct osl_table *table, uint32_t id, return blob_get_name_by_id(table_name ## _table, id, name); \ } - static int blob_get_def_by_name(struct osl_table *table, char *name, struct osl_object *def) { @@ -420,10 +522,10 @@ static int blob_get_def_by_name(struct osl_table *table, char *name, def->data = NULL; if (!*name) return 1; - ret = osl_get_row(table, BLOBCOL_NAME, &obj, &row); + ret = osl(osl_get_row(table, BLOBCOL_NAME, &obj, &row)); if (ret < 0) return ret; - return osl_open_disk_object(table, row, BLOBCOL_DEF, def); + return osl(osl_open_disk_object(table, row, BLOBCOL_DEF, def)); } /** Define the \p get_def_by_id function for this blob type. */ @@ -443,10 +545,10 @@ static int blob_get_def_by_id(struct osl_table *table, uint32_t id, def->data = NULL; if (!id) return 1; - ret = osl_get_row(table, BLOBCOL_ID, &obj, &row); + ret = osl(osl_get_row(table, BLOBCOL_ID, &obj, &row)); if (ret < 0) return ret; - return osl_open_disk_object(table, row, BLOBCOL_DEF, def); + return osl(osl_open_disk_object(table, row, BLOBCOL_DEF, def)); } /** Define the \p get_def_by_id function for this blob type. */ @@ -460,11 +562,12 @@ static int blob_get_name_and_def_by_row(struct osl_table *table, const struct osl_row *row, char **name, struct osl_object *def) { struct osl_object obj; - int ret = osl_get_object(table, row, BLOBCOL_NAME, &obj); + int ret = osl(osl_get_object(table, row, BLOBCOL_NAME, &obj)); + if (ret < 0) return ret; *name = obj.data; - return osl_open_disk_object(table, row, BLOBCOL_DEF, def); + return osl(osl_open_disk_object(table, row, BLOBCOL_DEF, def)); } /** Define the \p get_name_and_def_by_row function for this blob type. */ #define DEFINE_GET_NAME_AND_DEF_BY_ROW(table_name, cmd_prefix) \ @@ -488,7 +591,7 @@ static int blob_get_name_and_def_by_row(struct osl_table *table, static int table_name ## _create(const char *dir) \ { \ table_name ## _table_desc.dir = dir; \ - return osl_create_table(&table_name ## _table_desc); \ + return osl(osl_create_table(&table_name ## _table_desc)); \ } static int blob_open(struct osl_table **table, @@ -496,12 +599,13 @@ static int blob_open(struct osl_table **table, const char *dir) { int ret; + desc->dir = dir; - ret = osl_open_table(desc, table); + ret = osl(osl_open_table(desc, table)); if (ret >= 0) return ret; *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; } @@ -527,24 +631,25 @@ static int blob_open(struct osl_table **table, /** Define all functions for this blob type. */ -#define DEFINE_BLOB_FUNCTIONS(table_name, cmd_prefix) \ +#define DEFINE_BLOB_FUNCTIONS(table_name, short_name, c_short_name) \ DEFINE_BLOB_OPEN(table_name) \ DEFINE_BLOB_CLOSE(table_name) \ DEFINE_BLOB_CREATE(table_name) \ DEFINE_BLOB_INIT(table_name) \ - DEFINE_BLOB_COMMAND(ls, table_name, cmd_prefix) \ - DEFINE_BLOB_COMMAND(cat, table_name, cmd_prefix) \ - DEFINE_BLOB_COMMAND(add, table_name, cmd_prefix) \ - DEFINE_BLOB_COMMAND(rm, table_name, cmd_prefix) \ - DEFINE_BLOB_COMMAND(mv, table_name, cmd_prefix) \ - DEFINE_GET_NAME_BY_ID(table_name, cmd_prefix); \ - DEFINE_GET_DEF_BY_ID(table_name, cmd_prefix); \ - DEFINE_GET_DEF_BY_NAME(table_name, cmd_prefix); \ - DEFINE_GET_NAME_AND_DEF_BY_ROW(table_name, cmd_prefix); \ - -/** \cond doxygen isn't smart enough to recognize these */ -DEFINE_BLOB_FUNCTIONS(lyrics, lyr); -DEFINE_BLOB_FUNCTIONS(images, img); -DEFINE_BLOB_FUNCTIONS(moods, mood); -DEFINE_BLOB_FUNCTIONS(playlists, pl); -/** \endcond */ + DEFINE_BLOB_COMMAND(ls, LS, table_name, short_name, c_short_name) \ + DEFINE_BLOB_COMMAND(cat, CAT, table_name, short_name, c_short_name) \ + DEFINE_BLOB_COMMAND(add, ADD, table_name, short_name, c_short_name) \ + DEFINE_BLOB_COMMAND(rm, RM, table_name, short_name, c_short_name) \ + DEFINE_BLOB_COMMAND(mv, MV, table_name, short_name, c_short_name) \ + DEFINE_GET_NAME_BY_ID(table_name, short_name); \ + DEFINE_GET_DEF_BY_ID(table_name, short_name); \ + DEFINE_GET_DEF_BY_NAME(table_name, short_name); \ + DEFINE_GET_NAME_AND_DEF_BY_ROW(table_name, short_name); \ + +/* doxygen isn't smart enough to recognize these */ +/** \cond blob_function */ +DEFINE_BLOB_FUNCTIONS(lyrics, lyr, LYR); +DEFINE_BLOB_FUNCTIONS(images, img, IMG); +DEFINE_BLOB_FUNCTIONS(moods, mood, MOOD); +DEFINE_BLOB_FUNCTIONS(playlists, pl, PL); +/** \endcond blob_function */