X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=attribute.c;h=f7091727bc5b62518f91436de9428ba6c14b5a86;hp=99e7865eaf599a14311d31de6778234b48d64136;hb=04c16387cc13317ded03ce478b131d94558f585f;hpb=db8b6df30d17d9f93c60758e156699067121cbb5

diff --git a/attribute.c b/attribute.c
index 99e7865e..f7091727 100644
--- a/attribute.c
+++ b/attribute.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 1997 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 1997 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file attribute.c Attribute handling functions. */
 
@@ -179,28 +175,31 @@ struct addatt_event_data {
 
 static int com_addatt_callback(struct afs_callback_arg *aca)
 {
-	char *p;
-	int ret = 1;
+	const struct lls_command *cmd = SERVER_CMD_CMD_PTR(ADDATT);
+	int i, ret = 1;
 	size_t len;
+	unsigned num_inputs;
 
-	for (
-		p = aca->query.data;
-		p < (char *)aca->query.data + aca->query.size;
-		p += len + 1
-	) {
+	ret = lls(lls_deserialize_parse_result(aca->query.data, cmd, &aca->lpr));
+	assert(ret >= 0);
+	num_inputs = lls_num_inputs(aca->lpr);
+	for (i = 0; i < num_inputs; i++) {
+		const char *name = lls_input(i, aca->lpr);
 		struct osl_object objs[NUM_ATT_COLUMNS];
 		struct osl_row *row;
 		unsigned char bitnum;
 		struct addatt_event_data aed;
 
-		len = strlen(p);
-		if (!len || p[len - 1] == '-' || p[len - 1] == '+') {
-			para_printf(&aca->pbout, "invalid attribute name: %s\n", p);
+		len = strlen(name);
+		if (len == 0 || name[len - 1] == '-' || name[len - 1] == '+') {
+			para_printf(&aca->pbout,
+				"invalid attribute name: %s\n", name);
 			continue;
 		}
-		ret = get_attribute_bitnum_by_name(p, &bitnum);
+		ret = get_attribute_bitnum_by_name(name, &bitnum);
 		if (ret >= 0) {
-			para_printf(&aca->pbout, "attribute \"%s\" already exists\n", p);
+			para_printf(&aca->pbout,
+				"attribute \"%s\" already exists\n", name);
 			continue;
 		}
 		if (ret != -OSL_ERRNO_TO_PARA_ERROR(E_OSL_RB_KEY_NOT_FOUND)) /* error */
@@ -221,12 +220,12 @@ static int com_addatt_callback(struct afs_callback_arg *aca)
 			ret = -E_ATT_TABLE_FULL;
 			goto out;
 		}
-		objs[ATTCOL_NAME].data = p;
+		objs[ATTCOL_NAME].data = (char *)name;
 		objs[ATTCOL_NAME].size = len + 1;
 		ret = osl(osl_add_row(attribute_table, objs));
 		if (ret < 0)
 			goto out;
-		aed.name = p;
+		aed.name = name;
 		aed.bitnum = bitnum;
 		ret = afs_event(ATTRIBUTE_ADD, &aca->pbout, &aed);
 		if (ret < 0)
@@ -235,53 +234,67 @@ static int com_addatt_callback(struct afs_callback_arg *aca)
 	}
 out:
 	if (ret < 0)
-		para_printf(&aca->pbout, "%s: %s\n", p, para_strerror(-ret));
+		para_printf(&aca->pbout, "error while adding %s\n",
+			lls_input(i, aca->lpr));
 	return ret;
 }
 
-int com_addatt(struct command_context *cc)
+static int com_addatt(struct command_context *cc, struct lls_parse_result *lpr)
 {
-	int ret;
+	const struct lls_command *cmd = SERVER_CMD_CMD_PTR(ADDATT);
+	char *errctx;
+	int ret = lls(lls_check_arg_count(lpr, 1, 64, &errctx));
 
-	if (cc->argc < 2)
-		return -E_ATTR_SYNTAX;
-	ret = send_standard_callback_request(cc->argc - 1, cc->argv + 1,
-		com_addatt_callback, afs_cb_result_handler, cc);
-	if (ret < 0)
-		send_strerror(cc, -ret);
-	return ret;
+	if (ret < 0) {
+		send_errctx(cc, errctx);
+		return ret;
+	}
+	return send_lls_callback_request(com_addatt_callback, cmd, lpr, cc);
 }
+EXPORT_SERVER_CMD_HANDLER(addatt);
 
 static int com_mvatt_callback(struct afs_callback_arg *aca)
 {
-	char *old = aca->query.data;
-	size_t size = strlen(old) + 1;
-	char *new = old + size;
-	struct osl_object obj = {.data = old, .size = size};
+	const struct lls_command *cmd = SERVER_CMD_CMD_PTR(MVATT);
+	const char *old, *new;
+	struct osl_object obj;
 	struct osl_row *row;
 	int ret;
 
+	ret = lls(lls_deserialize_parse_result(aca->query.data, cmd, &aca->lpr));
+	assert(ret >= 0);
+	old = lls_input(0, aca->lpr);
+	new = lls_input(1, aca->lpr);
+	obj.data = (char *)old;
+	obj.size = strlen(old) + 1;
 	ret = osl(osl_get_row(attribute_table, ATTCOL_NAME, &obj, &row));
 	if (ret < 0)
 		goto out;
-	obj.data = new;
+	obj.data = (char *)new;
 	obj.size = strlen(new) + 1;
+	/* The update fails if the destination attribute exists. */
 	ret = osl(osl_update_object(attribute_table, row, ATTCOL_NAME, &obj));
 out:
 	if (ret < 0)
 		para_printf(&aca->pbout, "cannot rename %s to %s\n", old, new);
 	else
 		ret = afs_event(ATTRIBUTE_RENAME, &aca->pbout, NULL);
+	lls_free_parse_result(aca->lpr, cmd);
 	return ret;
 }
 
-int com_mvatt(struct command_context *cc)
+static int com_mvatt(struct command_context *cc, struct lls_parse_result *lpr)
 {
-	if (cc->argc != 3)
-		return -E_ATTR_SYNTAX;
-	return send_standard_callback_request(cc->argc - 1, cc->argv + 1,
-		com_mvatt_callback, afs_cb_result_handler, cc);
+	const struct lls_command *cmd = SERVER_CMD_CMD_PTR(MVATT);
+	char *errctx;
+	int ret = lls(lls_check_arg_count(lpr, 2, 2, &errctx));
+	if (ret < 0) {
+		send_errctx(cc, errctx);
+		return ret;
+	}
+	return send_lls_callback_request(com_mvatt_callback, cmd, lpr, cc);
 }
+EXPORT_SERVER_CMD_HANDLER(mvatt);
 
 static int remove_attribute(struct osl_table *table, struct osl_row *row,
 		const char *name, void *data)
@@ -306,31 +319,41 @@ static int remove_attribute(struct osl_table *table, struct osl_row *row,
 
 static int com_rmatt_callback(struct afs_callback_arg *aca)
 {
+	const struct lls_command *cmd = SERVER_CMD_CMD_PTR(RMATT);
 	int ret;
 	struct pattern_match_data pmd = {
 		.table = attribute_table,
-		.patterns = aca->query,
 		.loop_col_num = ATTCOL_BITNUM,
 		.match_col_num = ATTCOL_NAME,
 		.data = aca,
 		.action = remove_attribute
 	};
+	ret = lls(lls_deserialize_parse_result(aca->query.data, cmd, &aca->lpr));
+	assert(ret >= 0);
+	pmd.lpr = aca->lpr;
 	ret = for_each_matching_row(&pmd);
 	if (ret < 0)
 		goto out;
 	if (pmd.num_matches == 0)
 		ret = -E_NO_MATCH;
 out:
+	lls_free_parse_result(aca->lpr, cmd);
 	return ret;
 }
 
-int com_rmatt(struct command_context *cc)
+static int com_rmatt(struct command_context *cc, struct lls_parse_result *lpr)
 {
-	if (cc->argc < 2)
-		return -E_ATTR_SYNTAX;
-	return send_standard_callback_request(cc->argc - 1, cc->argv + 1,
-		com_rmatt_callback, afs_cb_result_handler, cc);
+	const struct lls_command *cmd = SERVER_CMD_CMD_PTR(RMATT);
+	char *errctx;
+	int ret = lls(lls_check_arg_count(lpr, 1, INT_MAX, &errctx));
+
+	if (ret < 0) {
+		send_errctx(cc, errctx);
+		return ret;
+	}
+	return send_lls_callback_request(com_rmatt_callback, cmd, lpr, cc);
 }
+EXPORT_SERVER_CMD_HANDLER(rmatt);
 
 /**
  * Return a binary representation of the given attribute value.
@@ -449,7 +472,7 @@ int attribute_check_callback(struct afs_callback_arg *aca)
 /**
  * Close the attribute table.
  *
- * \sa osl_close_table().
+ * \sa \ref osl_close_table().
  */
 static void attribute_close(void)
 {
@@ -464,7 +487,7 @@ static void attribute_close(void)
  *
  * \return Positive on success, negative on errors.
  *
- * \sa osl_open_table().
+ * \sa \ref osl_open_table().
  */
 static int attribute_open(const char *dir)
 {