X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fstdio%2Fftell.c;h=1e1a08d8281dc6f7a79b4010adf5302f08716bc3;hb=ea3b40a321e751e016948087ef23ae7b9e8e0150;hp=aad352bdd1e530365d9bed1cb91fb2069e186d3a;hpb=5ce3737931bb411a8d167356d4d0287b53b0cbdc;p=musl

diff --git a/src/stdio/ftell.c b/src/stdio/ftell.c
index aad352bd..1e1a08d8 100644
--- a/src/stdio/ftell.c
+++ b/src/stdio/ftell.c
@@ -1,17 +1,20 @@
 #include "stdio_impl.h"
 #include <limits.h>
 #include <errno.h>
-#include "libc.h"
 
 off_t __ftello_unlocked(FILE *f)
 {
 	off_t pos = f->seek(f, 0,
-		(f->flags & F_APP) && f->wpos > f->wbase
+		(f->flags & F_APP) && f->wpos != f->wbase
 		? SEEK_END : SEEK_CUR);
 	if (pos < 0) return pos;
 
 	/* Adjust for data in buffer. */
-	return pos - (f->rend - f->rpos) + (f->wpos - f->wbase);
+	if (f->rend)
+		pos += f->rpos - f->rend;
+	else if (f->wbase)
+		pos += f->wpos - f->wbase;
+	return pos;
 }
 
 off_t __ftello(FILE *f)
@@ -34,5 +37,3 @@ long ftell(FILE *f)
 }
 
 weak_alias(__ftello, ftello);
-
-LFS64(ftello);