X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=attribute.c;h=5a3861bed37ff9689ef171091b009db71df5ad28;hb=3c2dfc4b34326466fd4beb9d1a5e0983bedb6873;hp=f4e2012044ecb20c20333fe5a2d294131140b149;hpb=0229d751f7e4223e81d69bc2d8e9e5b5f3b10a0e;p=paraslash.git

diff --git a/attribute.c b/attribute.c
index f4e20120..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.
  */
@@ -154,6 +154,7 @@ static void com_lsatt_callback(int fd, const struct osl_object *query)
 			.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
 		}
@@ -175,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(fd, laad.pb.buf, laad.pb.offset);
+		pass_buffer_as_shm(fd, SBD_OUTPUT, laad.pb.buf, laad.pb.offset);
 	free(laad.pb.buf);
 }
 
@@ -208,12 +209,10 @@ int com_lsatt(struct command_context *cc)
 	}
 	ret = send_option_arg_callback_request(&options, cc->argc - i, cc->argv + i,
 		com_lsatt_callback, afs_cb_result_handler, cc);
-
-	if (!ret) {
-		if (cc->argc > 1)
-			ret = sc_send_va_buffer(&cc->scc, "no matches\n");
-	} else if (ret < 0)
+	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;
 }
 
@@ -303,6 +302,7 @@ static void com_addatt_callback(int fd, const struct osl_object *query)
 		.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
 	};
@@ -360,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(fd, pb.buf, pb.offset);
+		pass_buffer_as_shm(fd, SBD_OUTPUT, pb.buf, pb.offset);
 	free(pb.buf);
 }
 
@@ -388,6 +388,7 @@ static void com_mvatt_callback(int fd, const struct osl_object *query)
 		.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,
 	};
@@ -405,7 +406,7 @@ out:
 	else
 		afs_event(ATTRIBUTE_RENAME, &pb, NULL);
 	if (pb.offset)
-		pass_buffer_as_shm(fd, pb.buf, pb.offset);
+		pass_buffer_as_shm(fd, SBD_OUTPUT, pb.buf, pb.offset);
 	free(pb.buf);
 }
 
@@ -460,6 +461,7 @@ static void com_rmatt_callback(int fd, const struct osl_object *query)
 			.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,
 		}
@@ -479,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(fd, raad.pb.buf, raad.pb.offset);
+		pass_buffer_as_shm(fd, SBD_OUTPUT, raad.pb.buf, raad.pb.offset);
 	free(raad.pb.buf);
 }