RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 03:18:11 +00:00
Code Issues Activity Actions

Shell: Set up the PWD environment variable early

Browse source 
This ensures that PWD is set when running "sh -c something"
This commit is contained in:
Andreas Kling 2020-03-07 00:25:30 +01:00
parent d7cfe61fe4
commit 4a271430f8
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Shell/main.cpp
View file

@ -981,6 +981,13 @@ int main(int argc, char** argv)
if (rc < 0) if (rc < 0)
perror("ttyname_r"); perror("ttyname_r");
{
auto* cwd = getcwd(nullptr, 0);
g.cwd = cwd;
setenv("PWD", cwd, 1);
free(cwd);
}
{ {
auto* pw = getpwuid(getuid()); auto* pw = getpwuid(getuid());
if (pw) { if (pw) {
@ -1012,13 +1019,6 @@ int main(int argc, char** argv)
return 0; return 0;
} }
{
auto* cwd = getcwd(nullptr, 0);
g.cwd = cwd;
setenv("PWD", cwd, 1);
free(cwd);
}
g.directory_stack.append(g.cwd); g.directory_stack.append(g.cwd);
load_history(); load_history();