diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/getpt.c | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/grantpt.c | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/linux_fsinfo.h | 64 |
4 files changed, 66 insertions, 19 deletions
diff --git a/ChangeLog b/ChangeLog index 66a3510c7f..1435154f21 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +1999-11-18 Andreas Jaeger <aj@suse.de> + + * sysdeps/unix/sysv/linux/linux_fsinfo.h: Sorted entries and added + comments. + + * sysdeps/unix/sysv/linux/getpt.c: Include linux_fsinfo.h instead + of defining *_SUPER_MAGIC. + * sysdeps/unix/sysv/linux/grantpt.c: Likewise. + 1999-11-18 Ulrich Drepper <drepper@cygnus.com> * locale/programs/locale.c: Don't handle LC_ALL together with the diff --git a/sysdeps/unix/sysv/linux/getpt.c b/sysdeps/unix/sysv/linux/getpt.c index e6cfd18951..3b01ef561e 100644 --- a/sysdeps/unix/sysv/linux/getpt.c +++ b/sysdeps/unix/sysv/linux/getpt.c @@ -24,11 +24,7 @@ #include <paths.h> #include <sys/statfs.h> -/* Constant that identifies the `devpts' filesystem. */ -#define DEVPTS_SUPER_MAGIC 0x1cd1 - -/* Constant that identifies the `devfs' filesystem. */ -#define DEVFS_SUPER_MAGIC 0x1373 +#include "linux_fsinfo.h" /* Path to the master pseudo terminal cloning device. */ #define _PATH_DEVPTMX _PATH_DEV "ptmx" diff --git a/sysdeps/unix/sysv/linux/grantpt.c b/sysdeps/unix/sysv/linux/grantpt.c index c6252eaf79..0473f357b3 100644 --- a/sysdeps/unix/sysv/linux/grantpt.c +++ b/sysdeps/unix/sysv/linux/grantpt.c @@ -20,11 +20,7 @@ #include <stdlib.h> #include <sys/statfs.h> -/* Constant that identifies the `devpts' filesystem. */ -#define DEVPTS_SUPER_MAGIC 0x1cd1 - -/* Constant that identifies the `devfs' filesystem. */ -#define DEVFS_SUPER_MAGIC 0x1373 +#include "linux_fsinfo.h" /* Prototype for function that changes ownership and access permission for slave pseudo terminals that do not live on a `devpts' diff --git a/sysdeps/unix/sysv/linux/linux_fsinfo.h b/sysdeps/unix/sysv/linux/linux_fsinfo.h index 85e2645880..774b87ce22 100644 --- a/sysdeps/unix/sysv/linux/linux_fsinfo.h +++ b/sysdeps/unix/sysv/linux/linux_fsinfo.h @@ -24,42 +24,88 @@ include the headers here because of type clashes. If new filesystem types will become available we have to add the appropriate definitions here.*/ + +/* Constants that identify the `adfs' filesystem. */ #define ADFS_SUPER_MAGIC 0xadf5 + +/* Constants that identify the `affs' filesystem. */ #define AFFS_SUPER_MAGIC 0xadff + +/* Constants that identify the `bfs' filesystem. */ #define BFS_MAGIC 0x1BADFACE + +/* Constants that identify the `coda' filesystem. */ #define CODA_SUPER_MAGIC 0x73757245 -#define DEVPTS_SUPER_MAGIC 0x1cd1 + +/* Constants that identify the `coherent' filesystem. */ +#define COH_SUPER_MAGIC 0x012ff7b7 + +/* Constant that identifies the `devfs' filesystem. */ #define DEVFS_SUPER_MAGIC 0x1373 + +/* Constant that identifies the `devpts' filesystem. */ +#define DEVPTS_SUPER_MAGIC 0x1cd1 + +/* Constant that identifies the `efs' filesystem. */ #define EFS_SUPER_MAGIC 0x414A53 + +/* Constant that identifies the `ext2' and `ext3' filesystems. */ #define EXT2_SUPER_MAGIC 0xef53 + +/* Constant that identifies the `hpfs' filesystem. */ #define HPFS_SUPER_MAGIC 0xf995e849 + +/* Constant that identifies the `iso9660' filesystem. */ #define ISOFS_SUPER_MAGIC 0x9660 -#define MINIX_SUPER_MAGIC 0x137f -#define MINIX_SUPER_MAGIC2 0x138F + +/* Constants that identify the `minix2' filesystem. */ #define MINIX2_SUPER_MAGIC 0x2468 #define MINIX2_SUPER_MAGIC2 0x2478 + +/* Constants that identify the `minix' filesystem. */ +#define MINIX_SUPER_MAGIC 0x137f +#define MINIX_SUPER_MAGIC2 0x138F + +/* Constants that identify the `msdos' filesystem. */ #define MSDOS_SUPER_MAGIC 0x4d44 + +/* Constants that identify the `ncp' filesystem. */ #define NCP_SUPER_MAGIC 0x564c + +/* Constants that identify the `nfs' filesystem. */ #define NFS_SUPER_MAGIC 0x6969 + +/* Constants that identify the `proc' filesystem. */ #define PROC_SUPER_MAGIC 0x9fa0 + +/* Constants that identify the `qnx4' filesystem. */ #define QNX4_SUPER_MAGIC 0x002f + +/* Constants that identify the `reiser' filesystem. */ #define REISERFS_SUPER_MAGIC 0x52654973 + +/* Constants that identify the `smb' filesystem. */ #define SMB_SUPER_MAGIC 0x517b -#define XENIX_SUPER_MAGIC 0x012ff7b4 -#define SYSV4_SUPER_MAGIC 0x012ff7b5 + +/* Constants that identify the `sysV' filesystem. */ #define SYSV2_SUPER_MAGIC 0x012ff7b6 -#define COH_SUPER_MAGIC 0x012ff7b7 +#define SYSV4_SUPER_MAGIC 0x012ff7b5 + +/* Constants that identify the `ufs' filesystem. */ #define UFS_MAGIC 0x00011954 #define UFS_CIGAM 0x54190100 /* byteswapped MAGIC */ +/* Constants that identify the `xenix' filesystem. */ +#define XENIX_SUPER_MAGIC 0x012ff7b4 + /* Maximum link counts. */ +#define COH_LINK_MAX 10000 #define EXT2_LINK_MAX 32000 -#define MINIX_LINK_MAX 250 #define MINIX2_LINK_MAX 65530 -#define XENIX_LINK_MAX 126 /* ?? */ +#define MINIX_LINK_MAX 250 #define REISERFS_LINK_MAX 64535 #define SYSV_LINK_MAX 126 /* 127? 251? */ -#define COH_LINK_MAX 10000 #define UFS_LINK_MAX EXT2_LINK_MAX +#define XENIX_LINK_MAX 126 /* ?? */ #endif /* linux_fsinfo.h */ |