From fab656f5a776f09596b9e74f9a43f8300dd724c7 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 15 Apr 2002 05:35:10 +0000 Subject: Update. * include/sys/stat.h: Add prototypes for __lxstat_internal and __lxstat64_internal. Add macros __lxstat and __lxstat64 if not NOT_IN_libc. * sysdeps/generic/lxstat.c: Use INTDEF for __lxstat. * sysdeps/mach/hurd/lxstat.c: Likewise. * sysdeps/unix/common/lxstat.c: Likewise. * sysdeps/unix/sysv/aix/lxstat.c: Likewise. * sysdeps/unix/sysv/linux/lxstat.c: Likewise. * sysdeps/unix/sysv/linux/i386/lxstat.c: Likewise. * sysdeps/unix/sysv/linux/ia64/lxstat.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-64/lxstat.c: Likewise. * sysdeps/generic/lxstat64.c: Use INTDEF for __lxstat64. * sysdeps/mach/hurd/lxstat64.c: Likewise. * sysdeps/unix/sysv/aix/lxstat64.c: Likewise. * sysdeps/unix/sysv/linuxx/lxstat64.c: Likewise. * include/wchar.h: Declare __mbrtowc_internal and __mbrlen_internal prototypes. Add __mbrlen and __mbrtowc macros. * wcsmbs/mbrlen.c: Use INTDEF for __mbrlen. * wcsmbs/mbrtowc.c: Use INTDEF for __mbrtowc. * include/unistd.h: Add prototype for __write_internal and add __libc_write macro is SHARED. * sysdeps/generic/write.c: Use INTDEF for __write. * sysdeps/mach/hurd/write.c: Likewise. * sysdeps/unix/sysv/aix/write.c: Likewise. * sysdeps/unix/syscalls.list: Add __libc_write alias. * assert/assert.c: Replace STR_N_SIZE with something usable in macro arguments. * assert/assert-perr.c: Likewise. --- sysdeps/unix/sysv/aix/lxstat.c | 6 +++++- sysdeps/unix/sysv/aix/lxstat64.c | 6 +++++- sysdeps/unix/sysv/aix/write.c | 5 ++++- sysdeps/unix/sysv/linux/i386/lxstat.c | 6 +++++- sysdeps/unix/sysv/linux/ia64/lxstat.c | 6 +++++- sysdeps/unix/sysv/linux/lxstat.c | 9 +++++++-- sysdeps/unix/sysv/linux/lxstat64.c | 3 +++ sysdeps/unix/sysv/linux/s390/s390-64/lxstat.c | 6 +++++- 8 files changed, 39 insertions(+), 8 deletions(-) (limited to 'sysdeps/unix/sysv') diff --git a/sysdeps/unix/sysv/aix/lxstat.c b/sysdeps/unix/sysv/aix/lxstat.c index bd6f6534a8..52562bd934 100644 --- a/sysdeps/unix/sysv/aix/lxstat.c +++ b/sysdeps/unix/sysv/aix/lxstat.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1999, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -21,6 +21,8 @@ #define STX_LINK 0x01 +#undef __lxstat + extern int statx (const char *pathname, struct stat *st, int len, int cmd); int @@ -29,3 +31,5 @@ __lxstat (int ver, const char *pathname, struct stat *st) assert (ver == 0); return statx (pathname, st, sizeof (*st), STX_LINK); } + +INTDEF(__lxstat) diff --git a/sysdeps/unix/sysv/aix/lxstat64.c b/sysdeps/unix/sysv/aix/lxstat64.c index d6376bd260..d68b4583d2 100644 --- a/sysdeps/unix/sysv/aix/lxstat64.c +++ b/sysdeps/unix/sysv/aix/lxstat64.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1999, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -22,6 +22,8 @@ #define STX_LINK 0x01 #define STX_64 0x08 +#undef __lxstat64 + extern int statx (const char *pathname, struct stat64 *st, int len, int cmd); int @@ -30,3 +32,5 @@ __lxstat64 (int ver, const char *pathname, struct stat64 *st) assert (ver == 0); return statx (pathname, st, sizeof (*st), STX_LINK | STX_64); } + +INTDEF(__lxstat64) diff --git a/sysdeps/unix/sysv/aix/write.c b/sysdeps/unix/sysv/aix/write.c index 727ec82cfb..5a1ac101e4 100644 --- a/sysdeps/unix/sysv/aix/write.c +++ b/sysdeps/unix/sysv/aix/write.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1999. @@ -21,6 +21,8 @@ #include "kernel_proto.h" +#undef __libc_write +#undef __write ssize_t __write (fd, ptr, n) @@ -30,6 +32,7 @@ __write (fd, ptr, n) { return kwrite (fd, ptr, n); } +INTDEF(__write) /* AIX has no weak aliases (yet) but let's hope for better times. */ weak_alias (__write, write) strong_alias (__write, __libc_write) diff --git a/sysdeps/unix/sysv/linux/i386/lxstat.c b/sysdeps/unix/sysv/linux/i386/lxstat.c index dee4fbac73..58a837ee1c 100644 --- a/sysdeps/unix/sysv/linux/i386/lxstat.c +++ b/sysdeps/unix/sysv/linux/i386/lxstat.c @@ -1,5 +1,5 @@ /* lxstat using old-style Unix lstat system call. - Copyright (C) 1991,95,96,97,98,2000 Free Software Foundation, Inc. + Copyright (C) 1991,95,96,97,98,2000,2002 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -34,6 +34,8 @@ #include +#undef __lxstat + extern int __syscall_lstat (const char *__unbounded, struct kernel_stat *__unbounded); @@ -96,8 +98,10 @@ __lxstat (int vers, const char *name, struct stat *buf) #endif } +INTDEF(__lxstat) weak_alias (__lxstat, _lxstat); #ifdef XSTAT_IS_XSTAT64 #undef __lxstat64 +INTDEF(__lxstat64) strong_alias (__lxstat, __lxstat64); #endif diff --git a/sysdeps/unix/sysv/linux/ia64/lxstat.c b/sysdeps/unix/sysv/linux/ia64/lxstat.c index 925f1353e3..449682563d 100644 --- a/sysdeps/unix/sysv/linux/ia64/lxstat.c +++ b/sysdeps/unix/sysv/linux/ia64/lxstat.c @@ -1,5 +1,5 @@ /* lxstat using old-style Unix fstat system call. - Copyright (C) 1991, 95, 96, 97, 98, 2000 Free Software Foundation, Inc. + Copyright (C) 1991,95,96,97,98,2000,2002 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -29,6 +29,8 @@ #include #include +#undef __lxstat + extern int __syscall_lstat (const char *__unbounded, struct stat *__unbounded); /* Get information about the file FD in BUF. */ @@ -38,6 +40,8 @@ __lxstat (int vers, const char *name, struct stat *buf) return INLINE_SYSCALL (lstat, 2, CHECK_STRING (name), CHECK_1 (buf)); } +INTDEF(__lxstat) weak_alias (__lxstat, _lxstat); #undef __lxstat64 +INTDEF(__lxstat64) strong_alias (__lxstat, __lxstat64); diff --git a/sysdeps/unix/sysv/linux/lxstat.c b/sysdeps/unix/sysv/linux/lxstat.c index 15824e09f5..9f92a191f1 100644 --- a/sysdeps/unix/sysv/linux/lxstat.c +++ b/sysdeps/unix/sysv/linux/lxstat.c @@ -1,5 +1,5 @@ /* lxstat using old-style Unix lstat system call. - Copyright (C) 1991, 1995, 1996, 1997, 1998, 2000 Free Software Foundation, Inc. + Copyright (C) 1991,1995-1998,2000,2002 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -32,7 +32,10 @@ #include -extern int __syscall_lstat (const char *__unbounded, struct kernel_stat *__unbounded); +#undef __lxstat + +extern int __syscall_lstat (const char *__unbounded, + struct kernel_stat *__unbounded); /* Get information about the file NAME in BUF. */ int @@ -52,8 +55,10 @@ __lxstat (int vers, const char *name, struct stat *buf) return result; } +INTDEF(__lxstat) weak_alias (__lxstat, _lxstat); #ifdef XSTAT_IS_XSTAT64 #undef __lxstat64 +INTDEF(__lxstat64) strong_alias (__lxstat, __lxstat64); #endif diff --git a/sysdeps/unix/sysv/linux/lxstat64.c b/sysdeps/unix/sysv/linux/lxstat64.c index 94540a97ab..6191af2724 100644 --- a/sysdeps/unix/sysv/linux/lxstat64.c +++ b/sysdeps/unix/sysv/linux/lxstat64.c @@ -32,6 +32,8 @@ # include #endif +#undef __lxstat64 + extern int __syscall_lstat (const char *__unbounded, struct kernel_stat *__unbounded); @@ -100,3 +102,4 @@ compat_symbol (libc, __old__lxstat64, __lxstat64, GLIBC_2_1); #else strong_alias (___lxstat64, __lxstat64); #endif +INTDEF2(___lxstat64, __lxstat64) diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/lxstat.c b/sysdeps/unix/sysv/linux/s390/s390-64/lxstat.c index d6bd47789b..5a86fc177a 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/lxstat.c +++ b/sysdeps/unix/sysv/linux/s390/s390-64/lxstat.c @@ -1,5 +1,5 @@ /* lxstat using old-style Unix fstat system call. 64 bit S/390 version. - Copyright (C) 2001 Free Software Foundation, Inc. + Copyright (C) 2001, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -28,6 +28,8 @@ #include #include +#undef __lxstat + extern int __syscall_lstat (const char *, struct stat *); /* Get information about the file FD in BUF. */ @@ -37,6 +39,8 @@ __lxstat (int vers, const char *name, struct stat *buf) return INLINE_SYSCALL (lstat, 2, name, buf); } +INTDEF(__lxstat) weak_alias (__lxstat, _lxstat); #undef __lxstat64 +INTDEF(__lxstat64) strong_alias (__lxstat, __lxstat64); -- cgit 1.4.1