X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=attribute.c;h=19700944dff7c266db4c78a78e73eb79fda37713;hp=d94589871562038a7ba96aad85c741de0db05b65;hb=f0e41e36c3f1a3a5bb6ff66d92d2814391d8f908;hpb=2aa98426fca67a8b9c075ca7efea54aef18c0380

diff --git a/attribute.c b/attribute.c
index d9458987..19700944 100644
--- a/attribute.c
+++ b/attribute.c
@@ -1,5 +1,5 @@
 /*
- * 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.
  */
@@ -7,7 +7,6 @@
 /** \file attribute.c Attribute handling functions. */
 
 #include <regex.h>
-#include <openssl/rc4.h>
 #include <osl.h>
 
 #include "para.h"
@@ -16,8 +15,8 @@
 #include "string.h"
 #include "afh.h"
 #include "afs.h"
-#include "net.h"
 #include "ipc.h"
+#include "command.h"
 
 static struct osl_table *attribute_table;
 static int greatest_att_bitnum;
@@ -151,7 +150,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
 		}
@@ -177,14 +176,14 @@ static void com_lsatt_callback(int fd, const struct osl_object *query)
 	free(laad.pb.buf);
 }
 
-int com_lsatt(struct rc4_context *rc4c, int argc, char * const * const argv)
+int com_lsatt(struct command_context *cc)
 {
 	unsigned flags = 0;
 	struct osl_object options = {.data = &flags, .size = sizeof(flags)};
 	int ret, i;
 
-	for (i = 1; i < argc; i++) {
-		const char *arg = argv[i];
+	for (i = 1; i < cc->argc; i++) {
+		const char *arg = cc->argv[i];
 		if (arg[0] != '-')
 			break;
 		if (!strcmp(arg, "--")) {
@@ -204,13 +203,13 @@ int com_lsatt(struct rc4_context *rc4c, int argc, char * const * const argv)
 			continue;
 		}
 	}
-	ret = send_option_arg_callback_request(&options, argc - i, argv + i,
-		com_lsatt_callback, rc4_send_result, rc4c);
+	ret = send_option_arg_callback_request(&options, cc->argc - i, cc->argv + i,
+		com_lsatt_callback, sc_send_result, cc);
 	if (!ret) {
-		if (argc > 1)
-			ret = rc4_send_va_buffer(rc4c, "no matches\n");
+		if (cc->argc > 1)
+			ret = sc_send_va_buffer(&cc->scc, "no matches\n");
 	} else if (ret < 0)
-		rc4_send_va_buffer(rc4c, "%s\n", para_strerror(-ret));
+		sc_send_va_buffer(&cc->scc, "%s\n", para_strerror(-ret));
 	return ret;
 }
 
@@ -278,12 +277,12 @@ out:
 		PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
 }
 
-int com_setatt(__a_unused struct rc4_context *rc4c, int argc, char * const * const argv)
+int com_setatt(struct command_context *cc)
 {
-	if (argc < 3)
+	if (cc->argc < 3)
 		return -E_ATTR_SYNTAX;
-	return send_standard_callback_request(argc - 1, argv + 1, com_setatt_callback,
-		NULL, NULL);
+	return send_standard_callback_request(cc->argc - 1, cc->argv + 1,
+		com_setatt_callback, NULL, NULL);
 }
 
 struct addatt_event_data {
@@ -297,7 +296,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
 	};
@@ -359,16 +358,16 @@ out:
 	free(pb.buf);
 }
 
-int com_addatt(struct rc4_context *rc4c, int argc, char * const * const argv)
+int com_addatt(struct command_context *cc)
 {
 	int ret;
 
-	if (argc < 2)
+	if (cc->argc < 2)
 		return -E_ATTR_SYNTAX;
-	ret = send_standard_callback_request(argc - 1, argv + 1, com_addatt_callback,
-		rc4_send_result, rc4c);
+	ret = send_standard_callback_request(cc->argc - 1, cc->argv + 1,
+		com_addatt_callback, sc_send_result, cc);
 	if (ret < 0)
-		rc4_send_va_buffer(rc4c, "%s\n", para_strerror(-ret));
+		sc_send_va_buffer(&cc->scc, "%s\n", para_strerror(-ret));
 	return ret;
 }
 
@@ -380,7 +379,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
 	};
@@ -402,16 +401,16 @@ out:
 	free(pb.buf);
 }
 
-int com_mvatt(struct rc4_context *rc4c, int argc, char * const * const argv)
+int com_mvatt(struct command_context *cc)
 {
 	int ret;
 
-	if (argc != 3)
+	if (cc->argc != 3)
 		return -E_ATTR_SYNTAX;
-	ret = send_standard_callback_request(argc - 1, argv + 1, com_mvatt_callback,
-		rc4_send_result, rc4c);
+	ret = send_standard_callback_request(cc->argc - 1, cc->argv + 1,
+		com_mvatt_callback, sc_send_result, cc);
 	if (ret < 0)
-		rc4_send_va_buffer(rc4c, "%s\n", para_strerror(-ret));
+		sc_send_va_buffer(&cc->scc, "%s\n", para_strerror(-ret));
 	return ret;
 }
 
@@ -450,7 +449,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
 		}
@@ -474,16 +473,16 @@ static void com_rmatt_callback(int fd, const struct osl_object *query)
 	free(raad.pb.buf);
 }
 
-int com_rmatt(struct rc4_context *rc4c, int argc, char * const * const argv)
+int com_rmatt(struct command_context *cc)
 {
 	int ret;
 
-	if (argc < 2)
+	if (cc->argc < 2)
 		return -E_ATTR_SYNTAX;
-	ret = send_standard_callback_request(argc - 1, argv + 1, com_rmatt_callback,
-		rc4_send_result, rc4c);
+	ret = send_standard_callback_request(cc->argc - 1, cc->argv + 1,
+		com_rmatt_callback, sc_send_result, cc);
 	if (ret < 0)
-		rc4_send_va_buffer(rc4c, "%s\n", para_strerror(-ret));
+		sc_send_va_buffer(&cc->scc, "%s\n", para_strerror(-ret));
 	return ret;
 }