mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-29 11:41:21 +03:00
Update.
* sysdeps/unix/sysv/linux/bits/statvfs.h: Change type of f_fsid field to unsigned long. Add __f_unused. Define _STATVFSBUF_F_UNUSED. * sysdeps/unix/sysv/linux/internal_statvfs.c: Adjust initialization of f_fsid field after change in struct statvfs. * sysdeps/unix/sysv/linux/alpha/bits/statvfs.h: New file. * sysdeps/unix/sysv/linux/ia64/bits/statvfs.h: New file. * sysdeps/unix/sysv/linux/sparc/sparc64/bits/statvfs.h: New file. * conform/data/sys/stat.h-data: Remove isfdtype. Use optional-macro.
This commit is contained in:
Ulrich Drepper
11
ChangeLog
11
ChangeLog
@ -1,5 +1,16 @@
|
||||
2001-01-27 Ulrich Drepper <drepper@redhat.com>
|
||||
|
||||
* sysdeps/unix/sysv/linux/bits/statvfs.h: Change type of f_fsid field
|
||||
to unsigned long. Add __f_unused. Define _STATVFSBUF_F_UNUSED.
|
||||
* sysdeps/unix/sysv/linux/internal_statvfs.c: Adjust initialization of
|
||||
f_fsid field after change in struct statvfs.
|
||||
* sysdeps/unix/sysv/linux/alpha/bits/statvfs.h: New file.
|
||||
* sysdeps/unix/sysv/linux/ia64/bits/statvfs.h: New file.
|
||||
* sysdeps/unix/sysv/linux/sparc/sparc64/bits/statvfs.h: New file.
|
||||
|
||||
* conform/data/sys/stat.h-data: Remove isfdtype. Use
|
||||
optional-macro.
|
||||
|
||||
* conform/data/sys/socket.h-data: Fix typos. Correct getsockopt,
|
||||
recvfrom, send, and socketpair prototypes. Add allow lines.
|
||||
* socket/sys/socket.h: Include <sys/uio.h>.
|
||||
|
||||
@ -58,15 +58,14 @@ macro S_ISREG
|
||||
macro S_ISLNK
|
||||
|
||||
// How to represent optional tests?
|
||||
// macro S_TYPEISMQ
|
||||
// macro S_TYPEISSEM
|
||||
// macro S_TYPEISSHM
|
||||
// macro S_TYPEISTMO
|
||||
optional-macro S_TYPEISMQ
|
||||
optional-macro S_TYPEISSEM
|
||||
optional-macro S_TYPEISSHM
|
||||
optional-macro S_TYPEISTMO
|
||||
|
||||
function int chmod (const char*, mode_t)
|
||||
function int fchmod (int, mode_t)
|
||||
function int fstat (int, struct stat*)
|
||||
function int isfdtype (int, int)
|
||||
function int lstat (const char*, struct stat*)
|
||||
function int mkdir (const char*, mode_t)
|
||||
function int mkfifo (const char*, mode_t)
|
||||
|
||||
96
sysdeps/unix/sysv/linux/alpha/bits/statvfs.h
Normal file
96
sysdeps/unix/sysv/linux/alpha/bits/statvfs.h
Normal file
@ -0,0 +1,96 @@
|
||||
/* Copyright (C) 1997, 1998, 2000, 2001 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
|
||||
modify it under the terms of the GNU Library General Public License as
|
||||
published by the Free Software Foundation; either version 2 of the
|
||||
License, or (at your option) any later version.
|
||||
|
||||
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
|
||||
Library General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Library General Public
|
||||
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
||||
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
Boston, MA 02111-1307, USA. */
|
||||
|
||||
#ifndef _SYS_STATVFS_H
|
||||
# error "Never include <bits/statvfs.h> directly; use <sys/statvfs.h> instead."
|
||||
#endif
|
||||
|
||||
#include <bits/types.h> /* For __fsblkcnt_t and __fsfilcnt_t. */
|
||||
|
||||
struct statvfs
|
||||
{
|
||||
unsigned long int f_bsize;
|
||||
unsigned long int f_frsize;
|
||||
#ifndef __USE_FILE_OFFSET64
|
||||
__fsblkcnt_t f_blocks;
|
||||
__fsblkcnt_t f_bfree;
|
||||
__fsblkcnt_t f_bavail;
|
||||
__fsfilcnt_t f_files;
|
||||
__fsfilcnt_t f_ffree;
|
||||
__fsfilcnt_t f_favail;
|
||||
#else
|
||||
__fsblkcnt64_t f_blocks;
|
||||
__fsblkcnt64_t f_bfree;
|
||||
__fsblkcnt64_t f_bavail;
|
||||
__fsfilcnt64_t f_files;
|
||||
__fsfilcnt64_t f_ffree;
|
||||
__fsfilcnt64_t f_favail;
|
||||
#endif
|
||||
unsigned long int f_fsid;
|
||||
unsigned long int f_flag;
|
||||
unsigned long int f_namemax;
|
||||
int __f_spare[6];
|
||||
};
|
||||
|
||||
#ifdef __USE_LARGEFILE64
|
||||
struct statvfs64
|
||||
{
|
||||
unsigned long int f_bsize;
|
||||
unsigned long int f_frsize;
|
||||
__fsblkcnt64_t f_blocks;
|
||||
__fsblkcnt64_t f_bfree;
|
||||
__fsblkcnt64_t f_bavail;
|
||||
__fsfilcnt64_t f_files;
|
||||
__fsfilcnt64_t f_ffree;
|
||||
__fsfilcnt64_t f_favail;
|
||||
unsigned long int f_fsid;
|
||||
unsigned long int f_flag;
|
||||
unsigned long int f_namemax;
|
||||
int __f_spare[6];
|
||||
};
|
||||
#endif
|
||||
|
||||
/* Definitions for the flag in `f_flag'. These definitions should be
|
||||
kept in sync which the definitions in <sys/mount.h>. */
|
||||
enum
|
||||
{
|
||||
ST_RDONLY = 1, /* Mount read-only. */
|
||||
#define ST_RDONLY ST_RDONLY
|
||||
ST_NOSUID = 2, /* Ignore suid and sgid bits. */
|
||||
#define ST_NOSUID ST_NOSUID
|
||||
#ifdef __USE_GNU
|
||||
ST_NODEV = 4, /* Disallow access to device special files. */
|
||||
# define ST_NODEV ST_NODEV
|
||||
ST_NOEXEC = 8, /* Disallow program execution. */
|
||||
# define ST_NOEXEC ST_NOEXEC
|
||||
ST_SYNCHRONOUS = 16, /* Writes are synced at once. */
|
||||
# define ST_SYNCHRONOUS ST_SYNCHRONOUS
|
||||
ST_MANDLOCK = 64, /* Allow mandatory locks on an FS. */
|
||||
# define ST_MANDLOCK ST_MANDLOCK
|
||||
ST_WRITE = 128, /* Write on file/directory/symlink. */
|
||||
# define ST_WRITE ST_WRITE
|
||||
ST_APPEND = 256, /* Append-only file. */
|
||||
# define ST_APPEND ST_APPEND
|
||||
ST_IMMUTABLE = 512, /* Immutable file. */
|
||||
# define ST_IMMUTABLE ST_IMMUTABLE
|
||||
ST_NOATIME = 1024, /* Do not update access times. */
|
||||
# define ST_NOATIME ST_NOATIME
|
||||
ST_NODIRATIME /* Do not update directory access times. */
|
||||
# define ST_NODIRATIME ST_NODIRATIME
|
||||
#endif /* Use GNU. */
|
||||
};
|
||||
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 1997, 1998, 2000 Free Software Foundation, Inc.
|
||||
/* Copyright (C) 1997, 1998, 2000, 2001 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
|
||||
@ -20,7 +20,7 @@
|
||||
# error "Never include <bits/statvfs.h> directly; use <sys/statvfs.h> instead."
|
||||
#endif
|
||||
|
||||
#include <bits/types.h> /* For __fsid_t, __fsblkcnt_t and __fsfilcnt_t. */
|
||||
#include <bits/types.h> /* For __fsblkcnt_t and __fsfilcnt_t. */
|
||||
|
||||
struct statvfs
|
||||
{
|
||||
@ -41,11 +41,13 @@ struct statvfs
|
||||
__fsfilcnt64_t f_ffree;
|
||||
__fsfilcnt64_t f_favail;
|
||||
#endif
|
||||
__fsid_t f_fsid;
|
||||
unsigned long int f_fsid;
|
||||
int __f_unused;
|
||||
unsigned long int f_flag;
|
||||
unsigned long int f_namemax;
|
||||
int __f_spare[6];
|
||||
};
|
||||
#define _STATVFSBUF_F_UNUSED
|
||||
|
||||
#ifdef __USE_LARGEFILE64
|
||||
struct statvfs64
|
||||
@ -58,7 +60,8 @@ struct statvfs64
|
||||
__fsfilcnt64_t f_files;
|
||||
__fsfilcnt64_t f_ffree;
|
||||
__fsfilcnt64_t f_favail;
|
||||
__fsid_t f_fsid;
|
||||
unsigned long int f_fsid;
|
||||
int __f_unused;
|
||||
unsigned long int f_flag;
|
||||
unsigned long int f_namemax;
|
||||
int __f_spare[6];
|
||||
|
||||
96
sysdeps/unix/sysv/linux/ia64/bits/statvfs.h
Normal file
96
sysdeps/unix/sysv/linux/ia64/bits/statvfs.h
Normal file
@ -0,0 +1,96 @@
|
||||
/* Copyright (C) 1997, 1998, 2000, 2001 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
|
||||
modify it under the terms of the GNU Library General Public License as
|
||||
published by the Free Software Foundation; either version 2 of the
|
||||
License, or (at your option) any later version.
|
||||
|
||||
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
|
||||
Library General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Library General Public
|
||||
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
||||
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
Boston, MA 02111-1307, USA. */
|
||||
|
||||
#ifndef _SYS_STATVFS_H
|
||||
# error "Never include <bits/statvfs.h> directly; use <sys/statvfs.h> instead."
|
||||
#endif
|
||||
|
||||
#include <bits/types.h> /* For __fsblkcnt_t and __fsfilcnt_t. */
|
||||
|
||||
struct statvfs
|
||||
{
|
||||
unsigned long int f_bsize;
|
||||
unsigned long int f_frsize;
|
||||
#ifndef __USE_FILE_OFFSET64
|
||||
__fsblkcnt_t f_blocks;
|
||||
__fsblkcnt_t f_bfree;
|
||||
__fsblkcnt_t f_bavail;
|
||||
__fsfilcnt_t f_files;
|
||||
__fsfilcnt_t f_ffree;
|
||||
__fsfilcnt_t f_favail;
|
||||
#else
|
||||
__fsblkcnt64_t f_blocks;
|
||||
__fsblkcnt64_t f_bfree;
|
||||
__fsblkcnt64_t f_bavail;
|
||||
__fsfilcnt64_t f_files;
|
||||
__fsfilcnt64_t f_ffree;
|
||||
__fsfilcnt64_t f_favail;
|
||||
#endif
|
||||
unsigned long int f_fsid;
|
||||
unsigned long int f_flag;
|
||||
unsigned long int f_namemax;
|
||||
int __f_spare[6];
|
||||
};
|
||||
|
||||
#ifdef __USE_LARGEFILE64
|
||||
struct statvfs64
|
||||
{
|
||||
unsigned long int f_bsize;
|
||||
unsigned long int f_frsize;
|
||||
__fsblkcnt64_t f_blocks;
|
||||
__fsblkcnt64_t f_bfree;
|
||||
__fsblkcnt64_t f_bavail;
|
||||
__fsfilcnt64_t f_files;
|
||||
__fsfilcnt64_t f_ffree;
|
||||
__fsfilcnt64_t f_favail;
|
||||
unsigned long int f_fsid;
|
||||
unsigned long int f_flag;
|
||||
unsigned long int f_namemax;
|
||||
int __f_spare[6];
|
||||
};
|
||||
#endif
|
||||
|
||||
/* Definitions for the flag in `f_flag'. These definitions should be
|
||||
kept in sync which the definitions in <sys/mount.h>. */
|
||||
enum
|
||||
{
|
||||
ST_RDONLY = 1, /* Mount read-only. */
|
||||
#define ST_RDONLY ST_RDONLY
|
||||
ST_NOSUID = 2, /* Ignore suid and sgid bits. */
|
||||
#define ST_NOSUID ST_NOSUID
|
||||
#ifdef __USE_GNU
|
||||
ST_NODEV = 4, /* Disallow access to device special files. */
|
||||
# define ST_NODEV ST_NODEV
|
||||
ST_NOEXEC = 8, /* Disallow program execution. */
|
||||
# define ST_NOEXEC ST_NOEXEC
|
||||
ST_SYNCHRONOUS = 16, /* Writes are synced at once. */
|
||||
# define ST_SYNCHRONOUS ST_SYNCHRONOUS
|
||||
ST_MANDLOCK = 64, /* Allow mandatory locks on an FS. */
|
||||
# define ST_MANDLOCK ST_MANDLOCK
|
||||
ST_WRITE = 128, /* Write on file/directory/symlink. */
|
||||
# define ST_WRITE ST_WRITE
|
||||
ST_APPEND = 256, /* Append-only file. */
|
||||
# define ST_APPEND ST_APPEND
|
||||
ST_IMMUTABLE = 512, /* Immutable file. */
|
||||
# define ST_IMMUTABLE ST_IMMUTABLE
|
||||
ST_NOATIME = 1024, /* Do not update access times. */
|
||||
# define ST_NOATIME ST_NOATIME
|
||||
ST_NODIRATIME /* Do not update directory access times. */
|
||||
# define ST_NODIRATIME ST_NODIRATIME
|
||||
#endif /* Use GNU. */
|
||||
};
|
||||
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
|
||||
/* Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
|
||||
|
||||
@ -26,7 +26,18 @@
|
||||
buf->f_bavail = fsbuf.f_bavail;
|
||||
buf->f_files = fsbuf.f_files;
|
||||
buf->f_ffree = fsbuf.f_ffree;
|
||||
buf->f_fsid = fsbuf.f_fsid;
|
||||
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])))));
|
||||
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];
|
||||
#ifdef _STATVFSBUF_F_UNUSED
|
||||
buf->__f_unused = 0;
|
||||
#endif
|
||||
buf->f_namemax = fsbuf.f_namelen;
|
||||
memset (buf->__f_spare, '\0', 6 * sizeof (int));
|
||||
|
||||
|
||||
96
sysdeps/unix/sysv/linux/sparc/sparc64/bits/statvfs.h
Normal file
96
sysdeps/unix/sysv/linux/sparc/sparc64/bits/statvfs.h
Normal file
@ -0,0 +1,96 @@
|
||||
/* Copyright (C) 1997, 1998, 2000, 2001 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
|
||||
modify it under the terms of the GNU Library General Public License as
|
||||
published by the Free Software Foundation; either version 2 of the
|
||||
License, or (at your option) any later version.
|
||||
|
||||
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
|
||||
Library General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Library General Public
|
||||
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
||||
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
Boston, MA 02111-1307, USA. */
|
||||
|
||||
#ifndef _SYS_STATVFS_H
|
||||
# error "Never include <bits/statvfs.h> directly; use <sys/statvfs.h> instead."
|
||||
#endif
|
||||
|
||||
#include <bits/types.h> /* For __fsblkcnt_t and __fsfilcnt_t. */
|
||||
|
||||
struct statvfs
|
||||
{
|
||||
unsigned long int f_bsize;
|
||||
unsigned long int f_frsize;
|
||||
#ifndef __USE_FILE_OFFSET64
|
||||
__fsblkcnt_t f_blocks;
|
||||
__fsblkcnt_t f_bfree;
|
||||
__fsblkcnt_t f_bavail;
|
||||
__fsfilcnt_t f_files;
|
||||
__fsfilcnt_t f_ffree;
|
||||
__fsfilcnt_t f_favail;
|
||||
#else
|
||||
__fsblkcnt64_t f_blocks;
|
||||
__fsblkcnt64_t f_bfree;
|
||||
__fsblkcnt64_t f_bavail;
|
||||
__fsfilcnt64_t f_files;
|
||||
__fsfilcnt64_t f_ffree;
|
||||
__fsfilcnt64_t f_favail;
|
||||
#endif
|
||||
unsigned long int f_fsid;
|
||||
unsigned long int f_flag;
|
||||
unsigned long int f_namemax;
|
||||
int __f_spare[6];
|
||||
};
|
||||
|
||||
#ifdef __USE_LARGEFILE64
|
||||
struct statvfs64
|
||||
{
|
||||
unsigned long int f_bsize;
|
||||
unsigned long int f_frsize;
|
||||
__fsblkcnt64_t f_blocks;
|
||||
__fsblkcnt64_t f_bfree;
|
||||
__fsblkcnt64_t f_bavail;
|
||||
__fsfilcnt64_t f_files;
|
||||
__fsfilcnt64_t f_ffree;
|
||||
__fsfilcnt64_t f_favail;
|
||||
unsigned long int f_fsid;
|
||||
unsigned long int f_flag;
|
||||
unsigned long int f_namemax;
|
||||
int __f_spare[6];
|
||||
};
|
||||
#endif
|
||||
|
||||
/* Definitions for the flag in `f_flag'. These definitions should be
|
||||
kept in sync which the definitions in <sys/mount.h>. */
|
||||
enum
|
||||
{
|
||||
ST_RDONLY = 1, /* Mount read-only. */
|
||||
#define ST_RDONLY ST_RDONLY
|
||||
ST_NOSUID = 2, /* Ignore suid and sgid bits. */
|
||||
#define ST_NOSUID ST_NOSUID
|
||||
#ifdef __USE_GNU
|
||||
ST_NODEV = 4, /* Disallow access to device special files. */
|
||||
# define ST_NODEV ST_NODEV
|
||||
ST_NOEXEC = 8, /* Disallow program execution. */
|
||||
# define ST_NOEXEC ST_NOEXEC
|
||||
ST_SYNCHRONOUS = 16, /* Writes are synced at once. */
|
||||
# define ST_SYNCHRONOUS ST_SYNCHRONOUS
|
||||
ST_MANDLOCK = 64, /* Allow mandatory locks on an FS. */
|
||||
# define ST_MANDLOCK ST_MANDLOCK
|
||||
ST_WRITE = 128, /* Write on file/directory/symlink. */
|
||||
# define ST_WRITE ST_WRITE
|
||||
ST_APPEND = 256, /* Append-only file. */
|
||||
# define ST_APPEND ST_APPEND
|
||||
ST_IMMUTABLE = 512, /* Immutable file. */
|
||||
# define ST_IMMUTABLE ST_IMMUTABLE
|
||||
ST_NOATIME = 1024, /* Do not update access times. */
|
||||
# define ST_NOATIME ST_NOATIME
|
||||
ST_NODIRATIME /* Do not update directory access times. */
|
||||
# define ST_NODIRATIME ST_NODIRATIME
|
||||
#endif /* Use GNU. */
|
||||
};
|
||||
Reference in New Issue
Block a user