X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=attribute.c;h=5a3861bed37ff9689ef171091b009db71df5ad28;hp=19700944dff7c266db4c78a78e73eb79fda37713;hb=22fb31a1325891b0b274d4f8dd9d563136d7bdd8;hpb=0703f75a276020f9645f987134d49402f7c019c0

diff --git a/attribute.c b/attribute.c
index 19700944..5a3861be 100644
--- a/attribute.c
+++ b/attribute.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -16,6 +16,7 @@
 #include "afh.h"
 #include "afs.h"
 #include "ipc.h"
+#include "sideband.h"
 #include "command.h"
 
 static struct osl_table *attribute_table;
@@ -151,8 +152,11 @@ static void com_lsatt_callback(int fd, const struct osl_object *query)
 		.flags = *(unsigned *) 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
 		}
 
 	};
@@ -172,7 +176,7 @@ static void com_lsatt_callback(int fd, const struct osl_object *query)
 		pmd.pm_flags |= PM_REVERSE_LOOP;
 	for_each_matching_row(&pmd);
 	if (laad.pb.offset)
-		pass_buffer_as_shm(laad.pb.buf, laad.pb.offset, &fd);
+		pass_buffer_as_shm(fd, SBD_OUTPUT, laad.pb.buf, laad.pb.offset);
 	free(laad.pb.buf);
 }
 
@@ -204,12 +208,11 @@ int com_lsatt(struct command_context *cc)
 		}
 	}
 	ret = send_option_arg_callback_request(&options, cc->argc - i, cc->argv + i,
-		com_lsatt_callback, sc_send_result, cc);
-	if (!ret) {
-		if (cc->argc > 1)
-			ret = sc_send_va_buffer(&cc->scc, "no matches\n");
-	} else if (ret < 0)
-		sc_send_va_buffer(&cc->scc, "%s\n", para_strerror(-ret));
+		com_lsatt_callback, afs_cb_result_handler, cc);
+	if (ret < 0)
+		send_strerror(cc, -ret);
+	else if (ret == 0 && cc->argc > 1)
+		ret = send_sb_va(&cc->scc, SBD_ERROR_LOG, "no matches\n");
 	return ret;
 }
 
@@ -297,8 +300,11 @@ static void com_addatt_callback(int fd, const struct osl_object *query)
 	int ret = 1, ret2 = 0;
 	struct para_buffer 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
 	};
 	size_t len;
 
@@ -354,7 +360,7 @@ out:
 	if (ret < 0 && ret2 >= 0)
 		para_printf(&pb, "%s: %s\n", p, para_strerror(-ret));
 	if (pb.offset)
-		pass_buffer_as_shm(pb.buf, pb.offset, &fd);
+		pass_buffer_as_shm(fd, SBD_OUTPUT, pb.buf, pb.offset);
 	free(pb.buf);
 }
 
@@ -365,9 +371,9 @@ int com_addatt(struct command_context *cc)
 	if (cc->argc < 2)
 		return -E_ATTR_SYNTAX;
 	ret = send_standard_callback_request(cc->argc - 1, cc->argv + 1,
-		com_addatt_callback, sc_send_result, cc);
+		com_addatt_callback, afs_cb_result_handler, cc);
 	if (ret < 0)
-		sc_send_va_buffer(&cc->scc, "%s\n", para_strerror(-ret));
+		send_strerror(cc, -ret);
 	return ret;
 }
 
@@ -380,8 +386,11 @@ static void com_mvatt_callback(int fd, const struct osl_object *query)
 	struct osl_row *row;
 	struct para_buffer 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,
 	};
 	int ret;
 
@@ -397,7 +406,7 @@ out:
 	else
 		afs_event(ATTRIBUTE_RENAME, &pb, NULL);
 	if (pb.offset)
-		pass_buffer_as_shm(pb.buf, pb.offset, &fd);
+		pass_buffer_as_shm(fd, SBD_OUTPUT, pb.buf, pb.offset);
 	free(pb.buf);
 }
 
@@ -408,9 +417,9 @@ int com_mvatt(struct command_context *cc)
 	if (cc->argc != 3)
 		return -E_ATTR_SYNTAX;
 	ret = send_standard_callback_request(cc->argc - 1, cc->argv + 1,
-		com_mvatt_callback, sc_send_result, cc);
+		com_mvatt_callback, afs_cb_result_handler, cc);
 	if (ret < 0)
-		sc_send_va_buffer(&cc->scc, "%s\n", para_strerror(-ret));
+		send_strerror(cc, -ret);
 	return ret;
 }
 
@@ -450,8 +459,11 @@ static void com_rmatt_callback(int fd, const struct osl_object *query)
 		.num_removed = 0,
 		.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,
 		}
 	};
 	int ret, ret2 = 0;
@@ -469,7 +481,7 @@ static void com_rmatt_callback(int fd, const struct osl_object *query)
 	else if (!raad.num_removed)
 		ret2 = para_printf(&raad.pb, "no match -- nothing removed\n");
 	if (ret2 >= 0 && raad.pb.offset)
-		pass_buffer_as_shm(raad.pb.buf, raad.pb.offset, &fd);
+		pass_buffer_as_shm(fd, SBD_OUTPUT, raad.pb.buf, raad.pb.offset);
 	free(raad.pb.buf);
 }
 
@@ -480,9 +492,9 @@ int com_rmatt(struct command_context *cc)
 	if (cc->argc < 2)
 		return -E_ATTR_SYNTAX;
 	ret = send_standard_callback_request(cc->argc - 1, cc->argv + 1,
-		com_rmatt_callback, sc_send_result, cc);
+		com_rmatt_callback, afs_cb_result_handler, cc);
 	if (ret < 0)
-		sc_send_va_buffer(&cc->scc, "%s\n", para_strerror(-ret));
+		send_strerror(cc, -ret);
 	return ret;
 }