svn commit: trunk/uClibc/libc: inet/rpc misc/dirent misc/error misc/fil etc...
psm at uclibc.org
psm at uclibc.org
Tue Dec 13 21:39:02 UTC 2005
Author: psm
Date: 2005-12-13 13:38:57 -0800 (Tue, 13 Dec 2005)
New Revision: 12879
Log:
Convert all users of earlier hiddens
Modified:
trunk/uClibc/libc/inet/rpc/rcmd.c
trunk/uClibc/libc/inet/rpc/xdr_rec.c
trunk/uClibc/libc/inet/rpc/xdr_stdio.c
trunk/uClibc/libc/misc/dirent/opendir.c
trunk/uClibc/libc/misc/dirent/rewinddir.c
trunk/uClibc/libc/misc/dirent/scandir.c
trunk/uClibc/libc/misc/dirent/scandir64.c
trunk/uClibc/libc/misc/dirent/seekdir.c
trunk/uClibc/libc/misc/error/error.c
trunk/uClibc/libc/misc/file/lockf.c
trunk/uClibc/libc/misc/file/lockf64.c
trunk/uClibc/libc/misc/ftw/ftw.c
trunk/uClibc/libc/misc/glob/glob.c
trunk/uClibc/libc/misc/glob/glob64.c
trunk/uClibc/libc/misc/internals/__uClibc_main.c
trunk/uClibc/libc/misc/locale/locale.c
trunk/uClibc/libc/misc/mntent/mntent.c
trunk/uClibc/libc/misc/syslog/syslog.c
trunk/uClibc/libc/misc/utmp/utent.c
trunk/uClibc/libc/misc/utmp/wtent.c
trunk/uClibc/libc/misc/wchar/wstdio.c
trunk/uClibc/libc/pwd_grp/lckpwdf.c
trunk/uClibc/libc/stdio/_cs_funcs.c
trunk/uClibc/libc/stdio/_fopen.c
trunk/uClibc/libc/stdio/_trans2w.c
trunk/uClibc/libc/stdio/fdopen.c
trunk/uClibc/libc/stdio/fseeko.c
trunk/uClibc/libc/stdio/fsetpos.c
trunk/uClibc/libc/stdio/fsetpos64.c
trunk/uClibc/libc/stdio/rewind.c
trunk/uClibc/libc/sysdeps/linux/common/getcwd.c
trunk/uClibc/libc/sysdeps/linux/common/getdents.c
trunk/uClibc/libc/sysdeps/linux/common/getdents64.c
trunk/uClibc/libc/sysdeps/linux/common/pread_write.c
trunk/uClibc/libc/sysdeps/linux/powerpc/pread_write.c
trunk/uClibc/libc/termios/ttyname.c
trunk/uClibc/libc/unistd/getpass.c
Changeset:
Modified: trunk/uClibc/libc/inet/rpc/rcmd.c
===================================================================
--- trunk/uClibc/libc/inet/rpc/rcmd.c 2005-12-13 21:31:53 UTC (rev 12878)
+++ trunk/uClibc/libc/inet/rpc/rcmd.c 2005-12-13 21:38:57 UTC (rev 12879)
@@ -169,7 +169,7 @@
sigsetmask(oldmask); /* sigsetmask */
return -1;
}
- fcntl(s, F_SETOWN, pid); /* __fcntl */
+ __fcntl(s, F_SETOWN, pid); /* __fcntl */
sin.sin_family = hp->h_addrtype;
bcopy(hp->h_addr_list[0], &sin.sin_addr,
MIN (sizeof (sin.sin_addr), hp->h_length));
Modified: trunk/uClibc/libc/inet/rpc/xdr_rec.c
===================================================================
--- trunk/uClibc/libc/inet/rpc/xdr_rec.c 2005-12-13 21:31:53 UTC (rev 12878)
+++ trunk/uClibc/libc/inet/rpc/xdr_rec.c 2005-12-13 21:38:57 UTC (rev 12879)
@@ -317,7 +317,7 @@
RECSTREAM *rstrm = (RECSTREAM *) xdrs->x_private;
long pos;
- pos = lseek ((int) (long) rstrm->tcp_handle, (long) 0, 1);
+ pos = __lseek ((int) (long) rstrm->tcp_handle, (long) 0, 1);
if (pos != -1)
switch (xdrs->x_op)
{
Modified: trunk/uClibc/libc/inet/rpc/xdr_stdio.c
===================================================================
--- trunk/uClibc/libc/inet/rpc/xdr_stdio.c 2005-12-13 21:31:53 UTC (rev 12878)
+++ trunk/uClibc/libc/inet/rpc/xdr_stdio.c 2005-12-13 21:38:57 UTC (rev 12879)
@@ -39,6 +39,8 @@
#define fread __fread
#define fwrite __fwrite
+#define fseek __fseek
+#define fflush __fflush
#include <rpc/types.h>
#include <stdio.h>
Modified: trunk/uClibc/libc/misc/dirent/opendir.c
===================================================================
--- trunk/uClibc/libc/misc/dirent/opendir.c 2005-12-13 21:31:53 UTC (rev 12878)
+++ trunk/uClibc/libc/misc/dirent/opendir.c 2005-12-13 21:38:57 UTC (rev 12879)
@@ -29,7 +29,7 @@
/* According to POSIX, directory streams should be closed when
* exec. From "Anna Pluzhnikov" <besp at midway.uchicago.edu>.
*/
- if (fcntl(fd, F_SETFD, FD_CLOEXEC) < 0)
+ if (__fcntl(fd, F_SETFD, FD_CLOEXEC) < 0)
return NULL;
if (!(ptr = malloc(sizeof(*ptr)))) {
__close(fd);
Modified: trunk/uClibc/libc/misc/dirent/rewinddir.c
===================================================================
--- trunk/uClibc/libc/misc/dirent/rewinddir.c 2005-12-13 21:31:53 UTC (rev 12878)
+++ trunk/uClibc/libc/misc/dirent/rewinddir.c 2005-12-13 21:38:57 UTC (rev 12879)
@@ -12,7 +12,7 @@
return;
}
__pthread_mutex_lock(&(dir->dd_lock));
- lseek(dir->dd_fd, 0, SEEK_SET);
+ __lseek(dir->dd_fd, 0, SEEK_SET);
dir->dd_nextoff = dir->dd_nextloc = dir->dd_size = 0;
__pthread_mutex_unlock(&(dir->dd_lock));
}
Modified: trunk/uClibc/libc/misc/dirent/scandir.c
===================================================================
--- trunk/uClibc/libc/misc/dirent/scandir.c 2005-12-13 21:31:53 UTC (rev 12878)
+++ trunk/uClibc/libc/misc/dirent/scandir.c 2005-12-13 21:38:57 UTC (rev 12879)
@@ -49,7 +49,7 @@
__set_errno (0);
pos = 0;
- while ((current = readdir (dp)) != NULL)
+ while ((current = __readdir (dp)) != NULL)
if (selector == NULL || (*selector) (current))
{
struct dirent *vnew;
Modified: trunk/uClibc/libc/misc/dirent/scandir64.c
===================================================================
--- trunk/uClibc/libc/misc/dirent/scandir64.c 2005-12-13 21:31:53 UTC (rev 12878)
+++ trunk/uClibc/libc/misc/dirent/scandir64.c 2005-12-13 21:38:57 UTC (rev 12879)
@@ -64,7 +64,7 @@
__set_errno (0);
pos = 0;
- while ((current = readdir64 (dp)) != NULL)
+ while ((current = __readdir64 (dp)) != NULL)
if (selector == NULL || (*selector) (current))
{
struct dirent64 *vnew;
Modified: trunk/uClibc/libc/misc/dirent/seekdir.c
===================================================================
--- trunk/uClibc/libc/misc/dirent/seekdir.c 2005-12-13 21:31:53 UTC (rev 12878)
+++ trunk/uClibc/libc/misc/dirent/seekdir.c 2005-12-13 21:38:57 UTC (rev 12879)
@@ -10,7 +10,7 @@
return;
}
__pthread_mutex_lock(&(dir->dd_lock));
- dir->dd_nextoff = lseek(dir->dd_fd, offset, SEEK_SET);
+ dir->dd_nextoff = __lseek(dir->dd_fd, offset, SEEK_SET);
dir->dd_size = dir->dd_nextloc = 0;
__pthread_mutex_unlock(&(dir->dd_lock));
}
Modified: trunk/uClibc/libc/misc/error/error.c
===================================================================
--- trunk/uClibc/libc/misc/error/error.c 2005-12-13 21:31:53 UTC (rev 12878)
+++ trunk/uClibc/libc/misc/error/error.c 2005-12-13 21:38:57 UTC (rev 12879)
@@ -24,6 +24,7 @@
#define strerror __strerror
#define vfprintf __vfprintf
+#define fflush __fflush
#include <stdio.h>
#include <stdarg.h>
Modified: trunk/uClibc/libc/misc/file/lockf.c
===================================================================
--- trunk/uClibc/libc/misc/file/lockf.c 2005-12-13 21:31:53 UTC (rev 12878)
+++ trunk/uClibc/libc/misc/file/lockf.c 2005-12-13 21:38:57 UTC (rev 12879)
@@ -41,7 +41,7 @@
/* Test the lock: return 0 if FD is unlocked or locked by this process;
return -1, set errno to EACCES, if another process holds the lock. */
fl.l_type = F_RDLCK;
- if (fcntl (fd, F_GETLK, &fl) < 0)
+ if (__fcntl (fd, F_GETLK, &fl) < 0)
return -1;
if (fl.l_type == F_UNLCK || fl.l_pid == __getpid ())
return 0;
@@ -66,6 +66,6 @@
return -1;
}
- return fcntl(fd, cmd, &fl);
+ return __fcntl(fd, cmd, &fl);
}
strong_alias(__lockf,lockf)
Modified: trunk/uClibc/libc/misc/file/lockf64.c
===================================================================
--- trunk/uClibc/libc/misc/file/lockf64.c 2005-12-13 21:31:53 UTC (rev 12878)
+++ trunk/uClibc/libc/misc/file/lockf64.c 2005-12-13 21:38:57 UTC (rev 12879)
@@ -41,11 +41,12 @@
#include <sys/syscall.h>
#ifdef __NR_fcntl64
-extern int fcntl64 (int fd, int cmd, ...);
#define flock flock64
-#define fcntl fcntl64
+#define fcntl __fcntl64
#define F_GETLK F_GETLK64
#define F_SETLK F_SETLK64
+#else
+#define fcntl __fcntl
#endif
/* lockf is a simplified interface to fcntl's locking facilities. */
Modified: trunk/uClibc/libc/misc/ftw/ftw.c
===================================================================
--- trunk/uClibc/libc/misc/ftw/ftw.c 2005-12-13 21:31:53 UTC (rev 12878)
+++ trunk/uClibc/libc/misc/ftw/ftw.c 2005-12-13 21:38:57 UTC (rev 12879)
@@ -219,7 +219,7 @@
struct dirent *d;
size_t actsize = 0;
- while ((d = readdir (st)) != NULL)
+ while ((d = __readdir (st)) != NULL)
{
size_t this_len = _D_EXACT_NAMLEN (d);
if (actsize + this_len + 2 >= bufsize)
@@ -443,7 +443,7 @@
*startp++ = '/';
data->ftw.base = startp - data->dirbuf;
- while (dir.stream != NULL && (d = readdir (dir.stream)) != NULL)
+ while (dir.stream != NULL && (d = __readdir (dir.stream)) != NULL)
{
result = process_entry (data, &dir, d->d_name, _D_EXACT_NAMLEN (d));
if (result != 0)
Modified: trunk/uClibc/libc/misc/glob/glob.c
===================================================================
--- trunk/uClibc/libc/misc/glob/glob.c 2005-12-13 21:31:53 UTC (rev 12878)
+++ trunk/uClibc/libc/misc/glob/glob.c 2005-12-13 21:38:57 UTC (rev 12879)
@@ -428,7 +428,7 @@
}
else
{
- struct dirent *d = readdir ((DIR *) stream);
+ struct dirent *d = __readdir ((DIR *) stream);
if (d == NULL)
break;
if (! (d->d_ino != 0))
Modified: trunk/uClibc/libc/misc/glob/glob64.c
===================================================================
--- trunk/uClibc/libc/misc/glob/glob64.c 2005-12-13 21:31:53 UTC (rev 12878)
+++ trunk/uClibc/libc/misc/glob/glob64.c 2005-12-13 21:38:57 UTC (rev 12879)
@@ -19,7 +19,7 @@
#include <sys/stat.h>
#define dirent dirent64
-#define readdir(dirp) readdir64 (dirp)
+#define __readdir(dirp) __readdir64(dirp)
#define glob_t glob64_t
#define glob(pattern, flags, errfunc, pglob) \
@@ -28,7 +28,7 @@
#undef stat
#define stat stat64
-#define lstat lstat64
+#define __lstat __lstat64
#define __GLOB64 1
Modified: trunk/uClibc/libc/misc/internals/__uClibc_main.c
===================================================================
--- trunk/uClibc/libc/misc/internals/__uClibc_main.c 2005-12-13 21:31:53 UTC (rev 12878)
+++ trunk/uClibc/libc/misc/internals/__uClibc_main.c 2005-12-13 21:38:57 UTC (rev 12879)
@@ -81,14 +81,12 @@
# define O_NOFOLLOW 0
#endif
-extern int __libc_fcntl(int fd, int cmd, ...);
-
#ifdef __ARCH_HAS_MMU__
static void __check_one_fd(int fd, int mode)
{
/* Check if the specified fd is already open */
- if (unlikely(__libc_fcntl(fd, F_GETFD)==-1 && *(__errno_location())==EBADF))
+ if (unlikely(__fcntl(fd, F_GETFD)==-1 && *(__errno_location())==EBADF))
{
/* The descriptor is probably not open, so try to use /dev/null */
struct stat st;
Modified: trunk/uClibc/libc/misc/locale/locale.c
===================================================================
--- trunk/uClibc/libc/misc/locale/locale.c 2005-12-13 21:31:53 UTC (rev 12878)
+++ trunk/uClibc/libc/misc/locale/locale.c 2005-12-13 21:38:57 UTC (rev 12879)
@@ -48,6 +48,7 @@
#define stpcpy __stpcpy
#define strtok_r __strtok_r
+/* #define fflush __fflush */
#define _GNU_SOURCE
Modified: trunk/uClibc/libc/misc/mntent/mntent.c
===================================================================
--- trunk/uClibc/libc/misc/mntent/mntent.c 2005-12-13 21:31:53 UTC (rev 12878)
+++ trunk/uClibc/libc/misc/mntent/mntent.c 2005-12-13 21:38:57 UTC (rev 12879)
@@ -1,6 +1,7 @@
#define strtok_r __strtok_r
#define strstr __strstr
#define atoi __atoi
+#define fseek __fseek
#include <stdio.h>
#include <stdlib.h>
Modified: trunk/uClibc/libc/misc/syslog/syslog.c
===================================================================
--- trunk/uClibc/libc/misc/syslog/syslog.c 2005-12-13 21:31:53 UTC (rev 12878)
+++ trunk/uClibc/libc/misc/syslog/syslog.c 2005-12-13 21:38:57 UTC (rev 12879)
@@ -153,7 +153,7 @@
UNLOCK;
return;
}
- /* fcntl(LogFile, F_SETFD, 1); */
+ /* __fcntl(LogFile, F_SETFD, 1); */
}
}
Modified: trunk/uClibc/libc/misc/utmp/utent.c
===================================================================
--- trunk/uClibc/libc/misc/utmp/utent.c 2005-12-13 21:31:53 UTC (rev 12878)
+++ trunk/uClibc/libc/misc/utmp/utent.c 2005-12-13 21:38:57 UTC (rev 12879)
@@ -49,9 +49,9 @@
}
}
/* Make sure the file will be closed on exec() */
- ret = fcntl(static_fd, F_GETFD, 0);
+ ret = __fcntl(static_fd, F_GETFD, 0);
if (ret >= 0) {
- ret = fcntl(static_fd, F_GETFD, 0);
+ ret = __fcntl(static_fd, F_GETFD, 0);
}
if (ret < 0) {
bummer:
@@ -61,7 +61,7 @@
return;
}
}
- lseek(static_fd, 0, SEEK_SET);
+ __lseek(static_fd, 0, SEEK_SET);
UNLOCK;
return;
}
@@ -151,14 +151,14 @@
LOCK;
/* Ignore the return value. That way, if they've already positioned
the file pointer where they want it, everything will work out. */
- lseek(static_fd, (off_t) - sizeof(struct utmp), SEEK_CUR);
+ __lseek(static_fd, (off_t) - sizeof(struct utmp), SEEK_CUR);
if (__getutid(utmp_entry) != NULL) {
- lseek(static_fd, (off_t) - sizeof(struct utmp), SEEK_CUR);
+ __lseek(static_fd, (off_t) - sizeof(struct utmp), SEEK_CUR);
if (__write(static_fd, utmp_entry, sizeof(struct utmp)) != sizeof(struct utmp))
return NULL;
} else {
- lseek(static_fd, (off_t) 0, SEEK_END);
+ __lseek(static_fd, (off_t) 0, SEEK_END);
if (__write(static_fd, utmp_entry, sizeof(struct utmp)) != sizeof(struct utmp))
return NULL;
}
Modified: trunk/uClibc/libc/misc/utmp/wtent.c
===================================================================
--- trunk/uClibc/libc/misc/utmp/wtent.c 2005-12-13 21:31:53 UTC (rev 12878)
+++ trunk/uClibc/libc/misc/utmp/wtent.c 2005-12-13 21:38:57 UTC (rev 12879)
@@ -52,9 +52,9 @@
fd = __open(wtmp_file, O_APPEND | O_WRONLY, 0);
if (fd >= 0) {
- if (lockf(fd, F_LOCK, 0)==0) {
+ if (__lockf(fd, F_LOCK, 0)==0) {
__write(fd, (const char *) lutmp, sizeof(struct utmp));
- lockf(fd, F_ULOCK, 0);
+ __lockf(fd, F_ULOCK, 0);
__close(fd);
}
}
Modified: trunk/uClibc/libc/misc/wchar/wstdio.c
===================================================================
--- trunk/uClibc/libc/misc/wchar/wstdio.c 2005-12-13 21:31:53 UTC (rev 12878)
+++ trunk/uClibc/libc/misc/wchar/wstdio.c 2005-12-13 21:38:57 UTC (rev 12879)
@@ -53,6 +53,7 @@
#define wcsrtombs __wcsrtombs
#define mbrtowc __mbrtowc
#define wcrtomb __wcrtomb
+#define fflush_unlocked __fflush_unlocked
#define _GNU_SOURCE
#include <stdio.h>
Modified: trunk/uClibc/libc/pwd_grp/lckpwdf.c
===================================================================
--- trunk/uClibc/libc/pwd_grp/lckpwdf.c 2005-12-13 21:31:53 UTC (rev 12878)
+++ trunk/uClibc/libc/pwd_grp/lckpwdf.c 2005-12-13 21:38:57 UTC (rev 12879)
@@ -73,7 +73,7 @@
}
/* Make sure file gets correctly closed when process finished. */
- flags = fcntl (lock_fd, F_GETFD, 0);
+ flags = __fcntl (lock_fd, F_GETFD, 0);
if (flags == -1) {
/* Cannot get file flags. */
__close(lock_fd);
@@ -82,7 +82,7 @@
return -1;
}
flags |= FD_CLOEXEC; /* Close on exit. */
- if (fcntl (lock_fd, F_SETFD, flags) < 0) {
+ if (__fcntl (lock_fd, F_SETFD, flags) < 0) {
/* Cannot set new flags. */
__close(lock_fd);
lock_fd = -1;
@@ -131,7 +131,7 @@
__memset (&fl, '\0', sizeof (struct flock));
fl.l_type = F_WRLCK;
fl.l_whence = SEEK_SET;
- result = fcntl (lock_fd, F_SETLKW, &fl);
+ result = __fcntl (lock_fd, F_SETLKW, &fl);
/* Clear alarm. */
alarm (0);
Modified: trunk/uClibc/libc/stdio/_cs_funcs.c
===================================================================
--- trunk/uClibc/libc/stdio/_cs_funcs.c 2005-12-13 21:31:53 UTC (rev 12878)
+++ trunk/uClibc/libc/stdio/_cs_funcs.c 2005-12-13 21:38:57 UTC (rev 12879)
@@ -30,9 +30,9 @@
__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 @@
__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);
Modified: trunk/uClibc/libc/stdio/_fopen.c
===================================================================
--- trunk/uClibc/libc/stdio/_fopen.c 2005-12-13 21:31:53 UTC (rev 12878)
+++ trunk/uClibc/libc/stdio/_fopen.c 2005-12-13 21:38:57 UTC (rev 12879)
@@ -121,7 +121,7 @@
/* 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;
}
Modified: trunk/uClibc/libc/stdio/_trans2w.c
===================================================================
--- trunk/uClibc/libc/stdio/_trans2w.c 2005-12-13 21:31:53 UTC (rev 12878)
+++ trunk/uClibc/libc/stdio/_trans2w.c 2005-12-13 21:38:57 UTC (rev 12879)
@@ -64,7 +64,7 @@
* 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))
) {
Modified: trunk/uClibc/libc/stdio/fdopen.c
===================================================================
--- trunk/uClibc/libc/stdio/fdopen.c 2005-12-13 21:31:53 UTC (rev 12878)
+++ trunk/uClibc/libc/stdio/fdopen.c 2005-12-13 21:38:57 UTC (rev 12879)
@@ -11,7 +11,7 @@
{
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;
}
Modified: trunk/uClibc/libc/stdio/fseeko.c
===================================================================
--- trunk/uClibc/libc/stdio/fseeko.c 2005-12-13 21:31:53 UTC (rev 12878)
+++ trunk/uClibc/libc/stdio/fseeko.c 2005-12-13 21:38:57 UTC (rev 12879)
@@ -74,8 +74,8 @@
}
#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
Modified: trunk/uClibc/libc/stdio/fsetpos.c
===================================================================
--- trunk/uClibc/libc/stdio/fsetpos.c 2005-12-13 21:31:53 UTC (rev 12878)
+++ trunk/uClibc/libc/stdio/fsetpos.c 2005-12-13 21:38:57 UTC (rev 12879)
@@ -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 @@
__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 @@
#else
- return fseek(stream, pos->__pos, SEEK_SET);
+ return FSEEK(stream, pos->__pos, SEEK_SET);
#endif
}
Modified: trunk/uClibc/libc/stdio/fsetpos64.c
===================================================================
--- trunk/uClibc/libc/stdio/fsetpos64.c 2005-12-13 21:31:53 UTC (rev 12878)
+++ trunk/uClibc/libc/stdio/fsetpos64.c 2005-12-13 21:38:57 UTC (rev 12879)
@@ -10,5 +10,5 @@
#define __DO_LARGEFILE
#define fsetpos fsetpos64
#define fpos_t fpos64_t
-#define fseek fseeko64
+#define FSEEK __fseeko64
#include "fsetpos.c"
Modified: trunk/uClibc/libc/stdio/rewind.c
===================================================================
--- trunk/uClibc/libc/stdio/rewind.c 2005-12-13 21:31:53 UTC (rev 12878)
+++ trunk/uClibc/libc/stdio/rewind.c 2005-12-13 21:38:57 UTC (rev 12879)
@@ -14,7 +14,7 @@
__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);
}
Modified: trunk/uClibc/libc/sysdeps/linux/common/getcwd.c
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/common/getcwd.c 2005-12-13 21:31:53 UTC (rev 12878)
+++ trunk/uClibc/libc/sysdeps/linux/common/getcwd.c 2005-12-13 21:38:57 UTC (rev 12879)
@@ -66,7 +66,7 @@
goto oops;
}
- while ((d = readdir(dp)) != 0) {
+ while ((d = __readdir(dp)) != 0) {
#ifdef FAST_DIR_SEARCH_POSSIBLE
if (slow_search || this_ino == d->d_ino) {
#endif
Modified: trunk/uClibc/libc/sysdeps/linux/common/getdents.c
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/common/getdents.c 2005-12-13 21:31:53 UTC (rev 12878)
+++ trunk/uClibc/libc/sysdeps/linux/common/getdents.c 2005-12-13 21:38:57 UTC (rev 12879)
@@ -75,7 +75,7 @@
/* Our heuristic failed. We read too many entries. Reset
the stream. */
assert (last_offset != -1);
- lseek(fd, last_offset, SEEK_SET);
+ __lseek(fd, last_offset, SEEK_SET);
if ((char *) dp == buf) {
/* The buffer the user passed in is too small to hold even
Modified: trunk/uClibc/libc/sysdeps/linux/common/getdents64.c
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/common/getdents64.c 2005-12-13 21:31:53 UTC (rev 12878)
+++ trunk/uClibc/libc/sysdeps/linux/common/getdents64.c 2005-12-13 21:38:57 UTC (rev 12879)
@@ -80,7 +80,7 @@
/* Our heuristic failed. We read too many entries. Reset
the stream. */
assert (last_offset != -1);
- lseek64(fd, last_offset, SEEK_SET);
+ __lseek64(fd, last_offset, SEEK_SET);
if ((char *) dp == buf) {
/* The buffer the user passed in is too small to hold even
Modified: trunk/uClibc/libc/sysdeps/linux/common/pread_write.c
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/common/pread_write.c 2005-12-13 21:31:53 UTC (rev 12878)
+++ trunk/uClibc/libc/sysdeps/linux/common/pread_write.c 2005-12-13 21:38:57 UTC (rev 12879)
@@ -100,11 +100,11 @@
/* Since we must not change the file pointer preserve the
* value so that we can restore it later. */
- if ((old_offset=lseek(fd, 0, SEEK_CUR)) == (off_t) -1)
+ if ((old_offset=__lseek(fd, 0, SEEK_CUR)) == (off_t) -1)
return -1;
/* Set to wanted position. */
- if (lseek (fd, offset, SEEK_SET) == (off_t) -1)
+ if (__lseek (fd, offset, SEEK_SET) == (off_t) -1)
return -1;
if (do_pwrite==1) {
@@ -118,7 +118,7 @@
/* Now we have to restore the position. If this fails we
* have to return this as an error. */
save_errno = errno;
- if (lseek(fd, old_offset, SEEK_SET) == (off_t) -1)
+ if (__lseek(fd, old_offset, SEEK_SET) == (off_t) -1)
{
if (result == -1)
__set_errno(save_errno);
@@ -138,11 +138,11 @@
/* Since we must not change the file pointer preserve the
* value so that we can restore it later. */
- if ((old_offset=lseek64(fd, 0, SEEK_CUR)) == (off64_t) -1)
+ if ((old_offset=__lseek64(fd, 0, SEEK_CUR)) == (off64_t) -1)
return -1;
/* Set to wanted position. */
- if (lseek64(fd, offset, SEEK_SET) == (off64_t) -1)
+ if (__lseek64(fd, offset, SEEK_SET) == (off64_t) -1)
return -1;
if (do_pwrite==1) {
@@ -155,7 +155,7 @@
/* Now we have to restore the position. */
save_errno = errno;
- if (lseek64 (fd, old_offset, SEEK_SET) == (off64_t) -1) {
+ if (__lseek64 (fd, old_offset, SEEK_SET) == (off64_t) -1) {
if (result == -1)
__set_errno (save_errno);
return -1;
Modified: trunk/uClibc/libc/sysdeps/linux/powerpc/pread_write.c
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/powerpc/pread_write.c 2005-12-13 21:31:53 UTC (rev 12878)
+++ trunk/uClibc/libc/sysdeps/linux/powerpc/pread_write.c 2005-12-13 21:38:57 UTC (rev 12879)
@@ -96,11 +96,11 @@
/* Since we must not change the file pointer preserve the
* value so that we can restore it later. */
- if ((old_offset=lseek(fd, 0, SEEK_CUR)) == (off_t) -1)
+ if ((old_offset=__lseek(fd, 0, SEEK_CUR)) == (off_t) -1)
return -1;
/* Set to wanted position. */
- if (lseek (fd, offset, SEEK_SET) == (off_t) -1)
+ if (__lseek (fd, offset, SEEK_SET) == (off_t) -1)
return -1;
if (do_pwrite==1) {
@@ -114,7 +114,7 @@
/* Now we have to restore the position. If this fails we
* have to return this as an error. */
save_errno = errno;
- if (lseek(fd, old_offset, SEEK_SET) == (off_t) -1)
+ if (__lseek(fd, old_offset, SEEK_SET) == (off_t) -1)
{
if (result == -1)
__set_errno(save_errno);
@@ -134,11 +134,11 @@
/* Since we must not change the file pointer preserve the
* value so that we can restore it later. */
- if ((old_offset=lseek64(fd, 0, SEEK_CUR)) == (off64_t) -1)
+ if ((old_offset=__lseek64(fd, 0, SEEK_CUR)) == (off64_t) -1)
return -1;
/* Set to wanted position. */
- if (lseek64(fd, offset, SEEK_SET) == (off64_t) -1)
+ if (__lseek64(fd, offset, SEEK_SET) == (off64_t) -1)
return -1;
if (do_pwrite==1) {
@@ -151,7 +151,7 @@
/* Now we have to restore the position. */
save_errno = errno;
- if (lseek64 (fd, old_offset, SEEK_SET) == (off64_t) -1) {
+ if (__lseek64 (fd, old_offset, SEEK_SET) == (off64_t) -1) {
if (result == -1)
__set_errno (save_errno);
return -1;
Modified: trunk/uClibc/libc/termios/ttyname.c
===================================================================
--- trunk/uClibc/libc/termios/ttyname.c 2005-12-13 21:31:53 UTC (rev 12878)
+++ trunk/uClibc/libc/termios/ttyname.c 2005-12-13 21:38:57 UTC (rev 12879)
@@ -73,7 +73,7 @@
continue;
}
- while ((d = readdir(fp)) != NULL) {
+ while ((d = __readdir(fp)) != NULL) {
/* This should never trigger for standard names, but we
* check it to be safe. */
if (__strlen(d->d_name) > len) { /* Too big? */
Modified: trunk/uClibc/libc/unistd/getpass.c
===================================================================
--- trunk/uClibc/libc/unistd/getpass.c 2005-12-13 21:31:53 UTC (rev 12878)
+++ trunk/uClibc/libc/unistd/getpass.c 2005-12-13 21:38:57 UTC (rev 12879)
@@ -20,6 +20,7 @@
#define tcsetattr __tcsetattr
#define tcgetattr __tcgetattr
#define fileno __fileno
+#define fflush __fflush
#include <stdio.h>
#include <string.h>
More information about the uClibc-cvs
mailing list