| ... | ... | @@ -2,6 +2,7 @@ const std = @import("std"); |
| 2 | 2 | const string = []const u8; |
| 3 | 3 | const List = std.ArrayList(string); |
| 4 | 4 | const extras = @import("extras"); |
| 5 | const libc = @import("sys-libc"); |
| 5 | 6 | |
| 6 | 7 | var singles: std.StringArrayHashMap(string) = undefined; |
| 7 | 8 | var multis: std.StringArrayHashMap(List) = undefined; |
| ... | ... | @@ -67,7 +68,7 @@ pub fn parse(k: FlagDashKind) !std.process.ArgIterator { |
| 67 | 68 | } |
| 68 | 69 | } |
| 69 | 70 | std.log.err("Unrecognized argument: {s}{s}", .{ dash, name }); |
| 70 | | std.posix.exit(1); |
| 71 | libc.exit(1); |
| 71 | 72 | } |
| 72 | 73 | return argiter; |
| 73 | 74 | } |
| ... | ... | @@ -78,7 +79,7 @@ pub fn parseEnv() !void { |
| 78 | 79 | for (singles.keys(), singles.values()) |k, *v| { |
| 79 | 80 | const u = try fixNameForEnv(alloc, k); |
| 80 | 81 | defer alloc.free(u); |
| 81 | | if (std.posix.getenv(u)) |value| { |
| 82 | if (libc.getenv(u)) |value| { |
| 82 | 83 | v.* = value; |
| 83 | 84 | } |
| 84 | 85 | } |
| ... | ... | @@ -87,9 +88,9 @@ pub fn parseEnv() !void { |
| 87 | 88 | while (true) : (n += 1) { |
| 88 | 89 | const u = try fixNameForEnv(alloc, k); |
| 89 | 90 | defer alloc.free(u); |
| 90 | | const w = try std.fmt.allocPrint(alloc, "{s}_{d}", .{ u, n }); |
| 91 | const w = try std.fmt.allocPrintZ(alloc, "{s}_{d}", .{ u, n }); |
| 91 | 92 | defer alloc.free(w); |
| 92 | | if (std.posix.getenv(w)) |value| { |
| 93 | if (libc.getenv(w)) |value| { |
| 93 | 94 | try v.append(value); |
| 94 | 95 | continue; |
| 95 | 96 | } |
| ... | ... | @@ -98,7 +99,7 @@ pub fn parseEnv() !void { |
| 98 | 99 | } |
| 99 | 100 | } |
| 100 | 101 | |
| 101 | | fn fixNameForEnv(alloc: std.mem.Allocator, input: string) !string { |
| 102 | fn fixNameForEnv(alloc: std.mem.Allocator, input: string) ![:0]const u8 { |
| 102 | 103 | var ret = try extras.asciiUpper(alloc, input); |
| 103 | 104 | for (0..ret.len) |i| { |
| 104 | 105 | if (ret[i] == '-') { |
Meghan Denny <hello@nektro.net> 2025-08-24 02:40:22 -07:00