Skip to content

Commit

Permalink
Shell: Replace fprintf(stderr) => warnln()
Browse files Browse the repository at this point in the history
  • Loading branch information
@alimpfard @awesomekling
alimpfard authored and awesomekling committed May 2, 2021
1 parent 6a9dced commit bda69a5
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 37 deletions.
54 changes: 27 additions & 27 deletions Userland/Shell/Builtin.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ int Shell::builtin_bg(int argc, const char** argv)
job->set_shell_did_continue(true);

dbgln("Resuming {} ({})", job->pid(), job->cmd());
warnln("Resuming job {} - {}", job->job_id(), job->cmd().characters());
warnln("Resuming job {} - {}", job->job_id(), job->cmd());

// Try using the PGID, but if that fails, just use the PID.
if (killpg(job->pgid(), SIGCONT) < 0) {
Expand Down Expand Up @@ -227,7 +227,7 @@ int Shell::builtin_cd(int argc, const char** argv)

auto real_path = Core::File::real_path_for(new_path);
if (real_path.is_empty()) {
fprintf(stderr, "Invalid path '%s'\n", new_path.characters());
warnln("Invalid path '{}'", new_path);
return 1;
}

Expand All @@ -239,9 +239,9 @@ int Shell::builtin_cd(int argc, const char** argv)
int rc = chdir(path);
if (rc < 0) {
if (errno == ENOTDIR) {
fprintf(stderr, "Not a directory: %s\n", path);
warnln("Not a directory: {}", path);
} else {
fprintf(stderr, "chdir(%s) failed: %s\n", path, strerror(errno));
warnln("chdir({}) failed: {}", path, strerror(errno));
}
return 1;
}
Expand All @@ -263,7 +263,7 @@ int Shell::builtin_cdh(int argc, const char** argv)

if (index == -1) {
if (cd_history.is_empty()) {
fprintf(stderr, "cdh: no history available\n");
warnln("cdh: no history available");
return 0;
}

Expand All @@ -273,7 +273,7 @@ int Shell::builtin_cdh(int argc, const char** argv)
}

if (index < 1 || (size_t)index > cd_history.size()) {
fprintf(stderr, "cdh: history index out of bounds: %d not in (0, %zu)\n", index, cd_history.size());
warnln("cdh: history index out of bounds: {} not in (0, {})", index, cd_history.size());
return 1;
}

Expand Down Expand Up @@ -308,7 +308,7 @@ int Shell::builtin_dirs(int argc, const char** argv)

if (print) {
if (!paths.is_empty()) {
fprintf(stderr, "dirs: 'print' and 'number' are not allowed when any path is specified");
warnln("dirs: 'print' and 'number' are not allowed when any path is specified");
return 1;
}
separator = '\n';
Expand Down Expand Up @@ -338,7 +338,7 @@ int Shell::builtin_dirs(int argc, const char** argv)
int Shell::builtin_exec(int argc, const char** argv)
{
if (argc < 2) {
fprintf(stderr, "Shell: No command given to exec\n");
warnln("Shell: No command given to exec");
return 1;
}

Expand All @@ -360,7 +360,7 @@ int Shell::builtin_exit(int argc, const char** argv)
if (m_is_interactive) {
if (!jobs.is_empty()) {
if (!m_should_ignore_jobs_on_next_exit) {
fprintf(stderr, "Shell: You have %zu active job%s, run 'exit' again to really exit.\n", jobs.size(), jobs.size() > 1 ? "s" : "");
warnln("Shell: You have {} active job{}, run 'exit' again to really exit.", jobs.size(), jobs.size() > 1 ? "s" : "");
m_should_ignore_jobs_on_next_exit = true;
return 1;
}
Expand Down Expand Up @@ -488,7 +488,7 @@ int Shell::builtin_fg(int argc, const char** argv)
job->set_shell_did_continue(true);

dbgln("Resuming {} ({})", job->pid(), job->cmd());
warnln("Resuming job {} - {}", job->job_id(), job->cmd().characters());
warnln("Resuming job {} - {}", job->job_id(), job->cmd());

tcsetpgrp(STDOUT_FILENO, job->pgid());
tcsetpgrp(STDIN_FILENO, job->pgid());
Expand Down Expand Up @@ -615,7 +615,7 @@ int Shell::builtin_jobs(int argc, const char** argv)
int Shell::builtin_popd(int argc, const char** argv)
{
if (directory_stack.size() <= 1) {
fprintf(stderr, "Shell: popd: directory stack empty\n");
warnln("Shell: popd: directory stack empty");
return 1;
}

Expand All @@ -634,7 +634,7 @@ int Shell::builtin_popd(int argc, const char** argv)
if (argc == 1) {
int rc = chdir(path.characters());
if (rc < 0) {
fprintf(stderr, "chdir(%s) failed: %s\n", path.characters(), strerror(errno));
warnln("chdir({}) failed: {}", path, strerror(errno));
return 1;
}

Expand All @@ -644,7 +644,7 @@ int Shell::builtin_popd(int argc, const char** argv)

LexicalPath lexical_path(path.characters());
if (!lexical_path.is_valid()) {
fprintf(stderr, "LexicalPath failed to canonicalize '%s'\n", path.characters());
warnln("LexicalPath failed to canonicalize '{}'", path);
return 1;
}

Expand All @@ -653,19 +653,19 @@ int Shell::builtin_popd(int argc, const char** argv)
struct stat st;
int rc = stat(real_path, &st);
if (rc < 0) {
fprintf(stderr, "stat(%s) failed: %s\n", real_path, strerror(errno));
warnln("stat({}) failed: {}", real_path, strerror(errno));
return 1;
}

if (!S_ISDIR(st.st_mode)) {
fprintf(stderr, "Not a directory: %s\n", real_path);
warnln("Not a directory: {}", real_path);
return 1;
}

if (should_switch) {
int rc = chdir(real_path);
if (rc < 0) {
fprintf(stderr, "chdir(%s) failed: %s\n", real_path, strerror(errno));
warnln("chdir({}) failed: {}", real_path, strerror(errno));
return 1;
}

Expand All @@ -684,7 +684,7 @@ int Shell::builtin_pushd(int argc, const char** argv)
// With no arguments, pushd exchanges the top two directories and makes the new top the current directory.
if (argc == 1) {
if (directory_stack.size() < 2) {
fprintf(stderr, "pushd: no other directory\n");
warnln("pushd: no other directory");
return 1;
}

Expand All @@ -695,7 +695,7 @@ int Shell::builtin_pushd(int argc, const char** argv)

int rc = chdir(dir2.characters());
if (rc < 0) {
fprintf(stderr, "chdir(%s) failed: %s\n", dir2.characters(), strerror(errno));
warnln("chdir({}) failed: {}", dir2, strerror(errno));
return 1;
}

Expand Down Expand Up @@ -731,7 +731,7 @@ int Shell::builtin_pushd(int argc, const char** argv)

LexicalPath lexical_path(path_builder.to_string());
if (!lexical_path.is_valid()) {
fprintf(stderr, "LexicalPath failed to canonicalize '%s'\n", path_builder.to_string().characters());
warnln("LexicalPath failed to canonicalize '{}'", path_builder.string_view());
return 1;
}

Expand All @@ -740,19 +740,19 @@ int Shell::builtin_pushd(int argc, const char** argv)
struct stat st;
int rc = stat(real_path, &st);
if (rc < 0) {
fprintf(stderr, "stat(%s) failed: %s\n", real_path, strerror(errno));
warnln("stat({}) failed: {}", real_path, strerror(errno));
return 1;
}

if (!S_ISDIR(st.st_mode)) {
fprintf(stderr, "Not a directory: %s\n", real_path);
warnln("Not a directory: {}", real_path);
return 1;
}

if (should_switch) {
int rc = chdir(real_path);
if (rc < 0) {
fprintf(stderr, "chdir(%s) failed: %s\n", real_path, strerror(errno));
warnln("chdir({}) failed: {}", real_path, strerror(errno));
return 1;
}

Expand All @@ -774,7 +774,7 @@ int Shell::builtin_setopt(int argc, const char** argv)
if (argc == 1) {
#define __ENUMERATE_SHELL_OPTION(name, default_, description) \
if (options.name) \
fprintf(stderr, #name "\n");
warnln("{}", #name);

ENUMERATE_SHELL_OPTIONS();

Expand Down Expand Up @@ -823,7 +823,7 @@ int Shell::builtin_shift(int argc, const char** argv)

auto argv_ = lookup_local_variable("ARGV");
if (!argv_) {
fprintf(stderr, "shift: ARGV is unset\n");
warnln("shift: ARGV is unset");
return 1;
}

Expand All @@ -832,7 +832,7 @@ int Shell::builtin_shift(int argc, const char** argv)

auto& values = static_cast<AST::ListValue*>(argv_.ptr())->values();
if ((size_t)count > values.size()) {
fprintf(stderr, "shift: shift count must not be greater than %zu\n", values.size());
warnln("shift: shift count must not be greater than {}", values.size());
return 1;
}

Expand Down Expand Up @@ -896,7 +896,7 @@ int Shell::builtin_time(int argc, const char** argv)
block_on_job(job);
exit_code = job.exit_code();
}
fprintf(stderr, "Time: %d ms\n", timer.elapsed());
warnln("Time: {} ms", timer.elapsed());
return exit_code;
}

Expand Down Expand Up @@ -924,7 +924,7 @@ int Shell::builtin_umask(int argc, const char** argv)
return 0;
}

fprintf(stderr, "umask: Invalid mask '%s'\n", mask_text);
warnln("umask: Invalid mask '{}'", mask_text);
return 1;
}

Expand Down
18 changes: 9 additions & 9 deletions Userland/Shell/Shell.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,7 @@ RefPtr<Job> Shell::run_command(const AST::Command& command)
auto rewiring_result = redirection.apply();
if (rewiring_result.is_error()) {
if (!rewiring_result.error().is_empty())
fprintf(stderr, "error: %s\n", rewiring_result.error().characters());
warnln("error: {}", rewiring_result.error());
return IterationDecision::Break;
}
auto& rewiring = rewiring_result.value();
Expand Down Expand Up @@ -837,9 +837,9 @@ RefPtr<Job> Shell::run_command(const AST::Command& command)
return;

if (job->is_running_in_background() && job->should_announce_exit())
warnln("Shell: Job {} ({}) exited\n", job->job_id(), job->cmd().characters());
warnln("Shell: Job {} ({}) exited\n", job->job_id(), job->cmd());
else if (job->signaled() && job->should_announce_signal())
warnln("Shell: Job {} ({}) {}\n", job->job_id(), job->cmd().characters(), strsignal(job->termination_signal()));
warnln("Shell: Job {} ({}) {}\n", job->job_id(), job->cmd(), strsignal(job->termination_signal()));

last_return_code = job->exit_code();
job->disown();
Expand All @@ -859,12 +859,12 @@ void Shell::execute_process(Vector<const char*>&& argv)
int saved_errno = errno;
struct stat st;
if (stat(argv[0], &st)) {
fprintf(stderr, "stat(%s): %s\n", argv[0], strerror(errno));
warnln("stat({}): {}", argv[0], strerror(errno));
// Return code 127 on command not found.
_exit(127);
}
if (!(st.st_mode & S_IXUSR)) {
fprintf(stderr, "%s: Not executable\n", argv[0]);
warnln("{}: Not executable", argv[0]);
// Return code 126 when file is not executable.
_exit(126);
}
Expand All @@ -882,17 +882,17 @@ void Shell::execute_process(Vector<const char*>&& argv)
argv.prepend(shebang.characters());
int rc = execvp(argv[0], const_cast<char* const*>(argv.data()));
if (rc < 0) {
fprintf(stderr, "%s: Invalid interpreter \"%s\": %s\n", argv[0], shebang.characters(), strerror(errno));
warnln("{}: Invalid interpreter \"{}\": {}", argv[0], shebang.characters(), strerror(errno));
_exit(126);
}
} while (false);
fprintf(stderr, "%s: Command not found.\n", argv[0]);
warnln("{}: Command not found.", argv[0]);
} else {
if (S_ISDIR(st.st_mode)) {
fprintf(stderr, "Shell: %s: Is a directory\n", argv[0]);
warnln("Shell: {}: Is a directory", argv[0]);
_exit(126);
}
fprintf(stderr, "execvp(%s): %s\n", argv[0], strerror(saved_errno));
warnln("execvp({}): {}", argv[0], strerror(saved_errno));
}
_exit(126);
}
Expand Down
2 changes: 1 addition & 1 deletion Userland/Shell/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ int main(int argc, char** argv)
if (format) {
auto file = Core::File::open(format, Core::IODevice::ReadOnly);
if (file.is_error()) {
fprintf(stderr, "Error: %s", file.error().characters());
warnln("Error: {}", file.error());
return 1;
}

Expand Down

0 comments on commit bda69a5

Please sign in to comment.