tom/minishell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix *************************************

Browse Source
This commit is contained in:
tomoron
2024-04-25 10:38:02 +02:00
parent 26cf503126
commit 7f85951e43
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
srcs/here_doc.c
View File

@ -6,7 +6,7 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */ /* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/03/24 17:44:32 by marde-vr #+# #+# */ /* Created: 2024/03/24 17:44:32 by marde-vr #+# #+# */
/* Updated: 2024/04/24 10:40:41 by marde-vr ### ########.fr */ /* Updated: 2024/04/25 10:16:53 by tomoron ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -24,7 +24,7 @@ void get_here_doc_input(t_msh *msh, char *eof)
if (!line) if (!line)
{ {
ft_printf_fd(2, "\nminishell: warning: here-document delimited by"); ft_printf_fd(2, "\nminishell: warning: here-document delimited by");
ft_printf_fd(2, " end-of-file, (wanted `%s')", eof); ft_printf_fd(2, " end-of-file, (wanted `%s')\n", eof);
break ; break ;
} }
if (line && !ft_strncmp(line, eof, ft_strlen(eof))) if (line && !ft_strncmp(line, eof, ft_strlen(eof)))

9
srcs/wildcards.c
View File

@ -6,7 +6,7 @@
/* By: tomoron <marvin@42.fr> +#+ +:+ +#+ */ /* By: tomoron <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/04/15 12:53:29 by tomoron #+# #+# */ /* Created: 2024/04/15 12:53:29 by tomoron #+# #+# */
/* Updated: 2024/04/24 20:37:10 by marde-vr ### ########.fr */ /* Updated: 2024/04/25 10:35:48 by tomoron ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "minishell.h" #include "minishell.h"
@ -19,14 +19,13 @@ int filename_corresponds(char *wildcard, char *value)
{ {
if (*wildcard == '*') if (*wildcard == '*')
{ {
while(*wildcard == '*' && wildcard[1] == '*')
wildcard++;
if (!wildcard[1]) if (!wildcard[1])
return (1); return (1);
while (*value) while (*value)
{ if (filename_corresponds(wildcard + 1, value++))
if (filename_corresponds(wildcard + 1, value))
return (1); return (1);
value++;
}
return (0); return (0);
} }
else if (*wildcard == *value) else if (*wildcard == *value)