zoriya/ash
1
0
Fork 0
mirror of https://github.com/zoriya/ash.git synced 2026-06-02 02:35:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleaning the parser

Browse Source
This commit is contained in:
Anonymus Raccoon
2020-05-24 22:51:49 +02:00
parent fdc18469fd
commit 7b542598af
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/parser/parser.c
+15 -4
View File
@@ -42,6 +42,7 @@ char **remove_leading_entries(char **cmds)
char *process_aliases(char *cmd, env_t *env)
{
int bin_len;
int len;
for (bin_len = 0; cmd[bin_len]; bin_len++) {
if (cmd[bin_len] == ' ' || cmd[bin_len] == '\t')
@@ -49,10 +50,11 @@ char *process_aliases(char *cmd, env_t *env)
}
for (alias_t *al = env->alias; al; al = al->next) {
if (!strncmp(al->alias, cmd, bin_len)) {
cmd = realloc(cmd, strlen(cmd) + strlen(al->command) + 1 - bin_len);
len = strlen(cmd) + strlen(al->command) + 1 - bin_len;
rm_n_char(cmd, bin_len);
cmd = realloc(cmd, len);
if (!cmd)
return (NULL);
rm_n_char(cmd, bin_len);
insert_substring(cmd, al->command, 1);
}
}
@@ -66,8 +68,17 @@ char **parse_input(char *cmd, env_t *env, wordexp_t *parser)
if (!(cmd = process_vars(cmd, env)))
return (NULL);
cmd = process_aliases(cmd, env);
if (wordexp(cmd, parser, WRDE_SHOWERR)) {
perror(SHELL_NAME);
switch (wordexp(cmd, parser, WRDE_SHOWERR)) {
case 0:
break;
case WRDE_BADCHAR:
dprintf(2, "Illegal occurrence of one of |, &, ;, <, >, (, ), {, }.\n");
return (NULL);
case WRDE_SYNTAX:
dprintf(2, "Shell syntax error\n");
return (NULL);
default:
dprintf(2, "Unknonw parsing error.\n");
return (NULL);
}
free(cmd);