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

diff --git a/afs.c b/afs.c
index 92c58cc8..ef05a473 100644
--- a/afs.c
+++ b/afs.c
@@ -18,7 +18,8 @@
 #include <netdb.h>
 #include <lopsub.h>
 
-#include "server.cmdline.h"
+#include "server.lsg.h"
+#include "server_cmd.lsg.h"
 #include "para.h"
 #include "error.h"
 #include "crypt.h"
@@ -36,22 +37,22 @@
 #include "sideband.h"
 #include "command.h"
 
-/** The osl tables used by afs. \sa blob.c. */
+/** The osl tables used by afs. \sa \ref blob.c. */
 enum afs_table_num {
-	/** Contains audio file information. See aft.c. */
+	/** Contains audio file information. See \ref aft.c. */
 	TBLNUM_AUDIO_FILES,
-	/** The table for the paraslash attributes. See attribute.c. */
+	/** The table for the paraslash attributes. See \ref attribute.c. */
 	TBLNUM_ATTRIBUTES,
 	/**
 	 * Paraslash's scoring system is based on Gaussian normal
 	 * distributions, and the relevant data is stored in the rbtrees of an
-	 * osl table containing only volatile columns.  See score.c for
+	 * osl table containing only volatile columns. See \ref score.c for
 	 * details.
 	 */
 	TBLNUM_SCORES,
 	/**
 	 * A standard blob table containing the mood definitions. For details
-	 * see mood.c.
+	 * see \ref mood.c.
 	 */
 	TBLNUM_MOODS,
 	/** A blob table containing lyrics on a per-song basis. */
@@ -129,7 +130,7 @@ extern uint32_t afs_socket_cookie;
  * command socket, so that the handler process can read the id, attach the
  * shared memory area and use the result.
  *
- * \sa struct callback_result.
+ * \sa \ref struct callback_result.
  */
 struct callback_query {
 	/** The function to be called. */
@@ -145,7 +146,7 @@ struct callback_query {
  * into the shared memory area holding the result, mainly to let the command
  * handler know the size of the result.
  *
- * \sa struct callback_query.
+ * \sa \ref struct callback_query.
  */
 struct callback_result {
 	/** The number of bytes of the result. */
@@ -200,9 +201,8 @@ static int dispatch_result(int result_shmid, callback_result_handler *handler,
  * shmid are passed to that function as an osl object. The private_result_data
  * pointer is passed as the second argument to \a result_handler.
  *
- * \return Number of shared memory areas dispatched on success, negative on errors.
- *
- * \sa send_option_arg_callback_request(), send_standard_callback_request().
+ * \return Number of shared memory areas dispatched on success, negative on
+ * errors.
  */
 int send_callback_request(afs_callback *f, struct osl_object *query,
 		callback_result_handler *result_handler,
@@ -237,7 +237,7 @@ int send_callback_request(afs_callback *f, struct osl_object *query,
 	*(uint32_t *)buf = afs_socket_cookie;
 	*(int *)(buf + sizeof(afs_socket_cookie)) = query_shmid;
 
-	ret = connect_local_socket(conf.afs_socket_arg);
+	ret = connect_local_socket(OPT_STRING_VAL(AFS_SOCKET));
 	if (ret < 0)
 		goto out;
 	fd = ret;
@@ -311,106 +311,31 @@ int send_lls_callback_request(afs_callback *f,
 	return ret;
 }
 
-/**
- * Send a callback request passing an options structure and an argument vector.
- *
- * \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.
- *
- * 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.
- *
- * \return The return value of the underlying call to \ref
- * send_callback_request().
- *
- * \sa send_standard_callback_request(), 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)
-{
-	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;
-}
-
-/**
- * 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,
-		private_result_data);
-}
-
 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 i, 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->lpr && lls_num_inputs(pmd->lpr) == 0) || pmd->patterns.size == 0) {
+	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);
 		}
 	}
-	p = pattern_txt;
 	i = pmd->input_skip;
 	for (;;) {
-		if (pmd->lpr) {
-			if (i >= lls_num_inputs(pmd->lpr))
-				break;
-			p = lls_input(i, pmd->lpr);
-		} else {
-			if (p >= pattern_txt + pmd->patterns.size)
-				break;
-		}
+		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) {
 			if (ret != 0)
@@ -421,10 +346,7 @@ static int action_if_pattern_matches(struct osl_row *row, void *data)
 			return ret;
 
 		}
-		if (pmd->lpr)
-			i++;
-		else
-			p += strlen(p) + 1;
+		i++;
 	}
 	return 1;
 }
@@ -458,7 +380,7 @@ int for_each_matching_row(struct pattern_match_data *pmd)
  * \a obj1 is found, respectively, to be less than, to match, or be greater than
  * obj2.
  *
- * \sa strcmp(3), strncmp(3), osl_compare_func.
+ * \sa strcmp(3), strncmp(3).
  */
 int string_compare(const struct osl_object *obj1, const struct osl_object *obj2)
 {
@@ -510,7 +432,7 @@ static int pass_afd(int fd, char *buf, size_t size)
  *
  * \return Standard.
  *
- * \sa open_and_update_audio_file().
+ * \sa \ref open_and_update_audio_file().
  */
 static int open_next_audio_file(void)
 {
@@ -560,7 +482,7 @@ static int activate_mood_or_playlist(const char *arg, int *num_admissible)
 			ret = change_current_mood(arg + 2);
 			mode = PLAY_MODE_MOOD;
 		} else
-			return -E_AFS_SYNTAX;
+			return -ERRNO_TO_PARA_ERROR(EINVAL);
 		if (ret < 0)
 			return ret;
 	}
@@ -575,10 +497,12 @@ static int activate_mood_or_playlist(const char *arg, int *num_admissible)
 			strncpy(mmd->afs_mode_string, arg,
 				sizeof(mmd->afs_mode_string));
 			mmd->afs_mode_string[sizeof(mmd->afs_mode_string) - 1] = '\0';
+			mmd->events++;
 			mutex_unlock(mmd_mutex);
 		} else {
 			mutex_lock(mmd_mutex);
 			strcpy(mmd->afs_mode_string, "dummy");
+			mmd->events++;
 			mutex_unlock(mmd_mutex);
 			current_mop = NULL;
 		}
@@ -637,14 +561,17 @@ static void flush_and_free_pb(struct para_buffer *pb)
 
 static int com_select_callback(struct afs_callback_arg *aca)
 {
-	const 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();
@@ -655,7 +582,7 @@ static int com_select_callback(struct afs_callback_arg *aca)
 		goto out;
 	/* ignore subsequent errors (but log them) */
 	para_printf(&aca->pbout, "could not activate %s\n", arg);
-	if (current_mop) {
+	if (current_mop && strcmp(current_mop, arg) != 0) {
 		int ret2;
 		para_printf(&aca->pbout, "switching back to %s\n", current_mop);
 		ret2 = activate_mood_or_playlist(current_mop, &num_admissible);
@@ -669,42 +596,46 @@ static int com_select_callback(struct afs_callback_arg *aca)
 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)
+static void init_admissible_files(const char *arg)
 {
-	if (activate_mood_or_playlist(arg, NULL) < 0)
+	int ret = activate_mood_or_playlist(arg, NULL);
+	if (ret < 0) {
+		assert(arg);
+		PARA_WARNING_LOG("could not activate %s: %s\n", arg,
+			para_strerror(-ret));
 		activate_mood_or_playlist(NULL, NULL); /* always successful */
+	}
 }
 
 static int setup_command_socket_or_die(void)
 {
 	int ret, socket_fd;
-	char *socket_name = conf.afs_socket_arg;
+	const char *socket_name = OPT_STRING_VAL(AFS_SOCKET);
 
 	unlink(socket_name);
-	ret = create_local_socket(socket_name, 0);
+	ret = create_local_socket(socket_name);
 	if (ret < 0) {
-		ret = create_local_socket(socket_name,
-			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);
-			exit(EXIT_FAILURE);
-		}
+		PARA_EMERG_LOG("%s: %s\n", para_strerror(-ret), socket_name);
+		exit(EXIT_FAILURE);
 	}
 	socket_fd = ret;
 	PARA_INFO_LOG("listening on socket %s (fd %d)\n", socket_name,
@@ -725,8 +656,8 @@ static char *database_dir;
 static void get_database_dir(void)
 {
 	if (!database_dir) {
-		if (conf.afs_database_dir_given)
-			database_dir = para_strdup(conf.afs_database_dir_arg);
+		if (OPT_GIVEN(AFS_DATABASE_DIR))
+			database_dir = para_strdup(OPT_STRING_VAL(AFS_DATABASE_DIR));
 		else {
 			char *home = para_homedir();
 			database_dir = make_message(
@@ -1067,7 +998,7 @@ __noreturn void afs_init(uint32_t cookie, int socket_fd)
 		goto out_close;
 	PARA_INFO_LOG("server_socket: %d, afs_socket_cookie: %u\n",
 		server_socket, (unsigned) cookie);
-	init_admissible_files(conf.afs_initial_mode_arg);
+	init_admissible_files(OPT_STRING_VAL(AFS_INITIAL_MODE));
 	register_command_task(cookie, &s);
 	s.default_timeout.tv_sec = 0;
 	s.default_timeout.tv_usec = 999 * 1000;
@@ -1148,76 +1079,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 +1115,7 @@ int com_check(struct command_context *cc)
 	}
 	return 1;
 }
+EXPORT_SERVER_CMD_HANDLER(check);
 
 /**
  * The afs event dispatcher.