jack/42-archive
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

correction match .> + tab

Browse source
This commit is contained in:
gwojda 2017-03-22 13:00:01 +01:00
parent 4ba59d089b
commit f0e931b44d
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
42sh/src/completion/c_find_files.c
View file

@ -6,7 +6,7 @@
/* By: alao <alao@student.42.fr> +#+ +:+ +#+ */ /* By: alao <alao@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/01/09 13:31:21 by alao #+# #+# */ /* Created: 2017/01/09 13:31:21 by alao #+# #+# */
/* Updated: 2017/03/21 14:53:21 by gwojda ### ########.fr */ /* Updated: 2017/03/22 12:57:02 by gwojda ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -88,7 +88,7 @@ int c_seek_files(t_data *s, t_comp *c, char *current_word)
if (c->rcmd[0] == '.') if (c->rcmd[0] == '.')
{ {
c->cpath = ft_strdup("./"); c->cpath = ft_strdup("./");
c->match = ft_strdup("."); c->match = ft_strdup(current_word);
} }
if (c->cpath == NULL) if (c->cpath == NULL)
{ {

8
42sh/src/completion/c_match.c
View file

@ -6,7 +6,7 @@
/* By: alao <alao@student.42.fr> +#+ +:+ +#+ */ /* By: alao <alao@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2016/10/15 13:27:14 by alao #+# #+# */ /* Created: 2016/10/15 13:27:14 by alao #+# #+# */
/* Updated: 2017/03/22 12:44:00 by alao ### ########.fr */ /* Updated: 2017/03/22 12:58:21 by gwojda ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -49,9 +49,11 @@ static char *c_current_words(t_comp *c)
input_len = ft_strlen(data_singleton()->line.input); input_len = ft_strlen(data_singleton()->line.input);
if (pos >= ft_strlen(c->rcmd)) if (pos >= ft_strlen(c->rcmd))
pos = ft_strlen(c->rcmd) - (input_len - pos + 1); pos = ft_strlen(c->rcmd) - (input_len - pos + 1);
while (pos && c->rcmd[pos] != ' ') while (pos && c->rcmd[pos] != ' ' && c->rcmd[pos] != '<'
&& c->rcmd[pos] != '>' && c->rcmd[pos] != '\n')
--pos; --pos;
if (c->rcmd[pos] == ' ') if (c->rcmd[pos] == ' ' || c->rcmd[pos] == '<'
|| c->rcmd[pos] == '>' || c->rcmd[pos] == '\n')
++pos; ++pos;
return (c->rcmd + pos); return (c->rcmd + pos);
} }