max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2025-02-07 18:57:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don’t use execvp when we know the path

Browse source
This commit is contained in:
Greg Pfeil 2023-11-30 00:17:25 -07:00
parent 02bd821f2e
commit 743232bf04
No known key found for this signature in database
GPG key ID: 1193ACD196ED61F2
4 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/nix/develop.cc
View file

@ -662,7 +662,7 @@ struct CmdDevelop : Common, MixEnvironment
} }
} }
runProgramInStore(store, shell, args, buildEnvironment.getSystem()); runProgramInStore(store, true, shell, args, buildEnvironment.getSystem());
} }
}; };

2
src/nix/fmt.cc
View file

@ -49,7 +49,7 @@ struct CmdFmt : SourceExprCommand {
} }
} }
runProgramInStore(store, app.program, programArgs); runProgramInStore(store, false, app.program, programArgs);
}; };
}; };

10
src/nix/run.cc
View file

@ -25,6 +25,7 @@ std::string chrootHelperName = "__run_in_chroot";
namespace nix { namespace nix {
void runProgramInStore(ref<Store> store, void runProgramInStore(ref<Store> store,
bool search,
const std::string & program, const std::string & program,
const Strings & args, const Strings & args,
std::optional<std::string_view> system) std::optional<std::string_view> system)
@ -58,7 +59,10 @@ void runProgramInStore(ref<Store> store,
if (system) if (system)
setPersonality(*system); setPersonality(*system);
execvp(program.c_str(), stringsToCharPtrs(args).data()); if (search)
execvp(program.c_str(), stringsToCharPtrs(args).data());
else
execv(program.c_str(), stringsToCharPtrs(args).data());
throw SysError("unable to execute '%s'", program); throw SysError("unable to execute '%s'", program);
} }
@ -132,7 +136,7 @@ struct CmdShell : InstallablesCommand, MixEnvironment
Strings args; Strings args;
for (auto & arg : command) args.push_back(arg); for (auto & arg : command) args.push_back(arg);
runProgramInStore(store, *command.begin(), args); runProgramInStore(store, true, *command.begin(), args);
} }
}; };
@ -194,7 +198,7 @@ struct CmdRun : InstallableValueCommand
Strings allArgs{app.program}; Strings allArgs{app.program};
for (auto & i : args) allArgs.push_back(i); for (auto & i : args) allArgs.push_back(i);
runProgramInStore(store, app.program, allArgs); runProgramInStore(store, false, app.program, allArgs);
} }
}; };

1
src/nix/run.hh
View file

@ -6,6 +6,7 @@
namespace nix { namespace nix {
void runProgramInStore(ref<Store> store, void runProgramInStore(ref<Store> store,
bool search,
const std::string & program, const std::string & program,
const Strings & args, const Strings & args,
std::optional<std::string_view> system = std::nullopt); std::optional<std::string_view> system = std::nullopt);