Update.
2003-09-16 Ulrich Drepper <drepper@redhat.com> * sysdeps/unix/sysv/linux/Dist: Remove internal_statvfs.c. * sysdeps/unix/sysv/linux/Makefile [subdir=io] (sysdep_routines): Add internal_statvfs. * sysdeps/unix/sysv/linux/fstatvfs.c: Call __internal_statvfs instead of including "internal_statvfs.c". * sysdeps/unix/sysv/linux/statvfs.c: Likewise. * sysdeps/unix/sysv/linux/internal_statvfs.c: Make it a real function. Add code to avoid the stat calls on all the reported mount points when we can determine mismatch in advance. * sysdeps/unix/sysv/linux/linux_fsinfo.h: Add AUTOFS_SUPER_MAGIC and USBDEVFS_SUPER_MAGIC. 2003-09-16 Jakub Jelinek <jakub@redhat.com> * posix/Versions (sched_getaffinity, sched_setaffinity): Change from GLIBC_2.3.2 to GLIBC_2.3.3 symbol version. 2003-09-16 Bruno Haible <bruno@clisp.org> * intl/tst-gettext2.sh: Set GCONV_PATH and LOCPATH only after invoking msgfmt, not before.
This commit is contained in:
Ulrich Drepper
parent
e07bb02a4f
commit
d0501a245c
24
ChangeLog
24
ChangeLog
|
|
@ -1,3 +1,27 @@
|
|||
2003-09-16 Ulrich Drepper <drepper@redhat.com>
|
||||
|
||||
* sysdeps/unix/sysv/linux/Dist: Remove internal_statvfs.c.
|
||||
* sysdeps/unix/sysv/linux/Makefile [subdir=io] (sysdep_routines):
|
||||
Add internal_statvfs.
|
||||
* sysdeps/unix/sysv/linux/fstatvfs.c: Call __internal_statvfs
|
||||
instead of including "internal_statvfs.c".
|
||||
* sysdeps/unix/sysv/linux/statvfs.c: Likewise.
|
||||
* sysdeps/unix/sysv/linux/internal_statvfs.c: Make it a real function.
|
||||
Add code to avoid the stat calls on all the reported mount points
|
||||
when we can determine mismatch in advance.
|
||||
* sysdeps/unix/sysv/linux/linux_fsinfo.h: Add AUTOFS_SUPER_MAGIC and
|
||||
USBDEVFS_SUPER_MAGIC.
|
||||
|
||||
2003-09-16 Jakub Jelinek <jakub@redhat.com>
|
||||
|
||||
* posix/Versions (sched_getaffinity, sched_setaffinity): Change
|
||||
from GLIBC_2.3.2 to GLIBC_2.3.3 symbol version.
|
||||
|
||||
2003-09-16 Bruno Haible <bruno@clisp.org>
|
||||
|
||||
* intl/tst-gettext2.sh: Set GCONV_PATH and LOCPATH only after
|
||||
invoking msgfmt, not before.
|
||||
|
||||
2003-09-15 Jakub Jelinek <jakub@redhat.com>
|
||||
|
||||
* argp/argp.h (argp_parse, __argp_parse): Remove __THROW.
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#! /bin/sh
|
||||
# Test of gettext functions.
|
||||
# Copyright (C) 2000 Free Software Foundation, Inc.
|
||||
# Copyright (C) 2000, 2003 Free Software Foundation, Inc.
|
||||
# This file is part of the GNU C Library.
|
||||
#
|
||||
|
||||
|
|
@ -22,10 +22,6 @@
|
|||
common_objpfx=$1
|
||||
objpfx=$2
|
||||
|
||||
GCONV_PATH=${common_objpfx}iconvdata
|
||||
export GCONV_PATH
|
||||
LOCPATH=${objpfx}domaindir
|
||||
export LOCPATH
|
||||
LC_ALL=C
|
||||
export LC_ALL
|
||||
|
||||
|
|
@ -64,6 +60,10 @@ msgfmt -o ${objpfx}domaindir/lang1/LC_MESSAGES/tstlang.mo \
|
|||
msgfmt -o ${objpfx}domaindir/lang2/LC_MESSAGES/tstlang.mo \
|
||||
tstlang2.po
|
||||
|
||||
GCONV_PATH=${common_objpfx}iconvdata
|
||||
export GCONV_PATH
|
||||
LOCPATH=${objpfx}domaindir
|
||||
export LOCPATH
|
||||
|
||||
# Now run the test.
|
||||
${common_objpfx}elf/ld.so --library-path $common_objpfx \
|
||||
|
|
|
|||
|
|
@ -110,14 +110,15 @@ libc {
|
|||
__nanosleep;
|
||||
}
|
||||
GLIBC_2.3.2 {
|
||||
sched_getaffinity; sched_setaffinity;
|
||||
|
||||
# Note that these symbols appear in sysdeps/unix/sysv/linux/Versions
|
||||
# under GLIBC_2.0; the first instance in the script is taken as the
|
||||
# default, so linux configurations put them in GLIBC_2.0 while other
|
||||
# configuration put them in GLIBC_2.3.2.
|
||||
getresuid; getresgid; setresuid; setresgid;
|
||||
}
|
||||
GLIBC_2.3.3 {
|
||||
sched_getaffinity; sched_setaffinity;
|
||||
}
|
||||
GLIBC_PRIVATE {
|
||||
# functions which have an additional interface since they are
|
||||
# are cancelable.
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ kernel-features.h
|
|||
kernel_sigaction.h
|
||||
kernel_stat.h
|
||||
kernel_termios.h
|
||||
internal_statvfs.c
|
||||
ldd-rewrite.sed
|
||||
lddlibc4.c
|
||||
linux_fsinfo.h
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@ CFLAGS-ypclnt.c = -DUSE_BINDINGDIR=1
|
|||
endif
|
||||
|
||||
ifeq ($(subdir),io)
|
||||
sysdep_routines += xstatconv
|
||||
sysdep_routines += xstatconv internal_statvfs
|
||||
endif
|
||||
|
||||
ifeq ($(subdir),elf)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* Copyright (C) 1998, 1999, 2000, 2002 Free Software Foundation, Inc.
|
||||
/* Copyright (C) 1998, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
|
||||
|
||||
|
|
@ -17,16 +17,14 @@
|
|||
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
||||
02111-1307 USA. */
|
||||
|
||||
#include <errno.h>
|
||||
#include <mntent.h>
|
||||
#include <paths.h>
|
||||
#include <stdio_ext.h>
|
||||
#include <string.h>
|
||||
#include <sys/mount.h>
|
||||
#include <stddef.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/statfs.h>
|
||||
#include <sys/statvfs.h>
|
||||
|
||||
extern void __internal_statvfs (const char *name, struct statvfs *buf,
|
||||
struct statfs *fsbuf, struct stat64 *st);
|
||||
|
||||
|
||||
int
|
||||
fstatvfs (int fd, struct statvfs *buf)
|
||||
|
|
@ -38,8 +36,8 @@ fstatvfs (int fd, struct statvfs *buf)
|
|||
if (__fstatfs (fd, &fsbuf) < 0)
|
||||
return -1;
|
||||
|
||||
#define STAT(st) fstat64 (fd, st)
|
||||
#include "internal_statvfs.c"
|
||||
/* Convert the result. */
|
||||
__internal_statvfs (NULL, buf, &fsbuf, fstat64 (fd, &st) == -1 ? NULL : &st);
|
||||
|
||||
/* We signal success if the statfs call succeeded. */
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -17,29 +17,46 @@
|
|||
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
||||
02111-1307 USA. */
|
||||
|
||||
#include <errno.h>
|
||||
#include <mntent.h>
|
||||
#include <paths.h>
|
||||
#include <stdbool.h>
|
||||
#include <stdio_ext.h>
|
||||
#include <string.h>
|
||||
#include <sys/mount.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/statfs.h>
|
||||
#include <sys/statvfs.h>
|
||||
#include "linux_fsinfo.h"
|
||||
|
||||
|
||||
void
|
||||
__internal_statvfs (const char *name, struct statvfs *buf,
|
||||
struct statfs *fsbuf, struct stat64 *st)
|
||||
{
|
||||
/* Now fill in the fields we have information for. */
|
||||
buf->f_bsize = fsbuf.f_bsize;
|
||||
buf->f_bsize = fsbuf->f_bsize;
|
||||
/* Linux has the f_frsize size only in later version of the kernel.
|
||||
If the value is not filled in use f_bsize. */
|
||||
buf->f_frsize = fsbuf.f_frsize ?: fsbuf.f_bsize;
|
||||
buf->f_blocks = fsbuf.f_blocks;
|
||||
buf->f_bfree = fsbuf.f_bfree;
|
||||
buf->f_bavail = fsbuf.f_bavail;
|
||||
buf->f_files = fsbuf.f_files;
|
||||
buf->f_ffree = fsbuf.f_ffree;
|
||||
if (sizeof (buf->f_fsid) == sizeof (fsbuf.f_fsid))
|
||||
buf->f_fsid = (fsbuf.f_fsid.__val[0]
|
||||
| ((unsigned long int) fsbuf.f_fsid.__val[1]
|
||||
buf->f_frsize = fsbuf->f_frsize ?: fsbuf->f_bsize;
|
||||
buf->f_blocks = fsbuf->f_blocks;
|
||||
buf->f_bfree = fsbuf->f_bfree;
|
||||
buf->f_bavail = fsbuf->f_bavail;
|
||||
buf->f_files = fsbuf->f_files;
|
||||
buf->f_ffree = fsbuf->f_ffree;
|
||||
if (sizeof (buf->f_fsid) == sizeof (fsbuf->f_fsid))
|
||||
buf->f_fsid = (fsbuf->f_fsid.__val[0]
|
||||
| ((unsigned long int) fsbuf->f_fsid.__val[1]
|
||||
<< (8 * (sizeof (buf->f_fsid)
|
||||
- sizeof (fsbuf.f_fsid.__val[0])))));
|
||||
- sizeof (fsbuf->f_fsid.__val[0])))));
|
||||
else
|
||||
/* We cannot help here. The statvfs element is not large enough to
|
||||
contain both words of the statfs f_fsid field. */
|
||||
buf->f_fsid = fsbuf.f_fsid.__val[0];
|
||||
buf->f_fsid = fsbuf->f_fsid.__val[0];
|
||||
#ifdef _STATVFSBUF_F_UNUSED
|
||||
buf->__f_unused = 0;
|
||||
#endif
|
||||
buf->f_namemax = fsbuf.f_namelen;
|
||||
buf->f_namemax = fsbuf->f_namelen;
|
||||
memset (buf->__f_spare, '\0', 6 * sizeof (int));
|
||||
|
||||
/* What remains to do is to fill the fields f_favail and f_flag. */
|
||||
|
|
@ -52,10 +69,40 @@
|
|||
file. The way we can test for matching filesystem is using the
|
||||
device number. */
|
||||
buf->f_flag = 0;
|
||||
if (STAT (&st) >= 0)
|
||||
if (st != NULL)
|
||||
{
|
||||
struct mntent mntbuf;
|
||||
FILE *mtab;
|
||||
const char *fsname = NULL;
|
||||
const char *fsname2 = NULL;
|
||||
bool success = false;
|
||||
|
||||
/* Map the filesystem type we got from the statfs call to a string. */
|
||||
switch (fsbuf->f_type)
|
||||
{
|
||||
case EXT2_SUPER_MAGIC:
|
||||
fsname = "ext3";
|
||||
fsname2 = "ext2";
|
||||
break;
|
||||
case DEVPTS_SUPER_MAGIC:
|
||||
fsname= "devpts";
|
||||
break;
|
||||
case SHMFS_SUPER_MAGIC:
|
||||
fsname = "tmpfs";
|
||||
break;
|
||||
case PROC_SUPER_MAGIC:
|
||||
fsname = "proc";
|
||||
break;
|
||||
case USBDEVFS_SUPER_MAGIC:
|
||||
fsname = "usbdevfs";
|
||||
break;
|
||||
case AUTOFS_SUPER_MAGIC:
|
||||
fsname = "autofs";
|
||||
break;
|
||||
case NFS_SUPER_MAGIC:
|
||||
fsname = "nfs";
|
||||
break;
|
||||
}
|
||||
|
||||
mtab = __setmntent ("/proc/mounts", "r");
|
||||
if (mtab == NULL)
|
||||
|
|
@ -68,13 +115,25 @@
|
|||
/* No locking needed. */
|
||||
(void) __fsetlocking (mtab, FSETLOCKING_BYCALLER);
|
||||
|
||||
again:
|
||||
while (__getmntent_r (mtab, &mntbuf, tmpbuf, sizeof (tmpbuf)))
|
||||
{
|
||||
struct stat64 fsst;
|
||||
/* In a first round we look for a given mount point, if
|
||||
we have a name. */
|
||||
if (name != NULL && strcmp (name, mntbuf.mnt_dir) != 0)
|
||||
continue;
|
||||
/* We need to look at the entry only if the filesystem
|
||||
name matches. If we have a filesystem name. */
|
||||
else if (fsname != NULL
|
||||
&& strcmp (fsname, mntbuf.mnt_type) != 0
|
||||
&& (fsname2 == NULL
|
||||
|| strcmp (fsname2, mntbuf.mnt_type) != 0))
|
||||
continue;
|
||||
|
||||
/* Find out about the device the current entry is for. */
|
||||
struct stat64 fsst;
|
||||
if (stat64 (mntbuf.mnt_dir, &fsst) >= 0
|
||||
&& st.st_dev == fsst.st_dev)
|
||||
&& st->st_dev == fsst.st_dev)
|
||||
{
|
||||
/* Bingo, we found the entry for the device FD is on.
|
||||
Now interpret the option string. */
|
||||
|
|
@ -100,11 +159,34 @@
|
|||
buf->f_flag |= ST_NODIRATIME;
|
||||
|
||||
/* We can stop looking for more entries. */
|
||||
success = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
/* Maybe the kernel names for the filesystems changed or the
|
||||
statvfs call got a name which was not the mount point.
|
||||
Check again, this time without checking for name matches
|
||||
first. */
|
||||
if (! success)
|
||||
{
|
||||
if (name != NULL)
|
||||
/* Try without a mount point name. */
|
||||
name = NULL;
|
||||
else if (fsname != NULL)
|
||||
/* Try without a filesystem name. */
|
||||
fsname = fsname2 = NULL;
|
||||
|
||||
/* It is not strictly allowed to use rewind here. But
|
||||
this code is part of the implementation so it is
|
||||
acceptable. */
|
||||
rewind (mtab);
|
||||
|
||||
goto again;
|
||||
}
|
||||
|
||||
/* Close the file. */
|
||||
__endmntent (mtab);
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,6 +31,9 @@
|
|||
/* Constants that identify the `affs' filesystem. */
|
||||
#define AFFS_SUPER_MAGIC 0xadff
|
||||
|
||||
/* Constants that identify the `autofs' filesystem. */
|
||||
#define AUTOFS_SUPER_MAGIC 0x187
|
||||
|
||||
/* Constants that identify the `bfs' filesystem. */
|
||||
#define BFS_MAGIC 0x1BADFACE
|
||||
|
||||
|
|
@ -94,6 +97,9 @@
|
|||
/* Constants that identify the `proc' filesystem. */
|
||||
#define PROC_SUPER_MAGIC 0x9fa0
|
||||
|
||||
/* Constant that identifies the `usbdevfs' filesystem. */
|
||||
#define USBDEVFS_SUPER_MAGIC 0x9fa2
|
||||
|
||||
/* Constants that identify the `qnx4' filesystem. */
|
||||
#define QNX4_SUPER_MAGIC 0x002f
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* Copyright (C) 1998, 2000, 2002 Free Software Foundation, Inc.
|
||||
/* Copyright (C) 1998, 2000, 2002, 2003 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
|
||||
|
||||
|
|
@ -17,16 +17,14 @@
|
|||
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
||||
02111-1307 USA. */
|
||||
|
||||
#include <errno.h>
|
||||
#include <mntent.h>
|
||||
#include <paths.h>
|
||||
#include <stdio_ext.h>
|
||||
#include <string.h>
|
||||
#include <sys/mount.h>
|
||||
#include <stddef.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/statfs.h>
|
||||
#include <sys/statvfs.h>
|
||||
|
||||
extern void __internal_statvfs (const char *name, struct statvfs *buf,
|
||||
struct statfs *fsbuf, struct stat64 *st);
|
||||
|
||||
|
||||
int
|
||||
statvfs (const char *file, struct statvfs *buf)
|
||||
|
|
@ -38,8 +36,9 @@ statvfs (const char *file, struct statvfs *buf)
|
|||
if (__statfs (file, &fsbuf) < 0)
|
||||
return -1;
|
||||
|
||||
#define STAT(st) stat64 (file, st)
|
||||
#include "internal_statvfs.c"
|
||||
/* Convert the result. */
|
||||
__internal_statvfs (file, buf, &fsbuf,
|
||||
stat64 (file, &st) == -1 ? NULL : &st);
|
||||
|
||||
/* We signal success if the statfs call succeeded. */
|
||||
return 0;
|
||||
|
|
|
|||
Loading…
Reference in New Issue