system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-10-04 15:09:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

mktemp: Make sure to use target directory option argument

Browse source 
Previously, we ignored the -p argument if it was specified. This
would resort in a crash because final_target_directory wasn't given a
value.

This snapshot does away with giving this variable an Optional<> and
just has the -p argument be its default value.
This commit is contained in:
Kemal Zebari 2024-01-15 12:14:30 -08:00 committed by Sam Atkins
parent f4b345258d
commit 22ea2f638a
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Userland/Utilities/mktemp.cpp
View file

@ -72,7 +72,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
args_parser.parse(arguments);
Optional<ByteString> final_file_template;
Optional<ByteString> final_target_directory;
ByteString final_target_directory = target_directory;
if (target_directory.is_empty()) {
if (!file_template.is_empty()) {
@ -97,7 +97,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
return 1;
}
auto target_path = LexicalPath::join(final_target_directory.value(), final_file_template.value()).string();
auto target_path = LexicalPath::join(final_target_directory, final_file_template.value()).string();
auto final_path = TRY(make_temp(target_path, create_directory, dry_run));
if (!final_path.has_value()) {