From 56a6747e061be611ff1613bbed6a9155c6f934e6 Mon Sep 17 00:00:00 2001 From: Chris Cromer Date: Sat, 17 Jul 2021 21:27:39 -0400 Subject: [PATCH] move the remove variable sysmbols function to utils --- src/builtins.c | 14 -------------- src/include/builtins.h | 7 ------- src/include/utils.h | 8 ++++++++ src/utils.c | 14 ++++++++++++++ 4 files changed, 22 insertions(+), 21 deletions(-) diff --git a/src/builtins.c b/src/builtins.c index 74078b5..8da1578 100644 --- a/src/builtins.c +++ b/src/builtins.c @@ -219,17 +219,3 @@ void echo(StringArray *args) { } free_string_array(no_variables); } - -char *remove_variable_symbol(char *original_variable) { - char *variable = malloc((strlen(original_variable)) * sizeof(char *)); - if (variable == NULL) { - perror("malloc"); - exit(EXIT_FAILURE); - } - memset(variable, 0, strlen(original_variable)); - - for (size_t i = 0; i < strlen(original_variable); i++) { - variable[i] = original_variable[i + 1]; - } - return variable; -} diff --git a/src/include/builtins.h b/src/include/builtins.h index 1d3fd05..1eeaba6 100644 --- a/src/include/builtins.h +++ b/src/include/builtins.h @@ -62,11 +62,4 @@ void set_variable(StringArray *args); */ void echo(StringArray *args); -/** - * Remove the $ symbol from a variable name. - * @param original_variable The original variable name. - * @return Returns the string without the $ symbool. - */ -char *remove_variable_symbol(char *original_variable); - #endif diff --git a/src/include/utils.h b/src/include/utils.h index 6129c68..1ab61f2 100644 --- a/src/include/utils.h +++ b/src/include/utils.h @@ -27,4 +27,12 @@ void remove_new_line(char *line); * @return Returns the current working directory. */ char *get_working_directory(); + +/** + * Remove the $ symbol from a variable name. + * @param original_variable The original variable name. + * @return Returns the string without the $ symbool. + */ +char *remove_variable_symbol(char *original_variable); + #endif diff --git a/src/utils.c b/src/utils.c index ff320b5..75e0dbf 100644 --- a/src/utils.c +++ b/src/utils.c @@ -33,3 +33,17 @@ char *get_working_directory() { } return cwd; } + +char *remove_variable_symbol(char *original_variable) { + char *variable = malloc((strlen(original_variable)) * sizeof(char *)); + if (variable == NULL) { + perror("malloc"); + exit(EXIT_FAILURE); + } + memset(variable, 0, strlen(original_variable)); + + for (size_t i = 0; i < strlen(original_variable); i++) { + variable[i] = original_variable[i + 1]; + } + return variable; +}