From 0c3f8b1a010b345ad090eed5ba0e39b1ca7769e6 Mon Sep 17 00:00:00 2001 From: Meghan Denny Date: Sat, 24 Jul 2021 02:41:45 -0700 Subject: [PATCH] util- add run_cmd_raw that returns the actual ChildProcess.ExecResult --- src/util/funcs.zig | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/util/funcs.zig b/src/util/funcs.zig index ebb0a66d8ef668a4dd46e3cfaa594599008f01da..c65173dd38e05c998bd04d4bdae7eb4a6f2974a8 100644 --- a/src/util/funcs.zig +++ b/src/util/funcs.zig @@ -155,14 +155,18 @@ pub fn file_list(dpath: []const u8, list: *std.ArrayList([]const u8)) !void { } } -pub fn run_cmd(dir: ?[]const u8, args: []const []const u8) !u32 { - const result = std.ChildProcess.exec(.{ .allocator = gpa, .cwd = dir, .argv = args, .max_output_bytes = std.math.maxInt(usize) }) catch |e| switch (e) { +pub fn run_cmd_raw(dir: ?[]const u8, args: []const []const u8) !std.ChildProcess.ExecResult { + return std.ChildProcess.exec(.{ .allocator = gpa, .cwd = dir, .argv = args, .max_output_bytes = std.math.maxInt(usize) }) catch |e| switch (e) { error.FileNotFound => { u.assert(false, "\"{s}\" command not found", .{args[0]}); unreachable; }, else => return e, }; +} + +pub fn run_cmd(dir: ?[]const u8, args: []const []const u8) !u32 { + const result = try run_cmd_raw(dir, args); gpa.free(result.stdout); gpa.free(result.stderr); return result.term.Exited; -- 2.54.0