Shell: Do not assume that stdin/stdout is a TTY

This closes SerenityOS#2989.
fleximus · Aug 5, 2020 · 7b15c85 · 7b15c85
1 parent 70eb7aa
commit 7b15c85
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/Shell/Builtin.cpp b/Shell/Builtin.cpp
@@ -267,7 +267,8 @@ int Shell::builtin_exit(int argc, const char** argv)
  }
  stop_all_jobs();
  save_history();
- printf("Good-bye!\n");
+ if (m_is_interactive)
+ printf("Good-bye!\n");
  exit(exit_code);
  return 0;
 }

diff --git a/Shell/Shell.cpp b/Shell/Shell.cpp
@@ -58,7 +58,7 @@ extern char** environ;
 
 void Shell::print_path(const String& path)
 {
- if (s_disable_hyperlinks) {
+ if (s_disable_hyperlinks || !m_is_interactive) {
  printf("%s", path.characters());
  return;
  }
@@ -1092,9 +1092,17 @@ Shell::Shell()
  int rc = gethostname(hostname, Shell::HostNameSize);
  if (rc < 0)
  perror("gethostname");
- rc = ttyname_r(0, ttyname, Shell::TTYNameSize);
- if (rc < 0)
- perror("ttyname_r");
+
+ auto istty = isatty(STDIN_FILENO);
+ m_is_interactive = istty;
+
+ if (istty) {
+ rc = ttyname_r(0, ttyname, Shell::TTYNameSize);
+ if (rc < 0)
+ perror("ttyname_r");
+ } else {
+ ttyname[0] = 0;
+ }
 
  {
  auto* cwd = getcwd(nullptr, 0);

diff --git a/Shell/Shell.h b/Shell/Shell.h
@@ -218,6 +218,7 @@ class Shell : public Core::Object {
  Vector<LocalFrame> m_local_frames;
 
  HashMap<String, String> m_aliases;
+ bool m_is_interactive { true };
 };
 
 static constexpr bool is_word_character(char c)