projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix integer overflow in WIFSTOPPED macro
[musl]
/
src
/
stdio
/
ftell.c
diff --git
a/src/stdio/ftell.c
b/src/stdio/ftell.c
index
3904a1d
..
1e1a08d
100644
(file)
--- a/
src/stdio/ftell.c
+++ b/
src/stdio/ftell.c
@@
-1,12
+1,20
@@
#include "stdio_impl.h"
#include "stdio_impl.h"
+#include <limits.h>
+#include <errno.h>
off_t __ftello_unlocked(FILE *f)
{
off_t __ftello_unlocked(FILE *f)
{
- off_t pos = f->seek(f, 0, SEEK_CUR);
+ off_t pos = f->seek(f, 0,
+ (f->flags & F_APP) && f->wpos != f->wbase
+ ? SEEK_END : SEEK_CUR);
if (pos < 0) return pos;
/* Adjust for data in buffer. */
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)
}
off_t __ftello(FILE *f)
@@
-29,5
+37,3
@@
long ftell(FILE *f)
}
weak_alias(__ftello, ftello);
}
weak_alias(__ftello, ftello);
-
-LFS64(ftello);