X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=blob.c;h=2e0a4762bfd1e34d0f12c7a9b2d4de582c8316d4;hp=ea746072d85b4493ec3c03313f8f8d3c74df191e;hb=6fbd93c8420823356a24a3637d332c23c0c85dcd;hpb=bb94ae9d3364ac5e868bc0f979854ccea222963c

diff --git a/blob.c b/blob.c
index ea746072..2e0a4762 100644
--- a/blob.c
+++ b/blob.c
@@ -100,64 +100,47 @@ enum blob_ls_flags {
 	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)
 {
-	struct lsblob_action_data *lbad = data;
+	struct afs_callback_arg *aca = data;
+	uint32_t flags = *(uint32_t *)aca->query.data;
 	struct osl_object obj;
 	uint32_t id;
 	int ret;
 
-	if (!(lbad->flags & BLOB_LS_FLAG_LONG)) {
-		para_printf(&lbad->pb, "%s\n", name);
+	if (!(flags & BLOB_LS_FLAG_LONG)) {
+		para_printf(&aca->pbout, "%s\n", name);
 		return 0;
 	}
 	ret = osl(osl_get_object(table, row, BLOBCOL_ID, &obj));
 	if (ret < 0) {
-		para_printf(&lbad->pb, "cannot list %s\n", name);
+		para_printf(&aca->pbout, "cannot list %s\n", name);
 		return ret;
 	}
 	id = *(uint32_t *)obj.data;
-	para_printf(&lbad->pb, "%u\t%s\n", id, name);
+	para_printf(&aca->pbout, "%u\t%s\n", id, name);
 	return 1;
 }
 
 static int com_lsblob_callback(struct osl_table *table,
-		int fd, const struct osl_object *query)
+		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,
-		}
-	};
+	uint32_t flags = *(uint32_t *)aca->query.data;
 	struct pattern_match_data pmd = {
 		.table = table,
-		.patterns = {.data = (char *)query->data + sizeof(uint32_t),
-			.size = query->size - sizeof(uint32_t)},
+		.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 = &lbad,
+		.data = aca,
 		.action = print_blob,
 	};
 	int ret;
 
-	if (lbad.flags & BLOB_LS_FLAG_REVERSE)
+	if (flags & BLOB_LS_FLAG_REVERSE)
 		pmd.pm_flags |= PM_REVERSE_LOOP;
-	if (!(lbad.flags & BLOB_LS_FLAG_SORT_BY_ID))
+	if (!(flags & BLOB_LS_FLAG_SORT_BY_ID))
 		pmd.loop_col_num = BLOBCOL_NAME;
 	else
 		pmd.loop_col_num = BLOBCOL_ID;
@@ -167,11 +150,10 @@ static int com_lsblob_callback(struct osl_table *table,
 	if (pmd.num_matches == 0 && pmd.patterns.size > 0)
 		ret = -E_NO_MATCH;
 out:
-	flush_and_free_pb(&lbad.pb);
 	return ret;
 }
 
-static int com_lsblob(callback_function *f, struct command_context *cc)
+static int com_lsblob(afs_callback *f, struct command_context *cc)
 {
 	uint32_t flags = 0;
 	struct osl_object options = {.data = &flags, .size = sizeof(flags)};
@@ -220,17 +202,17 @@ 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, int fd,
-		const struct osl_object *query)
+static int com_catblob_callback(struct osl_table *table,
+		struct afs_callback_arg *aca)
 {
 	int ret;
 	struct pattern_match_data pmd = {
 		.table = table,
-		.patterns = *query,
+		.patterns = aca->query,
 		.loop_col_num = BLOBCOL_NAME,
 		.match_col_num = BLOBCOL_NAME,
 		.pm_flags = PM_SKIP_EMPTY_NAME,
-		.data = &fd,
+		.data = &aca->fd,
 		.action = cat_blob
 	};
 	ret = for_each_matching_row(&pmd);
@@ -241,7 +223,7 @@ static int com_catblob_callback(struct osl_table *table, int fd,
 	return ret;
 }
 
-static int com_catblob(callback_function *f, struct command_context *cc)
+static int com_catblob(afs_callback *f, struct command_context *cc)
 {
 	if (cc->argc < 2)
 		return -E_BLOB_SYNTAX;
@@ -252,34 +234,26 @@ static int com_catblob(callback_function *f, struct command_context *cc)
 static int remove_blob(struct osl_table *table, struct osl_row *row,
 		const char *name, void *data)
 {
-	struct para_buffer *pb = data;
+	struct afs_callback_arg *aca = data;
 	int ret = osl(osl_del_row(table, row));
 	if (ret < 0) {
-		para_printf(pb, "cannot remove %s\n", name);
+		para_printf(&aca->pbout, "cannot remove %s\n", name);
 		return ret;
 	}
 	return 1;
 }
 
-static int com_rmblob_callback(struct osl_table *table, int fd,
-		const struct osl_object *query)
+static int com_rmblob_callback(struct osl_table *table,
+		struct afs_callback_arg *aca)
 {
 	int ret;
-	struct para_buffer 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,
-	};
 	struct pattern_match_data pmd = {
 		.table = table,
-		.patterns = *query,
+		.patterns = aca->query,
 		.loop_col_num = BLOBCOL_NAME,
 		.match_col_num = BLOBCOL_NAME,
 		.pm_flags = PM_SKIP_EMPTY_NAME,
-		.data = &pb,
+		.data = aca,
 		.action = remove_blob
 	};
 	ret = for_each_matching_row(&pmd);
@@ -288,15 +262,15 @@ static int com_rmblob_callback(struct osl_table *table, int fd,
 	if (pmd.num_matches == 0)
 		ret = -E_NO_MATCH;
 	else {
-		para_printf(&pb, "removed %d blob(s)\n", pmd.num_matches);
-		afs_event(BLOB_RENAME, NULL, table);
+		para_printf(&aca->pbout, "removed %d blob(s)\n",
+			pmd.num_matches);
+		ret = afs_event(BLOB_REMOVE, NULL, table);
 	}
 out:
-	flush_and_free_pb(&pb);
 	return ret;
 }
 
-static int com_rmblob(callback_function *f, struct command_context *cc)
+static int com_rmblob(afs_callback *f, struct command_context *cc)
 {
 	if (cc->argc < 2)
 		return -E_MOOD_SYNTAX;
@@ -304,12 +278,12 @@ static int com_rmblob(callback_function *f, struct command_context *cc)
 		afs_cb_result_handler, cc);
 }
 
-static int com_addblob_callback(struct osl_table *table, int fd,
-		const struct osl_object *query)
+static int com_addblob_callback(struct osl_table *table,
+		struct afs_callback_arg *aca)
 {
 	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;
@@ -342,7 +316,7 @@ static int com_addblob_callback(struct osl_table *table, int fd,
 				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;
 		}
@@ -367,20 +341,17 @@ static int 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_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;
-	afs_event(BLOB_ADD, NULL, table);
+	ret = afs_event(BLOB_ADD, NULL, table);
 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
-		msg_len = xasprintf(&msg, "added %s as id %u\n", name, id);
-	pass_buffer_as_shm(fd, SBD_OUTPUT, msg, msg_len);
-	free(msg);
-	return 0;
+		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. */
@@ -429,7 +400,7 @@ again:
  * afs process via the callback method.
  */
 static int stdin_command(struct command_context *cc, struct osl_object *arg_obj,
-		callback_function *f)
+		afs_callback *f)
 {
 	struct osl_object query, stdin_obj;
 	int ret;
@@ -452,7 +423,7 @@ static int stdin_command(struct command_context *cc, struct osl_object *arg_obj,
 	return ret;
 }
 
-static int com_addblob(callback_function *f, struct command_context *cc)
+static int com_addblob(afs_callback *f, struct command_context *cc)
 {
 	struct osl_object arg_obj;
 
@@ -465,56 +436,44 @@ static int com_addblob(callback_function *f, struct command_context *cc)
 	return stdin_command(cc, &arg_obj, f);
 }
 
-static int com_mvblob_callback(struct osl_table *table, int fd,
-		const struct osl_object *query)
+static int com_mvblob_callback(struct osl_table *table,
+		struct afs_callback_arg *aca)
 {
-	char *src = (char *) query->data;
+	char *src = (char *)aca->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) {
-		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;
 	}
 	obj.data = dest;
 	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;
 	}
-	afs_event(BLOB_RENAME, NULL, table);
+	ret = afs_event(BLOB_RENAME, NULL, table);
 out:
-	flush_and_free_pb(&pb);
-	return 0;
+	return ret;
 }
 
-static int com_mvblob(callback_function *f, struct command_context *cc)
+static int com_mvblob(afs_callback *f, struct command_context *cc)
 {
-	int ret;
-
 	if (cc->argc != 3)
 		return -E_MOOD_SYNTAX;
-	ret = send_option_arg_callback_request(NULL, cc->argc - 1,
+	return 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 com_ ## cmd_name ## cmd_prefix ## _callback(int fd, const struct osl_object *query) \
+	static int com_ ## cmd_name ## cmd_prefix ## _callback(struct afs_callback_arg *aca) \
 	{ \
-		return com_ ## cmd_name ## blob_callback(table_name ## _table, fd, query); \
+		return com_ ## cmd_name ## blob_callback(table_name ## _table, aca); \
 	} \
 	int com_ ## cmd_name ## cmd_prefix(struct command_context *cc) \
 	{ \