X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=attribute.c;h=b56a9574db48d28879cf31341bc0aaaf5afbe34f;hp=dc375c1d8dc57aea4e5ed06c7bfdf6092fa16880;hb=9de1287d67c9562e9140c6dc7deb0c01c4e10cc0;hpb=d43da48a1e6555b3eaea162f44ea131175acc1f7

diff --git a/attribute.c b/attribute.c
index dc375c1d..b56a9574 100644
--- a/attribute.c
+++ b/attribute.c
@@ -1,17 +1,20 @@
 /*
- * Copyright (C) 1997-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2012 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file attribute.c Attribute handling functions. */
+
+#include <regex.h>
 #include <osl.h>
+
 #include "para.h"
 #include "error.h"
+#include "crypt.h"
 #include "string.h"
 #include "afh.h"
 #include "afs.h"
-#include "net.h"
 #include "ipc.h"
 
 static struct osl_table *attribute_table;
@@ -146,7 +149,7 @@ static void com_lsatt_callback(int fd, const struct osl_object *query)
 	struct lsatt_action_data laad = {
 		.flags = *(unsigned *) query->data,
 		.pb = {
-			.max_size = SHMMAX,
+			.max_size = shm_get_shmmax(),
 			.private_data = &fd,
 			.max_size_handler = pass_buffer_as_shm
 		}
@@ -172,7 +175,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 stream_cipher_context *scc, int argc, char * const * const argv)
 {
 	unsigned flags = 0;
 	struct osl_object options = {.data = &flags, .size = sizeof(flags)};
@@ -200,12 +203,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, sc_send_result, scc);
 	if (!ret) {
 		if (argc > 1)
-			ret = send_va_buffer(fd, "no matches\n");
+			ret = sc_send_va_buffer(scc, "no matches\n");
 	} else if (ret < 0)
-		send_va_buffer(fd, "%s\n", para_strerror(-ret));
+		sc_send_va_buffer(scc, "%s\n", para_strerror(-ret));
 	return ret;
 }
 
@@ -273,7 +276,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 stream_cipher_context *scc, int argc, char * const * const argv)
 {
 	if (argc < 3)
 		return -E_ATTR_SYNTAX;
@@ -292,7 +295,7 @@ static void com_addatt_callback(int fd, const struct osl_object *query)
 	char *p;
 	int ret = 1, ret2 = 0;
 	struct para_buffer pb = {
-		.max_size = SHMMAX,
+		.max_size = shm_get_shmmax(),
 		.private_data = &fd,
 		.max_size_handler = pass_buffer_as_shm
 	};
@@ -354,16 +357,16 @@ out:
 	free(pb.buf);
 }
 
-int com_addatt(int fd, int argc, char * const * const argv)
+int com_addatt(struct stream_cipher_context *scc, 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);
+		sc_send_result, scc);
 	if (ret < 0)
-		send_va_buffer(fd, "%s\n", para_strerror(-ret));
+		sc_send_va_buffer(scc, "%s\n", para_strerror(-ret));
 	return ret;
 }
 
@@ -375,7 +378,7 @@ static void com_mvatt_callback(int fd, const struct osl_object *query)
 	struct osl_object obj = {.data = old, .size = size};
 	struct osl_row *row;
 	struct para_buffer pb = {
-		.max_size = SHMMAX,
+		.max_size = shm_get_shmmax(),
 		.private_data = &fd,
 		.max_size_handler = pass_buffer_as_shm
 	};
@@ -397,16 +400,16 @@ out:
 	free(pb.buf);
 }
 
-int com_mvatt(int fd, int argc, char * const * const argv)
+int com_mvatt(struct stream_cipher_context *scc, 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);
+		sc_send_result, scc);
 	if (ret < 0)
-		send_va_buffer(fd, "%s\n", para_strerror(-ret));
+		sc_send_va_buffer(scc, "%s\n", para_strerror(-ret));
 	return ret;
 }
 
@@ -445,7 +448,7 @@ static void com_rmatt_callback(int fd, const struct osl_object *query)
 	struct remove_attribute_action_data raad = {
 		.num_removed = 0,
 		.pb = {
-			.max_size = SHMMAX,
+			.max_size = shm_get_shmmax(),
 			.private_data = &fd,
 			.max_size_handler = pass_buffer_as_shm
 		}
@@ -469,16 +472,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 stream_cipher_context *scc, 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);
+		sc_send_result, scc);
 	if (ret < 0)
-		send_va_buffer(fd, "%s\n", para_strerror(-ret));
+		sc_send_va_buffer(scc, "%s\n", para_strerror(-ret));
 	return ret;
 }
 
@@ -560,7 +563,7 @@ err:
  *
  * \sa osl_close_table().
  */
-void attribute_close(void)
+static void attribute_close(void)
 {
 	osl_close_table(attribute_table, OSL_MARK_CLEAN);
 	attribute_table = NULL;
@@ -605,7 +608,6 @@ static int attribute_create(const char *dir)
  */
 void attribute_init(struct afs_table *t)
 {
-	t->name = attribute_table_desc.name;
 	t->open = attribute_open;
 	t->close = attribute_close;
 	t->create = attribute_create;