dm1sh/mshell
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added $ENV_VARIABLES expansion

Browse Source
This commit is contained in:
Dmitriy Shishkov 2020-07-18 15:34:14 +05:00
parent cc3e1892ef
commit e6c2e4a479
2 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -16,6 +16,7 @@ Work is still in porgress, buf when you will see a "finished" topic assigned to
* Expand `*` wildcards * Expand `*` wildcards
* Commands I/O redirection with `|` pipes and `>`, `<`, `>>`, `<>` file input/output * Commands I/O redirection with `|` pipes and `>`, `<`, `>>`, `<>` file input/output
* Save history into file and access recent command in another instance of shell * Save history into file and access recent command in another instance of shell
* `$ENVIRONMENT_VARIABLES` expansion
# Builtin commands # Builtin commands
* `cd`: changes current working directory to the one specified by user. If no arguments provided, shows error. * `cd`: changes current working directory to the one specified by user. If no arguments provided, shows error.
@ -23,7 +24,6 @@ Work is still in porgress, buf when you will see a "finished" topic assigned to
* `exec`: executes entered command and exits * `exec`: executes entered command and exits
# TODO # TODO
* Replace linux `echo` command with builtin one with support of environmental variables
* Environmental variables
* `Ctrl+Z` running programm with `fd` * `Ctrl+Z` running programm with `fd`
* `$()` subcommands * `$()` subcommands
* Setting environment variables with `export` and before commands

29
src/line_parce.c
View File

@ -34,7 +34,7 @@ cmds_p *process_line(char *line)
{ {
free_tmp[j] = '\0'; free_tmp[j] = '\0';
append_to_str_arr(&(curr_pipe->args), &curr_pipe->args_am, trim_string(tmp, false)); append_to_str_arr(&curr_pipe->args, &curr_pipe->args_am, trim_string(tmp, false));
tmp += strlen(curr_pipe->args[curr_pipe->args_am - 1]) + 1; tmp += strlen(curr_pipe->args[curr_pipe->args_am - 1]) + 1;
@ -68,7 +68,7 @@ cmds_p *process_line(char *line)
free_tmp[i] = '\0'; free_tmp[i] = '\0';
if (line[i - 1] != ' ') if (line[i - 1] != ' ')
{ {
append_to_str_arr(&(curr_pipe->args), &curr_pipe->args_am, trim_string(tmp, false)); append_to_str_arr(&curr_pipe->args, &curr_pipe->args_am, trim_string(tmp, false));
tmp += strlen(curr_pipe->args[curr_pipe->args_am - 1]) + 1; tmp += strlen(curr_pipe->args[curr_pipe->args_am - 1]) + 1;
} }
else else
@ -122,7 +122,7 @@ cmds_p *process_line(char *line)
{ {
if (line[i - 1] != ' ') if (line[i - 1] != ' ')
{ {
append_to_str_arr(&(curr_pipe->args), &curr_pipe->args_am, trim_string(tmp, false)); append_to_str_arr(&curr_pipe->args, &curr_pipe->args_am, trim_string(tmp, false));
tmp += strlen(curr_pipe->args[curr_pipe->args_am - 1]) + 1; tmp += strlen(curr_pipe->args[curr_pipe->args_am - 1]) + 1;
} }
else else
@ -220,6 +220,25 @@ cmds_p *process_line(char *line)
tmp += j - i + 1; tmp += j - i + 1;
i = j; i = j;
} }
else if (line[i] == '$')
{
tmp++;
i++;
int j = i;
for (; j < line_size; j++)
if (line[j] == ' ')
break;
free_tmp[j] = '\0';
char *msg = getenv(tmp);
if (msg != NULL)
append_to_str_arr(&curr_pipe->args, &curr_pipe->args_am, "\n");
tmp += j - i + 1;
i = j;
}
else if (line[i] == ' ') else if (line[i] == ' ')
{ {
free_tmp[i] = '\0'; free_tmp[i] = '\0';
@ -229,7 +248,7 @@ cmds_p *process_line(char *line)
int sz = expand_wildcatrd(&exp, ap_string); int sz = expand_wildcatrd(&exp, ap_string);
for (int l = 0; l < sz; l++) for (int l = 0; l < sz; l++)
append_to_str_arr(&(curr_pipe->args), &curr_pipe->args_am, exp[l]); append_to_str_arr(&curr_pipe->args, &curr_pipe->args_am, exp[l]);
tmp += strlen(ap_string) + 1; tmp += strlen(ap_string) + 1;
} }
@ -248,7 +267,7 @@ cmds_p *process_line(char *line)
int sz = expand_wildcatrd(&exp, ap_string); int sz = expand_wildcatrd(&exp, ap_string);
for (int l = 0; l < sz; l++) for (int l = 0; l < sz; l++)
append_to_str_arr(&(curr_pipe->args), &curr_pipe->args_am, exp[l]); append_to_str_arr(&curr_pipe->args, &curr_pipe->args_am, exp[l]);
} }
else else
append_to_str_arr(&curr_pipe->args, &curr_pipe->args_am, trim_string(tmp, false)); append_to_str_arr(&curr_pipe->args, &curr_pipe->args_am, trim_string(tmp, false));