X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=63a40d790f602c81d6f28e71e02b6d46d907cd5d;hp=d58f9daf014c0237148db3e0837f11f003bd0230;hb=b1c682279994fd35a590a925a0f51647771d2002;hpb=99b0bab8fcabc62aa154bc81da5b20ae9a3e3658

diff --git a/aft.c b/aft.c
index d58f9daf..63a40d79 100644
--- a/aft.c
+++ b/aft.c
@@ -377,6 +377,7 @@ static void save_afhi(struct afh_info *afhi, char *buf)
 	sprintf(p, "%s", afhi->tags.comment);
 }
 
+/* does not load the chunk table */
 static void load_afhi(const char *buf, struct afh_info *afhi)
 {
 	afhi->seconds_total = read_u32(buf + AFHI_SECONDS_TOTAL_OFFSET);
@@ -592,6 +593,10 @@ static int get_hash_of_row(const struct osl_row *row, unsigned char **hash)
  * \param afhi Result pointer.
  *
  * \return The return value of the underlying call to osl_get_object().
+ *
+ * After the call the members of the afhi structure point to mapped memory
+ * which is owned by the osl table, Hence the caller must not attempt to free
+ * this memory by calling \ref clear_afhi().
  */
 int get_afhi_of_row(const struct osl_row *row, struct afh_info *afhi)
 {
@@ -1105,6 +1110,12 @@ out:
 	return ret;
 }
 
+static int ls_hash_compare(const void *a, const void *b)
+{
+	struct ls_data *d1 = *(struct ls_data **)a, *d2 = *(struct ls_data **)b;
+	return memcmp(d1->hash, d2->hash, HASH_SIZE);
+}
+
 static int ls_audio_format_compare(const void *a, const void *b)
 {
 	struct ls_data *d1 = *(struct ls_data **)a, *d2 = *(struct ls_data **)b;
@@ -1222,6 +1233,8 @@ static int sort_matching_paths(struct ls_options *options)
 		compar = ls_duration_compare; break;
 	case LS_SORT_BY_AUDIO_FORMAT:
 		compar = ls_audio_format_compare; break;
+	case LS_SORT_BY_HASH:
+		compar = ls_hash_compare; break;
 	default:
 		return -E_BAD_SORT;
 	}
@@ -1370,7 +1383,6 @@ out:
 	return ret;
 }
 
-/* TODO: flags -h (sort by hash) */
 static int com_ls(struct command_context *cc, struct lls_parse_result *lpr)
 {
 	const struct lls_command *cmd = SERVER_CMD_CMD_PTR(LS);
@@ -1436,6 +1448,8 @@ static int com_ls(struct command_context *cc, struct lls_parse_result *lpr)
 			opts->sorting = LS_SORT_BY_DURATION;
 		else if (!strcmp(val, "a") || !strcmp(val, "audio-format"))
 			opts->sorting = LS_SORT_BY_AUDIO_FORMAT;
+		else if (!strcmp(val, "h") || !strcmp(val, "hash"))
+			opts->sorting = LS_SORT_BY_HASH;
 		else {
 			ret = -E_AFT_SYNTAX;
 			goto out;