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

Completion: Fix #156, tilde leqd to wrong folder

Browse source
This commit is contained in:
M600 2017-03-22 20:24:45 +01:00
parent ccb82193a8
commit 428a41f457
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
42sh/src/completion/c_find_abspath.c
View file

@ -6,7 +6,7 @@
/* By: gwojda <gwojda@student.42.fr> +#+ +:+ +#+ */ /* By: gwojda <gwojda@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/03/09 16:54:59 by gwojda #+# #+# */ /* Created: 2017/03/09 16:54:59 by gwojda #+# #+# */
/* Updated: 2017/03/22 15:14:41 by gwojda ### ########.fr */ /* Updated: 2017/03/22 20:21:43 by alao ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -30,11 +30,12 @@ void c_seek_abs_path(t_comp *c, char *current_word)
if (current_word[0] == '~') if (current_word[0] == '~')
{ {
tmp = c->cpath; tmp = c->cpath;
c->cpath = ft_str3join(getenv("PWD"), "/", c->cpath + 2); c->cpath = ft_str3join(getenv("HOME"), "/", c->cpath + 2);
free(tmp); free(tmp);
} }
!c->match ? c->match = ft_strdupi_w(ft_strrchr(c->rcmd, '/') + 1) : 0; !c->match ? c->match = ft_strdupi_w(ft_strrchr(c->rcmd, '/') + 1) : 0;
c_parser(c, c->cpath, c->match); c_parser(c, c->cpath, c->match);
DG("cpath [%s] match [%s]", c->cpath, c->match);
if (c->lst == NULL || c->lst == c->lst->prev) if (c->lst == NULL || c->lst == c->lst->prev)
c_exclusion_folder(c); c_exclusion_folder(c);
} }