X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.c;h=fbcffddef8d3669888be7711e097ebf07666012d;hp=0b24a3b8cdb7c53f70b09bba317f9afe523d9320;hb=534a94f441767947874cb15d18211edf758e9277;hpb=becfb4be64a123630775b6517279ed20e4b498f8

diff --git a/afs.c b/afs.c
index 0b24a3b8..fbcffdde 100644
--- a/afs.c
+++ b/afs.c
@@ -12,10 +12,13 @@
 #include <signal.h>
 #include <fnmatch.h>
 #include <osl.h>
+#include <lopsub.h>
 #include <arpa/inet.h>
 #include <sys/un.h>
 #include <netdb.h>
+#include <lopsub.h>
 
+#include "server_cmd.lsg.h"
 #include "server.cmdline.h"
 #include "para.h"
 #include "error.h"
@@ -280,73 +283,33 @@ out:
 }
 
 /**
- * Send a callback request passing an options structure and an argument vector.
+ * Wrapper for send_callback_request() which passes a lopsub parse result.
  *
- * \param options pointer to an arbitrary data structure.
- * \param argc Argument count.
- * \param argv Standard argument vector.
  * \param f The callback function.
- * \param result_handler See \ref send_callback_request.
- * \param private_result_data See \ref send_callback_request.
+ * \param cmd Needed for (de-)serialization.
+ * \param lpr Must match cmd.
+ * \param private_result_data Passed to send_callback_request().
  *
- * Some command handlers pass command-specific options to a callback, together
- * with a list of further arguments (often a list of audio files). This
- * function allows to pass an arbitrary structure (given as an osl object) and
- * a usual argument vector to the specified callback.
+ * This function serializes the parse result given by the lpr pointer into a
+ * buffer. The buffer is sent as the query to the afs process with the callback
+ * mechanism.
  *
- * \return The return value of the underlying call to \ref
- * send_callback_request().
- *
- * \sa send_standard_callback_request(), send_callback_request().
+ * \return The return value of the underlying call to send_callback_request().
  */
-int send_option_arg_callback_request(struct osl_object *options,
-		int argc,  char * const * const argv, afs_callback *f,
-		callback_result_handler *result_handler,
-		void *private_result_data)
+int send_lls_callback_request(afs_callback *f,
+		const struct lls_command * const cmd,
+		struct lls_parse_result *lpr, void *private_result_data)
 {
-	char *p;
-	int i, ret;
-	struct osl_object query = {.size = options? options->size : 0};
-
-	for (i = 0; i < argc; i++)
-		query.size += strlen(argv[i]) + 1;
-	query.data = para_malloc(query.size);
-	p = query.data;
-	if (options) {
-		memcpy(query.data, options->data, options->size);
-		p += options->size;
-	}
-	for (i = 0; i < argc; i++) {
-		strcpy(p, argv[i]); /* OK */
-		p += strlen(argv[i]) + 1;
-	}
-	ret = send_callback_request(f, &query, result_handler,
-		private_result_data);
-	free(query.data);
-	return ret;
-}
+	struct osl_object query;
+	char *buf = NULL;
+	int ret = lls_serialize_parse_result(lpr, cmd, &buf, &query.size);
 
-/**
- * Send a callback request with an argument vector only.
- *
- * \param argc The same meaning as in send_option_arg_callback_request().
- * \param argv The same meaning as in send_option_arg_callback_request().
- * \param f The same meaning as in send_option_arg_callback_request().
- * \param result_handler See \ref send_callback_request.
- * \param private_result_data See \ref send_callback_request.
- *
- * This is similar to send_option_arg_callback_request(), but no options buffer
- * is passed to the parent process.
- *
- * \return The return value of the underlying call to
- * send_option_arg_callback_request().
- */
-int send_standard_callback_request(int argc,  char * const * const argv,
-		afs_callback *f, callback_result_handler *result_handler,
-		void *private_result_data)
-{
-	return send_option_arg_callback_request(NULL, argc, argv, f, result_handler,
+	assert(ret >= 0);
+	query.data = buf;
+	ret = send_callback_request(f, &query, afs_cb_result_handler,
 		private_result_data);
+	free(buf);
+	return ret;
 }
 
 static int action_if_pattern_matches(struct osl_row *row, void *data)
@@ -354,30 +317,37 @@ static int action_if_pattern_matches(struct osl_row *row, void *data)
 	struct pattern_match_data *pmd = data;
 	struct osl_object name_obj;
 	const char *p, *name;
-	int ret = osl(osl_get_object(pmd->table, row, pmd->match_col_num, &name_obj));
-	const char *pattern_txt = (const char *)pmd->patterns.data;
+	int i, ret;
 
+	ret = osl(osl_get_object(pmd->table, row, pmd->match_col_num,
+		&name_obj));
 	if (ret < 0)
 		return ret;
 	name = (char *)name_obj.data;
 	if ((!name || !*name) && (pmd->pm_flags & PM_SKIP_EMPTY_NAME))
 		return 1;
-	if (pmd->patterns.size == 0 &&
-			(pmd->pm_flags & PM_NO_PATTERN_MATCHES_EVERYTHING)) {
-		pmd->num_matches++;
-		return pmd->action(pmd->table, row, name, pmd->data);
+	if (lls_num_inputs(pmd->lpr) == 0) {
+		if (pmd->pm_flags & PM_NO_PATTERN_MATCHES_EVERYTHING) {
+			pmd->num_matches++;
+			return pmd->action(pmd->table, row, name, pmd->data);
+		}
 	}
-	for (p = pattern_txt; p < pattern_txt + pmd->patterns.size;
-			p += strlen(p) + 1) {
+	i = pmd->input_skip;
+	for (;;) {
+		if (i >= lls_num_inputs(pmd->lpr))
+			break;
+		p = lls_input(i, pmd->lpr);
 		ret = fnmatch(p, name, pmd->fnmatch_flags);
-		if (ret == FNM_NOMATCH)
-			continue;
-		if (ret)
-			return -E_FNMATCH;
-		ret = pmd->action(pmd->table, row, name, pmd->data);
-		if (ret >= 0)
-			pmd->num_matches++;
-		return ret;
+		if (ret != FNM_NOMATCH) {
+			if (ret != 0)
+				return -E_FNMATCH;
+			ret = pmd->action(pmd->table, row, name, pmd->data);
+			if (ret >= 0)
+				pmd->num_matches++;
+			return ret;
+
+		}
+		i++;
 	}
 	return 1;
 }
@@ -497,7 +467,7 @@ no_admissible_files:
 }
 
 /* Never fails if arg == NULL */
-static int activate_mood_or_playlist(char *arg, int *num_admissible)
+static int activate_mood_or_playlist(const char *arg, int *num_admissible)
 {
 	enum play_mode mode;
 	int ret;
@@ -590,14 +560,17 @@ static void flush_and_free_pb(struct para_buffer *pb)
 
 static int com_select_callback(struct afs_callback_arg *aca)
 {
-	char *arg = aca->query.data;
+	const struct lls_command *cmd = SERVER_CMD_CMD_PTR(SELECT);
+	const char *arg;
 	int num_admissible, ret;
 
+	ret = lls_deserialize_parse_result(aca->query.data, cmd, &aca->lpr);
+	assert(ret >= 0);
+	arg = lls_input(0, aca->lpr);
 	ret = clear_score_table();
 	if (ret < 0) {
-		para_printf(&aca->pbout, "could not clear score table: %s\n",
-			para_strerror(-ret));
-		return ret;
+		para_printf(&aca->pbout, "could not clear score table\n");
+		goto free_lpr;
 	}
 	if (current_play_mode == PLAY_MODE_MOOD)
 		close_current_mood();
@@ -607,32 +580,39 @@ static int com_select_callback(struct afs_callback_arg *aca)
 	if (ret >= 0)
 		goto out;
 	/* ignore subsequent errors (but log them) */
-	para_printf(&aca->pbout, "could not activate %s: %s\n"
-		"switching back to %s\n",
-		arg, para_strerror(-ret), current_mop? current_mop : "dummy");
-	ret = activate_mood_or_playlist(current_mop, &num_admissible);
-	if (ret >= 0)
-		goto out;
-	para_printf(&aca->pbout, "could not activate %s: %s\nswitching to dummy\n",
-		current_mop, para_strerror(-ret));
+	para_printf(&aca->pbout, "could not activate %s\n", arg);
+	if (current_mop) {
+		int ret2;
+		para_printf(&aca->pbout, "switching back to %s\n", current_mop);
+		ret2 = activate_mood_or_playlist(current_mop, &num_admissible);
+		if (ret2 >= 0)
+			goto out;
+		para_printf(&aca->pbout, "could not reactivate %s: %s\n",
+			current_mop, para_strerror(-ret2));
+	}
+	para_printf(&aca->pbout, "activating dummy mood\n");
 	activate_mood_or_playlist(NULL, &num_admissible);
 out:
 	para_printf(&aca->pbout, "activated %s (%d admissible files)\n",
 		current_mop? current_mop : "dummy mood", num_admissible);
+free_lpr:
+	lls_free_parse_result(aca->lpr, cmd);
 	return ret;
 }
 
-int com_select(struct command_context *cc)
+static int com_select(struct command_context *cc, struct lls_parse_result *lpr)
 {
-	struct osl_object query;
+	const struct lls_command *cmd = SERVER_CMD_CMD_PTR(SELECT);
+	char *errctx;
+	int ret = lls(lls_check_arg_count(lpr, 1, 1, &errctx));
 
-	if (cc->argc != 2)
-		return -E_AFS_SYNTAX;
-	query.data = cc->argv[1];
-	query.size = strlen(cc->argv[1]) + 1;
-	return send_callback_request(com_select_callback, &query,
-		&afs_cb_result_handler, cc);
+	if (ret < 0) {
+		send_errctx(cc, errctx);
+		return ret;
+	}
+	return send_lls_callback_request(com_select_callback, cmd, lpr, cc);
 }
+EXPORT_SERVER_CMD_HANDLER(select);
 
 static void init_admissible_files(char *arg)
 {
@@ -649,7 +629,7 @@ static int setup_command_socket_or_die(void)
 	ret = create_local_socket(socket_name, 0);
 	if (ret < 0) {
 		ret = create_local_socket(socket_name,
-			S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IWOTH);
+			S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IROTH);
 		if (ret < 0) {
 			PARA_EMERG_LOG("%s: %s\n", para_strerror(-ret),
 				socket_name);
@@ -703,7 +683,7 @@ static int open_afs_tables(void)
 	int i, ret;
 
 	get_database_dir();
-	PARA_NOTICE_LOG("opening %u osl tables in %s\n", NUM_AFS_TABLES,
+	PARA_NOTICE_LOG("opening %d osl tables in %s\n", NUM_AFS_TABLES,
 		database_dir);
 	for (i = 0; i < NUM_AFS_TABLES; i++) {
 		ret = afs_tables[i].open(database_dir);
@@ -885,7 +865,7 @@ static int execute_server_command(fd_set *rfds)
 		return ret;
 	buf[n] = '\0';
 	if (strcmp(buf, "new"))
-		return -E_BAD_CMD;
+		return -ERRNO_TO_PARA_ERROR(EINVAL);
 	return open_next_audio_file();
 }
 
@@ -1021,6 +1001,13 @@ __noreturn void afs_init(uint32_t cookie, int socket_fd)
 	register_command_task(cookie, &s);
 	s.default_timeout.tv_sec = 0;
 	s.default_timeout.tv_usec = 999 * 1000;
+	ret = write(socket_fd, "\0", 1);
+	if (ret != 1) {
+		if (ret == 0)
+			errno = EINVAL;
+		ret = -ERRNO_TO_PARA_ERROR(errno);
+		goto out_close;
+	}
 	ret = schedule(&s);
 	sched_shutdown(&s);
 out_close:
@@ -1060,23 +1047,24 @@ out:
 	return ret;
 }
 
-int com_init(struct command_context *cc)
+static int com_init(struct command_context *cc, struct lls_parse_result *lpr)
 {
 	int i, j, ret;
 	uint32_t table_mask = (1 << (NUM_AFS_TABLES + 1)) - 1;
 	struct osl_object query = {.data = &table_mask,
 		.size = sizeof(table_mask)};
+	unsigned num_inputs = lls_num_inputs(lpr);
 
 	ret = make_database_dir();
 	if (ret < 0)
 		return ret;
-	if (cc->argc != 1) {
+	if (num_inputs > 0) {
 		table_mask = 0;
-		for (i = 1; i < cc->argc; i++) {
+		for (i = 0; i < num_inputs; i++) {
 			for (j = 0; j < NUM_AFS_TABLES; j++) {
 				struct afs_table *t = &afs_tables[j];
 
-				if (strcmp(cc->argv[i], t->name))
+				if (strcmp(lls_input(i, lpr), t->name))
 					continue;
 				table_mask |= (1 << j);
 				break;
@@ -1088,77 +1076,37 @@ int com_init(struct command_context *cc)
 	return send_callback_request(com_init_callback, &query,
 		afs_cb_result_handler, cc);
 }
+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)
@@ -1166,6 +1114,7 @@ int com_check(struct command_context *cc)
 	}
 	return 1;
 }
+EXPORT_SERVER_CMD_HANDLER(check);
 
 /**
  * The afs event dispatcher.
@@ -1192,7 +1141,7 @@ __must_check int afs_event(enum afs_events event, struct para_buffer *pb,
 			continue;
 		ret = t->event_handler(event, pb, data);
 		if (ret < 0) {
-			PARA_CRIT_LOG("table %s, event %d: %s\n", t->name,
+			PARA_CRIT_LOG("table %s, event %u: %s\n", t->name,
 				event, para_strerror(-ret));
 			return ret;
 		}