2022-01-02 02:54:23 +08:00
|
|
|
/* Copyright (C) 2000-2022 Free Software Foundation, Inc.
|
2000-09-27 15:22:02 +08:00
|
|
|
This file is part of the GNU C Library.
|
|
|
|
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
2001-07-06 12:58:11 +08:00
|
|
|
modify it under the terms of the GNU Lesser General Public
|
|
|
|
License as published by the Free Software Foundation; either
|
|
|
|
version 2.1 of the License, or (at your option) any later version.
|
2000-09-27 15:22:02 +08:00
|
|
|
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
2001-07-06 12:58:11 +08:00
|
|
|
Lesser General Public License for more details.
|
2000-09-27 15:22:02 +08:00
|
|
|
|
2001-07-06 12:58:11 +08:00
|
|
|
You should have received a copy of the GNU Lesser General Public
|
2012-02-10 07:18:22 +08:00
|
|
|
License along with the GNU C Library; if not, see
|
Prefer https to http for gnu.org and fsf.org URLs
Also, change sources.redhat.com to sourceware.org.
This patch was automatically generated by running the following shell
script, which uses GNU sed, and which avoids modifying files imported
from upstream:
sed -ri '
s,(http|ftp)(://(.*\.)?(gnu|fsf|sourceware)\.org($|[^.]|\.[^a-z])),https\2,g
s,(http|ftp)(://(.*\.)?)sources\.redhat\.com($|[^.]|\.[^a-z]),https\2sourceware.org\4,g
' \
$(find $(git ls-files) -prune -type f \
! -name '*.po' \
! -name 'ChangeLog*' \
! -path COPYING ! -path COPYING.LIB \
! -path manual/fdl-1.3.texi ! -path manual/lgpl-2.1.texi \
! -path manual/texinfo.tex ! -path scripts/config.guess \
! -path scripts/config.sub ! -path scripts/install-sh \
! -path scripts/mkinstalldirs ! -path scripts/move-if-change \
! -path INSTALL ! -path locale/programs/charmap-kw.h \
! -path po/libc.pot ! -path sysdeps/gnu/errlist.c \
! '(' -name configure \
-execdir test -f configure.ac -o -f configure.in ';' ')' \
! '(' -name preconfigure \
-execdir test -f preconfigure.ac ';' ')' \
-print)
and then by running 'make dist-prepare' to regenerate files built
from the altered files, and then executing the following to cleanup:
chmod a+x sysdeps/unix/sysv/linux/riscv/configure
# Omit irrelevant whitespace and comment-only changes,
# perhaps from a slightly-different Autoconf version.
git checkout -f \
sysdeps/csky/configure \
sysdeps/hppa/configure \
sysdeps/riscv/configure \
sysdeps/unix/sysv/linux/csky/configure
# Omit changes that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/powerpc/powerpc64/ppc-mcount.S: trailing lines
git checkout -f \
sysdeps/powerpc/powerpc64/ppc-mcount.S \
sysdeps/unix/sysv/linux/s390/s390-64/syscall.S
# Omit change that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S: last line does not end in newline
git checkout -f sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S
2019-09-07 13:40:42 +08:00
|
|
|
<https://www.gnu.org/licenses/>. */
|
2000-09-27 15:22:02 +08:00
|
|
|
|
2000-09-07 16:35:20 +08:00
|
|
|
#include <dirent.h>
|
2000-09-27 15:22:02 +08:00
|
|
|
#include <errno.h>
|
2000-09-07 16:35:20 +08:00
|
|
|
#include <fcntl.h>
|
|
|
|
#include <mcheck.h>
|
* locale/programs/ld-ctype.c (ctype_read): When given a repertoire
name of "", store a null pointer instead.
* configure.in (elf): Set to yes for freebsd*, netbsd*.
* configure: Regenerated.
* locale/xlocale.c [! (USE_TLS && HAVE___THREAD)] (__libc_tsd_LOCALE):
Initialize this instead of __libc_tsd_LOCALE_data.
* sysdeps/unix/grantpt.c (pts_name): Convert ENOTTY return from
ptsname_r to EINVAL.
* sysdeps/generic/ptsname.c (__ptsname_r): Return ENOSYS instead of 0.
* rt/Makefile: Revert last change, it was inappropriate to presume aio
implementations depend on pthreads.
* rt/tst-aio.c (do_test): Exit happy if first failure is ENOSYS.
* rt/tst-aio64.c (do_test): Likewise.
* rt/tst-aio2.c (do_test): Likewise.
* rt/tst-aio3.c (do_test): Likewise.
* rt/tst-aio4.c (do_test): Likewise.
* rt/tst-aio5.c (do_test): Likewise.
* rt/tst-aio6.c (do_test): Likewise.
* rt/tst-aio7.c (do_test): Likewise.
* sysdeps/generic/bits/libc-lock.h (__libc_setspecific): Use a cast to
void so as to avoid compiler warnings.
* libio/oldstdfiles.c [! _IO_MTSAFE_IO] (DEF_STDFILE): Don't define
_IO_wide_data_FD, which is never used here.
* libio/iofread.c
[! _IO_MTSAFE_IO] (fread_unlocked): Add libc_hidden_ver defn.
* libio/iofputs.c [! _IO_MTSAFE_IO] (fputs_unlocked): Likewise.
* libio/iofgets.c [! _IO_MTSAFE_IO] (fgets_unlocked): Likewise.
* include/resolv.h [! _LIBC_REENTRANT] (_res): #undef it before decl.
* include/netdb.h [! _LIBC_REENTRANT] (h_errno): Declare normal extern.
* misc/syslog.c (openlog): Conditionalize locking on [_LIBC_REENTRANT].
(closelog): Likewise.
2002-07-06 Bruno Haible <bruno@clisp.org>
* sysdeps/alpha/fpu/fpu_control.h: Comment fix.
* sysdeps/unix/sysv/linux/alpha/pipe.S: Moved to ...
* sysdeps/unix/alpha/pipe.S: ... here.
* sysdeps/unix/bsd/osf/alpha/pipe.S: File removed.
* sysdeps/unix/i386/brk.S: Rename local label to '.Lhere' in ELF.
* sysdeps/unix/i386/brk.S: Add PSEUDO_END invocation.
* sysdeps/unix/i386/fork.S: Likewise.
* sysdeps/unix/i386/pipe.S: Likewise.
* sysdeps/unix/i386/wait.S: Likewise.
* sysdeps/unix/fork.S: Fix PSEUDO_END argument.
* sysdeps/unix/arm/fork.S: Likewise.
* sysdeps/unix/sysv/linux/arm/sysdep.h (PSEUDO): Swap DO_CALL
arguments.
(DO_CALL): Swap argument order.
* sysdeps/unix/sysv/linux/hppa/sysdep.h (PSEUDO): Swap DO_CALL
arguments.
(DO_CALL): Swap argument order.
* sysdeps/unix/sysv/linux/i386/sysdep.h (PSEUDO): Swap DO_CALL
arguments.
(DO_CALL): Swap argument order.
* sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h (PSEUDO): Swap DO_CALL
arguments.
(DO_CALL): Swap argument order.
* sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h (PSEUDO): Swap DO_CALL
arguments.
(DO_CALL): Swap argument order.
* sysdeps/unix/sysv/linux/sh/sysdep.h (PSEUDO): Swap DO_CALL
arguments.
(DO_CALL): Swap argument order.
* sysdeps/unix/sysv/linux/x86_64/sysdep.h (PSEUDO): Swap DO_CALL
arguments.
(DO_CALL): Swap argument order.
* sysdeps/i386/sysdep.h (PSEUDO): Fix syntax error.
(L): Define right for ELF.
* sysdeps/unix/sysv/linux/i386/sysdep.h (L): Remove definition.
Now defined in sysdeps/i386/sysdep.h.
* sysdeps/posix/readv.c: Ansify function definition.
* sysdeps/posix/writev.c: Likewise.
* stdio-common/tst-fseek.c (main): Don't assume that off_t and size_t
have the same size. Avoid direct cast from size_t to off_t.
* login/tst-utmp.c (simulate_login): Don't leave garbage after the
nul byte in entry[n].ut_user.
(simulate_logout): Likewise.
* login/programs/utmpdump.c (print_entry): Test _HAVE_UT_TYPE,
_HAVE_UT_PID, _HAVE_UT_ID, _HAVE_UT_HOST, instead of assuming the
existence of corresponding members of 'struct utmp'.
* login/tst-utmp.c: Trivialize the test if testing 'struct utmp' and
!_HAVE_UT_TYPE.
* sysdeps/unix/opendir.c (__opendir): If st_blksize is 0 or too small,
allocate a buffer of at least BUFSIZ bytes, not just of
sizeof (struct dirent).
* sysdeps/generic/glob.c: Include <limits.h>.
(NAME_MAX): Define a fallback.
(glob_in_dir): Allocate enough room for a 'struct dirent64' on the
stack.
* posix/tst-dir.c: Include <stddef.h>, for offsetof.
(main): Allocate enough room for a 'struct dirent64' on the stack.
* posix/tst-gnuglob.c (my_DIR): Allocate enough room for a
'struct dirent'.
* sysdeps/unix/sysv/linux/init-first.c: Don't include
kernel-features.h.
* inet/htontest.c: Include <sys/types.h>.
* sysdeps/generic/sys/sysinfo.h: Surround with __{BEGIN,END}_DECLS.
* include/sys/sysctl.h: Comment fix.
* elf/rtld.c (_rtld_global) [! _LIBC_REENTRANT]: Don't initialize
_dl_load_lock.
* libio/fileno.c (fileno_unlocked): Define regardless of _IO_MTSAFE_IO.
* sysdeps/unix/bsd/bsd4.4/syscalls.list (__sigaltstack): New alias.
* sysdeps/unix/inet/syscalls.list (__connect_internal): New alias.
(__getpeername): New alias.
(__getsockname): New alias.
(__socket): New alias.
* sysdeps/unix/common/syscalls.list (getpgid): Remove.
* sysdeps/unix/syscalls.list (__chown_internal): New alias.
(__fcntl_internal): New alias.
(__profil): New alias.
2002-08-26 19:39:12 +08:00
|
|
|
#include <stddef.h>
|
2000-09-07 16:35:20 +08:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <sys/stat.h>
|
Split DIAG_* macros to new header libc-diag.h.
Quite a few tests include libc-internal.h just for the DIAG_* macros.
Split those macros to their own file, which can be included safely in
_ISOMAC mode. I also moved ignore_value, since it seems logically
related, even though I didn't notice any tests needing it.
Also add -Wnonnull suppressions to two tests that _should_ have them,
but the error is masked when compiling against internal headers.
* include/libc-diag.h: New file. Define ignore_value,
DIAG_PUSH_NEEDS_COMMENT, DIAG_POP_NEEDS_COMMENT,
DIAG_IGNORE_NEEDS_COMMENT, and DIAG_IGNORE_Os_NEEDS_COMMENT here.
* include/libc-internal.h: Definitions of above macros moved from
here. Include libc-diag.h. Add copyright notice.
* malloc/tst-malloc.c, malloc/tst-memcheck.c, malloc/tst-realloc.c
* misc/tst-error1.c, posix/tst-dir.c, stdio-common/bug21.c
* stdio-common/scanf14.c, stdio-common/scanf4.c, stdio-common/scanf7.c
* stdio-common/test-vfprintf.c, stdio-common/tst-printf.c
* stdio-common/tst-printfsz.c, stdio-common/tst-sprintf.c
* stdio-common/tst-unlockedio.c, stdio-common/tstdiomisc.c
* stdlib/bug-getcontext.c, string/tester.c, string/tst-endian.c
* time/tst-strptime2.c, wcsmbs/tst-wcstof.c:
Include libc-diag.h instead of libc-internal.h.
* stdlib/tst-environ.c: Include libc-diag.h. Suppress -Wnonnull for
call to unsetenv (NULL).
* nptl/tst-mutex1.c: Include libc-diag.h. Suppress -Wnonnull for
call to pthread_mutexattr_destroy (NULL).
2016-11-21 09:46:30 +08:00
|
|
|
#include <libc-diag.h>
|
2000-09-07 16:35:20 +08:00
|
|
|
|
|
|
|
/* We expect four arguments:
|
|
|
|
- source directory name
|
|
|
|
- object directory
|
|
|
|
- common object directory
|
|
|
|
- the program name with path
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
main (int argc, char *argv[])
|
|
|
|
{
|
|
|
|
const char *srcdir;
|
|
|
|
const char *objdir;
|
|
|
|
const char *common_objdir;
|
|
|
|
const char *progpath;
|
|
|
|
struct stat64 st1;
|
|
|
|
struct stat64 st2;
|
|
|
|
struct stat64 st3;
|
|
|
|
DIR *dir1;
|
|
|
|
DIR *dir2;
|
|
|
|
int result = 0;
|
|
|
|
struct dirent64 *d;
|
* locale/programs/ld-ctype.c (ctype_read): When given a repertoire
name of "", store a null pointer instead.
* configure.in (elf): Set to yes for freebsd*, netbsd*.
* configure: Regenerated.
* locale/xlocale.c [! (USE_TLS && HAVE___THREAD)] (__libc_tsd_LOCALE):
Initialize this instead of __libc_tsd_LOCALE_data.
* sysdeps/unix/grantpt.c (pts_name): Convert ENOTTY return from
ptsname_r to EINVAL.
* sysdeps/generic/ptsname.c (__ptsname_r): Return ENOSYS instead of 0.
* rt/Makefile: Revert last change, it was inappropriate to presume aio
implementations depend on pthreads.
* rt/tst-aio.c (do_test): Exit happy if first failure is ENOSYS.
* rt/tst-aio64.c (do_test): Likewise.
* rt/tst-aio2.c (do_test): Likewise.
* rt/tst-aio3.c (do_test): Likewise.
* rt/tst-aio4.c (do_test): Likewise.
* rt/tst-aio5.c (do_test): Likewise.
* rt/tst-aio6.c (do_test): Likewise.
* rt/tst-aio7.c (do_test): Likewise.
* sysdeps/generic/bits/libc-lock.h (__libc_setspecific): Use a cast to
void so as to avoid compiler warnings.
* libio/oldstdfiles.c [! _IO_MTSAFE_IO] (DEF_STDFILE): Don't define
_IO_wide_data_FD, which is never used here.
* libio/iofread.c
[! _IO_MTSAFE_IO] (fread_unlocked): Add libc_hidden_ver defn.
* libio/iofputs.c [! _IO_MTSAFE_IO] (fputs_unlocked): Likewise.
* libio/iofgets.c [! _IO_MTSAFE_IO] (fgets_unlocked): Likewise.
* include/resolv.h [! _LIBC_REENTRANT] (_res): #undef it before decl.
* include/netdb.h [! _LIBC_REENTRANT] (h_errno): Declare normal extern.
* misc/syslog.c (openlog): Conditionalize locking on [_LIBC_REENTRANT].
(closelog): Likewise.
2002-07-06 Bruno Haible <bruno@clisp.org>
* sysdeps/alpha/fpu/fpu_control.h: Comment fix.
* sysdeps/unix/sysv/linux/alpha/pipe.S: Moved to ...
* sysdeps/unix/alpha/pipe.S: ... here.
* sysdeps/unix/bsd/osf/alpha/pipe.S: File removed.
* sysdeps/unix/i386/brk.S: Rename local label to '.Lhere' in ELF.
* sysdeps/unix/i386/brk.S: Add PSEUDO_END invocation.
* sysdeps/unix/i386/fork.S: Likewise.
* sysdeps/unix/i386/pipe.S: Likewise.
* sysdeps/unix/i386/wait.S: Likewise.
* sysdeps/unix/fork.S: Fix PSEUDO_END argument.
* sysdeps/unix/arm/fork.S: Likewise.
* sysdeps/unix/sysv/linux/arm/sysdep.h (PSEUDO): Swap DO_CALL
arguments.
(DO_CALL): Swap argument order.
* sysdeps/unix/sysv/linux/hppa/sysdep.h (PSEUDO): Swap DO_CALL
arguments.
(DO_CALL): Swap argument order.
* sysdeps/unix/sysv/linux/i386/sysdep.h (PSEUDO): Swap DO_CALL
arguments.
(DO_CALL): Swap argument order.
* sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h (PSEUDO): Swap DO_CALL
arguments.
(DO_CALL): Swap argument order.
* sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h (PSEUDO): Swap DO_CALL
arguments.
(DO_CALL): Swap argument order.
* sysdeps/unix/sysv/linux/sh/sysdep.h (PSEUDO): Swap DO_CALL
arguments.
(DO_CALL): Swap argument order.
* sysdeps/unix/sysv/linux/x86_64/sysdep.h (PSEUDO): Swap DO_CALL
arguments.
(DO_CALL): Swap argument order.
* sysdeps/i386/sysdep.h (PSEUDO): Fix syntax error.
(L): Define right for ELF.
* sysdeps/unix/sysv/linux/i386/sysdep.h (L): Remove definition.
Now defined in sysdeps/i386/sysdep.h.
* sysdeps/posix/readv.c: Ansify function definition.
* sysdeps/posix/writev.c: Likewise.
* stdio-common/tst-fseek.c (main): Don't assume that off_t and size_t
have the same size. Avoid direct cast from size_t to off_t.
* login/tst-utmp.c (simulate_login): Don't leave garbage after the
nul byte in entry[n].ut_user.
(simulate_logout): Likewise.
* login/programs/utmpdump.c (print_entry): Test _HAVE_UT_TYPE,
_HAVE_UT_PID, _HAVE_UT_ID, _HAVE_UT_HOST, instead of assuming the
existence of corresponding members of 'struct utmp'.
* login/tst-utmp.c: Trivialize the test if testing 'struct utmp' and
!_HAVE_UT_TYPE.
* sysdeps/unix/opendir.c (__opendir): If st_blksize is 0 or too small,
allocate a buffer of at least BUFSIZ bytes, not just of
sizeof (struct dirent).
* sysdeps/generic/glob.c: Include <limits.h>.
(NAME_MAX): Define a fallback.
(glob_in_dir): Allocate enough room for a 'struct dirent64' on the
stack.
* posix/tst-dir.c: Include <stddef.h>, for offsetof.
(main): Allocate enough room for a 'struct dirent64' on the stack.
* posix/tst-gnuglob.c (my_DIR): Allocate enough room for a
'struct dirent'.
* sysdeps/unix/sysv/linux/init-first.c: Don't include
kernel-features.h.
* inet/htontest.c: Include <sys/types.h>.
* sysdeps/generic/sys/sysinfo.h: Surround with __{BEGIN,END}_DECLS.
* include/sys/sysctl.h: Comment fix.
* elf/rtld.c (_rtld_global) [! _LIBC_REENTRANT]: Don't initialize
_dl_load_lock.
* libio/fileno.c (fileno_unlocked): Define regardless of _IO_MTSAFE_IO.
* sysdeps/unix/bsd/bsd4.4/syscalls.list (__sigaltstack): New alias.
* sysdeps/unix/inet/syscalls.list (__connect_internal): New alias.
(__getpeername): New alias.
(__getsockname): New alias.
(__socket): New alias.
* sysdeps/unix/common/syscalls.list (getpgid): Remove.
* sysdeps/unix/syscalls.list (__chown_internal): New alias.
(__fcntl_internal): New alias.
(__profil): New alias.
2002-08-26 19:39:12 +08:00
|
|
|
union
|
|
|
|
{
|
|
|
|
struct dirent64 d;
|
|
|
|
char room [offsetof (struct dirent64, d_name[0]) + NAME_MAX + 1];
|
|
|
|
}
|
|
|
|
direntbuf;
|
2000-09-07 16:35:20 +08:00
|
|
|
char *objdir_copy1;
|
|
|
|
char *objdir_copy2;
|
|
|
|
char *buf;
|
|
|
|
int fd;
|
|
|
|
|
|
|
|
mtrace ();
|
|
|
|
|
|
|
|
if (argc < 5)
|
|
|
|
{
|
|
|
|
puts ("not enough parameters");
|
|
|
|
exit (1);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Make parameters available with nicer names. */
|
|
|
|
srcdir = argv[1];
|
|
|
|
objdir = argv[2];
|
|
|
|
common_objdir = argv[3];
|
|
|
|
progpath = argv[4];
|
|
|
|
|
|
|
|
/* First test the current source dir. We cannot really compare the
|
|
|
|
result of `getpwd' with the srcdir string but we have other means. */
|
|
|
|
if (stat64 (".", &st1) < 0)
|
|
|
|
{
|
|
|
|
printf ("cannot stat starting directory: %m\n");
|
|
|
|
exit (1);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (chdir (srcdir) < 0)
|
|
|
|
{
|
|
|
|
printf ("cannot change to source directory: %m\n");
|
|
|
|
exit (1);
|
|
|
|
}
|
|
|
|
if (stat64 (".", &st2) < 0)
|
|
|
|
{
|
|
|
|
printf ("cannot stat source directory: %m\n");
|
|
|
|
exit (1);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* The two last stat64 calls better were for the same directory. */
|
|
|
|
if (st1.st_dev != st2.st_dev || st1.st_ino != st2.st_ino)
|
|
|
|
{
|
|
|
|
printf ("stat of source directory failed: (%lld,%lld) vs (%lld,%lld)\n",
|
|
|
|
(long long int) st1.st_dev, (long long int) st1.st_ino,
|
|
|
|
(long long int) st2.st_dev, (long long int) st2.st_ino);
|
|
|
|
exit (1);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Change to the object directory. */
|
|
|
|
if (chdir (objdir) < 0)
|
|
|
|
{
|
|
|
|
printf ("cannot change to object directory: %m\n");
|
|
|
|
exit (1);
|
|
|
|
}
|
|
|
|
if (stat64 (".", &st1) < 0)
|
|
|
|
{
|
|
|
|
printf ("cannot stat object directory: %m\n");
|
|
|
|
exit (1);
|
|
|
|
}
|
|
|
|
/* Is this the same we get as with the full path? */
|
|
|
|
if (stat64 (objdir, &st2) < 0)
|
|
|
|
{
|
|
|
|
printf ("cannot stat object directory with full path: %m\n");
|
|
|
|
exit (1);
|
|
|
|
}
|
|
|
|
if (st1.st_dev != st2.st_dev || st1.st_ino != st2.st_ino)
|
|
|
|
{
|
|
|
|
printf ("stat of object directory failed: (%lld,%lld) vs (%lld,%lld)\n",
|
|
|
|
(long long int) st1.st_dev, (long long int) st1.st_ino,
|
|
|
|
(long long int) st2.st_dev, (long long int) st2.st_ino);
|
|
|
|
exit (1);
|
|
|
|
}
|
|
|
|
|
|
|
|
objdir_copy1 = getcwd (NULL, 0);
|
|
|
|
if (objdir_copy1 == NULL)
|
|
|
|
{
|
|
|
|
printf ("cannot get current directory name for object directory: %m\n");
|
|
|
|
result = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* First test: this directory must include our program. */
|
|
|
|
if (stat64 (progpath, &st2) < 0)
|
|
|
|
{
|
|
|
|
printf ("cannot stat program: %m\n");
|
|
|
|
exit (1);
|
|
|
|
}
|
|
|
|
|
|
|
|
dir1 = opendir (".");
|
|
|
|
if (dir1 == NULL)
|
|
|
|
{
|
|
|
|
printf ("cannot open object directory: %m\n");
|
|
|
|
exit (1);
|
|
|
|
}
|
|
|
|
|
|
|
|
while ((d = readdir64 (dir1)) != NULL)
|
|
|
|
{
|
|
|
|
if (d->d_type != DT_UNKNOWN && d->d_type != DT_REG)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (d->d_ino == st2.st_ino)
|
|
|
|
{
|
|
|
|
/* Might be it. Test the device. We could use the st_dev
|
|
|
|
element from st1 but what the heck, do more testing. */
|
|
|
|
if (stat64 (d->d_name, &st3) < 0)
|
|
|
|
{
|
|
|
|
printf ("cannot stat entry from readdir: %m\n");
|
|
|
|
result = 1;
|
|
|
|
d = NULL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (st3.st_dev == st2.st_dev)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (d == NULL)
|
|
|
|
{
|
|
|
|
puts ("haven't found program in object directory");
|
|
|
|
result = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* We leave dir1 open. */
|
|
|
|
|
|
|
|
/* Stat using file descriptor. */
|
|
|
|
if (fstat64 (dirfd (dir1), &st2) < 0)
|
|
|
|
{
|
|
|
|
printf ("cannot fstat object directory: %m\n");
|
|
|
|
result = 1;
|
|
|
|
}
|
|
|
|
if (st1.st_dev != st2.st_dev || st1.st_ino != st2.st_ino)
|
|
|
|
{
|
|
|
|
printf ("fstat of object directory failed: (%lld,%lld) vs (%lld,%lld)\n",
|
|
|
|
(long long int) st1.st_dev, (long long int) st1.st_ino,
|
|
|
|
(long long int) st2.st_dev, (long long int) st2.st_ino);
|
|
|
|
exit (1);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (chdir ("..") < 0)
|
|
|
|
{
|
|
|
|
printf ("cannot go to common object directory with \"..\": %m\n");
|
|
|
|
exit (1);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (stat64 (".", &st1) < 0)
|
|
|
|
{
|
|
|
|
printf ("cannot stat common object directory: %m\n");
|
|
|
|
exit (1);
|
|
|
|
}
|
|
|
|
/* Is this the same we get as with the full path? */
|
|
|
|
if (stat64 (common_objdir, &st2) < 0)
|
|
|
|
{
|
|
|
|
printf ("cannot stat common object directory with full path: %m\n");
|
|
|
|
exit (1);
|
|
|
|
}
|
|
|
|
if (st1.st_dev != st2.st_dev || st1.st_ino != st2.st_ino)
|
|
|
|
{
|
|
|
|
printf ("stat of object directory failed: (%lld,%lld) vs (%lld,%lld)\n",
|
|
|
|
(long long int) st1.st_dev, (long long int) st1.st_ino,
|
|
|
|
(long long int) st2.st_dev, (long long int) st2.st_ino);
|
|
|
|
exit (1);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Stat using file descriptor. */
|
|
|
|
if (fstat64 (dirfd (dir1), &st2) < 0)
|
|
|
|
{
|
|
|
|
printf ("cannot fstat object directory: %m\n");
|
|
|
|
result = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
dir2 = opendir (common_objdir);
|
|
|
|
if (dir2 == NULL)
|
|
|
|
{
|
|
|
|
printf ("cannot open common object directory: %m\n");
|
|
|
|
exit (1);
|
|
|
|
}
|
|
|
|
|
|
|
|
while ((d = readdir64 (dir2)) != NULL)
|
|
|
|
{
|
|
|
|
if (d->d_type != DT_UNKNOWN && d->d_type != DT_DIR)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (d->d_ino == st2.st_ino)
|
|
|
|
{
|
|
|
|
/* Might be it. Test the device. We could use the st_dev
|
|
|
|
element from st1 but what the heck, do more testing. */
|
|
|
|
if (stat64 (d->d_name, &st3) < 0)
|
|
|
|
{
|
|
|
|
printf ("cannot stat entry from readdir: %m\n");
|
|
|
|
result = 1;
|
|
|
|
d = NULL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (st3.st_dev == st2.st_dev)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* This better should be the object directory again. */
|
|
|
|
if (fchdir (dirfd (dir1)) < 0)
|
|
|
|
{
|
|
|
|
printf ("cannot fchdir to object directory: %m\n");
|
|
|
|
exit (1);
|
|
|
|
}
|
|
|
|
|
|
|
|
objdir_copy2 = getcwd (NULL, 0);
|
|
|
|
if (objdir_copy2 == NULL)
|
|
|
|
{
|
|
|
|
printf ("cannot get current directory name for object directory: %m\n");
|
|
|
|
result = 1;
|
|
|
|
}
|
|
|
|
if (strcmp (objdir_copy1, objdir_copy2) != 0)
|
|
|
|
{
|
|
|
|
puts ("getcwd returned a different string the second time");
|
|
|
|
result = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* This better should be the common object directory again. */
|
|
|
|
if (fchdir (dirfd (dir2)) < 0)
|
|
|
|
{
|
|
|
|
printf ("cannot fchdir to common object directory: %m\n");
|
|
|
|
exit (1);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (stat64 (".", &st2) < 0)
|
|
|
|
{
|
|
|
|
printf ("cannot stat common object directory: %m\n");
|
|
|
|
exit (1);
|
|
|
|
}
|
|
|
|
if (st1.st_dev != st2.st_dev || st1.st_ino != st2.st_ino)
|
|
|
|
{
|
|
|
|
printf ("stat of object directory failed: (%lld,%lld) vs (%lld,%lld)\n",
|
|
|
|
(long long int) st1.st_dev, (long long int) st1.st_ino,
|
|
|
|
(long long int) st2.st_dev, (long long int) st2.st_ino);
|
|
|
|
exit (1);
|
|
|
|
}
|
|
|
|
|
|
|
|
buf = (char *) malloc (strlen (objdir_copy1) + 1 + sizeof "tst-dir.XXXXXX");
|
|
|
|
if (buf == NULL)
|
|
|
|
{
|
|
|
|
printf ("cannot allocate buffer: %m");
|
|
|
|
exit (1);
|
|
|
|
}
|
|
|
|
|
|
|
|
stpcpy (stpcpy (stpcpy (buf, objdir_copy1), "/"), "tst-dir.XXXXXX");
|
|
|
|
if (mkdtemp (buf) == NULL)
|
|
|
|
{
|
|
|
|
printf ("cannot create test directory in object directory: %m\n");
|
|
|
|
exit (1);
|
|
|
|
}
|
|
|
|
if (stat64 (buf, &st1) < 0)
|
|
|
|
{
|
|
|
|
printf ("cannot stat new directory \"%s\": %m\n", buf);
|
|
|
|
exit (1);
|
|
|
|
}
|
|
|
|
if (chmod (buf, 0700) < 0)
|
|
|
|
{
|
|
|
|
printf ("cannot change mode of new directory: %m\n");
|
|
|
|
exit (1);
|
|
|
|
}
|
|
|
|
|
2016-02-20 19:56:55 +08:00
|
|
|
/* The test below covers the deprecated readdir64_r function. */
|
|
|
|
DIAG_PUSH_NEEDS_COMMENT;
|
|
|
|
DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wdeprecated-declarations");
|
|
|
|
|
2000-09-07 16:35:20 +08:00
|
|
|
/* Try to find the new directory. */
|
|
|
|
rewinddir (dir1);
|
* locale/programs/ld-ctype.c (ctype_read): When given a repertoire
name of "", store a null pointer instead.
* configure.in (elf): Set to yes for freebsd*, netbsd*.
* configure: Regenerated.
* locale/xlocale.c [! (USE_TLS && HAVE___THREAD)] (__libc_tsd_LOCALE):
Initialize this instead of __libc_tsd_LOCALE_data.
* sysdeps/unix/grantpt.c (pts_name): Convert ENOTTY return from
ptsname_r to EINVAL.
* sysdeps/generic/ptsname.c (__ptsname_r): Return ENOSYS instead of 0.
* rt/Makefile: Revert last change, it was inappropriate to presume aio
implementations depend on pthreads.
* rt/tst-aio.c (do_test): Exit happy if first failure is ENOSYS.
* rt/tst-aio64.c (do_test): Likewise.
* rt/tst-aio2.c (do_test): Likewise.
* rt/tst-aio3.c (do_test): Likewise.
* rt/tst-aio4.c (do_test): Likewise.
* rt/tst-aio5.c (do_test): Likewise.
* rt/tst-aio6.c (do_test): Likewise.
* rt/tst-aio7.c (do_test): Likewise.
* sysdeps/generic/bits/libc-lock.h (__libc_setspecific): Use a cast to
void so as to avoid compiler warnings.
* libio/oldstdfiles.c [! _IO_MTSAFE_IO] (DEF_STDFILE): Don't define
_IO_wide_data_FD, which is never used here.
* libio/iofread.c
[! _IO_MTSAFE_IO] (fread_unlocked): Add libc_hidden_ver defn.
* libio/iofputs.c [! _IO_MTSAFE_IO] (fputs_unlocked): Likewise.
* libio/iofgets.c [! _IO_MTSAFE_IO] (fgets_unlocked): Likewise.
* include/resolv.h [! _LIBC_REENTRANT] (_res): #undef it before decl.
* include/netdb.h [! _LIBC_REENTRANT] (h_errno): Declare normal extern.
* misc/syslog.c (openlog): Conditionalize locking on [_LIBC_REENTRANT].
(closelog): Likewise.
2002-07-06 Bruno Haible <bruno@clisp.org>
* sysdeps/alpha/fpu/fpu_control.h: Comment fix.
* sysdeps/unix/sysv/linux/alpha/pipe.S: Moved to ...
* sysdeps/unix/alpha/pipe.S: ... here.
* sysdeps/unix/bsd/osf/alpha/pipe.S: File removed.
* sysdeps/unix/i386/brk.S: Rename local label to '.Lhere' in ELF.
* sysdeps/unix/i386/brk.S: Add PSEUDO_END invocation.
* sysdeps/unix/i386/fork.S: Likewise.
* sysdeps/unix/i386/pipe.S: Likewise.
* sysdeps/unix/i386/wait.S: Likewise.
* sysdeps/unix/fork.S: Fix PSEUDO_END argument.
* sysdeps/unix/arm/fork.S: Likewise.
* sysdeps/unix/sysv/linux/arm/sysdep.h (PSEUDO): Swap DO_CALL
arguments.
(DO_CALL): Swap argument order.
* sysdeps/unix/sysv/linux/hppa/sysdep.h (PSEUDO): Swap DO_CALL
arguments.
(DO_CALL): Swap argument order.
* sysdeps/unix/sysv/linux/i386/sysdep.h (PSEUDO): Swap DO_CALL
arguments.
(DO_CALL): Swap argument order.
* sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h (PSEUDO): Swap DO_CALL
arguments.
(DO_CALL): Swap argument order.
* sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h (PSEUDO): Swap DO_CALL
arguments.
(DO_CALL): Swap argument order.
* sysdeps/unix/sysv/linux/sh/sysdep.h (PSEUDO): Swap DO_CALL
arguments.
(DO_CALL): Swap argument order.
* sysdeps/unix/sysv/linux/x86_64/sysdep.h (PSEUDO): Swap DO_CALL
arguments.
(DO_CALL): Swap argument order.
* sysdeps/i386/sysdep.h (PSEUDO): Fix syntax error.
(L): Define right for ELF.
* sysdeps/unix/sysv/linux/i386/sysdep.h (L): Remove definition.
Now defined in sysdeps/i386/sysdep.h.
* sysdeps/posix/readv.c: Ansify function definition.
* sysdeps/posix/writev.c: Likewise.
* stdio-common/tst-fseek.c (main): Don't assume that off_t and size_t
have the same size. Avoid direct cast from size_t to off_t.
* login/tst-utmp.c (simulate_login): Don't leave garbage after the
nul byte in entry[n].ut_user.
(simulate_logout): Likewise.
* login/programs/utmpdump.c (print_entry): Test _HAVE_UT_TYPE,
_HAVE_UT_PID, _HAVE_UT_ID, _HAVE_UT_HOST, instead of assuming the
existence of corresponding members of 'struct utmp'.
* login/tst-utmp.c: Trivialize the test if testing 'struct utmp' and
!_HAVE_UT_TYPE.
* sysdeps/unix/opendir.c (__opendir): If st_blksize is 0 or too small,
allocate a buffer of at least BUFSIZ bytes, not just of
sizeof (struct dirent).
* sysdeps/generic/glob.c: Include <limits.h>.
(NAME_MAX): Define a fallback.
(glob_in_dir): Allocate enough room for a 'struct dirent64' on the
stack.
* posix/tst-dir.c: Include <stddef.h>, for offsetof.
(main): Allocate enough room for a 'struct dirent64' on the stack.
* posix/tst-gnuglob.c (my_DIR): Allocate enough room for a
'struct dirent'.
* sysdeps/unix/sysv/linux/init-first.c: Don't include
kernel-features.h.
* inet/htontest.c: Include <sys/types.h>.
* sysdeps/generic/sys/sysinfo.h: Surround with __{BEGIN,END}_DECLS.
* include/sys/sysctl.h: Comment fix.
* elf/rtld.c (_rtld_global) [! _LIBC_REENTRANT]: Don't initialize
_dl_load_lock.
* libio/fileno.c (fileno_unlocked): Define regardless of _IO_MTSAFE_IO.
* sysdeps/unix/bsd/bsd4.4/syscalls.list (__sigaltstack): New alias.
* sysdeps/unix/inet/syscalls.list (__connect_internal): New alias.
(__getpeername): New alias.
(__getsockname): New alias.
(__socket): New alias.
* sysdeps/unix/common/syscalls.list (getpgid): Remove.
* sysdeps/unix/syscalls.list (__chown_internal): New alias.
(__fcntl_internal): New alias.
(__profil): New alias.
2002-08-26 19:39:12 +08:00
|
|
|
while (readdir64_r (dir1, &direntbuf.d, &d) == 0 && d != NULL)
|
2000-09-07 16:35:20 +08:00
|
|
|
{
|
|
|
|
if (d->d_type != DT_UNKNOWN && d->d_type != DT_DIR)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (d->d_ino == st1.st_ino)
|
|
|
|
{
|
|
|
|
/* Might be it. Test the device. We could use the st_dev
|
|
|
|
element from st1 but what the heck, do more testing. */
|
|
|
|
size_t len = strlen (objdir) + 1 + _D_EXACT_NAMLEN (d) + 1;
|
|
|
|
char tmpbuf[len];
|
|
|
|
|
|
|
|
stpcpy (stpcpy (stpcpy (tmpbuf, objdir), "/"), d->d_name);
|
|
|
|
|
|
|
|
if (stat64 (tmpbuf, &st3) < 0)
|
|
|
|
{
|
|
|
|
printf ("cannot stat entry from readdir: %m\n");
|
|
|
|
result = 1;
|
|
|
|
d = NULL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (st3.st_dev == st2.st_dev
|
|
|
|
&& strcmp (d->d_name, buf + strlen (buf) - 14) == 0)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-02-20 19:56:55 +08:00
|
|
|
DIAG_POP_NEEDS_COMMENT;
|
|
|
|
|
2000-09-07 16:35:20 +08:00
|
|
|
if (d == NULL)
|
|
|
|
{
|
|
|
|
printf ("haven't found new directory \"%s\"\n", buf);
|
|
|
|
exit (1);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (closedir (dir2) < 0)
|
|
|
|
{
|
|
|
|
printf ("closing dir2 failed: %m\n");
|
|
|
|
result = 1;
|
|
|
|
}
|
|
|
|
|
2000-09-27 15:22:02 +08:00
|
|
|
if (chdir (buf) < 0)
|
2000-09-07 16:35:20 +08:00
|
|
|
{
|
|
|
|
printf ("cannot change to new directory: %m\n");
|
|
|
|
exit (1);
|
|
|
|
}
|
|
|
|
|
|
|
|
dir2 = opendir (buf);
|
|
|
|
if (dir2 == NULL)
|
|
|
|
{
|
|
|
|
printf ("cannot open new directory: %m\n");
|
|
|
|
exit (1);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (fstat64 (dirfd (dir2), &st2) < 0)
|
|
|
|
{
|
|
|
|
printf ("cannot fstat new directory \"%s\": %m\n", buf);
|
|
|
|
exit (1);
|
|
|
|
}
|
|
|
|
if (st1.st_dev != st2.st_dev || st1.st_ino != st2.st_ino)
|
|
|
|
{
|
|
|
|
printf ("stat of new directory failed: (%lld,%lld) vs (%lld,%lld)\n",
|
|
|
|
(long long int) st1.st_dev, (long long int) st1.st_ino,
|
|
|
|
(long long int) st2.st_dev, (long long int) st2.st_ino);
|
|
|
|
exit (1);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (mkdir ("another-dir", 0777) < 0)
|
|
|
|
{
|
|
|
|
printf ("cannot create \"another-dir\": %m\n");
|
|
|
|
exit (1);
|
|
|
|
}
|
|
|
|
fd = open ("and-a-file", O_RDWR | O_CREAT | O_EXCL, 0666);
|
|
|
|
if (fd == -1)
|
|
|
|
{
|
|
|
|
printf ("cannot create \"and-a-file\": %m\n");
|
|
|
|
exit (1);
|
|
|
|
}
|
|
|
|
close (fd);
|
|
|
|
|
2000-09-27 15:22:02 +08:00
|
|
|
/* Some tests about error reporting. */
|
|
|
|
errno = 0;
|
|
|
|
if (chdir ("and-a-file") >= 0)
|
|
|
|
{
|
|
|
|
printf ("chdir to \"and-a-file\" succeeded\n");
|
|
|
|
exit (1);
|
|
|
|
}
|
|
|
|
if (errno != ENOTDIR)
|
|
|
|
{
|
|
|
|
printf ("chdir to \"and-a-file\" didn't set correct error\n");
|
|
|
|
result = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
errno = 0;
|
|
|
|
if (chdir ("and-a-file/..") >= 0)
|
|
|
|
{
|
|
|
|
printf ("chdir to \"and-a-file/..\" succeeded\n");
|
|
|
|
exit (1);
|
|
|
|
}
|
|
|
|
if (errno != ENOTDIR)
|
|
|
|
{
|
|
|
|
printf ("chdir to \"and-a-file/..\" didn't set correct error\n");
|
|
|
|
result = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
errno = 0;
|
|
|
|
if (chdir ("another-dir/../and-a-file") >= 0)
|
|
|
|
{
|
|
|
|
printf ("chdir to \"another-dir/../and-a-file\" succeeded\n");
|
|
|
|
exit (1);
|
|
|
|
}
|
|
|
|
if (errno != ENOTDIR)
|
|
|
|
{
|
|
|
|
printf ("chdir to \"another-dir/../and-a-file\" didn't set correct error\n");
|
|
|
|
result = 1;
|
|
|
|
}
|
|
|
|
|
2016-02-20 19:56:55 +08:00
|
|
|
/* The test below covers the deprecated readdir64_r function. */
|
|
|
|
DIAG_PUSH_NEEDS_COMMENT;
|
|
|
|
DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wdeprecated-declarations");
|
|
|
|
|
2000-09-07 16:35:20 +08:00
|
|
|
/* We now should have a directory and a file in the new directory. */
|
|
|
|
rewinddir (dir2);
|
* locale/programs/ld-ctype.c (ctype_read): When given a repertoire
name of "", store a null pointer instead.
* configure.in (elf): Set to yes for freebsd*, netbsd*.
* configure: Regenerated.
* locale/xlocale.c [! (USE_TLS && HAVE___THREAD)] (__libc_tsd_LOCALE):
Initialize this instead of __libc_tsd_LOCALE_data.
* sysdeps/unix/grantpt.c (pts_name): Convert ENOTTY return from
ptsname_r to EINVAL.
* sysdeps/generic/ptsname.c (__ptsname_r): Return ENOSYS instead of 0.
* rt/Makefile: Revert last change, it was inappropriate to presume aio
implementations depend on pthreads.
* rt/tst-aio.c (do_test): Exit happy if first failure is ENOSYS.
* rt/tst-aio64.c (do_test): Likewise.
* rt/tst-aio2.c (do_test): Likewise.
* rt/tst-aio3.c (do_test): Likewise.
* rt/tst-aio4.c (do_test): Likewise.
* rt/tst-aio5.c (do_test): Likewise.
* rt/tst-aio6.c (do_test): Likewise.
* rt/tst-aio7.c (do_test): Likewise.
* sysdeps/generic/bits/libc-lock.h (__libc_setspecific): Use a cast to
void so as to avoid compiler warnings.
* libio/oldstdfiles.c [! _IO_MTSAFE_IO] (DEF_STDFILE): Don't define
_IO_wide_data_FD, which is never used here.
* libio/iofread.c
[! _IO_MTSAFE_IO] (fread_unlocked): Add libc_hidden_ver defn.
* libio/iofputs.c [! _IO_MTSAFE_IO] (fputs_unlocked): Likewise.
* libio/iofgets.c [! _IO_MTSAFE_IO] (fgets_unlocked): Likewise.
* include/resolv.h [! _LIBC_REENTRANT] (_res): #undef it before decl.
* include/netdb.h [! _LIBC_REENTRANT] (h_errno): Declare normal extern.
* misc/syslog.c (openlog): Conditionalize locking on [_LIBC_REENTRANT].
(closelog): Likewise.
2002-07-06 Bruno Haible <bruno@clisp.org>
* sysdeps/alpha/fpu/fpu_control.h: Comment fix.
* sysdeps/unix/sysv/linux/alpha/pipe.S: Moved to ...
* sysdeps/unix/alpha/pipe.S: ... here.
* sysdeps/unix/bsd/osf/alpha/pipe.S: File removed.
* sysdeps/unix/i386/brk.S: Rename local label to '.Lhere' in ELF.
* sysdeps/unix/i386/brk.S: Add PSEUDO_END invocation.
* sysdeps/unix/i386/fork.S: Likewise.
* sysdeps/unix/i386/pipe.S: Likewise.
* sysdeps/unix/i386/wait.S: Likewise.
* sysdeps/unix/fork.S: Fix PSEUDO_END argument.
* sysdeps/unix/arm/fork.S: Likewise.
* sysdeps/unix/sysv/linux/arm/sysdep.h (PSEUDO): Swap DO_CALL
arguments.
(DO_CALL): Swap argument order.
* sysdeps/unix/sysv/linux/hppa/sysdep.h (PSEUDO): Swap DO_CALL
arguments.
(DO_CALL): Swap argument order.
* sysdeps/unix/sysv/linux/i386/sysdep.h (PSEUDO): Swap DO_CALL
arguments.
(DO_CALL): Swap argument order.
* sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h (PSEUDO): Swap DO_CALL
arguments.
(DO_CALL): Swap argument order.
* sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h (PSEUDO): Swap DO_CALL
arguments.
(DO_CALL): Swap argument order.
* sysdeps/unix/sysv/linux/sh/sysdep.h (PSEUDO): Swap DO_CALL
arguments.
(DO_CALL): Swap argument order.
* sysdeps/unix/sysv/linux/x86_64/sysdep.h (PSEUDO): Swap DO_CALL
arguments.
(DO_CALL): Swap argument order.
* sysdeps/i386/sysdep.h (PSEUDO): Fix syntax error.
(L): Define right for ELF.
* sysdeps/unix/sysv/linux/i386/sysdep.h (L): Remove definition.
Now defined in sysdeps/i386/sysdep.h.
* sysdeps/posix/readv.c: Ansify function definition.
* sysdeps/posix/writev.c: Likewise.
* stdio-common/tst-fseek.c (main): Don't assume that off_t and size_t
have the same size. Avoid direct cast from size_t to off_t.
* login/tst-utmp.c (simulate_login): Don't leave garbage after the
nul byte in entry[n].ut_user.
(simulate_logout): Likewise.
* login/programs/utmpdump.c (print_entry): Test _HAVE_UT_TYPE,
_HAVE_UT_PID, _HAVE_UT_ID, _HAVE_UT_HOST, instead of assuming the
existence of corresponding members of 'struct utmp'.
* login/tst-utmp.c: Trivialize the test if testing 'struct utmp' and
!_HAVE_UT_TYPE.
* sysdeps/unix/opendir.c (__opendir): If st_blksize is 0 or too small,
allocate a buffer of at least BUFSIZ bytes, not just of
sizeof (struct dirent).
* sysdeps/generic/glob.c: Include <limits.h>.
(NAME_MAX): Define a fallback.
(glob_in_dir): Allocate enough room for a 'struct dirent64' on the
stack.
* posix/tst-dir.c: Include <stddef.h>, for offsetof.
(main): Allocate enough room for a 'struct dirent64' on the stack.
* posix/tst-gnuglob.c (my_DIR): Allocate enough room for a
'struct dirent'.
* sysdeps/unix/sysv/linux/init-first.c: Don't include
kernel-features.h.
* inet/htontest.c: Include <sys/types.h>.
* sysdeps/generic/sys/sysinfo.h: Surround with __{BEGIN,END}_DECLS.
* include/sys/sysctl.h: Comment fix.
* elf/rtld.c (_rtld_global) [! _LIBC_REENTRANT]: Don't initialize
_dl_load_lock.
* libio/fileno.c (fileno_unlocked): Define regardless of _IO_MTSAFE_IO.
* sysdeps/unix/bsd/bsd4.4/syscalls.list (__sigaltstack): New alias.
* sysdeps/unix/inet/syscalls.list (__connect_internal): New alias.
(__getpeername): New alias.
(__getsockname): New alias.
(__socket): New alias.
* sysdeps/unix/common/syscalls.list (getpgid): Remove.
* sysdeps/unix/syscalls.list (__chown_internal): New alias.
(__fcntl_internal): New alias.
(__profil): New alias.
2002-08-26 19:39:12 +08:00
|
|
|
while (readdir64_r (dir2, &direntbuf.d, &d) == 0 && d != NULL)
|
2000-09-07 16:35:20 +08:00
|
|
|
{
|
|
|
|
if (strcmp (d->d_name, ".") == 0
|
|
|
|
|| strcmp (d->d_name, "..") == 0
|
|
|
|
|| strcmp (d->d_name, "another-dir") == 0)
|
|
|
|
{
|
|
|
|
if (d->d_type != DT_UNKNOWN && d->d_type != DT_DIR)
|
|
|
|
{
|
|
|
|
printf ("d_type for \"%s\" is wrong\n", d->d_name);
|
|
|
|
result = 1;
|
|
|
|
}
|
|
|
|
if (stat64 (d->d_name, &st3) < 0)
|
|
|
|
{
|
|
|
|
printf ("cannot stat \"%s\" is wrong\n", d->d_name);
|
|
|
|
result = 1;
|
|
|
|
}
|
|
|
|
else if (! S_ISDIR (st3.st_mode))
|
|
|
|
{
|
|
|
|
printf ("\"%s\" is no directory\n", d->d_name);
|
|
|
|
result = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (strcmp (d->d_name, "and-a-file") == 0)
|
|
|
|
{
|
|
|
|
if (d->d_type != DT_UNKNOWN && d->d_type != DT_REG)
|
|
|
|
{
|
|
|
|
printf ("d_type for \"%s\" is wrong\n", d->d_name);
|
|
|
|
result = 1;
|
|
|
|
}
|
|
|
|
if (stat64 (d->d_name, &st3) < 0)
|
|
|
|
{
|
|
|
|
printf ("cannot stat \"%s\" is wrong\n", d->d_name);
|
|
|
|
result = 1;
|
|
|
|
}
|
|
|
|
else if (! S_ISREG (st3.st_mode))
|
|
|
|
{
|
|
|
|
printf ("\"%s\" is no regular file\n", d->d_name);
|
|
|
|
result = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
printf ("unexpected directory entry \"%s\"\n", d->d_name);
|
|
|
|
result = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-02-20 19:56:55 +08:00
|
|
|
DIAG_POP_NEEDS_COMMENT;
|
|
|
|
|
2000-09-08 01:04:27 +08:00
|
|
|
if (stat64 ("does-not-exist", &st1) >= 0)
|
|
|
|
{
|
|
|
|
puts ("stat for unexisting file did not fail");
|
|
|
|
result = 1;
|
|
|
|
}
|
|
|
|
|
2000-09-07 16:35:20 +08:00
|
|
|
/* Free all resources. */
|
|
|
|
|
|
|
|
if (closedir (dir1) < 0)
|
|
|
|
{
|
|
|
|
printf ("closing dir1 failed: %m\n");
|
|
|
|
result = 1;
|
|
|
|
}
|
|
|
|
if (closedir (dir2) < 0)
|
|
|
|
{
|
|
|
|
printf ("second closing dir2 failed: %m\n");
|
|
|
|
result = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (rmdir ("another-dir") < 0)
|
|
|
|
{
|
|
|
|
printf ("cannot remove \"another-dir\": %m\n");
|
|
|
|
result = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (unlink ("and-a-file") < 0)
|
|
|
|
{
|
|
|
|
printf ("cannot remove \"and-a-file\": %m\n");
|
|
|
|
result = 1;
|
|
|
|
}
|
|
|
|
|
2001-01-09 09:04:59 +08:00
|
|
|
/* One more test before we leave: mkdir() is supposed to fail with
|
|
|
|
EEXIST if the named file is a symlink. */
|
|
|
|
if (symlink ("a-symlink", "a-symlink") != 0)
|
|
|
|
{
|
|
|
|
printf ("cannot create symlink \"a-symlink\": %m\n");
|
|
|
|
result = 1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (mkdir ("a-symlink", 0666) == 0)
|
|
|
|
{
|
|
|
|
puts ("can make directory \"a-symlink\"");
|
|
|
|
result = 1;
|
|
|
|
}
|
|
|
|
else if (errno != EEXIST)
|
|
|
|
{
|
|
|
|
puts ("mkdir(\"a-symlink\") does not fail with EEXIST\n");
|
|
|
|
result = 1;
|
|
|
|
}
|
|
|
|
if (unlink ("a-symlink") < 0)
|
|
|
|
{
|
|
|
|
printf ("cannot unlink \"a-symlink\": %m\n");
|
|
|
|
result = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2000-09-07 16:35:20 +08:00
|
|
|
if (chdir (srcdir) < 0)
|
|
|
|
{
|
|
|
|
printf ("cannot change back to source directory: %m\n");
|
|
|
|
exit (1);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (rmdir (buf) < 0)
|
|
|
|
{
|
|
|
|
printf ("cannot remove \"%s\": %m\n", buf);
|
|
|
|
result = 1;
|
|
|
|
}
|
|
|
|
free (objdir_copy1);
|
|
|
|
free (objdir_copy2);
|
|
|
|
|
|
|
|
if (result == 0)
|
|
|
|
puts ("all OK");
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|