std: reorganize std.c to eliminate usingnamespace
Behavior tests pass on x86_64-linux with -lc
This commit is contained in:
Andrew Kelley
@@ -1,11 +1,66 @@
|
||||
const std = @import("../std.zig");
|
||||
const builtin = @import("builtin");
|
||||
const maxInt = std.math.maxInt;
|
||||
const abi = std.Target.current.abi;
|
||||
const arch = std.Target.current.cpu.arch;
|
||||
const os_tag = std.Target.current.os.tag;
|
||||
usingnamespace std.c;
|
||||
const native_abi = builtin.abi;
|
||||
const native_arch = builtin.cpu.arch;
|
||||
const linux = std.os.linux;
|
||||
|
||||
pub const _errno = switch (abi) {
|
||||
pub const E = linux.E;
|
||||
pub const Sigaction = linux.Sigaction;
|
||||
pub const dl_phdr_info = linux.dl_phdr_info;
|
||||
pub const fd_t = linux.fd_t;
|
||||
pub const rlimit = linux.rlimit;
|
||||
pub const rlimit_resource = linux.rlimit_resource;
|
||||
pub const timespec = linux.timespec;
|
||||
pub const NAME_MAX = linux.NAME_MAX;
|
||||
pub const PATH_MAX = linux.PATH_MAX;
|
||||
pub const IOV_MAX = linux.IOV_MAX;
|
||||
pub const STDIN_FILENO = linux.STDIN_FILENO;
|
||||
pub const STDOUT_FILENO = linux.STDIN_FILENO;
|
||||
pub const STDERR_FILENO = linux.STDIN_FILENO;
|
||||
pub const AT = linux.AT;
|
||||
pub const PROT = linux.PROT;
|
||||
pub const CLOCK = linux.CLOCK;
|
||||
pub const SIG = linux.SIG;
|
||||
pub const empty_sigset = linux.empty_sigset;
|
||||
pub const S = linux.S;
|
||||
pub const siginfo_t = linux.siginfo_t;
|
||||
pub const SA = linux.SA;
|
||||
pub const pollfd = linux.pollfd;
|
||||
pub const sigset_t = linux.sigset_t;
|
||||
pub const ARCH = linux.ARCH;
|
||||
pub const Elf_Symndx = linux.Elf_Symndx;
|
||||
pub const F = linux.F;
|
||||
pub const Flock = linux.Flock;
|
||||
pub const LOCK = linux.LOCK;
|
||||
pub const MAP = linux.MAP;
|
||||
pub const MMAP2_UNIT = linux.MMAP2_UNIT;
|
||||
pub const O = linux.O;
|
||||
pub const REG = linux.REG;
|
||||
pub const SC = linux.SC;
|
||||
pub const SYS = linux.SYS;
|
||||
pub const VDSO = linux.VDSO;
|
||||
pub const blkcnt_t = linux.blkcnt_t;
|
||||
pub const blksize_t = linux.blksize_t;
|
||||
pub const dev_t = linux.dev_t;
|
||||
pub const ino_t = linux.ino_t;
|
||||
pub const mcontext_t = linux.mcontext_t;
|
||||
pub const mode_t = linux.mode_t;
|
||||
pub const msghdr = linux.msghdr;
|
||||
pub const msghdr_const = linux.msghdr_const;
|
||||
pub const nlink_t = linux.nlink_t;
|
||||
pub const off_t = linux.off_t;
|
||||
pub const time_t = linux.time_t;
|
||||
pub const timeval = linux.timeval;
|
||||
pub const timezone = linux.timezone;
|
||||
pub const ucontext_t = linux.ucontext_t;
|
||||
pub const user_desc = linux.user_desc;
|
||||
pub const pid_t = linux.pid_t;
|
||||
pub const uid_t = linux.uid_t;
|
||||
pub const gid_t = linux.gid_t;
|
||||
pub const clock_t = linux.clock_t;
|
||||
|
||||
pub const _errno = switch (native_abi) {
|
||||
.android => struct {
|
||||
extern "c" var __errno: c_int;
|
||||
fn getErrno() *c_int {
|
||||
@@ -17,22 +72,94 @@ pub const _errno = switch (abi) {
|
||||
}.__errno_location,
|
||||
};
|
||||
|
||||
pub const Stat = switch (native_arch) {
|
||||
.sparcv9 => extern struct {
|
||||
dev: u64,
|
||||
ino: ino_t,
|
||||
mode: u32,
|
||||
nlink: usize,
|
||||
|
||||
uid: u32,
|
||||
gid: u32,
|
||||
rdev: u64,
|
||||
__pad0: u32,
|
||||
|
||||
size: off_t,
|
||||
blksize: isize,
|
||||
blocks: i64,
|
||||
|
||||
atim: timespec,
|
||||
mtim: timespec,
|
||||
ctim: timespec,
|
||||
__unused: [2]isize,
|
||||
|
||||
pub fn atime(self: @This()) timespec {
|
||||
return self.atim;
|
||||
}
|
||||
|
||||
pub fn mtime(self: @This()) timespec {
|
||||
return self.mtim;
|
||||
}
|
||||
|
||||
pub fn ctime(self: @This()) timespec {
|
||||
return self.ctim;
|
||||
}
|
||||
},
|
||||
.mips, .mipsel => extern struct {
|
||||
dev: dev_t,
|
||||
__pad0: [2]u32,
|
||||
ino: ino_t,
|
||||
mode: mode_t,
|
||||
nlink: nlink_t,
|
||||
uid: uid_t,
|
||||
gid: gid_t,
|
||||
rdev: dev_t,
|
||||
__pad1: [2]u32,
|
||||
size: off_t,
|
||||
atim: timespec,
|
||||
mtim: timespec,
|
||||
ctim: timespec,
|
||||
blksize: blksize_t,
|
||||
__pad3: u32,
|
||||
blocks: blkcnt_t,
|
||||
__pad4: [14]u32,
|
||||
|
||||
pub fn atime(self: @This()) timespec {
|
||||
return self.atim;
|
||||
}
|
||||
|
||||
pub fn mtime(self: @This()) timespec {
|
||||
return self.mtim;
|
||||
}
|
||||
|
||||
pub fn ctime(self: @This()) timespec {
|
||||
return self.ctim;
|
||||
}
|
||||
},
|
||||
|
||||
else => std.os.linux.Stat, // libc stat is the same as kernel stat.
|
||||
};
|
||||
|
||||
pub const MAP_FAILED = @intToPtr(*c_void, maxInt(usize));
|
||||
|
||||
pub const AI_PASSIVE = 0x01;
|
||||
pub const AI_CANONNAME = 0x02;
|
||||
pub const AI_NUMERICHOST = 0x04;
|
||||
pub const AI_V4MAPPED = 0x08;
|
||||
pub const AI_ALL = 0x10;
|
||||
pub const AI_ADDRCONFIG = 0x20;
|
||||
pub const AI_NUMERICSERV = 0x400;
|
||||
pub const AI = struct {
|
||||
pub const PASSIVE = 0x01;
|
||||
pub const CANONNAME = 0x02;
|
||||
pub const NUMERICHOST = 0x04;
|
||||
pub const V4MAPPED = 0x08;
|
||||
pub const ALL = 0x10;
|
||||
pub const ADDRCONFIG = 0x20;
|
||||
pub const NUMERICSERV = 0x400;
|
||||
};
|
||||
|
||||
pub const NI_NUMERICHOST = 0x01;
|
||||
pub const NI_NUMERICSERV = 0x02;
|
||||
pub const NI_NOFQDN = 0x04;
|
||||
pub const NI_NAMEREQD = 0x08;
|
||||
pub const NI_DGRAM = 0x10;
|
||||
pub const NI_NUMERICSCOPE = 0x100;
|
||||
pub const NI = struct {
|
||||
pub const NUMERICHOST = 0x01;
|
||||
pub const NUMERICSERV = 0x02;
|
||||
pub const NOFQDN = 0x04;
|
||||
pub const NAMEREQD = 0x08;
|
||||
pub const DGRAM = 0x10;
|
||||
pub const NUMERICSCOPE = 0x100;
|
||||
};
|
||||
|
||||
pub const EAI = enum(c_int) {
|
||||
BADFLAGS = -1,
|
||||
@@ -60,8 +187,8 @@ pub const EAI = enum(c_int) {
|
||||
|
||||
pub extern "c" fn fallocate64(fd: fd_t, mode: c_int, offset: off_t, len: off_t) c_int;
|
||||
pub extern "c" fn fopen64(noalias filename: [*:0]const u8, noalias modes: [*:0]const u8) ?*FILE;
|
||||
pub extern "c" fn fstat64(fd: fd_t, buf: *libc_stat) c_int;
|
||||
pub extern "c" fn fstatat64(dirfd: fd_t, path: [*:0]const u8, stat_buf: *libc_stat, flags: u32) c_int;
|
||||
pub extern "c" fn fstat64(fd: fd_t, buf: *Stat) c_int;
|
||||
pub extern "c" fn fstatat64(dirfd: fd_t, path: [*:0]const u8, stat_buf: *Stat, flags: u32) c_int;
|
||||
pub extern "c" fn ftruncate64(fd: c_int, length: off_t) c_int;
|
||||
pub extern "c" fn getrlimit64(resource: rlimit_resource, rlim: *rlimit) c_int;
|
||||
pub extern "c" fn lseek64(fd: fd_t, offset: i64, whence: c_int) i64;
|
||||
@@ -137,7 +264,7 @@ pub const pthread_mutex_t = extern struct {
|
||||
pub const pthread_cond_t = extern struct {
|
||||
size: [__SIZEOF_PTHREAD_COND_T]u8 align(@alignOf(usize)) = [_]u8{0} ** __SIZEOF_PTHREAD_COND_T,
|
||||
};
|
||||
pub const pthread_rwlock_t = switch (abi) {
|
||||
pub const pthread_rwlock_t = switch (native_abi) {
|
||||
.android => switch (@sizeOf(usize)) {
|
||||
4 => extern struct {
|
||||
lock: std.c.pthread_mutex_t = std.c.PTHREAD_MUTEX_INITIALIZER,
|
||||
@@ -168,11 +295,11 @@ pub const sem_t = extern struct {
|
||||
};
|
||||
|
||||
const __SIZEOF_PTHREAD_COND_T = 48;
|
||||
const __SIZEOF_PTHREAD_MUTEX_T = if (os_tag == .fuchsia) 40 else switch (abi) {
|
||||
const __SIZEOF_PTHREAD_MUTEX_T = switch (native_abi) {
|
||||
.musl, .musleabi, .musleabihf => if (@sizeOf(usize) == 8) 40 else 24,
|
||||
.gnu, .gnuabin32, .gnuabi64, .gnueabi, .gnueabihf, .gnux32 => switch (arch) {
|
||||
.gnu, .gnuabin32, .gnuabi64, .gnueabi, .gnueabihf, .gnux32 => switch (native_arch) {
|
||||
.aarch64 => 48,
|
||||
.x86_64 => if (abi == .gnux32) 40 else 32,
|
||||
.x86_64 => if (native_abi == .gnux32) 40 else 32,
|
||||
.mips64, .powerpc64, .powerpc64le, .sparcv9 => 40,
|
||||
else => if (@sizeOf(usize) == 8) 40 else 24,
|
||||
},
|
||||
@@ -184,9 +311,11 @@ const __SIZEOF_SEM_T = 4 * @sizeOf(usize);
|
||||
pub extern "c" fn pthread_setname_np(thread: std.c.pthread_t, name: [*:0]const u8) E;
|
||||
pub extern "c" fn pthread_getname_np(thread: std.c.pthread_t, name: [*:0]u8, len: usize) E;
|
||||
|
||||
pub const RTLD_LAZY = 1;
|
||||
pub const RTLD_NOW = 2;
|
||||
pub const RTLD_NOLOAD = 4;
|
||||
pub const RTLD_NODELETE = 4096;
|
||||
pub const RTLD_GLOBAL = 256;
|
||||
pub const RTLD_LOCAL = 0;
|
||||
pub const RTLD = struct {
|
||||
pub const LAZY = 1;
|
||||
pub const NOW = 2;
|
||||
pub const NOLOAD = 4;
|
||||
pub const NODELETE = 4096;
|
||||
pub const GLOBAL = 256;
|
||||
pub const LOCAL = 0;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user