X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afh.c;h=bffe63216e71627dde4b4b49b53c436388500444;hp=7fc32cd1c583a035475888cf7ed69473b3402d84;hb=b55f405f8005821ffa369b929bc0b419da62683d;hpb=b55f996a9d756a84b7fb880df6a9b917215ea058

diff --git a/afh.c b/afh.c
index 7fc32cd1..bffe6321 100644
--- a/afh.c
+++ b/afh.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2008-2012 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -7,7 +7,6 @@
 /** \file afh.c Paraslash's standalone audio format handler tool. */
 
 #include <regex.h>
-#include <dirent.h>
 #include <sys/time.h>
 
 #include "para.h"
@@ -16,6 +15,7 @@
 #include "fd.h"
 #include "afh.h"
 #include "error.h"
+#include "version.h"
 
 static struct afh_args_info conf;
 /** The list of all status items */
@@ -76,22 +76,23 @@ static void print_chunk_table(struct afh_info *afhi)
 		from = tv2ms(&tv);
 		tv_scale(i, &afhi->chunk_tv, &tv);
 		to = tv2ms(&tv);
-		printf("%d [%lu.%03lu - %lu.%03lu] %u - %u (%u)\n", i,
+		printf("%d [%lu.%03lu - %lu.%03lu] %u - %u (%u)\n", i - 1,
 			from / 1000, from % 1000, to / 1000, to % 1000,
 			afhi->chunk_table[i - 1], afhi->chunk_table[i],
 			afhi->chunk_table[i] - afhi->chunk_table[i - 1]);
 	}
 }
 
-static int cat_file(void *audio_file_data, struct afh_info *afhi)
+static int cat_file(struct afh_info *afhi, int audio_format_id,
+		void *audio_file_data, size_t audio_file_size)
 {
 	int ret;
 	struct timeval stream_start;
 	long unsigned i, first_chunk, last_chunk;
 	const char *buf;
+	char *header;
 	size_t size;
 
-
 	if (conf.begin_chunk_arg < 0) {
 		if (-conf.begin_chunk_arg > afhi->chunks_total)
 			return -ERRNO_TO_PARA_ERROR(EINVAL);
@@ -114,14 +115,22 @@ static int cat_file(void *audio_file_data, struct afh_info *afhi)
 		return -ERRNO_TO_PARA_ERROR(EINVAL);
 	if (!afhi->chunks_total)
 		return 1;
-	afh_get_header(afhi, audio_file_data, &buf, &size);
-	if (size && first_chunk && !conf.no_header_given) {
-		PARA_INFO_LOG("writing audio file header (%zu bytes)\n", size);
-		ret = write(STDOUT_FILENO, buf, size);
-		if (ret < 0)
-			return ret;
-		if (ret != size)
-			return -E_AFH_SHORT_WRITE;
+	/* eliminate the possibility of short writes */
+	ret = mark_fd_blocking(STDOUT_FILENO);
+	if (ret < 0)
+		return ret;
+	if (first_chunk > 0 && !conf.no_header_given) {
+		afh_get_header(afhi, audio_format_id, audio_file_data, audio_file_size,
+			&header, &size);
+		if (size > 0) {
+			PARA_INFO_LOG("writing header (%zu bytes)\n", size);
+			ret = write_all(STDOUT_FILENO, header, size);
+			afh_free_header(header, audio_format_id);
+			if (ret < 0)
+				return ret;
+			if (ret != size)
+				return -E_AFH_SHORT_WRITE;
+		}
 	}
 	PARA_NOTICE_LOG("writing chunks %lu - %lu\n", first_chunk, last_chunk);
 	gettimeofday(&stream_start, NULL);
@@ -143,7 +152,7 @@ static int cat_file(void *audio_file_data, struct afh_info *afhi)
 		if (!size)
 			continue;
 		PARA_INFO_LOG("writing chunk %lu\n", i);
-		ret = write_all(STDOUT_FILENO, buf, &size);
+		ret = write_all(STDOUT_FILENO, buf, size);
 		if (ret < 0)
 			return ret;
 	}
@@ -178,29 +187,33 @@ int main(int argc, char **argv)
 		int ret2;
 		ret = mmap_full_file(conf.inputs[i], O_RDONLY, &audio_file_data,
 			&audio_file_size, &fd);
-		if (ret < 0)
+		if (ret < 0) {
+			PARA_ERROR_LOG("failed to mmap \"%s\"\n", conf.inputs[i]);
 			goto out;
+		}
 		ret = compute_afhi(conf.inputs[i], audio_file_data, audio_file_size,
 			fd, &afhi);
 		if (ret < 0)
 			goto out;
+
 		audio_format_num = ret;
 		if (conf.stream_given)
-			ret = cat_file(audio_file_data, &afhi);
+			ret = cat_file(&afhi, audio_format_num,
+				audio_file_data, audio_file_size);
 		else {
 			printf("File %d: %s\n", i + 1, conf.inputs[i]);
 			print_info(audio_format_num, &afhi);
 			if (conf.chunk_table_given)
 				print_chunk_table(&afhi);
-			free(afhi.techinfo);
-			free(afhi.tags.artist);
-			free(afhi.tags.title);
-			free(afhi.tags.year);
-			free(afhi.tags.album);
-			free(afhi.tags.comment);
-			free(afhi.chunk_table);
 			printf("\n");
 		}
+		free(afhi.techinfo);
+		free(afhi.tags.artist);
+		free(afhi.tags.title);
+		free(afhi.tags.year);
+		free(afhi.tags.album);
+		free(afhi.tags.comment);
+		free(afhi.chunk_table);
 		ret2 = para_munmap(audio_file_data, audio_file_size);
 		if (ret2 < 0 && ret >= 0)
 			ret = ret2;