X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=blob.c;h=ca39de0db5fc8fdb15009d0ed1c46ec14ca15087;hp=0b5f1f9b01f6102b6ff78bcae0645b6ee2debec1;hb=2b12fc963d15219721dd23eb7947bf516f2ad574;hpb=59a4f545566f77a22a8c27ece5155ecd154d4145 diff --git a/blob.c b/blob.c index 0b5f1f9b..ca39de0d 100644 --- a/blob.c +++ b/blob.c @@ -100,64 +100,47 @@ enum blob_ls_flags { 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; -}; - 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; + uint32_t flags = *(uint32_t *)aca->query.data; struct osl_object obj; uint32_t id; int ret; - if (!(lbad->flags & BLOB_LS_FLAG_LONG)) { - para_printf(&lbad->pb, "%s\n", name); + if (!(flags & BLOB_LS_FLAG_LONG)) { + 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, "cannot list %s\n", name); + para_printf(&aca->pbout, "cannot list %s\n", name); return ret; } id = *(uint32_t *)obj.data; - para_printf(&lbad->pb, "%u\t%s\n", id, name); + para_printf(&aca->pbout, "%u\t%s\n", id, name); return 1; } static int com_lsblob_callback(struct osl_table *table, struct afs_callback_arg *aca) { - struct lsblob_action_data lbad = { - .flags = *(uint32_t *)aca->query.data, - .pb = { - .max_size = shm_get_shmmax(), - .private_data = &(struct afs_max_size_handler_data) { - .fd = aca->fd, - .band = SBD_OUTPUT - }, - .max_size_handler = afs_max_size_handler, - } - }; + uint32_t flags = *(uint32_t *)aca->query.data; struct pattern_match_data pmd = { .table = table, .patterns = {.data = (char *)aca->query.data + sizeof(uint32_t), .size = aca->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) + if (flags & BLOB_LS_FLAG_REVERSE) pmd.pm_flags |= PM_REVERSE_LOOP; - if (!(lbad.flags & BLOB_LS_FLAG_SORT_BY_ID)) + if (!(flags & BLOB_LS_FLAG_SORT_BY_ID)) pmd.loop_col_num = BLOBCOL_NAME; else pmd.loop_col_num = BLOBCOL_ID; @@ -167,7 +150,6 @@ static int com_lsblob_callback(struct osl_table *table, if (pmd.num_matches == 0 && pmd.patterns.size > 0) ret = -E_NO_MATCH; out: - flush_and_free_pb(&lbad.pb); return ret; } @@ -252,10 +234,10 @@ static int com_catblob(afs_callback *f, struct command_context *cc) static int remove_blob(struct osl_table *table, struct osl_row *row, const char *name, void *data) { - struct para_buffer *pb = data; + struct afs_callback_arg *aca = data; int ret = osl(osl_del_row(table, row)); if (ret < 0) { - para_printf(pb, "cannot remove %s\n", name); + para_printf(&aca->pbout, "cannot remove %s\n", name); return ret; } return 1; @@ -265,21 +247,13 @@ static int com_rmblob_callback(struct osl_table *table, struct afs_callback_arg *aca) { int ret; - struct para_buffer pb = { - .max_size = shm_get_shmmax(), - .private_data = &(struct afs_max_size_handler_data) { - .fd = aca->fd, - .band = SBD_OUTPUT - }, - .max_size_handler = afs_max_size_handler, - }; struct pattern_match_data pmd = { .table = table, .patterns = aca->query, .loop_col_num = BLOBCOL_NAME, .match_col_num = BLOBCOL_NAME, .pm_flags = PM_SKIP_EMPTY_NAME, - .data = &pb, + .data = aca, .action = remove_blob }; ret = for_each_matching_row(&pmd); @@ -288,11 +262,11 @@ static int com_rmblob_callback(struct osl_table *table, if (pmd.num_matches == 0) ret = -E_NO_MATCH; else { - para_printf(&pb, "removed %d blob(s)\n", pmd.num_matches); - ret = afs_event(BLOB_RENAME, NULL, table); + para_printf(&aca->pbout, "removed %d blob(s)\n", + pmd.num_matches); + ret = afs_event(BLOB_REMOVE, NULL, table); } out: - flush_and_free_pb(&pb); return ret; } @@ -308,8 +282,8 @@ static int com_addblob_callback(struct osl_table *table, struct afs_callback_arg *aca) { struct osl_object objs[NUM_BLOB_COLUMNS]; - char *name = aca->query.data, *msg; - size_t name_len = strlen(name) + 1, msg_len; + char *name = aca->query.data; + size_t name_len = strlen(name) + 1; uint32_t id; unsigned num_rows; int ret; @@ -374,11 +348,9 @@ static int com_addblob_callback(struct osl_table *table, ret = afs_event(BLOB_ADD, NULL, table); out: if (ret < 0) - msg_len = xasprintf(&msg, "cannot add %s\n", name); + para_printf(&aca->pbout, "cannot add %s\n", name); else - msg_len = xasprintf(&msg, "added %s as id %u\n", name, id); - pass_buffer_as_shm(aca->fd, SBD_OUTPUT, msg, msg_len); - free(msg); + para_printf(&aca->pbout, "added %s as id %u\n", name, id); return ret; } @@ -471,27 +443,22 @@ static int com_mvblob_callback(struct osl_table *table, struct osl_object obj = {.data = src, .size = strlen(src) + 1}; char *dest = src + obj.size; struct osl_row *row; - struct para_buffer pb = { - .max_size = shm_get_shmmax(), - .private_data = &aca->fd, - .max_size_handler = afs_max_size_handler - }; int ret = osl(osl_get_row(table, BLOBCOL_NAME, &obj, &row)); if (ret < 0) { - para_printf(&pb, "cannot find source blob %s\n", src); + para_printf(&aca->pbout, "cannot find source blob %s\n", src); goto out; } obj.data = dest; obj.size = strlen(dest) + 1; ret = osl(osl_update_object(table, row, BLOBCOL_NAME, &obj)); if (ret < 0) { - para_printf(&pb, "cannot rename blob %s to %s\n", src, dest); + para_printf(&aca->pbout, "cannot rename blob %s to %s\n", + src, dest); goto out; } ret = afs_event(BLOB_RENAME, NULL, table); out: - flush_and_free_pb(&pb); return ret; } @@ -529,6 +496,8 @@ static int blob_get_name_by_id(struct osl_table *table, uint32_t id, ret = osl(osl_get_object(table, row, BLOBCOL_NAME, &obj)); if (ret < 0) return ret; + if (*(char *)obj.data == '\0') + return -E_DUMMY_ROW; *name = (char *)obj.data; return 1; }