d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Declare mknod in stat.h (in addition to unistd.h), as per XSI.

Browse Source 
- Use blksize_t and blkcnt_t in struct stat.
- Hide non-standard fields in stat.h when !__BSD_VISIBLE.
- Add restrict qualifiers in stat.h.
This commit is contained in:
David Schultz 2005-03-22 01:19:18 +00:00
parent 3edf7a78b7
commit 3eea66586b
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=143952
4 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/unistd.h
View File

@ -489,7 +489,10 @@ int iruserok(unsigned long, int, const char *, const char *);
int iruserok_sa(const void *, int, int, const char *, const char *); int iruserok_sa(const void *, int, int, const char *, const char *);
int issetugid(void); int issetugid(void);
char *mkdtemp(char *); char *mkdtemp(char *);
#ifndef _MKNOD_DECLARED
int mknod(const char *, mode_t, dev_t); int mknod(const char *, mode_t, dev_t);
#define _MKNOD_DECLARED
#endif
#ifndef _MKSTEMP_DECLARED #ifndef _MKSTEMP_DECLARED
int mkstemp(char *); int mkstemp(char *);
#define _MKSTEMP_DECLARED #define _MKSTEMP_DECLARED

2
sys/sys/_types.h
View File

@ -35,6 +35,8 @@
/* /*
* Standard type definitions. * Standard type definitions.
*/ */
typedef __uint32_t __blksize_t; /* file block size */
typedef __int64_t __blkcnt_t; /* file block count */
typedef __int32_t __clockid_t; /* clock_gettime()... */ typedef __int32_t __clockid_t; /* clock_gettime()... */
typedef __uint32_t __fflags_t; /* file flags */ typedef __uint32_t __fflags_t; /* file flags */
typedef __uint64_t __fsblkcnt_t; typedef __uint64_t __fsblkcnt_t;

34
sys/sys/stat.h
View File

@ -41,7 +41,15 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#include <sys/_types.h> #include <sys/_types.h>
/* XXX missing blkcnt_t, blksize_t. */ #ifndef _BLKSIZE_T_DECLARED
typedef __blksize_t blksize_t;
#define _BLKSIZE_T_DECLARED
#endif
#ifndef _BLKCNT_T_DECLARED
typedef __blkcnt_t blkcnt_t;
#define _BLKCNT_T_DECLARED
#endif
#ifndef _DEV_T_DECLARED #ifndef _DEV_T_DECLARED
typedef __dev_t dev_t; typedef __dev_t dev_t;
@ -134,15 +142,15 @@ struct stat {
struct timespec st_ctimespec; /* time of last file status change */ struct timespec st_ctimespec; /* time of last file status change */
#else #else
time_t st_atime; /* time of last access */ time_t st_atime; /* time of last access */
long st_atimensec; /* nsec of last access */ long __st_atimensec; /* nsec of last access */
time_t st_mtime; /* time of last data modification */ time_t st_mtime; /* time of last data modification */
long st_mtimensec; /* nsec of last data modification */ long __st_mtimensec; /* nsec of last data modification */
time_t st_ctime; /* time of last file status change */ time_t st_ctime; /* time of last file status change */
long st_ctimensec; /* nsec of last file status change */ long __st_ctimensec; /* nsec of last file status change */
#endif #endif
off_t st_size; /* file size, in bytes */ off_t st_size; /* file size, in bytes */
__int64_t st_blocks; /* blocks allocated for file */ blkcnt_t st_blocks; /* blocks allocated for file */
__uint32_t st_blksize; /* optimal blocksize for I/O */ blksize_t st_blksize; /* optimal blocksize for I/O */
fflags_t st_flags; /* user defined flags for file */ fflags_t st_flags; /* user defined flags for file */
__uint32_t st_gen; /* file generation number */ __uint32_t st_gen; /* file generation number */
__int32_t st_lspare; __int32_t st_lspare;
@ -179,8 +187,8 @@ struct nstat {
struct timespec st_mtimespec; /* time of last data modification */ struct timespec st_mtimespec; /* time of last data modification */
struct timespec st_ctimespec; /* time of last file status change */ struct timespec st_ctimespec; /* time of last file status change */
off_t st_size; /* file size, in bytes */ off_t st_size; /* file size, in bytes */
__int64_t st_blocks; /* blocks allocated for file */ blkcnt_t st_blocks; /* blocks allocated for file */
__uint32_t st_blksize; /* optimal blocksize for I/O */ blksize_t st_blksize; /* optimal blocksize for I/O */
fflags_t st_flags; /* user defined flags for file */ fflags_t st_flags; /* user defined flags for file */
__uint32_t st_gen; /* file generation number */ __uint32_t st_gen; /* file generation number */
struct timespec st_birthtimespec; /* time of file creation */ struct timespec st_birthtimespec; /* time of file creation */
@ -250,7 +258,7 @@ struct nstat {
#define S_ISLNK(m) (((m) & 0170000) == 0120000) /* symbolic link */ #define S_ISLNK(m) (((m) & 0170000) == 0120000) /* symbolic link */
#define S_ISSOCK(m) (((m) & 0170000) == 0140000) /* socket */ #define S_ISSOCK(m) (((m) & 0170000) == 0140000) /* socket */
#endif #endif
#if __XSI_VISIBLE #if __BSD_VISIBLE
#define S_ISWHT(m) (((m) & 0170000) == 0160000) /* whiteout */ #define S_ISWHT(m) (((m) & 0170000) == 0160000) /* whiteout */
#endif #endif
@ -312,11 +320,15 @@ int lchflags(const char *, int);
int lchmod(const char *, mode_t); int lchmod(const char *, mode_t);
#endif #endif
#if __POSIX_VISIBLE >= 200112 #if __POSIX_VISIBLE >= 200112
int lstat(const char *, struct stat *); int lstat(const char * __restrict, struct stat * __restrict);
#endif #endif
int mkdir(const char *, mode_t); int mkdir(const char *, mode_t);
int mkfifo(const char *, mode_t); int mkfifo(const char *, mode_t);
int stat(const char *, struct stat *); #if !defined(_MKNOD_DECLARED) && __XSI_VISIBLE
int mknod(const char *, mode_t, dev_t);
#define _MKNOD_DECLARED
#endif
int stat(const char * __restrict, struct stat * __restrict);
mode_t umask(mode_t); mode_t umask(mode_t);
__END_DECLS __END_DECLS
#endif /* !_KERNEL */ #endif /* !_KERNEL */

10
sys/sys/types.h
View File

@ -117,6 +117,16 @@ typedef char * caddr_t; /* core address */
typedef __const char * c_caddr_t; /* core address, pointer to const */ typedef __const char * c_caddr_t; /* core address, pointer to const */
typedef __volatile char *v_caddr_t; /* core address, pointer to volatile */ typedef __volatile char *v_caddr_t; /* core address, pointer to volatile */
#ifndef _BLKSIZE_T_DECLARED
typedef __blksize_t blksize_t;
#define _BLKSIZE_T_DECLARED
#endif
#ifndef _BLKCNT_T_DECLARED
typedef __blkcnt_t blkcnt_t;
#define _BLKCNT_T_DECLARED
#endif
#ifndef _CLOCK_T_DECLARED #ifndef _CLOCK_T_DECLARED
typedef __clock_t clock_t; typedef __clock_t clock_t;
#define _CLOCK_T_DECLARED #define _CLOCK_T_DECLARED