mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-25 16:55:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

zig build: copy args for addCommand

Browse Source 
avoids making it easy to accidentally use a dangling pointer
This commit is contained in:
Andrew Kelley 2017-05-02 18:22:08 -04:00
parent f69d28a087
commit f87be94f6a
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
std/build.zig
View File

@ -178,6 +178,7 @@ pub const Builder = struct {
return CLibExeObjStep.createObject(self, name, src);
}
/// ::args are copied.
pub fn addCommand(self: &Builder, cwd: ?[]const u8, env_map: &const BufMap,
path: []const u8, args: []const []const u8) -> &CommandStep
{
@ -1469,10 +1470,11 @@ pub const CommandStep = struct {
step: Step,
builder: &Builder,
exe_path: []const u8,
args: []const []const u8,
args: [][]const u8,
cwd: ?[]const u8,
env_map: &const BufMap,
/// ::args are copied.
pub fn create(builder: &Builder, cwd: ?[]const u8, env_map: &const BufMap,
exe_path: []const u8, args: []const []const u8) -> &CommandStep
{
@ -1481,10 +1483,11 @@ pub const CommandStep = struct {
.builder = builder,
.step = Step.init(exe_path, builder.allocator, make),
.exe_path = exe_path,
.args = args,
.args = %%builder.allocator.alloc([]u8, args.len),
.cwd = cwd,
.env_map = env_map,
};
mem.copy([]const u8, self.args, args);
return self;
}