X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=blob.c;h=409e348709de83de48090c0535f3aced79dda2c8;hp=2545aea9af2d9dbb5d34b4a41a6d3363c35c3385;hb=869f0e06ec4e15abc9230c1b2d7615da5250802e;hpb=e65bdaa6b207d5cd409acaa5d0d33fe85dd7a28d diff --git a/blob.c b/blob.c index 2545aea9..409e3487 100644 --- a/blob.c +++ b/blob.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 Andre Noll + * Copyright (C) 2007-2012 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -18,6 +18,7 @@ #include "afs.h" #include "ipc.h" #include "portable_io.h" +#include "command.h" /** * Compare two osl objects pointing to unsigned integers of 32 bit size. @@ -163,14 +164,14 @@ static void com_lsblob_callback(struct osl_table *table, free(lbad.pb.buf); } -static int com_lsblob(callback_function *f, struct stream_cipher_context *scc, int argc, char * const * const argv) +static int com_lsblob(callback_function *f, struct command_context *cc) { 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]; + for (i = 1; i < cc->argc; i++) { + const char *arg = cc->argv[i]; if (arg[0] != '-') break; if (!strcmp(arg, "--")) { @@ -193,8 +194,8 @@ static int com_lsblob(callback_function *f, struct stream_cipher_context *scc, i } // if (argc > i) // return -E_BLOB_SYNTAX; - return send_option_arg_callback_request(&options, argc - i, - argv + i, f, sc_send_result, scc); + return send_option_arg_callback_request(&options, cc->argc - i, + cc->argv + i, f, sc_send_result, cc); } static int cat_blob(struct osl_table *table, struct osl_row *row, @@ -231,13 +232,12 @@ static void com_catblob_callback(struct osl_table *table, int fd, } } -static int com_catblob(callback_function *f, struct stream_cipher_context *scc, int argc, - char * const * const argv) +static int com_catblob(callback_function *f, struct command_context *cc) { - if (argc < 2) + if (cc->argc < 2) return -E_BLOB_SYNTAX; - return send_standard_callback_request(argc - 1, argv + 1, f, - sc_send_result, scc); + return send_standard_callback_request(cc->argc - 1, cc->argv + 1, f, + sc_send_result, cc); } /** Used for removing rows from a blob table. */ @@ -296,13 +296,12 @@ out: free(rmbd.pb.buf); } -static int com_rmblob(callback_function *f, struct stream_cipher_context *scc, int argc, - char * const * const argv) +static int com_rmblob(callback_function *f, struct command_context *cc) { - if (argc < 2) + if (cc->argc < 2) return -E_MOOD_SYNTAX; - return send_option_arg_callback_request(NULL, argc - 1, argv + 1, f, - sc_send_result, scc); + return send_option_arg_callback_request(NULL, cc->argc - 1, cc->argv + 1, f, + sc_send_result, cc); } static void com_addblob_callback(struct osl_table *table, __a_unused int fd, @@ -425,7 +424,7 @@ static int fd2buf(struct stream_cipher_context *scc, unsigned max_size, struct o * \return Negative on errors, the return value of the underlying call to * send_callback_request() otherwise. */ -static int stdin_command(struct stream_cipher_context *scc, struct osl_object *arg_obj, +static int stdin_command(struct command_context *cc, struct osl_object *arg_obj, callback_function *f, unsigned max_len, callback_result_handler *result_handler, void *private_result_data) @@ -433,10 +432,10 @@ static int stdin_command(struct stream_cipher_context *scc, struct osl_object *a struct osl_object query, stdin_obj; int ret; - ret = sc_send_buffer(scc, AWAITING_DATA_MSG); + ret = sc_send_buffer(&cc->scc, AWAITING_DATA_MSG); if (ret < 0) return ret; - ret = fd2buf(scc, max_len, &stdin_obj); + ret = fd2buf(&cc->scc, max_len, &stdin_obj); if (ret < 0) return ret; query.size = arg_obj->size + stdin_obj.size; @@ -449,18 +448,17 @@ static int stdin_command(struct stream_cipher_context *scc, struct osl_object *a return ret; } -static int com_addblob(callback_function *f, struct stream_cipher_context *scc, int argc, - char * const * const argv) +static int com_addblob(callback_function *f, struct command_context *cc) { struct osl_object arg_obj; - if (argc != 2) + if (cc->argc != 2) return -E_BLOB_SYNTAX; - if (!*argv[1]) /* empty name is reserved for the dummy row */ + if (!*cc->argv[1]) /* 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(scc, &arg_obj, f, 10 * 1024 * 1024, NULL, NULL); + arg_obj.size = strlen(cc->argv[1]) + 1; + arg_obj.data = (char *)cc->argv[1]; + return stdin_command(cc, &arg_obj, f, 10 * 1024 * 1024, NULL, NULL); } /* FIXME: Print output to client, not to log file */ @@ -486,13 +484,12 @@ out: PARA_NOTICE_LOG("%s\n", para_strerror(-ret)); } -static int com_mvblob(callback_function *f, __a_unused struct stream_cipher_context *scc, - int argc, char * const * const argv) +static int com_mvblob(callback_function *f, struct command_context *cc) { - if (argc != 3) + if (cc->argc != 3) return -E_MOOD_SYNTAX; - return send_option_arg_callback_request(NULL, argc - 1, argv + 1, f, - NULL, NULL); + return send_option_arg_callback_request(NULL, cc->argc - 1, + cc->argv + 1, f, NULL, NULL); } #define DEFINE_BLOB_COMMAND(cmd_name, table_name, cmd_prefix) \ @@ -500,9 +497,9 @@ static int com_mvblob(callback_function *f, __a_unused struct stream_cipher_cont { \ return com_ ## cmd_name ## blob_callback(table_name ## _table, fd, query); \ } \ - int com_ ## cmd_name ## cmd_prefix(struct stream_cipher_context *scc, int argc, char * const * const argv) \ + int com_ ## cmd_name ## cmd_prefix(struct command_context *cc) \ { \ - return com_ ## cmd_name ## blob(com_ ## cmd_name ## cmd_prefix ## _callback, scc, argc, argv); \ + return com_ ## cmd_name ## blob(com_ ## cmd_name ## cmd_prefix ## _callback, cc); \ } static int blob_get_name_by_id(struct osl_table *table, uint32_t id,