/*
- * Copyright (C) 2007-2014 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007 Andre Noll <maan@tuebingen.mpg.de>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
/** Define an osl table description for a blob table. */
#define DEFINE_BLOB_TABLE_DESC(table_name) \
- struct osl_table_description table_name ## _table_desc = { \
+ static struct osl_table_description table_name ## _table_desc = { \
.name = #table_name, \
.num_columns = NUM_BLOB_COLUMNS, \
.flags = OSL_LARGE_TABLE, \
}
/*
- * Read data from a file descriptor, and send it to the afs process.
+ * Read blob from a file descriptor and send it to afs.
*
- * \param cc Contains the file descriptor to read data from.
- * \param arg_obj Pointer to the arguments to \a f.
- * \param f The callback function.
- * \param result_handler See \ref send_callback_request.
- * \param private_result_data See \ref send_callback_request.
- *
- * This function is used by the addblob commands that instruct para_server to
- * store arbitrary data in a blob table. Input data is read and decrypted from
- * the file descriptor given by \a cc. This data is concatenated with the
- * buffer given by \a arg_obj, and the combined buffer is made available to the
- * afs process via the callback method. See \ref send_callback_request for
- * details.
- *
- * \return Negative on errors, the return value of the underlying call to
- * send_callback_request() otherwise.
+ * 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 arg_obj, which 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 osl_object *arg_obj,
- callback_function *f, callback_result_handler *result_handler,
- void *private_result_data)
+ callback_function *f)
{
struct osl_object query, stdin_obj;
int ret;
memcpy((char *)query.data + arg_obj->size, stdin_obj.data,
stdin_obj.size);
free(stdin_obj.data);
- ret = send_callback_request(f, &query, result_handler, private_result_data);
+ ret = send_callback_request(f, &query, afs_cb_result_handler, cc);
free(query.data);
return ret;
}
return -E_BLOB_SYNTAX;
arg_obj.size = strlen(cc->argv[1]) + 1;
arg_obj.data = (char *)cc->argv[1];
- return stdin_command(cc, &arg_obj, f, afs_cb_result_handler, cc);
+ return stdin_command(cc, &arg_obj, f);
}
-/* FIXME: Print output to client, not to log file */
-static void com_mvblob_callback(struct osl_table *table, __a_unused int fd,
+static void com_mvblob_callback(struct osl_table *table, int fd,
const struct osl_object *query)
{
char *src = (char *) query->data;
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 = &fd,
+ .max_size_handler = afs_max_size_handler
+ };
int ret = osl(osl_get_row(table, BLOBCOL_NAME, &obj, &row));
- if (ret < 0)
+ if (ret < 0) {
+ para_printf(&pb, "could not locate %s: %s\n", src,
+ para_strerror(-ret));
goto out;
+ }
obj.data = dest;
obj.size = strlen(dest) + 1;
ret = osl(osl_update_object(table, row, BLOBCOL_NAME, &obj));
- if (ret < 0)
+ if (ret < 0) {
+ para_printf(&pb, "failed to update object %s: %s\n", dest,
+ para_strerror(-ret));
goto out;
+ }
afs_event(BLOB_RENAME, NULL, table);
out:
- if (ret < 0)
- PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
+ if (pb.offset)
+ pass_buffer_as_shm(fd, SBD_OUTPUT, pb.buf, pb.offset);
+ free(pb.buf);
}
static int com_mvblob(callback_function *f, struct command_context *cc)
{
+ int ret;
+
if (cc->argc != 3)
return -E_MOOD_SYNTAX;
- return send_option_arg_callback_request(NULL, cc->argc - 1,
- cc->argv + 1, f, NULL, NULL);
+ ret = send_option_arg_callback_request(NULL, cc->argc - 1,
+ cc->argv + 1, f, afs_cb_result_handler, cc);
+ if (ret < 0)
+ send_strerror(cc, -ret);
+ return ret;
}
#define DEFINE_BLOB_COMMAND(cmd_name, table_name, cmd_prefix) \
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,