/*
- * Copyright (C) 2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2008 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
/** 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;
};
}
ret = osl_get_object(table, row, BLOBCOL_ID, &obj);
if (ret < 0) {
- para_printf(&lbad->pb, "%s: %s\n", name, PARA_STRERROR(-ret));
+ para_printf(&lbad->pb, "%s: %s\n", name, para_strerror(-ret));
return ret;
}
id = *(uint32_t *)obj.data;
if (lbad.flags & BLOB_LS_FLAG_REVERSE)
pmd.pm_flags |= PM_REVERSE_LOOP;
if (!(lbad.flags & BLOB_LS_FLAG_SORT_BY_ID))
- pmd.loop_col_num = BLOBCOL_ID;
- else
pmd.loop_col_num = BLOBCOL_NAME;
+ else
+ pmd.loop_col_num = BLOBCOL_ID;
ret = for_each_matching_row(&pmd);
if (ret < 0)
- para_printf(&lbad.pb, "%s\n", PARA_STRERROR(-ret));
+ para_printf(&lbad.pb, "%s\n", para_strerror(-ret));
if (!lbad.pb.buf)
return 0;
result->data = lbad.pb.buf;
- result->size = lbad.pb.size;
+ result->size = lbad.pb.offset;
return 1;
}
static int com_lsblob(callback_function *f, int fd, int argc, char * const * const argv)
{
uint32_t flags = 0;
- struct osl_object options = {.data = &flags, .size = sizeof(flags)},
- result;
- int i, ret;
+ struct osl_object options = {.data = &flags, .size = sizeof(flags)};
+ int i;
for (i = 1; i < argc; i++) {
const char *arg = argv[i];
}
// if (argc > i)
// return -E_BLOB_SYNTAX;
- ret = send_option_arg_callback_request(&options, argc - i,
- argv + i, f, &result);
- if (ret > 0) {
- send_buffer(fd, (char *)result.data);
- free(result.data);
- }
- return ret;
+ return send_option_arg_callback_request(&options, argc - i,
+ argv + i, f, send_result, &fd);
}
static int cat_blob(struct osl_table *table, struct osl_row *row,
static int com_catblob(callback_function *f, int fd, int argc,
char * const * const argv)
{
- struct osl_object result;
- int ret;
-
if (argc < 2)
return -E_BLOB_SYNTAX;
- ret = send_standard_callback_request(argc - 1, argv + 1, f, &result);
- if (ret > 0) {
- ret = send_bin_buffer(fd, (char *)result.data, result.size);
- free(result.data);
- }
- return ret;
+ return send_standard_callback_request(argc - 1, argv + 1, f, send_result, &fd);
}
+/** Used for removing rows from a blob table. */
struct rmblob_data {
+ /** Message buffer. */
struct para_buffer pb;
+ /** Number of removed blobs. */
unsigned num_removed;
};
struct rmblob_data *rmbd = data;
int ret = osl_del_row(table, row);
if (ret < 0) {
- para_printf(&rmbd->pb, "%s: %s\n", name, PARA_STRERROR(-ret));
+ para_printf(&rmbd->pb, "%s: %s\n", name, para_strerror(-ret));
return ret;
}
rmbd->num_removed++;
static int com_rmblob_callback(struct osl_table *table,
const struct osl_object *query,
- __a_unused struct osl_object *result)
+ struct osl_object *result)
{
int ret;
struct rmblob_data rmbd = {.num_removed = 0};
result->data = NULL;
ret = for_each_matching_row(&pmd);
if (ret < 0)
- para_printf(&rmbd.pb, "%s\n", PARA_STRERROR(-ret));
+ para_printf(&rmbd.pb, "%s\n", para_strerror(-ret));
if (!rmbd.num_removed)
para_printf(&rmbd.pb, "no matches, nothing removed\n");
- else
+ else {
para_printf(&rmbd.pb, "removed %d blobs\n", rmbd.num_removed);
+ afs_event(BLOB_RENAME, NULL, table);
+ }
result->data = rmbd.pb.buf;
- result->size = rmbd.pb.size;
+ result->size = rmbd.pb.offset;
return 1;
}
-static int com_rmblob(callback_function *f, __a_unused int fd, int argc,
+static int com_rmblob(callback_function *f, int fd, int argc,
char * const * const argv)
{
- int ret;
- struct osl_object result;
-
if (argc < 2)
return -E_MOOD_SYNTAX;
- ret = send_option_arg_callback_request(NULL, argc - 1, argv + 1, f,
- &result);
- if (ret > 0) {
- send_buffer(fd, (char *)result.data);
- free(result.data);
- }
- return ret;
+ return send_option_arg_callback_request(NULL, argc - 1, argv + 1, f,
+ send_result, &fd);
}
static int com_addblob_callback(struct osl_table *table,
objs[BLOBCOL_NAME].size = name_len;
objs[BLOBCOL_DEF].data = name + name_len;
objs[BLOBCOL_DEF].size = query->size - name_len;
- return osl_add_row(table, objs);
+ ret = osl_add_row(table, objs);
+ if (ret < 0)
+ return ret;
+ afs_event(BLOB_ADD, NULL, table);
+ return 1;
}
static int com_addblob(callback_function *f, int fd, int argc,
PARA_NOTICE_LOG("argv[1]: %s\n", argv[1]);
arg_obj.size = strlen(argv[1]) + 1;
arg_obj.data = (char *)argv[1];
- return stdin_command(fd, &arg_obj, f, 10 * 1024 * 1024, NULL);
+ return stdin_command(fd, &arg_obj, f, 10 * 1024 * 1024, NULL, NULL);
}
static int com_mvblob_callback(struct osl_table *table,
return ret;
obj.data = dest;
obj.size = strlen(dest) + 1;
- return osl_update_object(table, row, BLOBCOL_NAME, &obj);
+ ret = osl_update_object(table, row, BLOBCOL_NAME, &obj);
+ if (ret < 0)
+ return ret;
+ afs_event(BLOB_RENAME, NULL, table);
+ return 1;
}
-static int com_mvblob(callback_function *f, __a_unused int fd,
+static int com_mvblob(callback_function *f, __a_unused int fd,
int argc, char * const * const argv)
{
if (argc != 3)
return -E_MOOD_SYNTAX;
return send_option_arg_callback_request(NULL, argc - 1, argv + 1, f,
- NULL);
+ NULL, NULL);
}
#define DEFINE_BLOB_COMMAND(cmd_name, table_name, cmd_prefix) \
t->close = table_name ## _close; \
t->create = table_name ## _create;\
t->event_handler = table_name ##_event_handler; \
+ table_name ## _table = NULL; \
}
projects / paraslash.git / blobdiff