X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=8a8e5282576dec0f3319bb98685bd0e1df9767c5;hp=a5da1a929e8c5c34920aab8d798d1a7f64cb3e68;hb=0f4910b50116416fefb09ca67a615679067ef359;hpb=00ae8d84bfe8872be809617a31fc11a35e145995

diff --git a/aft.c b/aft.c
index a5da1a92..8a8e5282 100644
--- a/aft.c
+++ b/aft.c
@@ -241,19 +241,12 @@ enum audio_file_table_columns {
 	NUM_AFT_COLUMNS
 };
 
-/**
- * Compare two osl objects pointing to hash values.
- *
- * \param obj1 Pointer to the first hash object.
- * \param obj2 Pointer to the second hash object.
- *
- * \return The values required for an osl compare function.
- *
- * \sa osl_compare_func, uint32_compare().
- */
-static int aft_hash_compare(const struct osl_object *obj1, const struct osl_object *obj2)
+/* compare function for the hash column */
+static int aft_hash_compare(const struct osl_object *obj1,
+		const struct osl_object *obj2)
 {
-	return hash_compare((unsigned char *)obj1->data, (unsigned char *)obj2->data);
+	return hash_compare((unsigned char *)obj1->data,
+		(unsigned char *)obj2->data);
 }
 
 static struct osl_column_description aft_cols[] = {
@@ -1365,18 +1358,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':
@@ -1411,10 +1412,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;
@@ -1497,16 +1500,16 @@ static int find_path_brother(const char *path, struct osl_row **result)
 
 /** The format of the data stored by save_audio_file_data(). */
 enum com_add_buffer_offsets {
-	/** afhi (if present) starts here. */
+	/* afhi (if present) starts at this offset. */
 	CAB_AFHI_OFFSET_POS = 0,
 	/** Start of the chunk table (if present). */
-	CAB_CHUNKS_OFFSET_POS = 2,
-	/** Audio format id. */
-	CAB_AUDIO_FORMAT_OFFSET = 4,
+	CAB_CHUNKS_OFFSET_POS = 4,
 	/** Flags given to the add command. */
-	CAB_FLAGS_OFFSET = 5,
+	CAB_FLAGS_OFFSET = 8,
+	/** Audio format id. */
+	CAB_AUDIO_FORMAT_ID_OFFSET = 12,
 	/** The hash of the audio file being added. */
-	CAB_HASH_OFFSET = 9,
+	CAB_HASH_OFFSET = 13,
 	/** Start of the path of the audio file. */
 	CAB_PATH_OFFSET = (CAB_HASH_OFFSET + HASH_SIZE),
 };
@@ -1527,27 +1530,23 @@ static void save_add_callback_buffer(unsigned char *hash, const char *path,
 	size_t size = CAB_PATH_OFFSET + path_len + afhi_size
 		+ sizeof_chunk_table(afhi);
 	char *buf = para_malloc(size);
-	uint16_t pos;
-
-	write_u8(buf + CAB_AUDIO_FORMAT_OFFSET, audio_format_num);
-	write_u32(buf + CAB_FLAGS_OFFSET, flags);
-
-	memcpy(buf + CAB_HASH_OFFSET, hash, HASH_SIZE);
-	strcpy(buf + CAB_PATH_OFFSET, path);
+	uint32_t pos;
 
 	pos = CAB_PATH_OFFSET + path_len;
-	PARA_DEBUG_LOG("size: %zu, afhi starts at %d\n", size, pos);
-	PARA_DEBUG_LOG("last afhi byte: %p, pos %zu\n", buf + pos + afhi_size - 1,
-		pos + afhi_size - 1);
-	write_u16(buf + CAB_AFHI_OFFSET_POS, pos);
+	write_u32(buf + CAB_AFHI_OFFSET_POS, pos);
 	save_afhi(afhi, buf + pos);
-
 	pos += afhi_size;
-	PARA_DEBUG_LOG("size: %zu, chunks start at %d\n", size, pos);
-	write_u16(buf + CAB_CHUNKS_OFFSET_POS, pos);
+
+	write_u32(buf + CAB_CHUNKS_OFFSET_POS, pos);
 	if (afhi)
 		save_chunk_table(afhi, buf + pos);
-	PARA_DEBUG_LOG("last byte in buf: %p\n", buf + size - 1);
+
+	write_u32(buf + CAB_FLAGS_OFFSET, flags);
+	write_u8(buf + CAB_AUDIO_FORMAT_ID_OFFSET, audio_format_num);
+
+	memcpy(buf + CAB_HASH_OFFSET, hash, HASH_SIZE);
+	strcpy(buf + CAB_PATH_OFFSET, path);
+
 	obj->data = buf;
 	obj->size = size;
 }
@@ -1684,8 +1683,8 @@ static int com_add_callback(struct afs_callback_arg *aca)
 			goto out;
 	}
 	/* no hs or force mode, child must have sent afhi */
-	afhi_offset = read_u16(buf + CAB_AFHI_OFFSET_POS);
-	chunks_offset = read_u16(buf + CAB_CHUNKS_OFFSET_POS);
+	afhi_offset = read_u32(buf + CAB_AFHI_OFFSET_POS);
+	chunks_offset = read_u32(buf + CAB_CHUNKS_OFFSET_POS);
 
 	objs[AFTCOL_AFHI].data = buf + afhi_offset;
 	objs[AFTCOL_AFHI].size = chunks_offset - afhi_offset;
@@ -1732,7 +1731,7 @@ static int com_add_callback(struct afs_callback_arg *aca)
 	if (flags & ADD_FLAG_VERBOSE)
 		para_printf(&aca->pbout, "new file\n");
 	default_afsi.last_played = time(NULL) - 365 * 24 * 60 * 60;
-	default_afsi.audio_format_id = read_u8(buf + CAB_AUDIO_FORMAT_OFFSET);
+	default_afsi.audio_format_id = read_u8(buf + CAB_AUDIO_FORMAT_ID_OFFSET);
 
 	objs[AFTCOL_AFSI].data = &afsi_buf;
 	objs[AFTCOL_AFSI].size = AFSI_SIZE;
@@ -2415,7 +2414,8 @@ static int com_setatt_callback(struct afs_callback_arg *aca)
 	if (!cad.add_mask && !cad.del_mask)
 		goto out;
 	pmd.patterns.data = p;
-	assert(p < (char *)aca->query.data + aca->query.size);
+	if (p >= (char *)aca->query.data + aca->query.size)
+		goto out;
 	pmd.patterns.size = (char *)aca->query.data + aca->query.size - p;
 	ret = for_each_matching_row(&pmd);
 	if (ret < 0)