Merge pull request 'cd' (#14) from cd into master

Reviewed-on: #14
This commit is contained in:
Chris Cromer 2021-07-06 22:51:14 -04:00
commit f45a93cfdd
3 changed files with 39 additions and 2 deletions

View File

@ -16,8 +16,10 @@
#include <stdbool.h> #include <stdbool.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <unistd.h>
#include "array.h" #include "array.h"
#include "builtins.h" #include "builtins.h"
#include "console_line.h"
/** /**
* Check if the command is a builtin or not. * Check if the command is a builtin or not.
@ -44,6 +46,9 @@ void run_builtin(StringArray *args) {
if (strcmp(args->array[0], "exit") == 0) { if (strcmp(args->array[0], "exit") == 0) {
exit_shell(args); exit_shell(args);
} }
else if (strcmp(args->array[0], "cd") == 0) {
change_directory(args);
}
else { else {
fprintf(stderr, "Builtin %s does not exist!\n", args->array[0]); fprintf(stderr, "Builtin %s does not exist!\n", args->array[0]);
} }
@ -57,3 +62,27 @@ void exit_shell(StringArray *args) {
free_string_array(args); free_string_array(args);
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
} }
/**
* Change the directory to what the user inputs.
* @param args The arguments the user input.
*/
void change_directory(StringArray *args) {
if (args->size > 2) {
fprintf(stderr, "Too many arguments!\n");
return;
}
else if (args->size == 1) {
char *cwd = get_working_directory();
fprintf(stdout, "%s\n", cwd);
if (cwd != NULL) {
free(cwd);
cwd = NULL;
}
}
else {
if (chdir(args->array[1]) != 0) {
perror("cd");
}
}
}

View File

@ -84,8 +84,14 @@ void print_input_line() {
char *hostname = get_hostname(); char *hostname = get_hostname();
char *cwd = get_working_directory(); char *cwd = get_working_directory();
printf(BRIGHT_GREEN "%s" RESET BRIGHT_MAGENTA "@" RESET BRIGHT_RED "%s" RESET BRIGHT_MAGENTA ":" RESET BRIGHT_BLUE "%s" RESET BRIGHT_MAGENTA "$ " RESET, username, hostname, cwd); printf(BRIGHT_GREEN "%s" RESET BRIGHT_MAGENTA "@" RESET BRIGHT_RED "%s" RESET BRIGHT_MAGENTA ":" RESET BRIGHT_BLUE "%s" RESET BRIGHT_MAGENTA "$ " RESET, username, hostname, cwd);
if (hostname != NULL) {
free(hostname); free(hostname);
hostname = NULL;
}
if (cwd != NULL) {
free(cwd); free(cwd);
cwd = NULL;
}
} }
/** /**

View File

@ -23,4 +23,6 @@ bool is_builtin(char *command);
void run_builtin(StringArray *args); void run_builtin(StringArray *args);
void exit_shell(StringArray *args); void exit_shell(StringArray *args);
void change_directory(StringArray *args);
#endif #endif