X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=aft.c;h=cfb1f69773a73a2f6401bf2b93bfc1be21217412;hb=fdb03951ee708a42795d4abb36d3a8637c478975;hp=fb0d4fd252b6091c2c7a3ae280d2746cc3519a36;hpb=f3623744f5b28e0df91323cf5069f1932df7848d;p=paraslash.git

diff --git a/aft.c b/aft.c
index fb0d4fd2..cfb1f697 100644
--- a/aft.c
+++ b/aft.c
@@ -669,16 +669,13 @@ err:
 int load_afd(int shmid, struct audio_file_data *afd)
 {
 	void *shm_afd;
-	char *buf;
 	int ret;
 
 	ret = shm_attach(shmid, ATTACH_RO, &shm_afd);
 	if (ret < 0)
 		return ret;
 	*afd = *(struct audio_file_data *)shm_afd;
-	buf = shm_afd;
-	buf += sizeof(*afd);
-	load_chunk_table(&afd->afhi, buf);
+	load_chunk_table(&afd->afhi, shm_afd + sizeof(*afd));
 	shm_detach(shm_afd);
 	return 1;
 }
@@ -1121,13 +1118,13 @@ again:
 		return ret;
 	ret = mmap_full_file(d->path, O_RDONLY, &map.data, &map.size, &afd->fd);
 	if (ret < 0)
-		goto err;
+		goto out;
 	hash_function(map.data, map.size, file_hash);
 	ret = hash_compare(file_hash, d->hash);
 	para_munmap(map.data, map.size);
 	if (ret) {
 		ret = -E_HASH_MISMATCH;
-		goto err;
+		goto out;
 	}
 	new_afsi = d->afsi;
 	new_afsi.num_played++;
@@ -1144,7 +1141,7 @@ again:
 	 */
 	afs_event(AFSI_CHANGE, NULL, &aced);
 	ret = save_afd(afd);
-err:
+out:
 	free(afd->afhi.chunk_table);
 	osl_close_disk_object(&chunk_table_obj);
 	if (ret < 0) {
@@ -1442,18 +1439,26 @@ int com_ls(struct command_context *cc)
 			i++;
 			break;
 		}
+		/*
+		 * Compatibility: Prior to 0.5.5 it was necessary to specify
+		 * the listing mode without the '=' character as in -lv, for
+		 * example. Now the variant with '=' is preferred and
+		 * documented but we still accept the old way to specify the
+		 * listing mode.
+		 *
+		 * Support for the legacy syntax can be dropped at 0.6.0
+		 * or later.
+		 */
 		if (!strncmp(arg, "-l", 2)) {
-			if (!*(arg + 2)) {
-				mode = LS_MODE_LONG;
-				continue;
-			}
-			if (*(arg + 3))
-				return -E_AFT_SYNTAX;
-			switch(*(arg + 2)) {
+			arg += 2;
+			if (*arg == '=')
+				arg++;
+			switch (*arg) {
 			case 's':
 				mode = LS_MODE_SHORT;
 				continue;
 			case 'l':
+			case '\0':
 				mode = LS_MODE_LONG;
 				continue;
 			case 'v':
@@ -1488,10 +1493,12 @@ int com_ls(struct command_context *cc)
 			flags |= LS_FLAG_UNIXDATE;
 			continue;
 		}
+		/* The compatibility remark above applies also to -s. */
 		if (!strncmp(arg, "-s", 2)) {
-			if (!*(arg + 2) || *(arg + 3))
-				return -E_AFT_SYNTAX;
-			switch(*(arg + 2)) {
+			arg += 2;
+			if (*arg == '=')
+				arg++;
+			switch (*arg) {
 			case 'p':
 				sort = LS_SORT_BY_PATH;
 				continue;
@@ -1879,8 +1886,10 @@ static int add_one_audio_file(const char *path, void *private_data)
 	unsigned char hash[HASH_SIZE];
 
 	ret = guess_audio_format(path);
-	if (ret < 0 && !(pad->flags & ADD_FLAG_ALL))
+	if (ret < 0 && !(pad->flags & ADD_FLAG_ALL)) {
+		ret = 0;
 		goto out_free;
+	}
 	query.data = (char *)path;
 	query.size = strlen(path) + 1;
 	ret = send_callback_request(path_brother_callback, &query,
@@ -2103,7 +2112,10 @@ static void com_touch_callback(int fd, const struct osl_object *query)
 	struct touch_action_data tad = {.cto = query->data,
 		.pb = {
 			.max_size = shm_get_shmmax(),
-			.private_data = &fd,
+			.private_data = &(struct afs_max_size_handler_data) {
+				.fd = fd,
+				.band = SBD_OUTPUT
+			},
 			.max_size_handler = afs_max_size_handler
 		}
 	};
@@ -2244,7 +2256,10 @@ static void com_rm_callback(int fd, const struct osl_object *query)
 	struct com_rm_action_data crd = {.flags = *(uint32_t *)query->data,
 		.pb = {
 			.max_size = shm_get_shmmax(),
-			.private_data = &fd,
+			.private_data = &(struct afs_max_size_handler_data) {
+				.fd = fd,
+				.band = SBD_OUTPUT
+			},
 			.max_size_handler = afs_max_size_handler
 		}
 	};
@@ -2386,7 +2401,10 @@ static void com_cpsi_callback(int fd, const struct osl_object *query)
 		.flags = *(unsigned *)query->data,
 		.pb = {
 			.max_size = shm_get_shmmax(),
-			.private_data = &fd,
+			.private_data = &(struct afs_max_size_handler_data) {
+				.fd = fd,
+				.band = SBD_OUTPUT
+			},
 			.max_size_handler = afs_max_size_handler
 		}
 	};
@@ -2540,8 +2558,10 @@ static void com_setatt_callback(int fd, const struct osl_object *query)
 			break;
 		p[len - 1] = '\0';
 		ret = get_attribute_bitnum_by_name(p, &bitnum);
-		if (ret < 0)
+		if (ret < 0) {
+			para_printf(&cad.pb, "attribute not found: %s\n", p);
 			goto out;
+		}
 		if (c == '+')
 			cad.add_mask |= (1UL << bitnum);
 		else
@@ -2551,7 +2571,8 @@ static void com_setatt_callback(int fd, const struct osl_object *query)
 	if (!cad.add_mask && !cad.del_mask)
 		goto out;
 	pmd.patterns.data = p;
-	assert(p < (char *)query->data + query->size);
+	if (p >= (char *)query->data + query->size)
+		goto out;
 	pmd.patterns.size = (char *)query->data + query->size - p;
 	ret = for_each_matching_row(&pmd);
 	if (ret < 0)
@@ -2712,9 +2733,9 @@ static int aft_open(const char *dir)
 		PARA_INFO_LOG("audio file table contains %d files\n", num);
 		return ret;
 	}
-	PARA_INFO_LOG("failed to open audio file table\n");
+	PARA_NOTICE_LOG("failed to open audio file table\n");
 	audio_file_table = NULL;
-	if (ret >= 0 || ret == -OSL_ERRNO_TO_PARA_ERROR(E_OSL_NOENT))
+	if (ret == -OSL_ERRNO_TO_PARA_ERROR(E_OSL_NOENT))
 		return 1;
 	return ret;
 }