diff options
Diffstat (limited to 'sysdeps/unix/sysv/linux')
-rw-r--r-- | sysdeps/unix/sysv/linux/alpha/bits/types.h | 3 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/alpha/fpathconf.c | 64 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/alpha/pathconf.c | 57 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/bits/errno.h | 4 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/bits/fcntl.h | 14 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/bits/resource.h | 4 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/bits/types.h | 3 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/fstatvfs.c | 4 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/i386/dl-librecon.h | 3 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/mips/bits/types.h | 3 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h | 3 |
11 files changed, 156 insertions, 6 deletions
diff --git a/sysdeps/unix/sysv/linux/alpha/bits/types.h b/sysdeps/unix/sysv/linux/alpha/bits/types.h index 276236d4f5..d4f2217f05 100644 --- a/sysdeps/unix/sysv/linux/alpha/bits/types.h +++ b/sysdeps/unix/sysv/linux/alpha/bits/types.h @@ -110,6 +110,9 @@ typedef struct typedef int __t_scalar_t; typedef unsigned int __t_uscalar_t; +/* Duplicates info from stdint.h but this is used in unistd.h. */ +typedef long int __intptr_t; + /* Now add the thread types. */ #include <bits/pthreadtypes.h> diff --git a/sysdeps/unix/sysv/linux/alpha/fpathconf.c b/sysdeps/unix/sysv/linux/alpha/fpathconf.c new file mode 100644 index 0000000000..d8c428dcda --- /dev/null +++ b/sysdeps/unix/sysv/linux/alpha/fpathconf.c @@ -0,0 +1,64 @@ +/* Copyright (C) 1991, 1995, 1996, 1998 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. */ + +#include <errno.h> +#include <stddef.h> +#include <unistd.h> +#include <limits.h> +#include <sys/statfs.h> + +#define EXT2_SUPER_MAGIC 0xef53 +#define UFS_MAGIC 0x00011954 +#define UFS_CIGAM 0x54190100 /* byteswapped MAGIC */ + +static long int default_fpathconf (int fd, int name); + +/* Get file-specific information about descriptor FD. */ +long int +__fpathconf (fd, name) + int fd; + int name; +{ + if (fd < 0) + { + __set_errno (EBADF); + return -1; + } + + if (name == _PC_FILESIZEBITS) + { + /* Test whether this is on a ext2 filesystem which supports large + files. */ + struct statfs fs; + + if (__fstatfs (fd, &fs) < 0 + || (fs.f_type != EXT2_SUPER_MAGIC + && fs.f_type != UFS_MAGIC + && fs.f_type != UFS_CIGAM)) + return 32; + + /* This filesystem supported files >2GB. */ + return 64; + } + + /* Fallback to the generic version. */ + return default_fpathconf (fd, name); +} + +#define __fpathconf static default_fpathconf +#include <sysdeps/posix/fpathconf.c> diff --git a/sysdeps/unix/sysv/linux/alpha/pathconf.c b/sysdeps/unix/sysv/linux/alpha/pathconf.c new file mode 100644 index 0000000000..91ca0942fb --- /dev/null +++ b/sysdeps/unix/sysv/linux/alpha/pathconf.c @@ -0,0 +1,57 @@ +/* Copyright (C) 1991, 1995, 1996, 1998 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. */ + +#include <errno.h> +#include <stddef.h> +#include <unistd.h> +#include <limits.h> +#include <fcntl.h> +#include <sys/statfs.h> + +#define EXT2_SUPER_MAGIC 0xef53 +#define UFS_MAGIC 0x00011954 +#define UFS_CIGAM 0x54190100 /* byteswapped MAGIC */ + +static long int default_pathconf (const char *path, int name); + +/* Get file-specific information about PATH. */ +long int +__pathconf (const char *path, int name) +{ + if (name == _PC_FILESIZEBITS) + { + /* Test whether this is on a ext2 or UFS filesystem which + support large files. */ + struct statfs fs; + + if (__statfs (path, &fs) < 0 + || (fs.f_type != EXT2_SUPER_MAGIC + && fs.f_type != UFS_MAGIC + && fs.f_type != UFS_CIGAM)) + return 32; + + /* This filesystem supported files >2GB. */ + return 64; + } + + /* Fallback to the generic version. */ + return default_pathconf (path, name); +} + +#define __pathconf static default_pathconf +#include <sysdeps/posix/pathconf.c> diff --git a/sysdeps/unix/sysv/linux/bits/errno.h b/sysdeps/unix/sysv/linux/bits/errno.h index 5976c25f02..e3e8b3213d 100644 --- a/sysdeps/unix/sysv/linux/bits/errno.h +++ b/sysdeps/unix/sysv/linux/bits/errno.h @@ -27,6 +27,10 @@ /* Linux has no ENOTSUP error code. */ # define ENOTSUP EOPNOTSUPP +/* Linux also has no ECANCELED error code. Since it is not used here + we define it to an invalid value. */ +# define ECANCELED (-1) + # ifndef __ASSEMBLER__ /* We now need a declaration of the `errno' variable. */ extern int errno; diff --git a/sysdeps/unix/sysv/linux/bits/fcntl.h b/sysdeps/unix/sysv/linux/bits/fcntl.h index 4222631129..f63e8ce4eb 100644 --- a/sysdeps/unix/sysv/linux/bits/fcntl.h +++ b/sysdeps/unix/sysv/linux/bits/fcntl.h @@ -24,12 +24,6 @@ #include <sys/types.h> - -/* In GNU, read and write are bits (unlike BSD). */ -#ifdef __USE_GNU -# define O_READ O_RDONLY /* Open for reading. */ -# define O_WRITE O_WRONLY /* Open for writing. */ -#endif /* open/fcntl - O_SYNC is only implemented on blocks devices and on files located on an ext2 file system */ #define O_ACCMODE 0003 @@ -47,6 +41,14 @@ #define O_FSYNC O_SYNC #define O_ASYNC 020000 +/* For now Linux has synchronisity options for data and read operations. + We define the symbols here but let them do the same as O_SYNS since + this is a superset. */ +#ifdef __USE_UNIX98 +# define O_DSYNC O_SYNC /* Synchronize data. */ +# define O_RSYNC O_SYNC /* Synchronize read operations. */ +#endif + /* XXX missing */ #ifdef __USE_LARGEFILE64 # define O_LARGEFILE 0 diff --git a/sysdeps/unix/sysv/linux/bits/resource.h b/sysdeps/unix/sysv/linux/bits/resource.h index faa493e7e3..7b188b9f9f 100644 --- a/sysdeps/unix/sysv/linux/bits/resource.h +++ b/sysdeps/unix/sysv/linux/bits/resource.h @@ -115,6 +115,10 @@ enum __rlimit_resource # define RLIM64_INFINITY 0x7fffffffffffffffLL #endif +/* We can represent all limits. */ +#define RLIM_SAVED_MAX RLIM_INFINITY +#define RLIM_SAVED_CUR RLIM_INFINITY + /* Type for resource quantity measurement. */ #ifndef __USE_FILE_OFFSET64 diff --git a/sysdeps/unix/sysv/linux/bits/types.h b/sysdeps/unix/sysv/linux/bits/types.h index 916910908f..30dc5e20e0 100644 --- a/sysdeps/unix/sysv/linux/bits/types.h +++ b/sysdeps/unix/sysv/linux/bits/types.h @@ -134,6 +134,9 @@ typedef __loff_t __off64_t; typedef int __t_scalar_t; typedef unsigned int __t_uscalar_t; +/* Duplicates info from stdint.h but this is used in unistd.h. */ +typedef int __intptr_t; + /* Now add the thread types. */ #include <bits/pthreadtypes.h> diff --git a/sysdeps/unix/sysv/linux/fstatvfs.c b/sysdeps/unix/sysv/linux/fstatvfs.c index de926f49c4..43bab44543 100644 --- a/sysdeps/unix/sysv/linux/fstatvfs.c +++ b/sysdeps/unix/sysv/linux/fstatvfs.c @@ -49,6 +49,8 @@ #define SYSV4_SUPER_MAGIC 0x012ff7b5 #define SYSV2_SUPER_MAGIC 0x012ff7b6 #define COH_SUPER_MAGIC 0x012ff7b7 +#define UFS_MAGIC 0x00011954 +#define UFS_CIGAM 0x54190100 /* byteswapped MAGIC */ int @@ -99,6 +101,8 @@ fstatvfs (int fd, struct statvfs *buf) case SYSV4_SUPER_MAGIC: case SYSV2_SUPER_MAGIC: case COH_SUPER_MAGIC: + case UFS_MAGIC: + case UFS_CIGAM: default: /* I hope it's safe to assume no fragmentation. */ buf->f_frsize = buf->f_bsize; diff --git a/sysdeps/unix/sysv/linux/i386/dl-librecon.h b/sysdeps/unix/sysv/linux/i386/dl-librecon.h index ef2c4bb632..b9ef9af8b6 100644 --- a/sysdeps/unix/sysv/linux/i386/dl-librecon.h +++ b/sysdeps/unix/sysv/linux/i386/dl-librecon.h @@ -54,4 +54,7 @@ break; \ } +/* Extra unsecure variables. */ +#define EXTRA_UNSECURE_ENVVARS "LD_AOUT_LIBRARY_PATH", "LD_AOUT_PRELOAD" + #endif /* dl-librecon.h */ diff --git a/sysdeps/unix/sysv/linux/mips/bits/types.h b/sysdeps/unix/sysv/linux/mips/bits/types.h index 313e96b480..2bb8a2a9c6 100644 --- a/sysdeps/unix/sysv/linux/mips/bits/types.h +++ b/sysdeps/unix/sysv/linux/mips/bits/types.h @@ -134,6 +134,9 @@ typedef __loff_t __off64_t; typedef int __t_scalar_t; typedef unsigned int __t_uscalar_t; +/* Duplicates info from stdint.h but this is used in unistd.h. */ +typedef int __intptr_t; + /* Now add the thread types. */ #include <bits/pthreadtypes.h> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h b/sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h index 88638143d6..c147dbe6e5 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h @@ -122,6 +122,9 @@ typedef __u_quad_t __fsfilcnt64_t; typedef int __t_scalar_t; typedef unsigned int __t_uscalar_t; +/* Duplicates info from stdint.h but this is used in unistd.h. */ +typedef long int __intptr_t; + /* Now add the thread types. */ #include <bits/pthreadtypes.h> |