From 3ecb09a40a8500d1052b087295b589ca4856fd7a Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 31 Mar 2017 11:58:41 -0400 Subject: [PATCH] builtins.exec: Make the argument just a list --- src/libexpr/primops.cc | 33 ++++++++++----------------------- 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc index a98da737e..615cc8138 100644 --- a/src/libexpr/primops.cc +++ b/src/libexpr/primops.cc @@ -181,30 +181,17 @@ static void prim_importNative(EvalState & state, const Pos & pos, Value * * args /* Execute a program and parse its output */ static void prim_exec(EvalState & state, const Pos & pos, Value * * args, Value & v) { - state.forceAttrs(*args[0], pos); - auto sProgram = state.symbols.create("program"); - auto sArguments = state.symbols.create("arguments"); - PathSet context; - string program; - bool programSet = false; - Strings commandArgs; - for (auto & attr : *args[0]->attrs) { - if (attr.name == sProgram) { - program = state.coerceToString(*attr.pos, *attr.value, context, false, false); - programSet = true; - } else if (attr.name == sArguments) { - state.forceList(*attr.value, *attr.pos); - auto elems = attr.value->listElems(); - for (unsigned int i = 0; i < attr.value->listSize(); ++i) { - commandArgs.emplace_back(state.coerceToString(*attr.pos, *elems[i], context, false, false)); - } - } else { - throw EvalError(format("unexpected attribute ‘%1%’ in argument to builtins.exec, at %2%") - % attr.name % pos); - } + state.forceList(*args[0], pos); + auto elems = args[0]->listElems(); + auto count = args[0]->listSize(); + if (count == 0) { + throw EvalError(format("at least one argument to 'exec' required, at %1%") % pos); } - if (!programSet) { - throw EvalError(format("attribute ‘programSet’ required, at %1%") % pos); + PathSet context; + auto program = state.coerceToString(pos, *elems[0], context, false, false); + Strings commandArgs; + for (unsigned int i = 1; i < args[0]->listSize(); ++i) { + commandArgs.emplace_back(state.coerceToString(pos, *elems[i], context, false, false)); } try { state.realiseContext(context);