blob.c: Fix stale comment of stdin_command().

[paraslash.git] / blob.c

diff --git a/blob.c b/blob.c
index adfdb1a999fa53a873959d5af6b96a15ac5f6f58..e10b522f73a249f5b02b6f50b72788efdc6d7f68 100644 (file)
--- a/blob.c
+++ b/blob.c
@@ -1,15 +1,13 @@
-/*
- * Copyright (C) 2007 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2007 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */

 
 /** \file blob.c Macros and functions for blob handling. */
 
 #include <regex.h>
 #include <fnmatch.h>
 #include <osl.h>
 
 /** \file blob.c Macros and functions for blob handling. */
 
 #include <regex.h>
 #include <fnmatch.h>
 #include <osl.h>

+#include <lopsub.h>

 
 

+#include "server_cmd.lsg.h"

 #include "para.h"
 #include "error.h"
 #include "crypt.h"
 #include "para.h"
 #include "error.h"
 #include "crypt.h"


@@ -28,13 +26,11 @@
  * \param obj2 Pointer to the second integer.
  *
  * \return The values required for an osl compare function.
  * \param obj2 Pointer to the second integer.
  *
  * \return The values required for an osl compare function.

- *
- * \sa osl_compare_func, osl_hash_compare().

  */
 static int uint32_compare(const struct osl_object *obj1, const struct osl_object *obj2)
 {
  */
 static int uint32_compare(const struct osl_object *obj1, const struct osl_object *obj2)
 {

-       uint32_t d1 = read_u32((const char *)obj1->data);
-       uint32_t d2 = read_u32((const char *)obj2->data);
+       uint32_t d1 = read_u32(obj1->data);
+       uint32_t d2 = read_u32(obj2->data);

 
        if (d1 < d2)
                return 1;
 
        if (d1 < d2)
                return 1;


@@ -76,7 +72,6 @@ static struct osl_column_description 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 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 a blob table. */
 #define INIT_BLOB_TABLE(table_name) \
        DEFINE_BLOB_TABLE_DESC(table_name); \


@@ -90,116 +85,68 @@ INIT_BLOB_TABLE(moods);
 INIT_BLOB_TABLE(playlists);
 /** \endcond blob_table */
 
 INIT_BLOB_TABLE(playlists);
 /** \endcond blob_table */
 

-/** 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;
-};
-

 static int print_blob(struct osl_table *table, struct osl_row *row,
                const char *name, void *data)
 {
 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;
 
        struct osl_object obj;
        uint32_t id;
        int ret;
 

-       if (!(lbad->flags & BLOB_LS_FLAG_LONG))
-               return para_printf(&lbad->pb, "%s\n", name);
+       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) {
        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 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 = shm_get_shmmax(),
-                       .private_data = &(struct afs_max_size_handler_data) {
-                               .fd = fd,
-                               .band = SBD_OUTPUT
-                       },
-                       .max_size_handler = afs_max_size_handler,
-               }
-       };
+       bool i_given, r_given;

        struct pattern_match_data pmd = {
                .table = table,
        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,
                .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;
 
                .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;
                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;
                pmd.loop_col_num = BLOBCOL_ID;

+       else
+               pmd.loop_col_num = BLOBCOL_NAME;

        ret = for_each_matching_row(&pmd);
        if (ret < 0)
        ret = for_each_matching_row(&pmd);
        if (ret < 0)

-               para_printf(&lbad.pb, "%s\n", para_strerror(-ret));
-       else if (pmd.num_matches == 0 && pmd.patterns.size > 0)
-               para_printf(&lbad.pb, "no matches\n");
-       if (lbad.pb.offset)
-               pass_buffer_as_shm(fd, SBD_OUTPUT, lbad.pb.buf, lbad.pb.offset);
-       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, struct command_context *cc)
+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 < cc->argc; i++) {
-               const char *arg = cc->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, cc->argc - i,
-               cc->argv + i, f, afs_cb_result_handler, cc);
+       return send_lls_callback_request(f, cmd, lpr, cc);

 }
 
 static int cat_blob(struct osl_table *table, struct osl_row *row,
 }
 
 static int cat_blob(struct osl_table *table, struct osl_row *row,


@@ -217,106 +164,108 @@ static int cat_blob(struct osl_table *table, struct osl_row *row,
        return (ret < 0)? ret : ret2;
 }
 
        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,
        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,
                .loop_col_num = BLOBCOL_NAME,
                .match_col_num = BLOBCOL_NAME,
                .pm_flags = PM_SKIP_EMPTY_NAME,

-               .data = &fd,
+               .data = &aca->fd,

                .action = cat_blob
        };
                .action = cat_blob
        };

-       for_each_matching_row(&pmd);
-       if (pmd.num_matches == 0) {
-               char err_msg[] = "no matches\n";
-               pass_buffer_as_shm(fd, SBD_OUTPUT, err_msg, sizeof(err_msg));
-       }
+
+       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, struct command_context *cc)
+static int com_catblob(afs_callback *f, const struct lls_command * const cmd,
+               struct command_context *cc, struct lls_parse_result *lpr)

 {
 {

-       if (cc->argc < 2)
-               return -E_BLOB_SYNTAX;
-       return send_standard_callback_request(cc->argc - 1, cc->argv + 1, f,
-               afs_cb_result_handler, cc);
-}
+       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;
-};
+       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)
 {
 
 static int remove_blob(struct osl_table *table, struct osl_row *row,
                const char *name, void *data)
 {

-       struct rmblob_data *rmbd = data;
+       struct afs_callback_arg *aca = data;

        int ret = osl(osl_del_row(table, row));
        int ret = osl(osl_del_row(table, row));

+

        if (ret < 0) {
        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;
        }
        return 1;
 }
 
                return ret;
        }
        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 = {
-               .pb = {
-                       .max_size = shm_get_shmmax(),
-                       .private_data = &(struct afs_max_size_handler_data) {
-                               .fd = fd,
-                               .band = SBD_OUTPUT
-                       },
-                       .max_size_handler = afs_max_size_handler,
-               }
-       };
+       int ret;

        struct pattern_match_data pmd = {
                .table = table,
        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,
                .loop_col_num = BLOBCOL_NAME,
                .match_col_num = BLOBCOL_NAME,
                .pm_flags = PM_SKIP_EMPTY_NAME,

-               .data = &rmbd,
+               .data = aca,

                .action = remove_blob
        };
                .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);
        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 (ret < 0)
+               goto out;

        if (pmd.num_matches == 0)
        if (pmd.num_matches == 0)

-               ret2 = para_printf(&rmbd.pb, "no matches, nothing removed\n");
+               ret = -E_NO_MATCH;

        else {
        else {

-               ret2 = para_printf(&rmbd.pb, "removed %d blobs\n", pmd.num_matches);
-               afs_event(BLOB_REMOVE, NULL, table);
+               para_printf(&aca->pbout, "removed %u blob(s)\n",
+                       pmd.num_matches);
+               ret = afs_event(BLOB_REMOVE, NULL, table);

        }
 out:
        }
 out:

-       if (ret2 >= 0 && rmbd.pb.offset)
-               pass_buffer_as_shm(fd, SBD_OUTPUT, rmbd.pb.buf, rmbd.pb.offset);
-       free(rmbd.pb.buf);
+       lls_free_parse_result(aca->lpr, cmd);
+       return ret;

 }
 
 }
 

-static int com_rmblob(callback_function *f, struct command_context *cc)
+static int com_rmblob(afs_callback *f, const struct lls_command * const cmd,
+               struct command_context *cc, struct lls_parse_result *lpr)

 {
 {

-       if (cc->argc < 2)
-               return -E_MOOD_SYNTAX;
-       return send_option_arg_callback_request(NULL, cc->argc - 1, cc->argv + 1, f,
-               afs_cb_result_handler, cc);
+       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, 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];
 {
        struct osl_object objs[NUM_BLOB_COLUMNS];

-       char *name = 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;
        uint32_t id;
        unsigned num_rows;
        int ret;


@@ -349,7 +298,7 @@ static void com_addblob_callback(struct osl_table *table, int fd,
                                goto out;
                        id = *(uint32_t *)obj.data;
                        obj.data = name + name_len;
                                goto out;
                        id = *(uint32_t *)obj.data;
                        obj.data = name + name_len;

-                       obj.size = query->size - name_len;
+                       obj.size = aca->query.size - name_len;

                        ret = osl(osl_update_object(table, row, BLOBCOL_DEF, &obj));
                        goto out;
                }
                        ret = osl(osl_update_object(table, row, BLOBCOL_DEF, &obj));
                        goto out;
                }


@@ -374,19 +323,17 @@ static void com_addblob_callback(struct osl_table *table, int fd,
        objs[BLOBCOL_NAME].data = name;
        objs[BLOBCOL_NAME].size = name_len;
        objs[BLOBCOL_DEF].data = name + name_len;
        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;
+       objs[BLOBCOL_DEF].size = aca->query.size - name_len;

        ret = osl(osl_add_row(table, objs));
        if (ret < 0)
                goto out;
        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)
 out:
        if (ret < 0)

-               msg_len = xasprintf(&msg, "could not add %s: %s\n", name,
-                       para_strerror(-ret));
+               para_printf(&aca->pbout, "cannot add %s\n", name);

        else
        else

-               msg_len = xasprintf(&msg, "added %s as id %u\n", name, id);
-       pass_buffer_as_shm(fd, SBD_OUTPUT, msg, msg_len);
-       free(msg);
+               para_printf(&aca->pbout, "added %s as id %u\n", name, id);
+       return ret;

 }
 
 /* Write input from fd to dynamically allocated buffer, but maximal 10M. */
 }
 
 /* Write input from fd to dynamically allocated buffer, but maximal 10M. */


@@ -426,30 +373,20 @@ again:
 }
 
 /*
 }
 
 /*

- * Read data from a file descriptor, and send it to the afs process.
- *
- * \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.
+ * Read blob from a file descriptor and send it to afs.

  *
  *

- * 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 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 osl_object *arg_obj,
-               callback_function *f, callback_result_handler *result_handler,
-               void *private_result_data)
+static int stdin_command(struct command_context *cc,
+               struct lls_parse_result *lpr, afs_callback *f)

 {
        struct osl_object query, stdin_obj;
        int ret;
 {
        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)
 
        ret = send_sb(&cc->scc, NULL, 0, SBD_AWAITING_DATA, false);
        if (ret < 0)


@@ -457,87 +394,92 @@ static int stdin_command(struct command_context *cc, struct osl_object *arg_obj,
        ret = fd2buf(&cc->scc, &stdin_obj);
        if (ret < 0)
                return ret;
        ret = fd2buf(&cc->scc, &stdin_obj);
        if (ret < 0)
                return ret;

-       query.size = arg_obj->size + stdin_obj.size;
+       query.size = len + 1 + stdin_obj.size;

        query.data = para_malloc(query.size);
        query.data = para_malloc(query.size);

-       memcpy(query.data, arg_obj->data, arg_obj->size);
+       memcpy(query.data, lls_input(0, lpr), len + 1);

        if (stdin_obj.size > 0)
        if (stdin_obj.size > 0)

-               memcpy((char *)query.data + arg_obj->size, stdin_obj.data,
+               memcpy((char *)query.data + len + 1, stdin_obj.data,

                        stdin_obj.size);
        free(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;
 }
 
        free(query.data);
        return ret;
 }
 

-static int com_addblob(callback_function *f, struct command_context *cc)
+static int com_addblob(afs_callback *f, __a_unused const struct lls_command * const cmd,
+               struct command_context *cc, struct lls_parse_result *lpr)

 {
 {

-       struct osl_object arg_obj;
+       char *errctx;
+       int ret = lls(lls_check_arg_count(lpr, 1, 1, &errctx));

 
 

-       if (cc->argc != 2)
-               return -E_BLOB_SYNTAX;
-       if (!*cc->argv[1]) /* empty name is reserved for the dummy row */
+       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;
                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, lpr, f);

 }
 
 }
 

-static void com_mvblob_callback(struct osl_table *table, 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;
        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));
+       int ret;
+
+       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) {
 
        if (ret < 0) {

-               para_printf(&pb, "could not locate %s: %s\n", src,
-                       para_strerror(-ret));
+               para_printf(&aca->pbout, "cannot find source blob %s\n", src);

                goto out;
        }
                goto out;
        }

-       obj.data = dest;
+       obj.data = (char *)dest;

        obj.size = strlen(dest) + 1;
        ret = osl(osl_update_object(table, row, BLOBCOL_NAME, &obj));
        if (ret < 0) {
        obj.size = strlen(dest) + 1;
        ret = osl(osl_update_object(table, row, BLOBCOL_NAME, &obj));
        if (ret < 0) {

-               para_printf(&pb, "failed to update object %s: %s\n", dest,
-                       para_strerror(-ret));
+               para_printf(&aca->pbout, "cannot rename blob %s to %s\n",
+                       src, dest);

                goto out;
        }
                goto out;
        }

-       afs_event(BLOB_RENAME, NULL, table);
+       ret = afs_event(BLOB_RENAME, NULL, table);

 out:
 out:

-       if (pb.offset)
-               pass_buffer_as_shm(fd, SBD_OUTPUT, pb.buf, pb.offset);
-       free(pb.buf);
+       lls_free_parse_result(aca->lpr, cmd);
+       return ret;

 }
 
 }
 

-static int com_mvblob(callback_function *f, struct command_context *cc)
+static int com_mvblob(afs_callback *f, const struct lls_command * const cmd,
+               struct command_context *cc, struct lls_parse_result *lpr)

 {
 {

-       int ret;
+       char *errctx;
+       int ret = lls(lls_check_arg_count(lpr, 2, 2, &errctx));

 
 

-       if (cc->argc != 3)
-               return -E_MOOD_SYNTAX;
-       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;
+       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(struct command_context *cc) \
+       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, cc); \
-       }
+               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)
 
 static int blob_get_name_by_id(struct osl_table *table, uint32_t id,
                char **name)


@@ -546,7 +488,8 @@ 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;
 
        struct osl_object obj = {.data = &id, .size = sizeof(id)};
        int ret;
 

-       *name = NULL;
+       if (name)
+               *name = NULL;

        if (!id)
                return 1;
        ret = osl(osl_get_row(table, BLOBCOL_ID, &obj, &row));
        if (!id)
                return 1;
        ret = osl(osl_get_row(table, BLOBCOL_ID, &obj, &row));


@@ -555,7 +498,10 @@ 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;
        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;
 }
 
        return 1;
 }
 


@@ -566,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); \
        }
 
                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)
 {
 static int blob_get_def_by_name(struct osl_table *table, char *name,
                struct osl_object *def)
 {


@@ -618,6 +563,7 @@ static int blob_get_name_and_def_by_row(struct osl_table *table,
 {
        struct osl_object obj;
        int ret = osl(osl_get_object(table, row, BLOBCOL_NAME, &obj));
 {
        struct osl_object obj;
        int ret = osl(osl_get_object(table, row, BLOBCOL_NAME, &obj));

+

        if (ret < 0)
                return ret;
        *name = obj.data;
        if (ret < 0)
                return ret;
        *name = obj.data;


@@ -653,6 +599,7 @@ static int blob_open(struct osl_table **table,
                const char *dir)
 {
        int ret;
                const char *dir)
 {
        int ret;

+

        desc->dir = dir;
        ret = osl(osl_open_table(desc, table));
        if (ret >= 0)
        desc->dir = dir;
        ret = osl(osl_open_table(desc, table));
        if (ret >= 0)


@@ -684,25 +631,25 @@ static int blob_open(struct osl_table **table,
 
 
 /** Define all functions for this blob type. */
 
 
 /** 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_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); \
+       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 */
 
 /* doxygen isn't smart enough to recognize these */
 /** \cond blob_function */

-DEFINE_BLOB_FUNCTIONS(lyrics, lyr);
-DEFINE_BLOB_FUNCTIONS(images, img);
-DEFINE_BLOB_FUNCTIONS(moods, mood);
-DEFINE_BLOB_FUNCTIONS(playlists, pl);
+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 */
 /** \endcond blob_function */