===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/aucat/Attic/headers.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- src/usr.bin/aucat/Attic/headers.c	2010/01/10 21:47:41	1.10
+++ src/usr.bin/aucat/Attic/headers.c	2010/04/03 17:40:33	1.11
@@ -1,4 +1,4 @@
-/*	$OpenBSD: headers.c,v 1.10 2010/01/10 21:47:41 ratchov Exp $	*/
+/*	$OpenBSD: headers.c,v 1.11 2010/04/03 17:40:33 ratchov Exp $	*/
 /*
  * Copyright (c) 2008 Alexandre Ratchov <alex@caoua.org>
  *
@@ -129,7 +129,7 @@
 }
 
 int
-wav_readhdr(int fd, struct aparams *par, off_t *datasz, short **map)
+wav_readhdr(int fd, struct aparams *par, off_t *startpos, off_t *datasz, short **map)
 {
 	struct wavriff riff;
 	struct wavchunk chunk;
@@ -161,6 +161,7 @@
 				return 0;
 			fmt_done = 1;
 		} else if (memcmp(chunk.id, wav_id_data, 4) == 0) {
+			*startpos = pos;
 			*datasz = csize;
 			break;
 		} else {
@@ -186,10 +187,12 @@
 	return 1;
 }
 
+/*
+ * Write header and seek to start position
+ */
 int
-wav_writehdr(int fd, struct aparams *par)
+wav_writehdr(int fd, struct aparams *par, off_t *startpos, off_t datasz)
 {
-	off_t datasz;
 	unsigned nch = par->cmax - par->cmin + 1;
 	struct {
 		struct wavriff riff;
@@ -198,16 +201,6 @@
 		struct wavchunk data_hdr;
 	} hdr;
 
-	datasz = lseek(fd, 0, SEEK_CUR);
-	if (datasz < 0) {
-		warn("wav_writehdr: lseek(end)");
-		return 0;
-	}
-	if (datasz >= sizeof(hdr))
-		datasz -= sizeof(hdr);
-	else
-		datasz = 0;
-
 	/*
 	 * Check that encoding is supported by .wav file format.
 	 */
@@ -253,5 +246,6 @@
 		warn("wav_writehdr: write");
 		return 0;
 	}
+	*startpos = sizeof(hdr);
 	return 1;
 }