summaryrefslogtreecommitdiff
path: root/src/trace/host.zig
diff options
context:
space:
mode:
Diffstat (limited to 'src/trace/host.zig')
-rw-r--r--src/trace/host.zig27
1 files changed, 17 insertions, 10 deletions
diff --git a/src/trace/host.zig b/src/trace/host.zig
index df2f845..7c43663 100644
--- a/src/trace/host.zig
+++ b/src/trace/host.zig
@@ -16,6 +16,22 @@ pub const Options = struct {
stop_mask: u64 = 0,
};
+/// `env` with the ring in it, the agent preloaded when there is one, and
+/// `extra` (settings for the agent) after them.
+pub fn environment(arena: std.mem.Allocator, env: [:null]const ?[*:0]const u8, ring: *const Ring, preload: ?[]const u8, extra: []const [*:0]const u8) ![:null]const ?[*:0]const u8 {
+ var envp: std.ArrayList(?[*:0]const u8) = .empty;
+ for (env) |v| {
+ const s = std.mem.span(v.?);
+ if (std.mem.startsWith(u8, s, client.env_fd ++ "=")) continue;
+ if (preload != null and std.mem.startsWith(u8, s, "LD_PRELOAD=")) continue;
+ try envp.append(arena, v);
+ }
+ try envp.append(arena, try std.fmt.allocPrintSentinel(arena, client.env_fd ++ "={d}", .{ring.fd}, 0));
+ if (preload) |lib| try envp.append(arena, try std.fmt.allocPrintSentinel(arena, "LD_PRELOAD={s}", .{lib}, 0));
+ for (extra) |v| try envp.append(arena, v);
+ return envp.toOwnedSliceSentinel(arena, null);
+}
+
pub const Session = struct {
ring: Ring,
pid: linux.pid_t,
@@ -27,16 +43,7 @@ pub const Session = struct {
var ring = try Ring.create(options.ring_bytes);
errdefer ring.close();
ring.hdr.stop_mask.store(options.stop_mask, .monotonic);
- var envp: std.ArrayList(?[*:0]const u8) = .empty;
- for (env) |v| {
- const s = std.mem.span(v.?);
- if (std.mem.startsWith(u8, s, client.env_fd ++ "=")) continue;
- if (options.preload != null and std.mem.startsWith(u8, s, "LD_PRELOAD=")) continue;
- try envp.append(arena, v);
- }
- try envp.append(arena, try std.fmt.allocPrintSentinel(arena, client.env_fd ++ "={d}", .{ring.fd}, 0));
- if (options.preload) |lib| try envp.append(arena, try std.fmt.allocPrintSentinel(arena, "LD_PRELOAD={s}", .{lib}, 0));
- const block = try envp.toOwnedSliceSentinel(arena, null);
+ const block = try environment(arena, env, &ring, options.preload, &.{});
const rc = linux.fork();
if (linux.errno(rc) != .SUCCESS) return error.Fork;