#include <osl.h>
#include <lopsub.h>
+#include "server_cmd.lsg.h"
#include "para.h"
#include "error.h"
#include "crypt.h"
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,
-};
-
static int print_blob(struct osl_table *table, struct osl_row *row,
const char *name, void *data)
{
struct afs_callback_arg *aca = data;
- uint32_t flags = *(uint32_t *)aca->query.data;
+ bool l_given = SERVER_CMD_OPT_GIVEN(LSMOOD, LONG, aca->lpr);
struct osl_object obj;
uint32_t id;
int ret;
- if (!(flags & BLOB_LS_FLAG_LONG)) {
+ if (!l_given) {
para_printf(&aca->pbout, "%s\n", name);
return 0;
}
return 1;
}
-static int com_lsblob_callback(struct osl_table *table,
- struct afs_callback_arg *aca)
+static int com_lsblob_callback(const struct lls_command * const cmd,
+ struct osl_table *table, struct afs_callback_arg *aca)
{
- uint32_t flags = *(uint32_t *)aca->query.data;
+ bool i_given, r_given;
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 = aca,
.action = print_blob,
};
int ret;
+ 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 (flags & BLOB_LS_FLAG_REVERSE)
+ if (r_given)
pmd.pm_flags |= PM_REVERSE_LOOP;
- if (!(flags & BLOB_LS_FLAG_SORT_BY_ID))
- pmd.loop_col_num = BLOBCOL_NAME;
- else
+ if (i_given)
pmd.loop_col_num = BLOBCOL_ID;
+ else
+ pmd.loop_col_num = BLOBCOL_NAME;
ret = for_each_matching_row(&pmd);
if (ret < 0)
goto out;
- if (pmd.num_matches == 0 && pmd.patterns.size > 0)
+ 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(afs_callback *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,
return (ret < 0)? ret : ret2;
}
-static int com_catblob_callback(struct osl_table *table,
- struct afs_callback_arg *aca)
+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,
- .patterns = aca->query,
.loop_col_num = BLOBCOL_NAME,
.match_col_num = BLOBCOL_NAME,
.pm_flags = PM_SKIP_EMPTY_NAME,
.data = &aca->fd,
.action = cat_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);
if (ret < 0)
- return ret;
+ 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(afs_callback *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));
+
+ 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,
return 1;
}
-static int com_rmblob_callback(struct osl_table *table,
- struct afs_callback_arg *aca)
+static int com_rmblob_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,
- .patterns = aca->query,
.loop_col_num = BLOBCOL_NAME,
.match_col_num = BLOBCOL_NAME,
.pm_flags = PM_SKIP_EMPTY_NAME,
.data = aca,
.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);
if (ret < 0)
goto out;
ret = afs_event(BLOB_REMOVE, NULL, table);
}
out:
+ lls_free_parse_result(aca->lpr, cmd);
return ret;
}
-static int com_rmblob(afs_callback *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 int com_addblob_callback(struct osl_table *table,
- struct afs_callback_arg *aca)
+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];
char *name = aca->query.data;
* 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,
- afs_callback *f)
+static int stdin_command(struct command_context *cc,
+ struct lls_parse_result *lpr, afs_callback *f)
{
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 = 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);
- memcpy(query.data, arg_obj->data, arg_obj->size);
+ memcpy(query.data, lls_input(0, lpr), len + 1);
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);
ret = send_callback_request(f, &query, afs_cb_result_handler, cc);
return ret;
}
-static int com_addblob(afs_callback *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;
- arg_obj.size = strlen(cc->argv[1]) + 1;
- arg_obj.data = (char *)cc->argv[1];
- return stdin_command(cc, &arg_obj, f);
+ return stdin_command(cc, lpr, f);
}
-static int com_mvblob_callback(struct osl_table *table,
- struct afs_callback_arg *aca)
+static int com_mvblob_callback(const struct lls_command * const cmd,
+ struct osl_table *table, struct afs_callback_arg *aca)
{
- char *src = (char *)aca->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;
- 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) {
para_printf(&aca->pbout, "cannot find source blob %s\n", src);
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) {
}
ret = afs_event(BLOB_RENAME, NULL, table);
out:
+ lls_free_parse_result(aca->lpr, cmd);
return ret;
}
-static int com_mvblob(afs_callback *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)
{
- if (cc->argc != 3)
- 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, 2, 2, &errctx));
+
+ 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 int com_ ## cmd_name ## cmd_prefix ## _callback(struct afs_callback_arg *aca) \
+#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, aca); \
+ 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)
/** 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_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 */
-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 */
projects / paraslash.git / commitdiff