Bananymous/banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BAN: Allow String::formatted to fail

Browse Source
This commit is contained in:
Bananymous
2024-06-25 09:48:13 +03:00
parent b1869bced4
commit 67dfe0bcf3
10 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
userspace/Shell/main.cpp
View File

@@ -41,7 +41,7 @@ BAN::Optional<BAN::String> parse_dollar(BAN::StringView command, size_t& i)
if (command[i] == '?')
{
i++;
return BAN::String::formatted("{}", last_return);
return MUST(BAN::String::formatted("{}", last_return));
}
if (isalnum(command[i]))
{

2
userspace/WindowServer/main.cpp
View File

@@ -52,7 +52,7 @@ Config parse_config()
return config;
}
auto config_path = BAN::String::formatted("{}/.config/WindowServer.conf", home_env);
auto config_path = MUST(BAN::String::formatted("{}/.config/WindowServer.conf", home_env));
FILE* fconfig = fopen(config_path.data(), "r");
if (!fconfig)
{

16
userspace/ls/main.cpp
View File

@@ -72,14 +72,14 @@ BAN::String build_access_string(mode_t mode)
BAN::String build_hard_links_string(nlink_t links)
{
return BAN::String::formatted("{}", links);
return MUST(BAN::String::formatted("{}", links));
}
BAN::String build_owner_name_string(uid_t uid)
{
struct passwd* passwd = getpwuid(uid);
if (passwd == nullptr)
return BAN::String::formatted("{}", uid);
return MUST(BAN::String::formatted("{}", uid));
return BAN::String(BAN::StringView(passwd->pw_name));
}
@@ -87,13 +87,13 @@ BAN::String build_owner_group_string(gid_t gid)
{
struct group* grp = getgrgid(gid);
if (grp == nullptr)
return BAN::String::formatted("{}", gid);
return MUST(BAN::String::formatted("{}", gid));
return BAN::String(BAN::StringView(grp->gr_name));
}
BAN::String build_size_string(off_t size)
{
return BAN::String::formatted("{}", size);
return MUST(BAN::String::formatted("{}", size));
}
BAN::String build_month_string(BAN::Time time)
@@ -104,15 +104,15 @@ BAN::String build_month_string(BAN::Time time)
BAN::String build_day_string(BAN::Time time)
{
return BAN::String::formatted("{}", time.day);
return MUST(BAN::String::formatted("{}", time.day));
}
BAN::String build_time_string(BAN::Time time)
{
static uint32_t current_year = ({ timespec real_time; clock_gettime(CLOCK_REALTIME, &real_time); BAN::from_unix_time(real_time.tv_sec).year; });
if (time.year != current_year)
return BAN::String::formatted("{}", time.year);
return BAN::String::formatted("{2}:{2}", time.hour, time.minute);
return MUST(BAN::String::formatted("{}", time.year));
return MUST(BAN::String::formatted("{2}:{2}", time.hour, time.minute));
}
int list_directory(const BAN::String& path, config_t config)
@@ -213,7 +213,7 @@ int list_directory(const BAN::String& path, config_t config)
GET_ENTRY_STRING(day, time);
GET_ENTRY_STRING(time, time);
full_entry.full_name = BAN::String::formatted("{}{}\e[m", entry_color(entry.st.st_mode), entry.name);
full_entry.full_name = MUST(BAN::String::formatted("{}{}\e[m", entry_color(entry.st.st_mode), entry.name));
MUST(full_entries.push_back(BAN::move(full_entry)));
}