X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=attribute.c;h=a28de6358248e7cd59dcb977227f6f46a69b3fcf;hp=75327111f860bcb39f444e18e379220c072c0dc5;hb=a8573c4bfa41a407247fb1cae56cf9dfb890d6ca;hpb=e31d5dc4774caa3a90d8be566bfd94b9e5cf1482

diff --git a/attribute.c b/attribute.c
index 75327111..a28de635 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;
@@ -153,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
 		}
@@ -174,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);
 }
 
@@ -207,11 +209,13 @@ 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;
 }
 
@@ -222,10 +226,10 @@ static void com_setatt_callback(__a_unused int fd, const struct osl_object *quer
 	int ret;
 	size_t len;
 	struct osl_object obj;
-	struct osl_row *row;
 
 	for (p = query->data; p < (char *)query->data + query->size; p += len + 1) {
 		char c;
+		unsigned char bitnum;
 
 		len = strlen(p);
 		ret = -E_ATTR_SYNTAX;
@@ -235,19 +239,13 @@ static void com_setatt_callback(__a_unused int fd, const struct osl_object *quer
 		if (c != '+' && c != '-')
 			break;
 		p[len - 1] = '\0';
-		obj.data = p;
-		obj.size = len + 1;
-		ret = osl(osl_get_row(attribute_table, ATTCOL_NAME, &obj, &row));
-		if (ret < 0)
-			goto out;
-		ret = osl(osl_get_object(attribute_table, row, ATTCOL_BITNUM,
-			&obj));
+		ret = get_attribute_bitnum_by_name(p, &bitnum);
 		if (ret < 0)
 			goto out;
 		if (c == '+')
-			add_mask |= (1UL << *(unsigned char *)obj.data);
+			add_mask |= (1UL << bitnum);
 		else
-			del_mask |= (1UL << *(unsigned char *)obj.data);
+			del_mask |= (1UL << bitnum);
 	}
 	ret = -E_ATTR_SYNTAX;
 	if (!add_mask && !del_mask)
@@ -301,6 +299,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
 	};
@@ -358,7 +357,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);
 }
 
@@ -371,7 +370,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;
 }
 
@@ -386,6 +385,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,
 	};
@@ -403,7 +403,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);
 }
 
@@ -416,7 +416,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;
 }
 
@@ -458,6 +458,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,
 		}
@@ -477,7 +478,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);
 }
 
@@ -490,7 +491,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;
 }