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

fix bugs completion...

Browse source
This commit is contained in:
gwojda 2017-03-22 15:46:42 +01:00
parent 1cc5de10e5
commit dea3e1c7a8
1 changed files with 37 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6,33 +6,59 @@
/* 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 15:13:12 by gwojda ### ########.fr */ /* Updated: 2017/03/22 15:46:22 by gwojda ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "minishell.h" #include "minishell.h"
static int c_is_delim(char c)
{
if (c == ' ' || c == '<' || c == '>' || c == '\n' || c == ';')
return (1);
return (0);
}
static char *c_strdupi(char *s, int (*f)(char))
{
int i;
char *str;
i = 0;
while (s[i] && !(*f)(s[i]))
i++;
str = (char *)ft_malloc(sizeof(char) * (i + 1));
if (str)
{
str[i--] = '\0';
while (i >= 0)
{
str[i] = s[i];
i--;
}
}
return (str);
}
/* /*
** Seek the current word. ** Seek the current word.
*/ */
static char *c_current_words(t_comp *c) static char *c_current_words(void)
{ {
size_t pos; size_t pos;
char *str; char *str;
(void)c;
pos = data_singleton()->line.pos; pos = data_singleton()->line.pos;
str = data_singleton()->line.input; str = data_singleton()->line.input;
DG("pos = \"%zu\"", pos); if (pos && c_is_delim(str[pos]))
while (pos && str[pos] != ' ' && str[pos] != '<'
&& str[pos] != '>' && str[pos] != '\n' && str[pos] != ';')
--pos; --pos;
if (str[pos] == ' ' || str[pos] == '<' while (pos && !c_is_delim(str[pos]))
|| str[pos] == '>' || str[pos] == '\n' || str[pos] == ';') --pos;
if (c_is_delim(str[pos]))
++pos; ++pos;
DG("pos = \"%zu\"", pos); return (c_strdupi(str + pos, &c_is_delim));
return (str + pos);
} }
/* /*
@ -44,7 +70,7 @@ int c_matching(t_data *s, t_comp *c)
char *current_word; char *current_word;
DG("c->rcmd = \"%s\"", c->rcmd); DG("c->rcmd = \"%s\"", c->rcmd);
current_word = c_current_words(c); current_word = c_current_words();
DG("current_word = \"%s\"", current_word); DG("current_word = \"%s\"", current_word);
if (ft_strchr(c->rcmd, '/')) if (ft_strchr(c->rcmd, '/'))
c_seek_abs_path(c, current_word); c_seek_abs_path(c, current_word);