| author |  Andrew Kelley <andrew@ziglang.org> 2025-12-30 21:53:56-08:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2026-01-04 00:27:08-08:00 |
| log | 42988fc5f43abdbac5ef5abc7cb5f74f8bc55ad4 |
| tree | 81af082900114fe30ebce324b5e26ab596802b70 |
| parent | b85524d0c83686b7492aee78d5f766e76b59fc90 |
std.process.Environ.Block: enhance type safety
3 files changed, 14 insertions(+), 17 deletions(-)
lib- std
- process
- start.zig
lib/std/Io/Threaded.zig+2-1
| ... | @@ -12688,7 +12688,8 @@ fn scanEnviron(t: *Threaded) void { | ... | @@ -12688,7 +12688,8 @@ fn scanEnviron(t: *Threaded) void { |
| 12688 | } | 12688 | } |
| 12689 | } | 12689 | } |
| 12690 | } else { | 12690 | } else { |
| 12691 | for (t.environ.block) |line| { | 12691 | for (t.environ.block) |opt_line| { |
| 12692 | const line = opt_line.?; | ||
| 12692 | var line_i: usize = 0; | 12693 | var line_i: usize = 0; |
| 12693 | while (line[line_i] != 0 and line[line_i] != '=') : (line_i += 1) {} | 12694 | while (line[line_i] != 0 and line[line_i] != '=') : (line_i += 1) {} |
| 12694 | const key = line[0..line_i]; | 12695 | const key = line[0..line_i]; |
lib/std/process/Environ.zig+9-13
| ... | @@ -15,7 +15,7 @@ block: Block, | ... | @@ -15,7 +15,7 @@ block: Block, |
| 15 | 15 | ||
| 16 | pub const Block = switch (native_os) { | 16 | pub const Block = switch (native_os) { |
| 17 | .windows => []const u16, | 17 | .windows => []const u16, |
| 18 | else => []const [*:0]const u8, | 18 | else => [:null]const ?[*:0]const u8, |
| 19 | }; | 19 | }; |
| 20 | 20 | ||
| 21 | pub const Map = struct { | 21 | pub const Map = struct { |
| ... | @@ -364,7 +364,8 @@ pub fn createMap(env: Environ, allocator: Allocator) CreateMapError!Map { | ... | @@ -364,7 +364,8 @@ pub fn createMap(env: Environ, allocator: Allocator) CreateMapError!Map { |
| 364 | } | 364 | } |
| 365 | return result; | 365 | return result; |
| 366 | } else { | 366 | } else { |
| 367 | for (env.block) |line| { | 367 | for (env.block) |opt_line| { |
| 368 | const line = opt_line.?; | ||
| 368 | var line_i: usize = 0; | 369 | var line_i: usize = 0; |
| 369 | while (line[line_i] != 0 and line[line_i] != '=') : (line_i += 1) {} | 370 | while (line[line_i] != 0 and line[line_i] != '=') : (line_i += 1) {} |
| 370 | const key = line[0..line_i]; | 371 | const key = line[0..line_i]; |
| ... | @@ -579,15 +580,10 @@ pub const CreateBlockOptions = struct { | ... | @@ -579,15 +580,10 @@ pub const CreateBlockOptions = struct { |
| 579 | /// Creates a null-delimited environment variable block in the format expected | 580 | /// Creates a null-delimited environment variable block in the format expected |
| 580 | /// by POSIX, from a different one. | 581 | /// by POSIX, from a different one. |
| 581 | pub fn createBlock(existing: Environ, arena: Allocator, options: CreateBlockOptions) Allocator.Error![:null]?[*:0]u8 { | 582 | pub fn createBlock(existing: Environ, arena: Allocator, options: CreateBlockOptions) Allocator.Error![:null]?[*:0]u8 { |
| 582 | const existing_block: [*:null]const ?[*:0]const u8 = @ptrCast(existing.block); | 583 | const contains_zig_progress = for (existing.block) |opt_line| { |
| 583 | const existing_count, const contains_zig_progress = c: { | 584 | if (mem.eql(u8, mem.sliceTo(opt_line.?, '='), "ZIG_PROGRESS")) break true; |
| 584 | var count: usize = 0; | 585 | } else false; |
| 585 | var contains = false; | 586 | |
| 586 | while (existing_block[count]) |line| : (count += 1) { | ||
| 587 | contains = contains or mem.eql(u8, mem.sliceTo(line, '='), "ZIG_PROGRESS"); | ||
| 588 | } | ||
| 589 | break :c .{ count, contains }; | ||
| 590 | }; | ||
| 591 | const ZigProgressAction = enum { nothing, edit, delete, add }; | 587 | const ZigProgressAction = enum { nothing, edit, delete, add }; |
| 592 | const zig_progress_action: ZigProgressAction = a: { | 588 | const zig_progress_action: ZigProgressAction = a: { |
| 593 | const fd = options.zig_progress_fd orelse break :a .nothing; | 589 | const fd = options.zig_progress_fd orelse break :a .nothing; |
| ... | @@ -600,7 +596,7 @@ pub fn createBlock(existing: Environ, arena: Allocator, options: CreateBlockOpti | ... | @@ -600,7 +596,7 @@ pub fn createBlock(existing: Environ, arena: Allocator, options: CreateBlockOpti |
| 600 | }; | 596 | }; |
| 601 | 597 | ||
| 602 | const envp_count: usize = c: { | 598 | const envp_count: usize = c: { |
| 603 | var count: usize = existing_count; | 599 | var count: usize = existing.block.len; |
| 604 | switch (zig_progress_action) { | 600 | switch (zig_progress_action) { |
| 605 | .add => count += 1, | 601 | .add => count += 1, |
| 606 | .delete => count -= 1, | 602 | .delete => count -= 1, |
| ... | @@ -618,7 +614,7 @@ pub fn createBlock(existing: Environ, arena: Allocator, options: CreateBlockOpti | ... | @@ -618,7 +614,7 @@ pub fn createBlock(existing: Environ, arena: Allocator, options: CreateBlockOpti |
| 618 | i += 1; | 614 | i += 1; |
| 619 | } | 615 | } |
| 620 | 616 | ||
| 621 | while (existing_block[existing_index]) |line| : (existing_index += 1) { | 617 | while (existing.block[existing_index]) |line| : (existing_index += 1) { |
| 622 | if (mem.eql(u8, mem.sliceTo(line, '='), "ZIG_PROGRESS")) switch (zig_progress_action) { | 618 | if (mem.eql(u8, mem.sliceTo(line, '='), "ZIG_PROGRESS")) switch (zig_progress_action) { |
| 623 | .add => unreachable, | 619 | .add => unreachable, |
| 624 | .delete => continue, | 620 | .delete => continue, |
lib/std/start.zig+3-3
| ... | @@ -559,7 +559,7 @@ fn posixCallMainAndExit(argc_argv_ptr: [*]usize) callconv(.c) noreturn { | ... | @@ -559,7 +559,7 @@ fn posixCallMainAndExit(argc_argv_ptr: [*]usize) callconv(.c) noreturn { |
| 559 | const envp_optional: [*:null]?[*:0]u8 = @ptrCast(@alignCast(argv + argc + 1)); | 559 | const envp_optional: [*:null]?[*:0]u8 = @ptrCast(@alignCast(argv + argc + 1)); |
| 560 | var envp_count: usize = 0; | 560 | var envp_count: usize = 0; |
| 561 | while (envp_optional[envp_count]) |_| : (envp_count += 1) {} | 561 | while (envp_optional[envp_count]) |_| : (envp_count += 1) {} |
| 562 | const envp = @as([*][*:0]u8, @ptrCast(envp_optional))[0..envp_count]; | 562 | const envp = envp_optional[0..envp_count :null]; |
| 563 | 563 | ||
| 564 | // Find the beginning of the auxiliary vector | 564 | // Find the beginning of the auxiliary vector |
| 565 | const auxv: [*]elf.Auxv = @ptrCast(@alignCast(envp.ptr + envp_count + 1)); | 565 | const auxv: [*]elf.Auxv = @ptrCast(@alignCast(envp.ptr + envp_count + 1)); |
| ... | @@ -668,7 +668,7 @@ fn expandStackSize(phdrs: []elf.Phdr) void { | ... | @@ -668,7 +668,7 @@ fn expandStackSize(phdrs: []elf.Phdr) void { |
| 668 | } | 668 | } |
| 669 | } | 669 | } |
| 670 | 670 | ||
| 671 | inline fn callMainWithArgs(argc: usize, argv: [*][*:0]u8, envp: [][*:0]u8) u8 { | 671 | inline fn callMainWithArgs(argc: usize, argv: [*][*:0]u8, envp: [:null]?[*:0]u8) u8 { |
| 672 | if (std.Options.debug_threaded_io) |t| { | 672 | if (std.Options.debug_threaded_io) |t| { |
| 673 | if (@sizeOf(std.Io.Threaded.Argv0) != 0) t.argv0.value = argv[0]; | 673 | if (@sizeOf(std.Io.Threaded.Argv0) != 0) t.argv0.value = argv[0]; |
| 674 | t.environ = .{ .block = envp }; | 674 | t.environ = .{ .block = envp }; |
| ... | @@ -680,7 +680,7 @@ inline fn callMainWithArgs(argc: usize, argv: [*][*:0]u8, envp: [][*:0]u8) u8 { | ... | @@ -680,7 +680,7 @@ inline fn callMainWithArgs(argc: usize, argv: [*][*:0]u8, envp: [][*:0]u8) u8 { |
| 680 | fn main(c_argc: c_int, c_argv: [*][*:0]c_char, c_envp: [*:null]?[*:0]c_char) callconv(.c) c_int { | 680 | fn main(c_argc: c_int, c_argv: [*][*:0]c_char, c_envp: [*:null]?[*:0]c_char) callconv(.c) c_int { |
| 681 | var env_count: usize = 0; | 681 | var env_count: usize = 0; |
| 682 | while (c_envp[env_count] != null) : (env_count += 1) {} | 682 | while (c_envp[env_count] != null) : (env_count += 1) {} |
| 683 | const envp = @as([*][*:0]u8, @ptrCast(c_envp))[0..env_count]; | 683 | const envp = c_envp[0..env_count :null]; |
| 684 | 684 | ||
| 685 | if (builtin.os.tag == .linux) { | 685 | if (builtin.os.tag == .linux) { |
| 686 | const at_phdr = std.c.getauxval(elf.AT_PHDR); | 686 | const at_phdr = std.c.getauxval(elf.AT_PHDR); |