X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=attribute.c;h=b962661a10b28ed879dc88271afe1ce34a9980c5;hp=cce8ce6e03bd9aef9d675de1ef79a983a294413b;hb=8ea8abb73199b32fdd7afdf8825afa42ed8de244;hpb=26d662890f5e1c29c0b09d1cac94b8b4acb065ed

diff --git a/attribute.c b/attribute.c
index cce8ce6e..b962661a 100644
--- a/attribute.c
+++ b/attribute.c
@@ -5,8 +5,14 @@
  */
 
 /** \file attribute.c Attribute handling functions. */
+
+#include <regex.h>
+#include <openssl/rc4.h>
+#include <osl.h>
+
 #include "para.h"
 #include "error.h"
+#include "crypt.h"
 #include "string.h"
 #include "afh.h"
 #include "afs.h"
@@ -89,11 +95,11 @@ int get_attribute_bitnum_by_name(const char *att_name, unsigned char *bitnum)
 	struct osl_object obj = {.data = (char *)att_name,
 		.size = strlen(att_name) + 1};
 	struct osl_row *row;
-	int ret = osl_get_row(attribute_table, ATTCOL_NAME, &obj, &row);
+	int ret = osl(osl_get_row(attribute_table, ATTCOL_NAME, &obj, &row));
 
 	if (ret < 0)
 		return ret;
-	ret = osl_get_object(attribute_table, row, ATTCOL_BITNUM, &obj);
+	ret = osl(osl_get_object(attribute_table, row, ATTCOL_BITNUM, &obj));
 	if (ret < 0)
 		return ret;
 	*bitnum = *(unsigned char *)obj.data;
@@ -127,13 +133,13 @@ static int print_attribute(struct osl_table *table, struct osl_row *row,
 {
 	struct lsatt_action_data *laad = data;
 	struct osl_object bitnum_obj;
-	int ret, ret2;
+	int ret;
 
 	if (!(laad->flags & LSATT_FLAG_LONG))
 		return para_printf(&laad->pb, "%s\n", name);
-	ret = osl_get_object(table, row, ATTCOL_BITNUM, &bitnum_obj);
+	ret = osl(osl_get_object(table, row, ATTCOL_BITNUM, &bitnum_obj));
 	if (ret < 0) {
-		ret2 = para_printf(&laad->pb, "%s: %s\n", name, para_strerror(-ret));
+		para_printf(&laad->pb, "%s: %s\n", name, para_strerror(-ret));
 		return ret;
 	}
 	return para_printf(&laad->pb, "%u\t%s\n", *(unsigned char*)bitnum_obj.data,
@@ -171,7 +177,7 @@ static void com_lsatt_callback(int fd, const struct osl_object *query)
 	free(laad.pb.buf);
 }
 
-int com_lsatt(int fd, int argc, char * const * const argv)
+int com_lsatt(struct rc4_context *rc4c, int argc, char * const * const argv)
 {
 	unsigned flags = 0;
 	struct osl_object options = {.data = &flags, .size = sizeof(flags)};
@@ -199,12 +205,12 @@ int com_lsatt(int fd, int argc, char * const * const argv)
 		}
 	}
 	ret = send_option_arg_callback_request(&options, argc - i, argv + i,
-		com_lsatt_callback, send_result, &fd);
+		com_lsatt_callback, rc4_send_result, rc4c);
 	if (!ret) {
 		if (argc > 1)
-			ret = send_va_buffer(fd, "no matches\n");
+			ret = rc4_send_va_buffer(rc4c, "no matches\n");
 	} else if (ret < 0)
-		send_va_buffer(fd, "%s\n", para_strerror(-ret));
+		rc4_send_va_buffer(rc4c, "%s\n", para_strerror(-ret));
 	return ret;
 }
 
@@ -230,11 +236,11 @@ static void com_setatt_callback(__a_unused int fd, const struct osl_object *quer
 		p[len - 1] = '\0';
 		obj.data = p;
 		obj.size = len + 1;
-		ret = osl_get_row(attribute_table, ATTCOL_NAME, &obj, &row);
+		ret = osl(osl_get_row(attribute_table, ATTCOL_NAME, &obj, &row));
 		if (ret < 0)
 			goto out;
-		ret = osl_get_object(attribute_table, row, ATTCOL_BITNUM,
-			&obj);
+		ret = osl(osl_get_object(attribute_table, row, ATTCOL_BITNUM,
+			&obj));
 		if (ret < 0)
 			goto out;
 		if (c == '+')
@@ -272,7 +278,7 @@ out:
 		PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
 }
 
-int com_setatt(__a_unused int fd, int argc, char * const * const argv)
+int com_setatt(__a_unused struct rc4_context *rc4c, int argc, char * const * const argv)
 {
 	if (argc < 3)
 		return -E_ATTR_SYNTAX;
@@ -288,7 +294,7 @@ struct addatt_event_data {
 
 static void com_addatt_callback(int fd, const struct osl_object *query)
 {
-	char *p = query->data;
+	char *p;
 	int ret = 1, ret2 = 0;
 	struct para_buffer pb = {
 		.max_size = SHMMAX,
@@ -317,15 +323,15 @@ static void com_addatt_callback(int fd, const struct osl_object *query)
 				goto out;
 			continue;
 		}
-		if (ret != -E_RB_KEY_NOT_FOUND) /* error */
+		if (ret != -OSL_ERRNO_TO_PARA_ERROR(E_OSL_RB_KEY_NOT_FOUND)) /* error */
 			goto out;
 		objs[ATTCOL_BITNUM].size = 1;
 		/* find smallest unused attribute */
 		for (bitnum = 0; bitnum < 64; bitnum++) {
 			objs[ATTCOL_BITNUM].data = &bitnum;
-			ret = osl_get_row(attribute_table, ATTCOL_BITNUM,
-				&objs[ATTCOL_BITNUM], &row);
-			if (ret == -E_RB_KEY_NOT_FOUND)
+			ret = osl(osl_get_row(attribute_table, ATTCOL_BITNUM,
+				&objs[ATTCOL_BITNUM], &row));
+			if (ret == -OSL_ERRNO_TO_PARA_ERROR(E_OSL_RB_KEY_NOT_FOUND))
 				break; /* this bitnum is unused, use it */
 			if (ret < 0) /* error */
 				goto out;
@@ -337,7 +343,7 @@ static void com_addatt_callback(int fd, const struct osl_object *query)
 		}
 		objs[ATTCOL_NAME].data = p;
 		objs[ATTCOL_NAME].size = len + 1;
-		ret = osl_add_row(attribute_table, objs);
+		ret = osl(osl_add_row(attribute_table, objs));
 		if (ret < 0)
 			goto out;
 		aed.name = p;
@@ -347,22 +353,22 @@ static void com_addatt_callback(int fd, const struct osl_object *query)
 	}
 out:
 	if (ret < 0 && ret2 >= 0)
-		ret = para_printf(&pb, "%s: %s\n", p, para_strerror(-ret));
+		para_printf(&pb, "%s: %s\n", p, para_strerror(-ret));
 	if (pb.offset)
 		pass_buffer_as_shm(pb.buf, pb.offset, &fd);
 	free(pb.buf);
 }
 
-int com_addatt(int fd, int argc, char * const * const argv)
+int com_addatt(struct rc4_context *rc4c, int argc, char * const * const argv)
 {
 	int ret;
 
 	if (argc < 2)
 		return -E_ATTR_SYNTAX;
 	ret = send_standard_callback_request(argc - 1, argv + 1, com_addatt_callback,
-		send_result, &fd);
+		rc4_send_result, rc4c);
 	if (ret < 0)
-		send_va_buffer(fd, "%s\n", para_strerror(-ret));
+		rc4_send_va_buffer(rc4c, "%s\n", para_strerror(-ret));
 	return ret;
 }
 
@@ -380,15 +386,15 @@ static void com_mvatt_callback(int fd, const struct osl_object *query)
 	};
 	int ret;
 
-	ret = osl_get_row(attribute_table, ATTCOL_NAME, &obj, &row);
+	ret = osl(osl_get_row(attribute_table, ATTCOL_NAME, &obj, &row));
 	if (ret < 0)
 		goto out;
 	obj.data = new;
 	obj.size = strlen(new) + 1;
-	ret = osl_update_object(attribute_table, row, ATTCOL_NAME, &obj);
+	ret = osl(osl_update_object(attribute_table, row, ATTCOL_NAME, &obj));
 out:
 	if (ret < 0)
-		ret = para_printf(&pb, "%s\n", para_strerror(-ret));
+		para_printf(&pb, "%s\n", para_strerror(-ret));
 	else
 		afs_event(ATTRIBUTE_RENAME, &pb, NULL);
 	if (pb.offset)
@@ -396,16 +402,16 @@ out:
 	free(pb.buf);
 }
 
-int com_mvatt(int fd, int argc, char * const * const argv)
+int com_mvatt(struct rc4_context *rc4c, int argc, char * const * const argv)
 {
 	int ret;
 
 	if (argc != 3)
 		return -E_ATTR_SYNTAX;
 	ret = send_standard_callback_request(argc - 1, argv + 1, com_mvatt_callback,
-		send_result, &fd);
+		rc4_send_result, rc4c);
 	if (ret < 0)
-		send_va_buffer(fd, "%s\n", para_strerror(-ret));
+		rc4_send_va_buffer(rc4c, "%s\n", para_strerror(-ret));
 	return ret;
 }
 
@@ -429,7 +435,7 @@ static int remove_attribute(struct osl_table *table, struct osl_row *row,
 	ret = get_attribute_bitnum_by_name(name, &red.bitnum);
 	if (ret < 0)
 		return para_printf(&raad->pb, "%s: %s\n", name, para_strerror(-ret));
-	ret = osl_del_row(table, row);
+	ret = osl(osl_del_row(table, row));
 	if (ret < 0)
 		return para_printf(&raad->pb, "%s: %s\n", name, para_strerror(-ret));
 	ret = para_printf(&raad->pb, "removed attribute %s\n", name);
@@ -468,16 +474,16 @@ static void com_rmatt_callback(int fd, const struct osl_object *query)
 	free(raad.pb.buf);
 }
 
-int com_rmatt(int fd, int argc, char * const * const argv)
+int com_rmatt(struct rc4_context *rc4c, int argc, char * const * const argv)
 {
 	int ret;
 
 	if (argc < 2)
 		return -E_ATTR_SYNTAX;
 	ret = send_standard_callback_request(argc - 1, argv + 1, com_rmatt_callback,
-		send_result, &fd);
+		rc4_send_result, rc4c);
 	if (ret < 0)
-		send_va_buffer(fd, "%s\n", para_strerror(-ret));
+		rc4_send_va_buffer(rc4c, "%s\n", para_strerror(-ret));
 	return ret;
 }
 
@@ -533,10 +539,10 @@ int get_attribute_text(uint64_t *atts, const char *delim, char **text)
 
 		if (!(*atts & (one << i)))
 			continue;
-		ret = osl_get_row(attribute_table, ATTCOL_BITNUM, &obj, &row);
+		ret = osl(osl_get_row(attribute_table, ATTCOL_BITNUM, &obj, &row));
 		if (ret < 0)
 			goto err;
-		ret = osl_get_object(attribute_table, row, ATTCOL_NAME, &obj);
+		ret = osl(osl_get_object(attribute_table, row, ATTCOL_NAME, &obj));
 		if (ret < 0)
 			goto err;
 		if (*text) {
@@ -579,14 +585,14 @@ static int attribute_open(const char *dir)
 	int ret;
 
 	attribute_table_desc.dir = dir;
-	ret = osl_open_table(&attribute_table_desc, &attribute_table);
+	ret = osl(osl_open_table(&attribute_table_desc, &attribute_table));
 	greatest_att_bitnum = -1; /* no atts available */
 	if (ret >= 0) {
 		find_greatest_att_bitnum();
 		return ret;
 	}
 	attribute_table = NULL;
-	if (ret >= 0 || is_errno(-ret, ENOENT))
+	if (ret >= 0 || ret == -OSL_ERRNO_TO_PARA_ERROR(E_OSL_NOENT))
 		return 1;
 	return ret;
 }
@@ -594,7 +600,7 @@ static int attribute_open(const char *dir)
 static int attribute_create(const char *dir)
 {
 	attribute_table_desc.dir = dir;
-	return osl_create_table(&attribute_table_desc);
+	return osl(osl_create_table(&attribute_table_desc));
 }
 
 /**