Commit 05b1a7414e2737fd987071a03a3fc8387b4fd268 | zig

author	Andrew Kelley <andrew@ziglang.org> 2020-10-17 17:52:09-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2020-10-17 17:52:09-07:00
log	05b1a7414e2737fd987071a03a3fc8387b4fd268
tree	4c204780f7877567e64f6d30f40204063ed06eed
parent	03f7cffce9472125f7a6e3c757309b8b841065fe

code cleanups

 * in selfExePath, return errors instead of defaulting to bogus data
 * less invasive edits to the logic of link/Elf.zig
 * less indentation

5 files changed, 45 insertions(+), 55 deletions(-)

lib
- std
  - fs.zig
  - os
    bits
    openbsd.zig
src
- link
  - Elf.zig
- stage1.zig
- target.zig

lib/std/fs.zig+30-31

...	@@ -2234,40 +2234,39 @@ pub fn selfExePath(out_buffer: []u8) SelfExePathError![]u8 {	...	@@ -2234,40 +2234,39 @@ pub fn selfExePath(out_buffer: []u8) SelfExePathError![]u8 {
2234	},	2234	},
2235	.openbsd => {	2235	.openbsd => {
2236	// OpenBSD doesn't support getting the path of a running process, so try to guess it	2236	// OpenBSD doesn't support getting the path of a running process, so try to guess it
2237	if (os.argv.len >= 1) {	2237	if (os.argv.len == 0)
2238	const argv0 = mem.span(os.argv[0]);	2238	return error.FileNotFound;
2239	if (mem.indexOf(u8, argv0, "/") != null) {	2239
2240	// argv[0] is a path (relative or absolute): use realpath(3) directly	2240	const argv0 = mem.span(os.argv[0]);
		2241	if (mem.indexOf(u8, argv0, "/") != null) {
		2242	// argv[0] is a path (relative or absolute): use realpath(3) directly
		2243	var real_path_buf: [MAX_PATH_BYTES]u8 = undefined;
		2244	const real_path = try os.realpathZ(os.argv[0], &real_path_buf);
		2245	if (real_path.len > out_buffer.len)
		2246	return error.NameTooLong;
		2247	mem.copy(u8, out_buffer, real_path);
		2248	return out_buffer[0..real_path.len];
		2249	} else if (argv0.len != 0) {
		2250	// argv[0] is not empty (and not a path): search it inside PATH
		2251	const PATH = std.os.getenvZ("PATH") orelse return error.FileNotFound;
		2252	var path_it = mem.tokenize(PATH, &[_]u8{path.delimiter});
		2253	while (path_it.next()) \|a_path\| {
		2254	var resolved_path_buf: [MAX_PATH_BYTES]u8 = undefined;
		2255	const resolved_path = std.fmt.bufPrintZ(&resolved_path_buf, "{s}/{s}", .{
		2256	a_path,
		2257	os.argv[0],
		2258	}) catch continue;
		2259
2241	var real_path_buf: [MAX_PATH_BYTES]u8 = undefined;	2260	var real_path_buf: [MAX_PATH_BYTES]u8 = undefined;
2242	const real_path = try os.realpathZ(os.argv[0], &real_path_buf);	2261	if (os.realpathZ(&resolved_path_buf, &real_path_buf)) \|real_path\| {
2243	if (real_path.len > out_buffer.len)	2262	// found a file, and hope it is the right file
2244	return error.NameTooLong;	2263	if (real_path.len > out_buffer.len)
2245	mem.copy(u8, out_buffer, real_path);	2264	return error.NameTooLong;
2246	return out_buffer[0..real_path.len];	2265	mem.copy(u8, out_buffer, real_path);
2247	} else if (argv0.len != 0) {	2266	return out_buffer[0..real_path.len];
2248	// argv[0] is not empty (and not a path): search it inside PATH	2267	} else \|_\| continue;
2249	const PATH = std.os.getenv("PATH") orelse "";
2250	var path_it = mem.tokenize(PATH, &[_]u8{path.delimiter});
2251	while (path_it.next()) \|a_path\| {
2252	var resolved_path_buf: [MAX_PATH_BYTES-1:0]u8 = undefined;
2253	const resolved_path = std.fmt.bufPrint(&resolved_path_buf, "{}/{}\x00", .{
2254	a_path,
2255	os.argv[0],
2256	}) catch "";
2257
2258	var real_path_buf: [MAX_PATH_BYTES]u8 = undefined;
2259	if (os.realpathZ(&resolved_path_buf, &real_path_buf) catch null) \|real_path\| {
2260	// found a file, and hope it is the right file
2261	if (real_path.len > out_buffer.len)
2262	return error.NameTooLong;
2263	mem.copy(u8, out_buffer, real_path);
2264	return out_buffer[0..real_path.len];
2265	}
2266	}
2267	}	2268	}
2268	}	2269	}
2269
2270	// sorry, we don't find it
2271	return error.FileNotFound;	2270	return error.FileNotFound;
2272	},	2271	},
2273	.windows => {	2272	.windows => {

lib/std/os/bits/openbsd.zig+2-2

...	@@ -174,7 +174,7 @@ pub const Stat = extern struct {	...	@@ -174,7 +174,7 @@ pub const Stat = extern struct {
174	blksize: blksize_t,	174	blksize: blksize_t,
175	flags: u32,	175	flags: u32,
176	gen: u32,	176	gen: u32,
177	birthtim: timespec,	177	birthtim: timespec,
178		178
179	pub fn atime(self: Stat) timespec {	179	pub fn atime(self: Stat) timespec {
180	return self.atim;	180	return self.atim;
...	@@ -203,7 +203,7 @@ pub const dirent = extern struct {	...	@@ -203,7 +203,7 @@ pub const dirent = extern struct {
203	d_type: u8,	203	d_type: u8,
204	d_namlen: u8,	204	d_namlen: u8,
205	__d_padding: [4]u8,	205	__d_padding: [4]u8,
206	d_name: [MAXNAMLEN+1]u8,	206	d_name: [MAXNAMLEN + 1]u8,
207		207
208	pub fn reclen(self: dirent) u16 {	208	pub fn reclen(self: dirent) u16 {
209	return self.d_reclen;	209	return self.d_reclen;

src/link/Elf.zig+10-19

 @@ -1448,14 +1448,10 @@ fn linkWithLLD(self: *Elf, comp: *Compilation) !void {
         };
         try argv.append(try comp.get_libc_crt_file(arena, crt1o));
         if (target_util.libc_needs_crti_crtn(target)) {
-            const crti_o = o: {
+            try argv.append(try comp.get_libc_crt_file(arena, "crti.o"));
-                if (target.os.tag == .openbsd) {
+        }
-                    break :o "crtbegin.o";
+        if (target.os.tag == .openbsd) {
-                } else {
+            try argv.append(try comp.get_libc_crt_file(arena, "crtbegin.o"));
-                    break :o "crti.o";
-                }
-            };
-            try argv.append(try comp.get_libc_crt_file(arena, crti_o));
         }
     }
 @@ -1599,17 +1595,12 @@ fn linkWithLLD(self: *Elf, comp: *Compilation) !void {
     // crt end
     if (link_in_crt) {
-        if (target.isAndroid() or target_util.libc_needs_crti_crtn(target)) {
+        if (target.isAndroid()) {
-            const crtn_o = o: {
+            try argv.append(try comp.get_libc_crt_file(arena, "crtend_android.o"));
-                if (target.os.tag == .openbsd) {
+        } else if (target.os.tag == .openbsd) {
-                    break :o "crtend.o";
+            try argv.append(try comp.get_libc_crt_file(arena, "crtend.o"));
-                } else if (target.isAndroid()) {
+        } else if (target_util.libc_needs_crti_crtn(target)) {
-                    break :o "crtend_android.o";
+            try argv.append(try comp.get_libc_crt_file(arena, "crtn.o"));
-                } else {
-                    break :o "crtn.o";
-                }
-            };
-            try argv.append(try comp.get_libc_crt_file(arena, crtn_o));
         }
     }

src/stage1.zig+2-2

...	@@ -26,8 +26,8 @@ pub const log = stage2.log;	...	@@ -26,8 +26,8 @@ pub const log = stage2.log;
26	pub const log_level = stage2.log_level;	26	pub const log_level = stage2.log_level;
27		27
28	pub export fn main(argc: c_int, argv: [][:0]u8) c_int {	28	pub export fn main(argc: c_int, argv: [][:0]u8) c_int {
29	std.os.argv = argv[0.. @intCast(usize, argc)];	29	std.os.argv = argv[0..@intCast(usize, argc)];
30		30
31	std.debug.maybeEnableSegfaultHandler();	31	std.debug.maybeEnableSegfaultHandler();
32		32
33	zig_stage1_os_init();	33	zig_stage1_os_init();

src/target.zig+1-1

...	@@ -161,7 +161,7 @@ pub fn supports_fpic(target: std.Target) bool {	...	@@ -161,7 +161,7 @@ pub fn supports_fpic(target: std.Target) bool {
161	}	161	}
162		162
163	pub fn libc_needs_crti_crtn(target: std.Target) bool {	163	pub fn libc_needs_crti_crtn(target: std.Target) bool {
164	return !(target.cpu.arch.isRISCV() or target.isAndroid());	164	return !(target.cpu.arch.isRISCV() or target.isAndroid() or target.os.tag == .openbsd);
165	}	165	}
166		166
167	pub fn isSingleThreaded(target: std.Target) bool {	167	pub fn isSingleThreaded(target: std.Target) bool {