X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=blob.c;h=f51f4de0257ede9e9bfaea933d6e1077f823d1fd;hp=89d993d48fea6610b9fd6fd933fa2c154da3cce1;hb=8c24d4e777f21a8773adfd028af26b967d1880ec;hpb=e31d5dc4774caa3a90d8be566bfd94b9e5cf1482

diff --git a/blob.c b/blob.c
index 89d993d4..f51f4de0 100644
--- a/blob.c
+++ b/blob.c
@@ -18,6 +18,7 @@
 #include "afs.h"
 #include "ipc.h"
 #include "portable_io.h"
+#include "sideband.h"
 #include "command.h"
 
 /**
@@ -135,6 +136,7 @@ static void com_lsblob_callback(struct osl_table *table,
 			.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,
 		}
@@ -162,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);
 }
 
@@ -203,14 +205,14 @@ static int com_lsblob(callback_function *f, struct command_context *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;
 }
@@ -230,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));
 	}
 }
 
@@ -269,6 +271,7 @@ static void com_rmblob_callback(struct osl_table *table, int fd,
 			.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,
 		}
@@ -296,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);
 }
 
@@ -436,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);