X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=blob.c;h=b7dd908fc9cda0b0b4b579464bfa0de634e99a99;hp=c6b05b2b803d597de1f5294ba2c54f2790b1ceb6;hb=c73d23911d78ed10179c12ef8f79a3fcf3bbcdaf;hpb=ab6cab06766f86086b53f2720d566f7ddf70db4c

diff --git a/blob.c b/blob.c
index c6b05b2b..b7dd908f 100644
--- a/blob.c
+++ b/blob.c
@@ -1,12 +1,19 @@
+/*
+ * Copyright (C) 2007 Andre Noll <maan@systemlinux.org>
+ *
+ * Licensed under the GPL v2. For licencing details see COPYING.
+ */
+
+/** \file blob.c Macros and functions for blob handling. */
+
+#include <fnmatch.h>
 #include "para.h"
 #include "error.h"
+#include "string.h"
 #include "afh.h"
 #include "afs.h"
-#include "string.h"
 #include "net.h"
 
-/** \file blob.c Macros and functions for blob handling. */
-
 static struct osl_column_description blob_cols[] = {
 	[BLOBCOL_ID] = {
 		.storage_type = OSL_MAPPED_STORAGE,
@@ -45,72 +52,72 @@ enum blob_ls_flags {
 	BLOB_LS_FLAG_SORT_BY_ID = 4,
 };
 
-/** Data passed to \p com_lsbob_callback(). */
-struct com_lsblob_options {
-	/** Given flags for the ls command. */
+/** 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;
 };
 
-/** Structure passed to the \p print_blob loop function. */
-struct lsblob_loop_data {
-	struct com_lsblob_options *opts;
-	struct para_buffer *pb;
-	struct osl_table *table;
-};
-
-static int print_blob(struct osl_row *row, void *loop_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 osl_object obj;
-	char *name;
 	uint32_t id;
 	int ret;
-	struct lsblob_loop_data *lld = loop_data;
 
-	ret = osl_get_object(lld->table, row, BLOBCOL_NAME, &obj);
-	if (ret < 0)
-		return ret;
-	name = obj.data;
-	if (!*name) /* ignore dummy row */
+	if (!(lbad->flags & BLOB_LS_FLAG_LONG)) {
+		para_printf(&lbad->pb, "%s\n", name);
 		return 1;
-	ret = osl_get_object(lld->table, row, BLOBCOL_ID, &obj);
-	if (ret < 0)
+	}
+	ret = osl_get_object(table, row, BLOBCOL_ID, &obj);
+	if (ret < 0) {
+		para_printf(&lbad->pb, "%s: %s\n", name, para_strerror(-ret));
 		return ret;
+	}
 	id = *(uint32_t *)obj.data;
-	if (lld->opts->flags & BLOB_LS_FLAG_LONG)
-		para_printf(lld->pb, "%u\t%s\n", id, name);
-	else
-		para_printf(lld->pb, "%s\n", name);
+	para_printf(&lbad->pb, "%u\t%s\n", id, name);
 	return 1;
 }
 
-int com_lsblob_callback(struct osl_table *table,
-		const struct osl_object *query, struct osl_object *ls_output)
+static int com_lsblob_callback(struct osl_table *table,
+		const struct osl_object *query, struct osl_object *result)
 {
-	struct para_buffer pb = {.buf = NULL};
-	struct lsblob_loop_data lld = {.opts = query->data, .pb = &pb, .table = table};
+	struct lsblob_action_data lbad = {.flags = *(uint32_t *)query->data};
+	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,
+		.data = &lbad,
+		.action = print_blob,
+	};
 	int ret;
 
-	if (lld.opts->flags & BLOB_LS_FLAG_REVERSE) {
-		if (lld.opts->flags & BLOB_LS_FLAG_SORT_BY_ID)
-			ret = osl_rbtree_loop(lld.table, BLOBCOL_ID, &lld, print_blob);
-		else
-			ret = osl_rbtree_loop_reverse(lld.table, BLOBCOL_NAME, &lld, print_blob);
-	} else {
-		if (lld.opts->flags & BLOB_LS_FLAG_SORT_BY_ID)
-			ret = osl_rbtree_loop_reverse(lld.table, BLOBCOL_ID, &lld, print_blob);
-		else
-			ret = osl_rbtree_loop(lld.table, BLOBCOL_NAME, &lld, print_blob);
-	}
-	ls_output->data = pb.buf;
-	ls_output->size = pb.size;
-	return ret;
+	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_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));
+	if (!lbad.pb.buf)
+		return 0;
+	result->data = lbad.pb.buf;
+	result->size = lbad.pb.size;
+	return 1;
 }
 
 static int com_lsblob(callback_function *f, int fd, int argc, char * const * const argv)
 {
-	struct com_lsblob_options clbo = {.flags = 0};
-	struct osl_object query = {.data = &clbo, .size = sizeof(clbo)},
-		ls_output;
+	uint32_t flags = 0;
+	struct osl_object options = {.data = &flags, .size = sizeof(flags)},
+		result;
 	int i, ret;
 
 	for (i = 1; i < argc; i++) {
@@ -122,63 +129,150 @@ static int com_lsblob(callback_function *f, int fd, int argc, char * const * con
 			break;
 		}
 		if (!strcmp(arg, "-l")) {
-			clbo.flags |= BLOB_LS_FLAG_LONG;
+			flags |= BLOB_LS_FLAG_LONG;
 			continue;
 		}
 		if (!strcmp(arg, "-i")) {
-			clbo.flags |= BLOB_LS_FLAG_SORT_BY_ID;
+			flags |= BLOB_LS_FLAG_SORT_BY_ID;
 			continue;
 		}
 		if (!strcmp(arg, "-r")) {
-			clbo.flags |= BLOB_LS_FLAG_REVERSE;
+			flags |= BLOB_LS_FLAG_REVERSE;
 			continue;
 		}
+		break;
 	}
-	if (argc > i)
-		return -E_BLOB_SYNTAX;
-	ret = send_option_arg_callback_request(&query, argc - i,
-		argv + i, f, &ls_output);
+//	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 *)ls_output.data);
-		free(ls_output.data);
+		send_buffer(fd, (char *)result.data);
+		free(result.data);
 	}
 	return ret;
 }
 
-static int com_catblob_callback(struct osl_table *table,
-		const struct osl_object *query, struct osl_object *output)
+static int cat_blob(struct osl_table *table, struct osl_row *row,
+		__a_unused const char *name, void *data)
 {
-	struct osl_object obj;
 	int ret;
-	struct osl_row *row;
+	struct osl_object *blobs = data;
+	struct osl_object obj;
 
-	ret = osl_get_row(table, BLOBCOL_NAME, query, &row);
-	if (ret < 0)
-		return ret;
 	ret = osl_open_disk_object(table, row, BLOBCOL_DEF, &obj);
 	if (ret < 0)
 		return ret;
-	output->data = para_malloc(obj.size);
-	output->size = obj.size;
-	memcpy(output->data, obj.data, obj.size);
+	if (obj.size) {
+		blobs->data = para_realloc(blobs->data, blobs->size + obj.size);
+		memcpy(blobs->data + blobs->size, obj.data, obj.size);
+		blobs->size += obj.size;
+	}
 	return osl_close_disk_object(&obj);
 }
+
+static int com_catblob_callback(struct osl_table *table,
+		const struct osl_object *query, struct osl_object *result)
+{
+	int ret;
+	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,
+		.data = result,
+		.action = cat_blob
+	};
+	result->data = NULL;
+	ret = for_each_matching_row(&pmd);
+	if (result->data)
+		return 1;
+	return (ret > 0)? 0 : ret;
+}
+
 static int com_catblob(callback_function *f, int fd, int argc,
 		char * const * const argv)
 {
-	struct osl_object cat_output = {.data = NULL};
+	struct osl_object result;
 	int ret;
 
-	if (argc != 2)
-		return -E_BLOB_SYNTAX;
-	if (!*argv[1]) /* empty name is reserved of the dummy row */
+	if (argc < 2)
 		return -E_BLOB_SYNTAX;
-	ret = send_standard_callback_request(1, argv + 1, f, &cat_output);
-	if (ret >= 0 && cat_output.data)
-		ret = send_buffer(fd, (char *)cat_output.data);
-	free(cat_output.data);
+	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;
+}
+
+/** Used for removing rows from a blob table. */
+struct rmblob_data {
+	/** Message buffer. */
+	struct para_buffer pb;
+	/** Number of removed blobs. */
+	unsigned num_removed;
+};
 
+static int remove_blob(struct osl_table *table, struct osl_row *row,
+		const char *name, void *data)
+{
+	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));
+		return ret;
+	}
+	rmbd->num_removed++;
+	return 1; /* return success to remove other matching blobs. */
+}
+
+static int com_rmblob_callback(struct osl_table *table,
+		const struct osl_object *query,
+		struct osl_object *result)
+{
+	int ret;
+	struct rmblob_data rmbd = {.num_removed = 0};
+	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,
+		.data = &rmbd,
+		.action = remove_blob
+	};
+	result->data = NULL;
+	ret = for_each_matching_row(&pmd);
+	if (ret < 0)
+		para_printf(&rmbd.pb, "%s\n", para_strerror(-ret));
+	if (!rmbd.num_removed)
+		para_printf(&rmbd.pb, "no matches, nothing removed\n");
+	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;
+	return 1;
+}
+
+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;
 }
 
 static int com_addblob_callback(struct osl_table *table,
@@ -207,9 +301,21 @@ static int com_addblob_callback(struct osl_table *table,
 		ret = osl_add_row(table, objs);
 		if (ret < 0)
 			return ret;
-	} else { /* get id of the dummy row and increment it */
+	} else {
+		/* check if name already exists */
 		struct osl_row *row;
-		struct osl_object obj = {.data = "", .size = 1};
+		struct osl_object obj = {.data = name, .size = name_len};
+		ret = osl_get_row(table, BLOBCOL_NAME, &obj, &row);
+		if (ret < 0 && ret != -E_RB_KEY_NOT_FOUND)
+			return ret;
+		if (ret >= 0) { /* we already have a blob with this name */
+			obj.data = name + name_len;
+			obj.size = query->size - name_len;
+			return osl_update_object(table, row, BLOBCOL_DEF, &obj);
+		}
+		/* new blob, get id of the dummy row and increment it */
+		obj.data = "";
+		obj.size = 1;
 		ret = osl_get_row(table, BLOBCOL_NAME, &obj, &row);
 		if (ret < 0)
 			return ret;
@@ -229,10 +335,14 @@ 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, __a_unused int fd, int argc,
+static int com_addblob(callback_function *f, int fd, int argc,
 		char * const * const argv)
 {
 	struct osl_object arg_obj;
@@ -244,41 +354,7 @@ static int com_addblob(callback_function *f, __a_unused 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(&arg_obj, f, 10 * 1024 * 1024, NULL);
-}
-
-static int com_rmblob_callback(struct osl_table *table,
-		const struct osl_object *query,
-		__a_unused struct osl_object *result)
-{
-	char *p = query->data;
-	size_t len;
-	int ret;
-
-	for (; p < (char *)query->data + query->size; p += len + 1) {
-		struct osl_row *row;
-		struct osl_object obj;
-
-		len = strlen(p);
-		obj.data = p;
-		obj.size = len + 1;
-		ret = osl_get_row(table, BLOBCOL_NAME, &obj, &row);
-		if (ret < 0)
-			return ret;
-		ret = osl_del_row(table, row);
-		if (ret < 0)
-			return ret;
-	}
-	return 1;
-}
-
-static int com_rmblob(callback_function *f, __a_unused int fd, int argc,
-		char * const * const argv)
-{
-	if (argc < 2)
-		return -E_MOOD_SYNTAX;
-	return send_option_arg_callback_request(NULL, argc - 1, argv + 1, f,
-		NULL);
+	return stdin_command(fd, &arg_obj, f, 10 * 1024 * 1024, NULL);
 }
 
 static int com_mvblob_callback(struct osl_table *table,
@@ -295,10 +371,14 @@ 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)
@@ -337,6 +417,7 @@ static int blob_get_name_by_id(struct osl_table *table, uint32_t id,
 	*name = (char *)obj.data;
 	return 1;
 }
+
 /** Define the \p get_name_by_id function for this blob type. */
 #define DEFINE_GET_NAME_BY_ID(table_name, cmd_prefix) \
 	int cmd_prefix ## _get_name_by_id(uint32_t id, char **name) \
@@ -344,49 +425,139 @@ 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); \
 	}
 
-/** Define the \p shutdown function for this blob type. */
-#define DEFINE_BLOB_SHUTDOWN(table_name) \
-	void table_name ## _shutdown(enum osl_close_flags flags) \
+
+static int blob_get_def_by_name(struct osl_table *table, char *name,
+		struct osl_object *def)
+{
+	struct osl_row *row;
+	struct osl_object obj = {.data = name, .size = strlen(name) + 1};
+	int ret;
+
+	def->data = NULL;
+	if (!*name)
+		return 1;
+	ret = osl_get_row(table, BLOBCOL_NAME, &obj, &row);
+	if (ret < 0)
+		return ret;
+	return osl_open_disk_object(table, row, BLOBCOL_DEF, def);
+}
+
+/** Define the \p get_def_by_id function for this blob type. */
+#define DEFINE_GET_DEF_BY_NAME(table_name, cmd_prefix) \
+	int cmd_prefix ## _get_def_by_name(char *name, struct osl_object *def) \
 	{ \
-		osl_close_table(table_name ## _table, flags); \
+		return blob_get_def_by_name(table_name ## _table, name, def); \
+	}
+
+static int blob_get_def_by_id(struct osl_table *table, uint32_t id,
+		struct osl_object *def)
+{
+	struct osl_row *row;
+	struct osl_object obj = {.data = &id, .size = sizeof(id)};
+	int ret;
+
+	def->data = NULL;
+	if (!id)
+		return 1;
+	ret = osl_get_row(table, BLOBCOL_ID, &obj, &row);
+	if (ret < 0)
+		return ret;
+	return osl_open_disk_object(table, row, BLOBCOL_DEF, def);
+}
+
+/** Define the \p get_def_by_id function for this blob type. */
+#define DEFINE_GET_DEF_BY_ID(table_name, cmd_prefix) \
+	int cmd_prefix ## _get_def_by_id(uint32_t id, struct osl_object *def) \
+	{ \
+		return blob_get_def_by_id(table_name ## _table, id, def); \
+	}
+
+static int blob_get_name_and_def_by_row(struct osl_table *table,
+		const struct osl_row *row, char **name, struct osl_object *def)
+{
+	struct osl_object obj;
+	int ret = osl_get_object(table, row, BLOBCOL_NAME, &obj);
+	if (ret < 0)
+		return ret;
+	*name = obj.data;
+	return osl_open_disk_object(table, row, BLOBCOL_DEF, def);
+}
+/** Define the \p get_name_and_def_by_row function for this blob type. */
+#define DEFINE_GET_NAME_AND_DEF_BY_ROW(table_name, cmd_prefix) \
+	int cmd_prefix ## _get_name_and_def_by_row(const struct osl_row *row, \
+		char **name, struct osl_object *def) \
+	{ \
+		return blob_get_name_and_def_by_row(table_name ## _table, \
+			row, name, def); \
+	}
+
+/** Define the \p close function for this blob type. */
+#define DEFINE_BLOB_CLOSE(table_name) \
+	void table_name ## _close(void) \
+	{ \
+		osl_close_table(table_name ## _table, OSL_MARK_CLEAN); \
 		table_name ## _table = NULL; \
 	}
 
-static int blob_init(struct osl_table **table,
+/** Define the \p create function for this blob type. */
+#define DEFINE_BLOB_CREATE(table_name) \
+	int table_name ## _create(const char *dir) \
+	{ \
+		table_name ## _table_desc.dir = dir; \
+		return osl_create_table(&table_name ## _table_desc); \
+	}
+
+static int blob_open(struct osl_table **table,
 		struct osl_table_description *desc,
-		struct table_info *ti, const char *db)
+		const char *dir)
 {
 	int ret;
-	desc->dir = db;
-	ti->desc = desc;
-	ret = osl_open_table(ti->desc, &ti->table);
-	if (ret >= 0) {
-		*table = ti->table;
+	desc->dir = dir;
+	ret = osl_open_table(desc, table);
+	if (ret >= 0)
 		return ret;
-	}
 	*table = NULL;
-	return ret == -E_NOENT? 1 : ret;
+	if (ret >= 0 || is_errno(-ret, ENOENT))
+		return 1;
+	return ret;
 }
 
+#define DEFINE_BLOB_OPEN(table_name) \
+	int table_name ## _open(const char *dir) \
+	{ \
+		return blob_open(&table_name ## _table, \
+			&table_name ## _table_desc, dir); \
+	}
+
+
 /** Define the \p init function for this blob type. */
 #define DEFINE_BLOB_INIT(table_name) \
-	int table_name ## _init(struct table_info *ti, const char *db) \
+	void table_name ## _init(struct afs_table *t) \
 	{ \
-		return blob_init(&table_name ## _table, \
-			&table_name ## _table_desc, ti, db); \
+		t->name = table_name ## _table_desc.name; \
+		t->open = table_name ## _open; \
+		t->close = table_name ## _close; \
+		t->create = table_name ## _create;\
+		t->event_handler = table_name ##_event_handler; \
+		table_name ## _table = NULL; \
 	}
 
 
 /** Define all functions for this blob type. */
 #define DEFINE_BLOB_FUNCTIONS(table_name, cmd_prefix) \
+	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_BLOB_SHUTDOWN(table_name); \
-	DEFINE_BLOB_INIT(table_name);
+	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); \
 
 /** \cond doxygen isn't smart enough to recognize these */
 DEFINE_BLOB_FUNCTIONS(lyrics, lyr);