RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 08:27:45 +00:00
Code Issues Activity Actions

Userland: Use find_executable_in_path in which.

Browse source
This commit is contained in:
asynts 2020-09-16 19:10:32 +02:00 • committed by Andreas Kling
parent 3283f5bb5d
commit c577f6e139
1 changed files with 7 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Userland/which.cpp
View file

@ -24,11 +24,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <AK/String.h>
#include <AK/Vector.h>
#include <LibCore/ArgsParser.h> #include <LibCore/ArgsParser.h>
#include <LibCore/DirIterator.h>
#include <stdio.h> #include <stdio.h>
#include <unistd.h>
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
@ -43,18 +41,12 @@ int main(int argc, char** argv)
args_parser.add_positional_argument(filename, "Name of executable", "executable"); args_parser.add_positional_argument(filename, "Name of executable", "executable");
args_parser.parse(argc, argv); args_parser.parse(argc, argv);
String path = getenv("PATH"); auto fullpath = Core::find_executable_in_path(filename);
if (path.is_empty()) if (fullpath.is_null()) {
path = "/bin:/usr/bin"; printf("no '%s' in path\n", filename);
return 1;
auto parts = path.split(':');
for (auto& part : parts) {
auto candidate = String::format("%s/%s", part.characters(), filename);
if(access(candidate.characters(), X_OK) == 0) {
printf("%s\n", candidate.characters());
return 0;
}
} }
return 1; printf("%s\n", fullpath.characters());
return 0;
} }