X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=blob.c;h=cd571d74e5d40f71286ef8dc19aca635778f9429;hp=409e348709de83de48090c0535f3aced79dda2c8;hb=74c88020bd325865fe26ed25ea8ad0ace0924136;hpb=69b3a249fb8f0f4a01e26f7a414dbe79f480a78c

diff --git a/blob.c b/blob.c
index 409e3487..cd571d74 100644
--- a/blob.c
+++ b/blob.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2013 Andre Noll <maan@systemlinux.org>
  *
  * 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 "sideband.h"
 #include "command.h"
 
 /**
@@ -133,8 +134,11 @@ static void com_lsblob_callback(struct osl_table *table,
 		.flags = *(uint32_t *)query->data,
 		.pb = {
 			.max_size = shm_get_shmmax(),
-			.private_data = &fd,
-			.max_size_handler = pass_buffer_as_shm
+			.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 = {
@@ -160,7 +164,7 @@ static void com_lsblob_callback(struct osl_table *table,
 	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(lbad.pb.buf, lbad.pb.offset, &fd);
+		pass_buffer_as_shm(fd, SBD_OUTPUT, lbad.pb.buf, lbad.pb.offset);
 	free(lbad.pb.buf);
 }
 
@@ -195,20 +199,20 @@ static int com_lsblob(callback_function *f, struct command_context *cc)
 //	if (argc > i)
 //		return -E_BLOB_SYNTAX;
 	return send_option_arg_callback_request(&options, cc->argc - i,
-		cc->argv + i, f, sc_send_result, cc);
+		cc->argv + i, f, afs_cb_result_handler, cc);
 }
 
 static int cat_blob(struct osl_table *table, struct osl_row *row,
 		__a_unused const char *name, void *data)
 {
-	int ret = 0, ret2;
+	int ret = 0, ret2, fd = *(int *)data;
 	struct osl_object obj;
 
 	ret = osl(osl_open_disk_object(table, row, BLOBCOL_DEF, &obj));
 	if (ret < 0)
 		return (ret == osl(-E_OSL_EMPTY))? 0 : ret;
 	assert(obj.size > 0);
-	ret = pass_buffer_as_shm(obj.data, obj.size, data);
+	ret = pass_buffer_as_shm(fd, SBD_OUTPUT, obj.data, obj.size);
 	ret2 = osl(osl_close_disk_object(&obj));
 	return (ret < 0)? ret : ret2;
 }
@@ -228,7 +232,7 @@ static void com_catblob_callback(struct osl_table *table, int fd,
 	for_each_matching_row(&pmd);
 	if (pmd.num_matches == 0) {
 		char err_msg[] = "no matches\n";
-		pass_buffer_as_shm(err_msg, sizeof(err_msg), &fd);
+		pass_buffer_as_shm(fd, SBD_OUTPUT, err_msg, sizeof(err_msg));
 	}
 }
 
@@ -237,7 +241,7 @@ static int com_catblob(callback_function *f, struct command_context *cc)
 	if (cc->argc < 2)
 		return -E_BLOB_SYNTAX;
 	return send_standard_callback_request(cc->argc - 1, cc->argv + 1, f,
-		sc_send_result, cc);
+		afs_cb_result_handler, cc);
 }
 
 /** Used for removing rows from a blob table. */
@@ -265,8 +269,11 @@ static void com_rmblob_callback(struct osl_table *table, int fd,
 	struct rmblob_data rmbd = {
 		.pb = {
 			.max_size = shm_get_shmmax(),
-			.private_data = &fd,
-			.max_size_handler = pass_buffer_as_shm
+			.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 = {
@@ -292,7 +299,7 @@ static void com_rmblob_callback(struct osl_table *table, int fd,
 	}
 out:
 	if (ret2 >= 0 && rmbd.pb.offset)
-		pass_buffer_as_shm(rmbd.pb.buf, rmbd.pb.offset, &fd);
+		pass_buffer_as_shm(fd, SBD_OUTPUT, rmbd.pb.buf, rmbd.pb.offset);
 	free(rmbd.pb.buf);
 }
 
@@ -301,7 +308,7 @@ static int com_rmblob(callback_function *f, struct command_context *cc)
 	if (cc->argc < 2)
 		return -E_MOOD_SYNTAX;
 	return send_option_arg_callback_request(NULL, cc->argc - 1, cc->argv + 1, f,
-		sc_send_result, cc);
+		afs_cb_result_handler, cc);
 }
 
 static void com_addblob_callback(struct osl_table *table, __a_unused int fd,
@@ -432,7 +439,10 @@ static int stdin_command(struct command_context *cc, struct osl_object *arg_obj,
 	struct osl_object query, stdin_obj;
 	int ret;
 
-	ret = sc_send_buffer(&cc->scc, AWAITING_DATA_MSG);
+	if (cc->use_sideband)
+		ret = send_sb(&cc->scc, NULL, 0, SBD_AWAITING_DATA, false);
+	else
+		ret = sc_send_buffer(&cc->scc, AWAITING_DATA_MSG);
 	if (ret < 0)
 		return ret;
 	ret = fd2buf(&cc->scc, max_len, &stdin_obj);