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

Userland: Fail Core::find_executable_in_path on empty inputs

Browse source 
Before this patch, `which ""` or `type ""` would say that the empty
string is `/usr/local/bin/`.

Convert callers to consistently call is_empty() on the returned string
while we're at it, to support eventually removing the is_null() String
state in the future.
This commit is contained in:
Andrew Kaster 2022-01-03 23:43:16 -07:00 • committed by Brian Gianforcaro
parent 7f9bd34d07
commit 170a7e263c
3 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Userland/Libraries/LibCore/DirIterator.cpp
View file

@ -97,6 +97,9 @@ String DirIterator::next_full_path()
String find_executable_in_path(String filename) String find_executable_in_path(String filename)
{ {
if (filename.is_empty())
return {};
if (filename.starts_with('/')) { if (filename.starts_with('/')) {
if (access(filename.characters(), X_OK) == 0) if (access(filename.characters(), X_OK) == 0)
return filename; return filename;

2
Userland/Shell/Builtin.cpp
View file

@ -227,7 +227,7 @@ int Shell::builtin_type(int argc, const char** argv)
// check if its an executable in PATH // check if its an executable in PATH
auto fullpath = Core::find_executable_in_path(command); auto fullpath = Core::find_executable_in_path(command);
if (!fullpath.is_null()) { if (!fullpath.is_empty()) {
printf("%s is %s\n", command, escape_token(fullpath).characters()); printf("%s is %s\n", command, escape_token(fullpath).characters());
continue; continue;
} }

2
Userland/Utilities/which.cpp
View file

@ -21,7 +21,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
args_parser.parse(arguments); args_parser.parse(arguments);
auto fullpath = Core::find_executable_in_path(filename); auto fullpath = Core::find_executable_in_path(filename);
if (fullpath.is_null()) { if (fullpath.is_empty()) {
warnln("no '{}' in path", filename); warnln("no '{}' in path", filename);
return 1; return 1;
} }