X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=attribute.c;h=65f08aef4c062c79b6b204b628fe0bbf0c98e8bb;hb=985ba0546ab18eadf73d0a2686029a3ac876c846;hp=edf3baf51fa376708785eaa014f321eaff827aa4;hpb=2830b9f881898aaec073d5ba19e33482e30190bd;p=paraslash.git

diff --git a/attribute.c b/attribute.c
index edf3baf5..65f08aef 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
 		}
@@ -161,7 +162,7 @@ static void com_lsatt_callback(int fd, const struct osl_object *query)
 	};
 	struct pattern_match_data pmd = {
 		.table = attribute_table,
-		.loop_col_num = ATTCOL_BITNUM,
+		.loop_col_num = ATTCOL_NAME,
 		.match_col_num = ATTCOL_NAME,
 		.patterns = {.data = (char *)query->data + sizeof(laad.flags),
 			.size = query->size - sizeof(laad.flags)},
@@ -170,12 +171,12 @@ static void com_lsatt_callback(int fd, const struct osl_object *query)
 		.action = print_attribute
 	};
 	if (laad.flags & LSATT_FLAG_SORT_BY_ID)
-		pmd.loop_col_num = ATTCOL_NAME;
+		pmd.loop_col_num = ATTCOL_BITNUM;
 	if (laad.flags & LSATT_FLAG_REVERSE)
 		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);
 }
 
@@ -208,18 +209,20 @@ 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)
-		sc_send_va_buffer(&cc->scc, "%s\n", para_strerror(-ret));
+	if (ret < 0)
+		send_strerror(cc, -ret);
+	else if (ret == 0 && cc->argc > 1)
+		ret = cc->use_sideband?
+			send_sb_va(&cc->scc, SBD_ERROR_LOG, "no matches\n")
+		:
+			sc_send_va_buffer(&cc->scc, "no matches\n");
 	return ret;
 }
 
 static void com_setatt_callback(__a_unused int fd, const struct osl_object *query)
 {
 	char *p;
-	uint64_t add_mask = 0, del_mask = 0;
+	uint64_t add_mask = 0, del_mask = 0, one = 1;
 	int ret;
 	size_t len;
 	struct osl_object obj;
@@ -246,9 +249,9 @@ static void com_setatt_callback(__a_unused int fd, const struct osl_object *quer
 		if (ret < 0)
 			goto out;
 		if (c == '+')
-			add_mask |= (1UL << *(unsigned char *)obj.data);
+			add_mask |= (one << *(unsigned char *)obj.data);
 		else
-			del_mask |= (1UL << *(unsigned char *)obj.data);
+			del_mask |= (one << *(unsigned char *)obj.data);
 	}
 	ret = -E_ATTR_SYNTAX;
 	if (!add_mask && !del_mask)
@@ -302,6 +305,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
 	};
@@ -359,7 +363,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);
 }
 
@@ -372,7 +376,7 @@ int com_addatt(struct command_context *cc)
 	ret = send_standard_callback_request(cc->argc - 1, cc->argv + 1,
 		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;
 }
 
@@ -387,6 +391,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,
 	};
@@ -404,7 +409,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);
 }
 
@@ -417,7 +422,7 @@ int com_mvatt(struct command_context *cc)
 	ret = send_standard_callback_request(cc->argc - 1, cc->argv + 1,
 		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;
 }
 
@@ -459,6 +464,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,
 		}
@@ -478,7 +484,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);
 }
 
@@ -491,7 +497,7 @@ int com_rmatt(struct command_context *cc)
 	ret = send_standard_callback_request(cc->argc - 1, cc->argv + 1,
 		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;
 }