diff options
author | Ulrich Drepper <drepper@redhat.com> | 2005-12-20 07:21:59 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 2005-12-20 07:21:59 +0000 |
commit | 00c2b3b91dc5f11924006ed4fb69d9d7442749b7 (patch) | |
tree | c367b0b7c66ba48cde11d2bd7bfe9c63e7b3ad49 /sysdeps/unix/sysv/linux/internal_statvfs.c | |
parent | fc3480d3eea6380ea00d150d87830dc3cb86ede8 (diff) | |
download | glibc-00c2b3b91dc5f11924006ed4fb69d9d7442749b7.tar.gz |
[BZ #1978]
2005-12-16 Thorsten Kukuk <kukuk@suse.de>
[BZ #1978]
* sysdeps/unix/sysv/linux/internal_statvfs.c (__statvfs_getflags):
Map more filesystem types to a string.
* sysdeps/unix/sysv/linux/linux_fsinfo.h: Add SYSFS_MAGIC.
2005-12-19 Jakub Jelinek <jakub@redhat.com>
* locale/Makefile (programs/%-kw.h): Run $(GPERF) inside of the
programs subdirectory.
* sysdeps/powerpc/powerpc32/__longjmp-common.S (__longjmp): Use
PTR_DEMANGLE for PC if defined.
* sysdeps/powerpc/powerpc64/__longjmp-common.S (__longjmp):
Likewise.
* sysdeps/unix/sysv/linux/ia64/__longjmp.S (__longjmp): Likewise.
* sysdeps/s390/s390-32/__longjmp.c (__longjmp): Xor %r14 with
THREAD_GET_POINTER_GUARD () if PTR_DEMANGLE is defined.
* sysdeps/s390/s390-64/__longjmp.c (__longjmp): Likewise.
* sysdeps/powerpc/powerpc32/setjmp-common.S (__sigsetjmp): Use
PTR_MANGLE for PC if defined.
* sysdeps/powerpc/powerpc64/setjmp-common.S (__sigsetjmp): Likewise.
* sysdeps/s390/s390-32/setjmp.S (__sigsetjmp): Likewise.
Avoid call to __sigjmp_save if IS_IN_rtld.
* sysdeps/s390/s390-32/elf/setjmp.S (__sigsetjmp): Likewise.
* sysdeps/s390/s390-64/setjmp.S (__sigsetjmp): Likewise.
* sysdeps/s390/s390-64/elf/setjmp.S (__sigsetjmp): Likewise.
* sysdeps/unix/sysv/linux/ia64/setjmp.S (__sigsetjmp): Likewise.
* sysdeps/unix/sysv/linux/ia64/sysdep.h (PTR_MANGLE, PTR_DEMANGLE):
Define.
* sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h: Include tls.h.
(PTR_MANGLE, PTR_DEMANGLE): Define.
* sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h: Include tls.h
(PTR_MANGLE, PTR_DEMANGLE): Define.
* sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h: Include tls.h.
(PTR_MANGLE, PTR_DEMANGLE): Define.
(SYSCALL_ERROR_HANDLER): Add missing semicolons.
* sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h: Include tls.h.
(PTR_MANGLE, PTR_DEMANGLE): Define.
* sysdeps/unix/sysv/linux/s390/s390-64/socket.S (__socket): Add
SYSCALL_ERROR_HANDLER.
2005-12-19 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/sparc/sparc32/socket.S: Handle NO_WEAK_ALIAS.
* sysdeps/unix/sysv/linux/sparc/sparc64/socket.S: Likewise.
Patch by Clint Adams.
2005-12-16 Martin Schwidefsky <schwidefsky@de.ibm.com>
* sysdeps/unix/sysv/linux/s390/sys/user.h: Copy struct user and
dependent definitions from the kernel header to sys/user.h and
remove the #include of asm/user.h.
Diffstat (limited to 'sysdeps/unix/sysv/linux/internal_statvfs.c')
-rw-r--r-- | sysdeps/unix/sysv/linux/internal_statvfs.c | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/sysdeps/unix/sysv/linux/internal_statvfs.c b/sysdeps/unix/sysv/linux/internal_statvfs.c index ea26729d55..73317ecafd 100644 --- a/sysdeps/unix/sysv/linux/internal_statvfs.c +++ b/sysdeps/unix/sysv/linux/internal_statvfs.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998-2003, 2004 Free Software Foundation, Inc. +/* Copyright (C) 1998-2003, 2004, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -71,6 +71,33 @@ __statvfs_getflags (const char *name, int fstype, struct stat64 *st) case NFS_SUPER_MAGIC: fsname = "nfs"; break; + case SYSFS_MAGIC: + fsname = "sysfs"; + break; + case REISERFS_SUPER_MAGIC: + fsname = "reiserfs"; + break; + case XFS_SUPER_MAGIC: + fsname = "xfs"; + break; + case JFS_SUPER_MAGIC: + fsname = "jfs"; + break; + case HPFS_SUPER_MAGIC: + fsname = "hpfs"; + break; + case DEVFS_SUPER_MAGIC: + fsname = "devfs"; + break; + case ISOFS_SUPER_MAGIC: + fsname = "iso9660"; + break; + case MSDOS_SUPER_MAGIC: + fsname = "msdos"; + break; + case NTFS_SUPER_MAGIC: + fsname = "ntfs"; + break; } FILE *mtab = __setmntent ("/proc/mounts", "r"); |