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

Merge branch 'master' of https://github.com/jzck/42sh

Browse source 
"resolution multi variable"
This commit is contained in:
Antoine Riard 2017-03-22 16:11:55 +01:00
commit b4fc0b6bff
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6,7 +6,7 @@
/* By: alao <alao@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/01/09 13:31:21 by alao #+# #+# */
/* Updated: 2017/03/22 12:57:02 by gwojda ### ########.fr */
/* Updated: 2017/03/22 16:02:18 by gwojda ### ########.fr */
/* */
/* ************************************************************************** */

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

@ -6,7 +6,7 @@
/* By: alao <alao@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/10/15 13:27:14 by alao #+# #+# */
/* Updated: 2017/03/22 15:49:09 by gwojda ### ########.fr */
/* Updated: 2017/03/22 16:02:25 by gwojda ### ########.fr */
/* */
/* ************************************************************************** */
@ -70,11 +70,11 @@ int c_matching(t_data *s, t_comp *c)
char *current_word;
current_word = c_current_words();
if (ft_strchr(c->rcmd, '/'))
if (ft_strchr(current_word, '/'))
c_seek_abs_path(c, current_word);
else if (ft_strchr(c->rcmd, '$'))
else if (ft_strchr(current_word, '$'))
c_seek_env(c, current_word);
else if (c->rcmd[0] != '.' && !(ft_strchr(c->rcmd, ' ')))
else if (current_word[0] != '.' && !(ft_strchr(c->rcmd, ' ')))
c_seek_binary(s, c);
else
c_seek_files(s, c, current_word);