RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-14 08:44:58 +00:00
Code Issues Activity Actions

LibC: Convert semaphore and termcap to String

Browse source
This commit is contained in:
kleines Filmröllchen 2023-06-26 20:51:12 +02:00 • committed by Linus Groh
parent bd13cc0732
commit a3f6236bec
2 changed files with 57 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

86
Userland/Libraries/LibC/termcap.cpp
View file

@ -5,8 +5,8 @@
*/
#include <AK/Debug.h>
#include <AK/DeprecatedString.h>
#include <AK/HashMap.h>
#include <AK/String.h>
#include <AK/Vector.h>
#include <assert.h>
#include <string.h>
@ -27,47 +27,47 @@ int __attribute__((weak)) tgetent([[maybe_unused]] char* bp, [[maybe_unused]] ch
return 1;
}
static HashMap<DeprecatedString, char const*>* caps = nullptr;
static HashMap<String, char const*>* caps = nullptr;
static void ensure_caps()
{
if (caps)
return;
caps = new HashMap<DeprecatedString, char const*>;
caps->set("DC", "\033[%p1%dP");
caps->set("IC", "\033[%p1%d@");
caps->set("ce", "\033[K");
caps->set("cl", "\033[H\033[J");
caps->set("cr", "\015");
caps->set("dc", "\033[P");
caps->set("ei", "");
caps->set("ic", "");
caps->set("im", "");
caps->set("kd", "\033[B");
caps->set("kl", "\033[D");
caps->set("kr", "\033[C");
caps->set("ku", "\033[A");
caps->set("ks", "");
caps->set("ke", "");
caps->set("le", "\033[D");
caps->set("mm", "");
caps->set("mo", "");
caps->set("pc", "");
caps->set("up", "\033[A");
caps->set("vb", "");
caps->set("am", "");
caps->set("@7", "");
caps->set("kH", "");
caps->set("kI", "\033[L");
caps->set("kh", "\033[H");
caps->set("vs", "");
caps->set("ve", "");
caps->set("E3", "");
caps->set("kD", "");
caps->set("nd", "\033[C");
caps = new HashMap<String, char const*>;
caps->set("DC"_short_string, "\033[%p1%dP");
caps->set("IC"_short_string, "\033[%p1%d@");
caps->set("ce"_short_string, "\033[K");
caps->set("cl"_short_string, "\033[H\033[J");
caps->set("cr"_short_string, "\015");
caps->set("dc"_short_string, "\033[P");
caps->set("ei"_short_string, "");
caps->set("ic"_short_string, "");
caps->set("im"_short_string, "");
caps->set("kd"_short_string, "\033[B");
caps->set("kl"_short_string, "\033[D");
caps->set("kr"_short_string, "\033[C");
caps->set("ku"_short_string, "\033[A");
caps->set("ks"_short_string, "");
caps->set("ke"_short_string, "");
caps->set("le"_short_string, "\033[D");
caps->set("mm"_short_string, "");
caps->set("mo"_short_string, "");
caps->set("pc"_short_string, "");
caps->set("up"_short_string, "\033[A");
caps->set("vb"_short_string, "");
caps->set("am"_short_string, "");
caps->set("@7"_short_string, "");
caps->set("kH"_short_string, "");
caps->set("kI"_short_string, "\033[L");
caps->set("kh"_short_string, "\033[H");
caps->set("vs"_short_string, "");
caps->set("ve"_short_string, "");
caps->set("E3"_short_string, "");
caps->set("kD"_short_string, "");
caps->set("nd"_short_string, "\033[C");
caps->set("co", "80");
caps->set("li", "25");
caps->set("co"_short_string, "80");
caps->set("li"_short_string, "25");
}
// Unfortunately, tgetstr() doesn't accept a size argument for the buffer
@ -79,7 +79,7 @@ char* __attribute__((weak)) tgetstr(char const* id, char** area)
{
ensure_caps();
warnln_if(TERMCAP_DEBUG, "tgetstr: id='{}'", id);
auto it = caps->find(id);
auto it = caps->find(StringView { id, strlen(id) });
if (it != caps->end()) {
char* ret = *area;
char const* val = (*it).value;
@ -96,7 +96,7 @@ char* __attribute__((weak)) tgetstr(char const* id, char** area)
int __attribute__((weak)) tgetflag([[maybe_unused]] char const* id)
{
warnln_if(TERMCAP_DEBUG, "tgetflag: '{}'", id);
auto it = caps->find(id);
auto it = caps->find(StringView { id, strlen(id) });
if (it != caps->end())
return 1;
return 0;
@ -105,7 +105,7 @@ int __attribute__((weak)) tgetflag([[maybe_unused]] char const* id)
int __attribute__((weak)) tgetnum(char const* id)
{
warnln_if(TERMCAP_DEBUG, "tgetnum: '{}'", id);
auto it = caps->find(id);
auto it = caps->find(StringView { id, strlen(id) });
if (it != caps->end())
return atoi((*it).value);
return -1;
@ -114,7 +114,13 @@ int __attribute__((weak)) tgetnum(char const* id)
static Vector<char> s_tgoto_buffer;
char* __attribute__((weak)) tgoto([[maybe_unused]] char const* cap, [[maybe_unused]] int col, [[maybe_unused]] int row)
{
auto cap_str = StringView { cap, strlen(cap) }.replace("%p1%d"sv, DeprecatedString::number(col), ReplaceMode::FirstOnly).replace("%p2%d"sv, DeprecatedString::number(row), ReplaceMode::FirstOnly);
auto row_string = String::number(row);
auto column_string = String::number(col);
if (row_string.is_error() || column_string.is_error()) {
// According to Linux man pages (https://man7.org/linux/man-pages/man3/tgoto.3x.html) we apparently don't have to set errno.
return nullptr;
}
auto cap_str = StringView { cap, strlen(cap) }.replace("%p1%d"sv, column_string.release_value(), ReplaceMode::FirstOnly).replace("%p2%d"sv, row_string.release_value(), ReplaceMode::FirstOnly);
s_tgoto_buffer.clear_with_capacity();
s_tgoto_buffer.ensure_capacity(cap_str.length());