X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.c;h=92c58cc8cbe142a4f403b6bd0654c21f8136757e;hp=5f933c5b31e440438acce2e9179121db66c0600e;hb=3f696a82bbb79cb07bfdb8e510bb4f3515570cec;hpb=f6a845d497ed6883e8318acc8a17d2ed07b85a51

diff --git a/afs.c b/afs.c
index 5f933c5b..92c58cc8 100644
--- a/afs.c
+++ b/afs.c
@@ -12,9 +12,11 @@
 #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.cmdline.h"
 #include "para.h"
@@ -279,6 +281,36 @@ out:
 	return num_dispatched;
 }
 
+/**
+ * Wrapper for send_callback_request() which passes a lopsub parse result.
+ *
+ * \param f The callback function.
+ * \param cmd Needed for (de-)serialization.
+ * \param lpr Must match cmd.
+ * \param private_result_data Passed to send_callback_request().
+ *
+ * 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 send_callback_request().
+ */
+int send_lls_callback_request(afs_callback *f,
+		const struct lls_command * const cmd,
+		struct lls_parse_result *lpr, void *private_result_data)
+{
+	struct osl_object query;
+	char *buf = NULL;
+	int ret = lls_serialize_parse_result(lpr, cmd, &buf, &query.size);
+
+	assert(ret >= 0);
+	query.data = buf;
+	ret = send_callback_request(f, &query, afs_cb_result_handler,
+		private_result_data);
+	free(buf);
+	return ret;
+}
+
 /**
  * Send a callback request passing an options structure and an argument vector.
  *
@@ -354,7 +386,7 @@ 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));
+	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;
 
 	if (ret < 0)
@@ -362,22 +394,37 @@ static int action_if_pattern_matches(struct osl_row *row, void *data)
 	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 ((pmd->lpr && lls_num_inputs(pmd->lpr) == 0) || pmd->patterns.size == 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) {
+	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;
+		}
 		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;
+
+		}
+		if (pmd->lpr)
+			i++;
+		else
+			p += strlen(p) + 1;
 	}
 	return 1;
 }
@@ -888,7 +935,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();
 }
 
@@ -1024,6 +1071,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:
@@ -1063,23 +1117,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;
@@ -1091,6 +1146,7 @@ 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.