X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=377740d132b831d126e0015f241ed65095c2e661;hp=412d19aa076235a7c663f943cce7a1fcec184a0c;hb=5a4b74486c7421fa666aa20d6bb2cfc900976264;hpb=fd5f94274de04e4dfed9bea8aadac661262d7cca

diff --git a/aft.c b/aft.c
index 412d19aa..377740d1 100644
--- a/aft.c
+++ b/aft.c
@@ -1876,12 +1876,8 @@ static int add_one_audio_file(const char *path, void *private_data)
 	ret = 1;
 	if (pb && (pad->flags & ADD_FLAG_LAZY)) { /* lazy is really cheap */
 		if (pad->flags & ADD_FLAG_VERBOSE)
-			send_ret = pad->cc->use_sideband?
-				send_sb_va(&pad->cc->scc, SBD_OUTPUT,
-					"lazy-ignore: %s\n", path)
-			:
-				sc_send_va_buffer(&pad->cc->scc,
-					"lazy-ignore: %s\n", path);
+			send_ret = send_sb_va(&pad->cc->scc, SBD_OUTPUT,
+				"lazy-ignore: %s\n", path);
 		goto out_free;
 	}
 	/* We still want to add this file. Compute its hash. */
@@ -1901,12 +1897,8 @@ static int add_one_audio_file(const char *path, void *private_data)
 	ret = 1;
 	if (pb && hs && hs == pb && !(pad->flags & ADD_FLAG_FORCE)) {
 		if (pad->flags & ADD_FLAG_VERBOSE)
-			send_ret = pad->cc->use_sideband?
-				send_sb_va(&pad->cc->scc, SBD_OUTPUT,
-					"%s exists, not forcing update\n", path)
-			:
-				sc_send_va_buffer(&pad->cc->scc,
-					"%s exists, not forcing update\n", path);
+			send_ret = send_sb_va(&pad->cc->scc, SBD_OUTPUT,
+				"%s exists, not forcing update\n", path);
 		goto out_unmap;
 	}
 	/*
@@ -1923,12 +1915,8 @@ static int add_one_audio_file(const char *path, void *private_data)
 	munmap(map.data, map.size);
 	close(fd);
 	if (pad->flags & ADD_FLAG_VERBOSE) {
-		send_ret = pad->cc->use_sideband?
-			send_sb_va(&pad->cc->scc, SBD_OUTPUT,
-				"adding %s\n", path)
-		:
-			sc_send_va_buffer(&pad->cc->scc,
-				"adding %s\n", path);
+		send_ret = send_sb_va(&pad->cc->scc, SBD_OUTPUT,
+			"adding %s\n", path);
 		if (send_ret < 0)
 			goto out_free;
 	}
@@ -1943,14 +1931,8 @@ out_unmap:
 	munmap(map.data, map.size);
 out_free:
 	if (ret < 0 && send_ret >= 0)
-		send_ret = pad->cc->use_sideband?
-			send_sb_va(&pad->cc->scc, SBD_ERROR_LOG,
-				"failed to add %s (%s)\n", path,
-				para_strerror(-ret))
-		:
-			sc_send_va_buffer(&pad->cc->scc,
-				"failed to add %s (%s)\n", path,
-				para_strerror(-ret));
+		send_ret = send_sb_va(&pad->cc->scc, SBD_ERROR_LOG,
+			"failed to add %s (%s)\n", path, para_strerror(-ret));
 	free(obj.data);
 	clear_afhi(afhi_ptr);
 	/* Stop adding files only on send errors. */
@@ -1994,11 +1976,7 @@ int com_add(struct command_context *cc)
 		char *path;
 		ret = verify_path(cc->argv[i], &path);
 		if (ret < 0) {
-			ret = cc->use_sideband?
-				send_sb_va(&cc->scc, SBD_ERROR_LOG, "%s: %s\n",
-				cc->argv[i], para_strerror(-ret))
-			:
-				sc_send_va_buffer(&cc->scc, "%s: %s\n",
+			ret = send_sb_va(&cc->scc, SBD_ERROR_LOG, "%s: %s\n",
 				cc->argv[i], para_strerror(-ret));
 			if (ret < 0)
 				return ret;
@@ -2006,14 +1984,9 @@ int com_add(struct command_context *cc)
 		}
 		ret = stat(path, &statbuf);
 		if (ret < 0) {
-			ret = cc->use_sideband?
-				send_sb_va(&cc->scc, SBD_ERROR_LOG,
-					"failed to stat %s (%s)\n", path,
-					strerror(errno))
-				:
-				sc_send_va_buffer(&cc->scc,
-					"failed to stat %s (%s)\n", path,
-					strerror(errno));
+			ret = send_sb_va(&cc->scc, SBD_ERROR_LOG,
+				"failed to stat %s (%s)\n", path,
+				strerror(errno));
 			free(path);
 			if (ret < 0)
 				return ret;
@@ -2025,12 +1998,8 @@ int com_add(struct command_context *cc)
 		else
 			ret = add_one_audio_file(path, &pad);
 		if (ret < 0) {
-			if (cc->use_sideband)
-				send_sb_va(&cc->scc, SBD_OUTPUT, "%s: %s\n", path,
-					para_strerror(-ret));
-			else
-				sc_send_va_buffer(&cc->scc, "%s: %s\n", path,
-					para_strerror(-ret));
+			send_sb_va(&cc->scc, SBD_OUTPUT, "%s: %s\n", path,
+				para_strerror(-ret));
 			free(path);
 			return ret;
 		}
@@ -2502,13 +2471,60 @@ int com_cpsi(struct command_context *cc)
 	return ret;
 }
 
-static void com_setatt_callback(__a_unused int fd, const struct osl_object *query)
+struct change_atts_data {
+	uint64_t add_mask, del_mask;
+	struct para_buffer pb;
+};
+
+static int change_atts(__a_unused struct osl_table *table,
+		struct osl_row *row, __a_unused const char *name, void *data)
+{
+	int ret;
+	struct osl_object obj;
+	struct afs_info old_afsi, new_afsi;
+	struct afsi_change_event_data aced = {
+		.aft_row = row,
+		.old_afsi = &old_afsi
+	};
+	struct change_atts_data *cad = data;
+
+	ret = get_afsi_object_of_row(row, &obj);
+	if (ret < 0)
+		return ret;
+	ret = load_afsi(&old_afsi, &obj);
+	if (ret < 0)
+		return ret;
+	new_afsi = old_afsi;
+	new_afsi.attributes |= cad->add_mask;
+	new_afsi.attributes &= ~cad->del_mask;
+	save_afsi(&new_afsi, &obj); /* in-place update */
+	afs_event(AFSI_CHANGE, &cad->pb, &aced);
+	return 1;
+}
+
+static void com_setatt_callback(int fd, const struct osl_object *query)
 {
 	char *p;
-	uint64_t add_mask = 0, del_mask = 0;
 	int ret;
 	size_t len;
-	struct osl_object obj;
+	struct change_atts_data cad = {
+		.pb = {
+			.max_size = shm_get_shmmax(),
+			.max_size_handler = afs_max_size_handler,
+			.private_data = &(struct afs_max_size_handler_data) {
+				.fd = fd,
+				.band = SBD_OUTPUT
+			}
+		}
+	};
+	struct pattern_match_data pmd = {
+		.table = audio_file_table,
+		.loop_col_num = AFTCOL_HASH,
+		.match_col_num = AFTCOL_PATH,
+		.pm_flags = PM_SKIP_EMPTY_NAME,
+		.data = &cad,
+		.action = change_atts
+	};
 
 	for (p = query->data; p < (char *)query->data + query->size; p += len + 1) {
 		char c;
@@ -2516,7 +2532,7 @@ static void com_setatt_callback(__a_unused int fd, const struct osl_object *quer
 
 		len = strlen(p);
 		ret = -E_ATTR_SYNTAX;
-		if (!*p)
+		if (len == 0)
 			goto out;
 		c = p[len - 1];
 		if (c != '+' && c != '-')
@@ -2526,38 +2542,27 @@ static void com_setatt_callback(__a_unused int fd, const struct osl_object *quer
 		if (ret < 0)
 			goto out;
 		if (c == '+')
-			add_mask |= (1UL << bitnum);
+			cad.add_mask |= (1UL << bitnum);
 		else
-			del_mask |= (1UL << bitnum);
+			cad.del_mask |= (1UL << bitnum);
 	}
 	ret = -E_ATTR_SYNTAX;
-	if (!add_mask && !del_mask)
+	if (!cad.add_mask && !cad.del_mask)
 		goto out;
-	PARA_DEBUG_LOG("masks: %llx:%llx\n",(long long unsigned)add_mask,
-		(long long unsigned)del_mask);
-	for (; p < (char *)query->data + query->size; p += len + 1) { /* TODO: fnmatch */
-		struct afs_info old_afsi, new_afsi;
-		struct afsi_change_event_data aced = {.old_afsi = &old_afsi};
-
-		len = strlen(p);
-		ret = aft_get_row_of_path(p, &aced.aft_row);
-		if (ret < 0)
-			goto out;
-		ret = get_afsi_object_of_row(aced.aft_row, &obj);
-		if (ret < 0)
-			goto out;
-		ret = load_afsi(&old_afsi, &obj);
-		if (ret < 0)
-			goto out;
-		new_afsi = old_afsi;
-		new_afsi.attributes |= add_mask;
-		new_afsi.attributes &= ~del_mask;
-		save_afsi(&new_afsi, &obj); /* in-place update */
-		afs_event(AFSI_CHANGE, NULL, &aced);
-	}
+	pmd.patterns.data = p;
+	assert(p < (char *)query->data + query->size);
+	pmd.patterns.size = (char *)query->data + query->size - p;
+	ret = for_each_matching_row(&pmd);
+	if (ret < 0)
+		goto out;
+	if (pmd.num_matches == 0)
+		para_printf(&cad.pb, "no matches\n");
 out:
 	if (ret < 0)
-		PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
+		para_printf(&cad.pb, "%s\n", para_strerror(-ret));
+	if (cad.pb.offset)
+		pass_buffer_as_shm(fd, SBD_OUTPUT, cad.pb.buf, cad.pb.offset);
+	free(cad.pb.buf);
 }
 
 int com_setatt(struct command_context *cc)
@@ -2565,7 +2570,7 @@ int com_setatt(struct command_context *cc)
 	if (cc->argc < 3)
 		return -E_ATTR_SYNTAX;
 	return send_standard_callback_request(cc->argc - 1, cc->argv + 1,
-		com_setatt_callback, NULL, NULL);
+		com_setatt_callback, afs_cb_result_handler, cc);
 }
 
 static void afs_stat_callback(int fd, const struct osl_object *query)