POSIX allows <fcntl.h> to include <sys/stat.h>, but doesn't require it. There's little reason to do that, since they are separate headers, and <fcntl.h> just needs the mode_t constants. Fix the code accidentally relying on <fcntl.h> including <sys/stat.h>. The mode_t constants are now provided in their own kernel header <sortix/mode.h>. Additionally fix <sys/stat.h> pulling in all of <sys/types.h>, which is not allowed by POSIX, which only requires a few types to be declared. Fix the code accidentally relying on <sys/stat.h> including <sys/types.h>. Finally fix <dirent.h> pulling in <stdint.h> through <sortix/dirent.h>. The <sortix/__/dt.h> and <sortix/__/stat.h> headers are no longer required and their contents have been merged into <sortix/__/dirent.h>.
42 lines
1.3 KiB
C
42 lines
1.3 KiB
C
/*
|
|
* Copyright (c) 2012, 2013, 2014, 2018 Jonas 'Sortie' Termansen.
|
|
*
|
|
* Permission to use, copy, modify, and distribute this software for any
|
|
* purpose with or without fee is hereby granted, provided that the above
|
|
* copyright notice and this permission notice appear in all copies.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
|
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
|
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
|
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
*
|
|
* sortix/__/dirent.h
|
|
* Format of directory entries.
|
|
*/
|
|
|
|
#ifndef INCLUDE_SORTIX____DIRENT_H
|
|
#define INCLUDE_SORTIX____DIRENT_H
|
|
|
|
#include <sys/cdefs.h>
|
|
|
|
#define __DT_UNKNOWN 0x0
|
|
#define __DT_FIFO 0x1
|
|
#define __DT_CHR 0x2
|
|
#define __DT_DIR 0x4
|
|
#define __DT_BLK 0x6
|
|
#define __DT_REG 0x8
|
|
#define __DT_LNK 0xA
|
|
#define __DT_SOCK 0xC
|
|
#define __DT_BITS 0xF
|
|
|
|
#define __S_IFMT_SHIFT 12
|
|
#define __S_IFMT_MASK __DT_BITS
|
|
|
|
#define __IFTODT(mode) (((mode) & __S_IFMT) >> __S_IFMT_SHIFT)
|
|
#define __DTTOIF(dirtype) ((dirtype) << __S_IFMT_SHIFT)
|
|
|
|
#endif
|