X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.c;h=fbcffddef8d3669888be7711e097ebf07666012d;hp=761a637cfe00caf14bc1850219cf139282bfc3bc;hb=ce9e297eb91a932a11f81890c800d0380b5bc9c9;hpb=15942e4836b212fd7f092f9df353ec54c872e2b8

diff --git a/afs.c b/afs.c
index 761a637c..fbcffdde 100644
--- a/afs.c
+++ b/afs.c
@@ -312,106 +312,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)
@@ -422,10 +347,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;
 }