RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-16 19:45:07 +00:00
Code Issues Activity Actions

Shell: Make some functions const

Browse source
This commit is contained in:
Shannon Booth 2020-02-15 10:12:00 +13:00 • committed by Andreas Kling
parent 859c1669f9
commit 90f40a80f4
1 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Shell/main.cpp
View file

@ -102,20 +102,20 @@ static String prompt()
return builder.to_string(); return builder.to_string();
} }
static int sh_pwd(int, char**) static int sh_pwd(int, const char**)
{ {
printf("%s\n", g.cwd.characters()); printf("%s\n", g.cwd.characters());
return 0; return 0;
} }
static int sh_exit(int, char**) static int sh_exit(int, const char**)
{ {
printf("Good-bye!\n"); printf("Good-bye!\n");
exit(0); exit(0);
return 0; return 0;
} }
static int sh_export(int argc, char** argv) static int sh_export(int argc, const char** argv)
{ {
if (argc == 1) { if (argc == 1) {
for (int i = 0; environ[i]; ++i) for (int i = 0; environ[i]; ++i)
@ -136,7 +136,7 @@ static int sh_export(int argc, char** argv)
return setenv_return; return setenv_return;
} }
static int sh_unset(int argc, char** argv) static int sh_unset(int argc, const char** argv)
{ {
if (argc != 2) { if (argc != 2) {
fprintf(stderr, "usage: unset variable\n"); fprintf(stderr, "usage: unset variable\n");
@ -185,7 +185,7 @@ static String expand_tilde(const char* expression)
return String::format("%s/%s", passwd->pw_dir, path.to_string().characters()); return String::format("%s/%s", passwd->pw_dir, path.to_string().characters());
} }
static int sh_cd(int argc, char** argv) static int sh_cd(int argc, const char** argv)
{ {
char pathbuf[PATH_MAX]; char pathbuf[PATH_MAX];
@ -239,7 +239,7 @@ static int sh_cd(int argc, char** argv)
return 0; return 0;
} }
static int sh_history(int, char**) static int sh_history(int, const char**)
{ {
for (int i = 0; i < editor.history().size(); ++i) { for (int i = 0; i < editor.history().size(); ++i) {
printf("%6d %s\n", i, editor.history()[i].characters()); printf("%6d %s\n", i, editor.history()[i].characters());
@ -247,7 +247,7 @@ static int sh_history(int, char**)
return 0; return 0;
} }
static int sh_time(int argc, char** argv) static int sh_time(int argc, const char** argv)
{ {
if (argc == 1) { if (argc == 1) {
printf("usage: time <command>\n"); printf("usage: time <command>\n");
@ -266,7 +266,7 @@ static int sh_time(int argc, char** argv)
return exit_code; return exit_code;
} }
static int sh_umask(int argc, char** argv) static int sh_umask(int argc, const char** argv)
{ {
if (argc == 1) { if (argc == 1) {
mode_t old_mask = umask(0); mode_t old_mask = umask(0);
@ -286,7 +286,7 @@ static int sh_umask(int argc, char** argv)
return 0; return 0;
} }
static int sh_popd(int argc, char** argv) static int sh_popd(int argc, const char** argv)
{ {
if (g.directory_stack.size() <= 1) { if (g.directory_stack.size() <= 1) {
fprintf(stderr, "Shell: popd: directory stack empty\n"); fprintf(stderr, "Shell: popd: directory stack empty\n");
@ -348,7 +348,7 @@ static int sh_popd(int argc, char** argv)
return 0; return 0;
} }
static int sh_pushd(int argc, char** argv) static int sh_pushd(int argc, const char** argv)
{ {
StringBuilder path_builder; StringBuilder path_builder;
bool should_switch = true; bool should_switch = true;
@ -435,7 +435,7 @@ static int sh_pushd(int argc, char** argv)
return 0; return 0;
} }
static int sh_dirs(int argc, char** argv) static int sh_dirs(int argc, const char** argv)
{ {
// The first directory in the stack is ALWAYS the current directory // The first directory in the stack is ALWAYS the current directory
g.directory_stack.at(0) = g.cwd.characters(); g.directory_stack.at(0) = g.cwd.characters();
@ -479,7 +479,7 @@ static int sh_dirs(int argc, char** argv)
return 0; return 0;
} }
static bool handle_builtin(int argc, char** argv, int& retval) static bool handle_builtin(int argc, const char** argv, int& retval)
{ {
if (argc == 0) if (argc == 0)
return false; return false;
@ -832,7 +832,7 @@ static int run_command(const String& cmd)
#endif #endif
int retval = 0; int retval = 0;
if (handle_builtin(argv.size() - 1, const_cast<char**>(argv.data()), retval)) if (handle_builtin(argv.size() - 1, argv.data(), retval))
return retval; return retval;
pid_t child = fork(); pid_t child = fork();