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

Shell: hostname is not parsed from /etc/hostname

This commit is contained in:
Bananymous 2023-08-22 15:33:01 +03:00
parent 8eb71084f0
commit a74eb357a1
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
base/etc/hostname Normal file
View File

@ -0,0 +1 @@
host

26
userspace/Shell/main.cpp
View File

@ -21,6 +21,8 @@ extern char** environ;
static const char* argv0 = nullptr; static const char* argv0 = nullptr;
static int last_return = 0; static int last_return = 0;
static BAN::String hostname;
BAN::Vector<BAN::Vector<BAN::String>> parse_command(BAN::StringView); BAN::Vector<BAN::Vector<BAN::String>> parse_command(BAN::StringView);
BAN::Optional<BAN::String> parse_dollar(BAN::StringView command, size_t& i) BAN::Optional<BAN::String> parse_dollar(BAN::StringView command, size_t& i)
@ -646,6 +648,11 @@ BAN::String get_prompt()
endpwent(); endpwent();
break; break;
} }
case 'h':
{
MUST(prompt.append(hostname));
break;
}
case '\0': case '\0':
MUST(prompt.push_back('\\')); MUST(prompt.push_back('\\'));
break; break;
@ -683,6 +690,23 @@ int main(int argc, char** argv)
if (signal(SIGINT, [](int) {}) == SIG_ERR) if (signal(SIGINT, [](int) {}) == SIG_ERR)
perror("signal"); perror("signal");
{
FILE* fp = fopen("/etc/hostname", "r");
if (fp != NULL)
{
char buffer[512];
while (size_t nbyte = fread(buffer, 1, sizeof(buffer), fp))
{
if (nbyte == 0)
break;
MUST(hostname.append(BAN::StringView(buffer, nbyte)));
}
fclose(fp);
}
if (!hostname.empty() && hostname.back() == '\n')
hostname.pop_back();
}
if (argc >= 2) if (argc >= 2)
{ {
if (strcmp(argv[1], "-c") == 0) if (strcmp(argv[1], "-c") == 0)
@ -706,7 +730,7 @@ int main(int argc, char** argv)
if (argc >= 1) if (argc >= 1)
setenv("SHELL", argv[0], true); setenv("SHELL", argv[0], true);
setenv("PS1", "\e[32m\\u@host\e[m:\e[34m\\~\e[m$ ", false); setenv("PS1", "\e[32m\\u@\\h\e[m:\e[34m\\~\e[m$ ", false);
tcgetattr(0, &old_termios); tcgetattr(0, &old_termios);