X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.c;h=1084b715354d3532d5a3be038186a04fdd41f1c8;hp=92c58cc8cbe142a4f403b6bd0654c21f8136757e;hb=f2d9fcc2aad0df59ae5a635564760c1cff4fcfc6;hpb=f57f71019a272c7e5a29a10da55a8ef2bed5de71

diff --git a/afs.c b/afs.c
index 92c58cc8..1084b715 100644
--- a/afs.c
+++ b/afs.c
@@ -18,6 +18,7 @@
 #include <netdb.h>
 #include <lopsub.h>
 
+#include "server_cmd.lsg.h"
 #include "server.cmdline.h"
 #include "para.h"
 #include "error.h"
@@ -1148,76 +1149,35 @@ static int com_init(struct command_context *cc, struct lls_parse_result *lpr)
 }
 EXPORT_SERVER_CMD_HANDLER(init);
 
-/**
- * Flags for the check command.
- *
- * \sa com_check().
- */
-enum com_check_flags {
-	/** Check the audio file table. */
-	CHECK_AFT = 1,
-	/** Check the mood table. */
-	CHECK_MOODS = 2,
-	/** Check the playlist table. */
-	CHECK_PLAYLISTS = 4,
-	/** Check the attribute table against the audio file table. */
-	CHECK_ATTS = 8
-};
-
-int com_check(struct command_context *cc)
+static int com_check(struct command_context *cc, struct lls_parse_result *lpr)
 {
-	unsigned flags = 0;
-	int i, ret;
+	const struct lls_opt_result *r_a = SERVER_CMD_OPT_RESULT(CHECK, AFT, lpr);
+	const struct lls_opt_result *r_A = SERVER_CMD_OPT_RESULT(CHECK, ATTRIBUTE, lpr);
+	const struct lls_opt_result *r_m = SERVER_CMD_OPT_RESULT(CHECK, MOOD, lpr);
+	const struct lls_opt_result *r_p = SERVER_CMD_OPT_RESULT(CHECK, PLAYLIST, lpr);
+	bool noopt = !lls_opt_given(r_a) && !lls_opt_given(r_A)
+		&& !lls_opt_given(r_m) && !lls_opt_given(r_p);
+	int ret;
 
-	for (i = 1; i < cc->argc; i++) {
-		const char *arg = cc->argv[i];
-		if (arg[0] != '-')
-			break;
-		if (!strcmp(arg, "--")) {
-			i++;
-			break;
-		}
-		if (!strcmp(arg, "-a")) {
-			flags |= CHECK_AFT;
-			continue;
-		}
-		if (!strcmp(arg, "-A")) {
-			flags |= CHECK_ATTS;
-			continue;
-		}
-		if (!strcmp(arg, "-p")) {
-			flags |= CHECK_PLAYLISTS;
-			continue;
-		}
-		if (!strcmp(arg, "-m")) {
-			flags |= CHECK_MOODS;
-			continue;
-		}
-		return -E_AFS_SYNTAX;
-	}
-	if (i < cc->argc)
-		return -E_AFS_SYNTAX;
-	if (!flags)
-		flags = ~0U;
-	if (flags & CHECK_AFT) {
+	if (noopt || lls_opt_given(r_a)) {
 		ret = send_callback_request(aft_check_callback, NULL,
 			afs_cb_result_handler, cc);
 		if (ret < 0)
 			return ret;
 	}
-	if (flags & CHECK_ATTS) {
+	if (noopt || lls_opt_given(r_A)) {
 		ret = send_callback_request(attribute_check_callback, NULL,
 			afs_cb_result_handler, cc);
 		if (ret < 0)
 			return ret;
 	}
-	if (flags & CHECK_PLAYLISTS) {
+	if (noopt || lls_opt_given(r_p)) {
 		ret = send_callback_request(playlist_check_callback,
 			NULL, afs_cb_result_handler, cc);
 		if (ret < 0)
 			return ret;
 	}
-	if (flags & CHECK_MOODS) {
+	if (noopt || lls_opt_given(r_m)) {
 		ret = send_callback_request(mood_check_callback, NULL,
 			afs_cb_result_handler, cc);
 		if (ret < 0)
@@ -1225,6 +1185,7 @@ int com_check(struct command_context *cc)
 	}
 	return 1;
 }
+EXPORT_SERVER_CMD_HANDLER(check);
 
 /**
  * The afs event dispatcher.