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 
"no leaks on case"
This commit is contained in:
Antoine Riard 2017-03-22 22:07:13 +01:00
commit 55f4007730
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
42sh/src/exec/plaunch_file.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */ /* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/03/07 14:53:31 by jhalford #+# #+# */ /* Created: 2017/03/07 14:53:31 by jhalford #+# #+# */
/* Updated: 2017/03/20 16:29:20 by gwojda ### ########.fr */ /* Updated: 2017/03/22 21:32:36 by wescande ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -14,7 +14,7 @@
static void error_launch(char *error_ori, char *error_type, int error_code) static void error_launch(char *error_ori, char *error_type, int error_code)
{ {
SH_ERR("%s: %s%s", SHELL_NAME, error_ori, error_type); SH_ERR("%s%s", error_ori, error_type);
exit(error_code); exit(error_code);
} }

5
42sh/src/glob/dir_glob.c
View file

@ -6,7 +6,7 @@
/* By: wescande <wescande@student.42.fr> +#+ +:+ +#+ */ /* By: wescande <wescande@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/01/30 12:07:16 by wescande #+# #+# */ /* Created: 2017/01/30 12:07:16 by wescande #+# #+# */
/* Updated: 2017/03/14 23:14:19 by wescande ### ########.fr */ /* Updated: 2017/03/22 21:59:49 by wescande ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -63,7 +63,8 @@ int dir_research(t_glob *gl, char *p,
} }
if ((ft_strlen(p) <= 1 || p[ft_strlen(p) - 1] != '.') && is_directory(p)) if ((ft_strlen(p) <= 1 || p[ft_strlen(p) - 1] != '.') && is_directory(p))
{ {
dir = opendir(p); if (!(dir = opendir(p)))
return (0);
while ((in = readdir(dir))) while ((in = readdir(dir)))
dir_list_content(gl, dir_list_content(gl,
(char *[2]){p, in->d_name}, pat, mode[0]); (char *[2]){p, in->d_name}, pat, mode[0]);