mirror of
https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git
synced 2024-12-25 03:54:17 +01:00
6992112349
Extend the ino_t, dev_t, nlink_t types to 64-bit ints. Modify struct dirent layout to add d_off, increase the size of d_fileno to 64-bits, increase the size of d_namlen to 16-bits, and change the required alignment. Increase struct statfs f_mntfromname[] and f_mntonname[] array length MNAMELEN to 1024. ABI breakage is mitigated by providing compatibility using versioned symbols, ingenious use of the existing padding in structures, and by employing other tricks. Unfortunately, not everything can be fixed, especially outside the base system. For instance, third-party APIs which pass struct stat around are broken in backward and forward incompatible ways. Kinfo sysctl MIBs ABI is changed in backward-compatible way, but there is no general mechanism to handle other sysctl MIBS which return structures where the layout has changed. It was considered that the breakage is either in the management interfaces, where we usually allow ABI slip, or is not important. Struct xvnode changed layout, no compat shims are provided. For struct xtty, dev_t tty device member was reduced to uint32_t. It was decided that keeping ABI compat in this case is more useful than reporting 64-bit dev_t, for the sake of pstat. Update note: strictly follow the instructions in UPDATING. Build and install the new kernel with COMPAT_FREEBSD11 option enabled, then reboot, and only then install new world. Credits: The 64-bit inode project, also known as ino64, started life many years ago as a project by Gleb Kurtsou (gleb). Kirk McKusick (mckusick) then picked up and updated the patch, and acted as a flag-waver. Feedback, suggestions, and discussions were carried by Ed Maste (emaste), John Baldwin (jhb), Jilles Tjoelker (jilles), and Rick Macklem (rmacklem). Kris Moore (kris) performed an initial ports investigation followed by an exp-run by Antoine Brodin (antoine). Essential and all-embracing testing was done by Peter Holm (pho). The heavy lifting of coordinating all these efforts and bringing the project to completion were done by Konstantin Belousov (kib). Sponsored by: The FreeBSD Foundation (emaste, kib) Differential revision: https://reviews.freebsd.org/D10439
142 lines
4.1 KiB
C
142 lines
4.1 KiB
C
/*-
|
|
* Copyright (c) 1989, 1993
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. Neither the name of the University nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* @(#)dirent.h 8.2 (Berkeley) 7/28/94
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
#ifndef _DIRENT_H_
|
|
#define _DIRENT_H_
|
|
|
|
/*
|
|
* The kernel defines the format of directory entries returned by
|
|
* the getdirentries(2) system call.
|
|
*/
|
|
#include <sys/cdefs.h>
|
|
#include <sys/_types.h>
|
|
#include <sys/dirent.h>
|
|
|
|
#if __BSD_VISIBLE
|
|
|
|
#ifndef _SIZE_T_DECLARED
|
|
typedef __size_t size_t;
|
|
#define _SIZE_T_DECLARED
|
|
#endif
|
|
|
|
#ifndef _SSIZE_T_DECLARED
|
|
typedef __ssize_t ssize_t;
|
|
#define _SSIZE_T_DECLARED
|
|
#endif
|
|
|
|
#ifndef _OFF_T_DECLARED
|
|
typedef __off_t off_t;
|
|
#define _OFF_T_DECLARED
|
|
#endif
|
|
|
|
#endif /* __BSD_VISIBLE */
|
|
|
|
#if __XSI_VISIBLE
|
|
|
|
#ifndef _INO_T_DECLARED
|
|
typedef __ino_t ino_t;
|
|
#define _INO_T_DECLARED
|
|
#endif
|
|
|
|
/*
|
|
* XXX this is probably illegal in the __XSI_VISIBLE case, but brings us closer
|
|
* to the specification.
|
|
*/
|
|
#define d_ino d_fileno /* backward and XSI compatibility */
|
|
|
|
#endif /* __XSI_VISIBLE */
|
|
|
|
#if __BSD_VISIBLE
|
|
|
|
#include <sys/_null.h>
|
|
|
|
/* definitions for library routines operating on directories. */
|
|
#define DIRBLKSIZ 1024
|
|
|
|
struct _dirdesc;
|
|
typedef struct _dirdesc DIR;
|
|
|
|
/* flags for opendir2 */
|
|
#define DTF_HIDEW 0x0001 /* hide whiteout entries */
|
|
#define DTF_NODUP 0x0002 /* don't return duplicate names */
|
|
#define DTF_REWIND 0x0004 /* rewind after reading union stack */
|
|
#define __DTF_READALL 0x0008 /* everything has been read */
|
|
#define __DTF_SKIPREAD 0x0010 /* assume internal buffer is populated */
|
|
|
|
#else /* !__BSD_VISIBLE */
|
|
|
|
typedef void * DIR;
|
|
|
|
#endif /* __BSD_VISIBLE */
|
|
|
|
#ifndef _KERNEL
|
|
|
|
__BEGIN_DECLS
|
|
#if __POSIX_VISIBLE >= 200809 || __XSI_VISIBLE >= 700
|
|
int alphasort(const struct dirent **, const struct dirent **);
|
|
int dirfd(DIR *);
|
|
#endif
|
|
#if __BSD_VISIBLE
|
|
DIR *__opendir2(const char *, int);
|
|
int fdclosedir(DIR *);
|
|
ssize_t getdents(int, char *, size_t);
|
|
ssize_t getdirentries(int, char *, size_t, off_t *);
|
|
#endif
|
|
DIR *opendir(const char *);
|
|
DIR *fdopendir(int);
|
|
struct dirent *
|
|
readdir(DIR *);
|
|
#if __POSIX_VISIBLE >= 199506 || __XSI_VISIBLE >= 500
|
|
int readdir_r(DIR *, struct dirent *, struct dirent **);
|
|
#endif
|
|
void rewinddir(DIR *);
|
|
#if __POSIX_VISIBLE >= 200809 || __XSI_VISIBLE >= 700
|
|
int scandir(const char *, struct dirent ***,
|
|
int (*)(const struct dirent *), int (*)(const struct dirent **,
|
|
const struct dirent **));
|
|
#ifdef __BLOCKS__
|
|
int scandir_b(const char *, struct dirent ***,
|
|
int (^)(const struct dirent *),
|
|
int (^)(const struct dirent **, const struct dirent **));
|
|
#endif
|
|
#endif
|
|
#if __XSI_VISIBLE
|
|
void seekdir(DIR *, long);
|
|
long telldir(DIR *);
|
|
#endif
|
|
int closedir(DIR *);
|
|
__END_DECLS
|
|
|
|
#endif /* !_KERNEL */
|
|
|
|
#endif /* !_DIRENT_H_ */
|