diff options
author | Andreas Kling <awesomekling@gmail.com> | 2019-06-07 11:49:21 +0200 |
---|---|---|
committer | Andreas Kling <awesomekling@gmail.com> | 2019-06-07 11:49:21 +0200 |
commit | f7ede145b42043a81c7e50f85616e25875521b04 (patch) | |
tree | 7d637027f1241abd6415ca61e674c76f118e0533 /Shell | |
parent | 46527b72d7cfbeee163c1009e27805061fcddf09 (diff) | |
download | serenity-f7ede145b42043a81c7e50f85616e25875521b04.zip |
Shell: Run clang-format on everything.
Diffstat (limited to 'Shell')
-rw-r--r-- | Shell/LineEditor.cpp | 2 | ||||
-rw-r--r-- | Shell/Parser.cpp | 6 | ||||
-rw-r--r-- | Shell/main.cpp | 87 |
3 files changed, 47 insertions, 48 deletions
diff --git a/Shell/LineEditor.cpp b/Shell/LineEditor.cpp index 547960858e..78b70794a4 100644 --- a/Shell/LineEditor.cpp +++ b/Shell/LineEditor.cpp @@ -1,8 +1,8 @@ #include "LineEditor.h" #include "GlobalState.h" +#include <ctype.h> #include <stdio.h> #include <unistd.h> -#include <ctype.h> LineEditor::LineEditor() { diff --git a/Shell/Parser.cpp b/Shell/Parser.cpp index 422b3feeb3..dd85237fda 100644 --- a/Shell/Parser.cpp +++ b/Shell/Parser.cpp @@ -52,7 +52,7 @@ Vector<Subcommand> Parser::parse() commit_token(); if (m_tokens.is_empty()) { fprintf(stderr, "Syntax error: Nothing before pipe (|)\n"); - return { }; + return {}; } do_pipe(); break; @@ -110,7 +110,7 @@ Vector<Subcommand> Parser::parse() commit_token(); if (m_tokens.is_empty()) { fprintf(stderr, "Syntax error: Nothing before pipe (|)\n"); - return { }; + return {}; } do_pipe(); m_state = State::Free; @@ -145,7 +145,7 @@ Vector<Subcommand> Parser::parse() for (auto& redirection : m_subcommands.last().redirections) { if (redirection.type == Redirection::Pipe) { fprintf(stderr, "Syntax error: Nothing after last pipe (|)\n"); - return { }; + return {}; } } } diff --git a/Shell/main.cpp b/Shell/main.cpp index b5e26767dc..4e3102051e 100644 --- a/Shell/main.cpp +++ b/Shell/main.cpp @@ -191,7 +191,7 @@ static bool handle_builtin(int argc, char** argv, int& retval) class FileDescriptionCollector { public: - FileDescriptionCollector() { } + FileDescriptionCollector() {} ~FileDescriptionCollector() { collect(); } void collect() @@ -248,7 +248,7 @@ static Vector<String> process_arguments(const Vector<String>& args) continue; // And even if they are, skip . and .. - if (name == "." || name == "..") + if (name == "." || name == "..") continue; if (name.matches(arg, String::CaseSensitivity::CaseSensitive)) @@ -308,50 +308,50 @@ static int run_command(const String& cmd) auto& subcommand = subcommands[i]; for (auto& redirection : subcommand.redirections) { switch (redirection.type) { - case Redirection::Pipe: { - int pipefd[2]; - int rc = pipe(pipefd); - if (rc < 0) { - perror("pipe"); - return 1; - } - subcommand.rewirings.append({ STDOUT_FILENO, pipefd[1] }); - auto& next_command = subcommands[i + 1]; - next_command.rewirings.append({ STDIN_FILENO, pipefd[0] }); - fds.add(pipefd[0]); - fds.add(pipefd[1]); - break; + case Redirection::Pipe: { + int pipefd[2]; + int rc = pipe(pipefd); + if (rc < 0) { + perror("pipe"); + return 1; } - case Redirection::FileWriteAppend: { - int fd = open(redirection.path.characters(), O_WRONLY | O_CREAT | O_APPEND, 0666); - if (fd < 0) { - perror("open"); - return 1; - } - subcommand.rewirings.append({ redirection.fd, fd }); - fds.add(fd); - break; + subcommand.rewirings.append({ STDOUT_FILENO, pipefd[1] }); + auto& next_command = subcommands[i + 1]; + next_command.rewirings.append({ STDIN_FILENO, pipefd[0] }); + fds.add(pipefd[0]); + fds.add(pipefd[1]); + break; + } + case Redirection::FileWriteAppend: { + int fd = open(redirection.path.characters(), O_WRONLY | O_CREAT | O_APPEND, 0666); + if (fd < 0) { + perror("open"); + return 1; } - case Redirection::FileWrite: { - int fd = open(redirection.path.characters(), O_WRONLY | O_CREAT | O_TRUNC, 0666); - if (fd < 0) { - perror("open"); - return 1; - } - subcommand.rewirings.append({ redirection.fd, fd }); - fds.add(fd); - break; + subcommand.rewirings.append({ redirection.fd, fd }); + fds.add(fd); + break; + } + case Redirection::FileWrite: { + int fd = open(redirection.path.characters(), O_WRONLY | O_CREAT | O_TRUNC, 0666); + if (fd < 0) { + perror("open"); + return 1; } - case Redirection::FileRead: { - int fd = open(redirection.path.characters(), O_RDONLY); - if (fd < 0) { - perror("open"); - return 1; - } - subcommand.rewirings.append({ redirection.fd, fd }); - fds.add(fd); - break; + subcommand.rewirings.append({ redirection.fd, fd }); + fds.add(fd); + break; + } + case Redirection::FileRead: { + int fd = open(redirection.path.characters(), O_RDONLY); + if (fd < 0) { + perror("open"); + return 1; } + subcommand.rewirings.append({ redirection.fd, fd }); + fds.add(fd); + break; + } } } } @@ -427,7 +427,6 @@ static int run_command(const String& cmd) dbgprintf(" %d\n", child); #endif - int wstatus = 0; int return_value = 0; @@ -452,7 +451,7 @@ static int run_command(const String& cmd) printf("Shell: %s(%d) exited abnormally\n", child.name.characters(), child.pid); } } - } while(errno == EINTR); + } while (errno == EINTR); } // FIXME: Should I really have to tcsetpgrp() after my child has exited? |