Convert all users of earlier hiddens

8 files changed, 18 insertions, 14 deletions

diff --git a/libc/stdio/_cs_funcs.c b/libc/stdio/_cs_funcs.c
index 3bec64c19..ef92048c0 100644
--- a/libc/stdio/_cs_funcs.c
+++ b/libc/stdio/_cs_funcs.c
@@ -30,9 +30,9 @@ int attribute_hidden _cs_seek(void *cookie, register __offmax_t *pos, int whence
 	__offmax_t res;
 
 #ifdef __UCLIBC_HAS_LFS__
-	res = lseek64(*((int *) cookie), *pos, whence);
+	res = __lseek64(*((int *) cookie), *pos, whence);
 #else
-	res = lseek(*((int *) cookie), *pos, whence);
+	res = __lseek(*((int *) cookie), *pos, whence);
 #endif
 
 	return (res >= 0) ? ((*pos = res), 0) : ((int) res);
@@ -54,9 +54,9 @@ int attribute_hidden __stdio_seek(FILE *stream, register __offmax_t *pos, int wh
 	__offmax_t res;
 
 #ifdef __UCLIBC_HAS_LFS__
-	res = lseek64(stream->__filedes, *pos, whence);
+	res = __lseek64(stream->__filedes, *pos, whence);
 #else
-	res = lseek(stream->__filedes, *pos, whence);
+	res = __lseek(stream->__filedes, *pos, whence);
 #endif
 
 	return (res >= 0) ? ((*pos = res), 0) : ((int) res);
diff --git a/libc/stdio/_fopen.c b/libc/stdio/_fopen.c
index 46ea8a212..b4f4d46c7 100644
--- a/libc/stdio/_fopen.c
+++ b/libc/stdio/_fopen.c
@@ -121,7 +121,7 @@ FILE attribute_hidden *_stdio_fopen(intptr_t fname_or_mode,
 		/* NOTE: fopencookie needs changing if the basic check changes! */
 		if (((i & (((int) fname_or_mode) + 1)) != i) /* Basic agreement? */
 			|| (((open_mode & ~((__mode_t) fname_or_mode)) & O_APPEND)
-				&& fcntl(filedes, F_SETFL, O_APPEND))	/* Need O_APPEND. */
+				&& __fcntl(filedes, F_SETFL, O_APPEND))	/* Need O_APPEND. */
 			) {
 			goto DO_EINVAL;
 		}
diff --git a/libc/stdio/_trans2w.c b/libc/stdio/_trans2w.c
index e85f45a24..650a5e1a0 100644
--- a/libc/stdio/_trans2w.c
+++ b/libc/stdio/_trans2w.c
@@ -64,7 +64,7 @@ int attribute_hidden __stdio_trans2w(FILE * __restrict stream)
 			 *   the end even if not reading.*/
 			if (((__STDIO_STREAM_BUFFER_RAVAIL(stream))
 				 || (stream->__modeflags & __FLAG_UNGOT))
-				&& fseek(stream, 0L,
+				&& __fseek(stream, 0L,
 						 ((stream->__modeflags & __FLAG_APPEND)
 						  ? SEEK_END : SEEK_CUR))
 				) {
diff --git a/libc/stdio/fdopen.c b/libc/stdio/fdopen.c
index 9b08b4b71..bca7f23fb 100644
--- a/libc/stdio/fdopen.c
+++ b/libc/stdio/fdopen.c
@@ -11,7 +11,7 @@ FILE attribute_hidden *__fdopen(int filedes, const char *mode)
 {
 	intptr_t cur_mode;
 
-	return (((cur_mode = fcntl(filedes, F_GETFL))) != -1)
+	return (((cur_mode = __fcntl(filedes, F_GETFL))) != -1)
 		? _stdio_fopen(cur_mode, mode, NULL, filedes) 
 		: NULL;
 }
diff --git a/libc/stdio/fseeko.c b/libc/stdio/fseeko.c
index c795356e7..190485775 100644
--- a/libc/stdio/fseeko.c
+++ b/libc/stdio/fseeko.c
@@ -74,8 +74,8 @@ int attribute_hidden FSEEK(register FILE *stream, OFFSET_TYPE offset, int whence
 }
 
 #ifdef __DO_LARGEFILE
-weak_alias(__fseeko64,fseeko64)
+strong_alias(__fseeko64,fseeko64)
 #else
-weak_alias(__fseek,fseek)
-weak_alias(fseek,fseeko)
+strong_alias(__fseek,fseek)
+weak_alias(__fseek,fseeko)
 #endif
diff --git a/libc/stdio/fsetpos.c b/libc/stdio/fsetpos.c
index 2b02f25e0..f33043f3b 100644
--- a/libc/stdio/fsetpos.c
+++ b/libc/stdio/fsetpos.c
@@ -7,6 +7,10 @@
 
 #include "_stdio.h"
 
+#ifndef __DO_LARGEFILE
+#define FSEEK __fseek
+#endif
+
 int fsetpos(FILE *stream, register const fpos_t *pos)
 {
 #ifdef __STDIO_MBSTATE
@@ -16,7 +20,7 @@ int fsetpos(FILE *stream, register const fpos_t *pos)
 
 	__STDIO_AUTO_THREADLOCK(stream);
 
-	if ((retval = fseek(stream, pos->__pos, SEEK_SET)) == 0) {
+	if ((retval = FSEEK(stream, pos->__pos, SEEK_SET)) == 0) {
 		__COPY_MBSTATE(&(stream->__state), &(pos->__mbstate));
 		stream->__ungot_width[0]= pos->__mblen_pending;
 	}
@@ -27,7 +31,7 @@ int fsetpos(FILE *stream, register const fpos_t *pos)
 
 #else
 
-	return fseek(stream, pos->__pos, SEEK_SET);
+	return FSEEK(stream, pos->__pos, SEEK_SET);
 
 #endif
 }
diff --git a/libc/stdio/fsetpos64.c b/libc/stdio/fsetpos64.c
index 92906e302..bf7d574cb 100644
--- a/libc/stdio/fsetpos64.c
+++ b/libc/stdio/fsetpos64.c
@@ -10,5 +10,5 @@
 #define __DO_LARGEFILE
 #define fsetpos	fsetpos64
 #define fpos_t        fpos64_t
-#define fseek         fseeko64
+#define FSEEK       __fseeko64
 #include "fsetpos.c"
diff --git a/libc/stdio/rewind.c b/libc/stdio/rewind.c
index aa4534aa7..8e0acc2d0 100644
--- a/libc/stdio/rewind.c
+++ b/libc/stdio/rewind.c
@@ -14,7 +14,7 @@ void attribute_hidden __rewind(register FILE *stream)
 	__STDIO_AUTO_THREADLOCK(stream);
 
 	__STDIO_STREAM_CLEAR_ERROR(stream);	/* Clear the error indicator */
-	fseek(stream, 0L, SEEK_SET); /* first since fseek could set it. */
+	__fseek(stream, 0L, SEEK_SET); /* first since fseek could set it. */
 
 	__STDIO_AUTO_THREADUNLOCK(stream);
 }