mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2024-11-22 15:40:19 +00:00
Shell: Refactor Shell::prompt to use GenericLexer to read the PROMPT var
This commit is contained in:
parent
1d26550370
commit
78b3703586
Notes:
sideshowbarker
2024-07-17 03:14:39 +09:00
Author: https://github.com/adamjoer Commit: https://github.com/SerenityOS/serenity/commit/78b3703586 Pull-request: https://github.com/SerenityOS/serenity/pull/21589 Reviewed-by: https://github.com/alimpfard
1 changed files with 48 additions and 52 deletions
|
@ -82,62 +82,58 @@ DeprecatedString Shell::prompt() const
|
|||
if (m_next_scheduled_prompt_text.has_value())
|
||||
return m_next_scheduled_prompt_text.release_value();
|
||||
|
||||
auto build_prompt = [&]() -> DeprecatedString {
|
||||
auto* ps1 = getenv("PROMPT");
|
||||
if (!ps1) {
|
||||
if (uid == 0)
|
||||
return "# ";
|
||||
|
||||
StringBuilder builder;
|
||||
builder.appendff("\033]0;{}@{}:{}\007", username, hostname, cwd);
|
||||
builder.appendff("\033[31;1m{}\033[0m@\033[37;1m{}\033[0m:\033[32;1m{}\033[0m$> ", username, hostname, cwd);
|
||||
return builder.to_deprecated_string();
|
||||
}
|
||||
auto const* ps1 = getenv("PROMPT");
|
||||
if (!ps1) {
|
||||
if (uid == 0)
|
||||
return "# ";
|
||||
|
||||
StringBuilder builder;
|
||||
for (char* ptr = ps1; *ptr; ++ptr) {
|
||||
if (*ptr == '\\') {
|
||||
++ptr;
|
||||
if (!*ptr)
|
||||
break;
|
||||
switch (*ptr) {
|
||||
case 'X':
|
||||
builder.append("\033]0;"sv);
|
||||
break;
|
||||
case 'a':
|
||||
builder.append(0x07);
|
||||
break;
|
||||
case 'e':
|
||||
builder.append(0x1b);
|
||||
break;
|
||||
case 'u':
|
||||
builder.append(username);
|
||||
break;
|
||||
case 'h':
|
||||
builder.append({ hostname, strlen(hostname) });
|
||||
break;
|
||||
case 'w': {
|
||||
DeprecatedString home_path = getenv("HOME");
|
||||
if (cwd.starts_with(home_path)) {
|
||||
builder.append('~');
|
||||
builder.append(cwd.substring_view(home_path.length(), cwd.length() - home_path.length()));
|
||||
} else {
|
||||
builder.append(cwd);
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 'p':
|
||||
builder.append(uid == 0 ? '#' : '$');
|
||||
break;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
builder.append(*ptr);
|
||||
}
|
||||
builder.appendff("\033]0;{}@{}:{}\007", username, hostname, cwd);
|
||||
builder.appendff("\033[31;1m{}\033[0m@\033[37;1m{}\033[0m:\033[32;1m{}\033[0m$> ", username, hostname, cwd);
|
||||
return builder.to_deprecated_string();
|
||||
};
|
||||
}
|
||||
|
||||
return build_prompt();
|
||||
StringBuilder builder;
|
||||
|
||||
GenericLexer lexer { { ps1, strlen(ps1) } };
|
||||
while (!lexer.is_eof()) {
|
||||
builder.append(lexer.consume_until('\\'));
|
||||
|
||||
if (!lexer.consume_specific('\\') || lexer.is_eof())
|
||||
break;
|
||||
|
||||
if (lexer.consume_specific('X')) {
|
||||
builder.append("\033]0;"sv);
|
||||
|
||||
} else if (lexer.consume_specific('a')) {
|
||||
builder.append(0x07);
|
||||
|
||||
} else if (lexer.consume_specific('e')) {
|
||||
builder.append(0x1b);
|
||||
|
||||
} else if (lexer.consume_specific('u')) {
|
||||
builder.append(username);
|
||||
|
||||
} else if (lexer.consume_specific('h')) {
|
||||
builder.append({ hostname, strlen(hostname) });
|
||||
|
||||
} else if (lexer.consume_specific('w')) {
|
||||
DeprecatedString const home_path = getenv("HOME");
|
||||
if (cwd.starts_with(home_path)) {
|
||||
builder.append('~');
|
||||
builder.append(cwd.substring_view(home_path.length(), cwd.length() - home_path.length()));
|
||||
} else {
|
||||
builder.append(cwd);
|
||||
}
|
||||
|
||||
} else if (lexer.consume_specific('p')) {
|
||||
builder.append(uid == 0 ? '#' : '$');
|
||||
|
||||
} else {
|
||||
lexer.consume();
|
||||
}
|
||||
}
|
||||
return builder.to_deprecated_string();
|
||||
}
|
||||
|
||||
DeprecatedString Shell::expand_tilde(StringView expression)
|
||||
|
|
Loading…
Reference in a new issue