X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=afh.c;h=8810a28b8dacc83731c40a57f014b2190a3b81ab;hb=864024c003d678dbb436cdfc1148b201e4e47018;hp=c5d7aec296a7a44b2fedfd2532ad838f89654e6c;hpb=92e4a0579a320372d2e94efc7c2a0d9f419e3ffe;p=paraslash.git

diff --git a/afh.c b/afh.c
index c5d7aec2..8810a28b 100644
--- a/afh.c
+++ b/afh.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2011 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 */
@@ -115,6 +115,10 @@ static int cat_file(struct afh_info *afhi, int audio_format_id,
 		return -ERRNO_TO_PARA_ERROR(EINVAL);
 	if (!afhi->chunks_total)
 		return 1;
+	/* 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);
@@ -148,7 +152,7 @@ static int cat_file(struct afh_info *afhi, int audio_format_id,
 		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;
 	}