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

Fixed autocompletion after command separators and spacing after quotes error

Browse Source
This commit is contained in:
Dmitriy Shishkov 2020-07-15 16:13:04 +05:00
parent b00548dc0f
commit 844b413f26
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/complete.c
View File

@ -50,6 +50,9 @@ ssize_t get_dir_list(char ***dir_list, char *path, int ex)
if (ex != 0 && !check_if_executable(path, ent->d_name)) if (ex != 0 && !check_if_executable(path, ent->d_name))
continue; continue;
if (ent->d_name[0] == '.')
continue;
n++; n++;
*dir_list = realloc(*dir_list, sizeof(char *) * n); *dir_list = realloc(*dir_list, sizeof(char *) * n);
(*dir_list)[n - 1] = strdup(ent->d_name); (*dir_list)[n - 1] = strdup(ent->d_name);
@ -114,7 +117,7 @@ ssize_t get_complete_options(char ***opts, char *line, char **to_complete)
{ {
curr_pos = strdup(""); curr_pos = strdup("");
} }
else if (strchr(line, ' ')) else if (strchr(line, ' ') && strcmp(args[am - 2], "||") != 0 && strcmp(args[am - 2], "&&") != 0 && strcmp(args[am - 2], ";") != 0 && line[strlen(line) - 2] != ';' && line[strlen(line) - 2] != '&' && line[strlen(line) - 2] != '|')
{ {
curr_pos = strdup("."); curr_pos = strdup(".");
} }
@ -138,8 +141,12 @@ ssize_t get_complete_options(char ***opts, char *line, char **to_complete)
} }
else else
{ {
ABSOLUTE:
*to_complete = strdup(line); *to_complete = strdup(line);
ABSOLUTE:
if ((*to_complete)[0] != '\0' && am >= 2)
if (strcmp(args[am - 2], "||") == 0 || strcmp(args[am - 2], "&&") == 0 || strcmp(args[am - 2], ";") == 0)
*to_complete = strdup("");
sz = get_dir_list(opts, "/usr/bin", 1); sz = get_dir_list(opts, "/usr/bin", 1);
append_builtin_list(opts, &sz); append_builtin_list(opts, &sz);

12
src/shell.c
View File

@ -85,7 +85,8 @@ int process_line(char *line, cmds_p **coms)
if (line[i] == '"') if (line[i] == '"')
{ {
tmp++; tmp++;
int j = i + 1; i++;
int j = i;
for (; j < line_size; j++) for (; j < line_size; j++)
if (line[j] == '"') if (line[j] == '"')
{ {
@ -111,7 +112,14 @@ int process_line(char *line, cmds_p **coms)
i--; i--;
continue; continue;
} }
i += j - i;
i = j;
if (tmp[0] == ' ')
{
tmp++;
i++;
}
} }
else if (line[i] == ';' || (line[i] == '&' && line[i + 1] == '&') || (line[i] == '|' && line[i + 1] == '|')) else if (line[i] == ';' || (line[i] == '&' && line[i + 1] == '&') || (line[i] == '|' && line[i + 1] == '|'))
{ {