summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsalad <fmoenne-@student.le-101.fr>2020-12-18 14:36:31 +0100
committersalad <fmoenne-@student.le-101.fr>2020-12-18 14:36:31 +0100
commitf6cc429d6152f330de5d4aac36fea9810f9f47de (patch)
tree061f0cfe49bdd762387f2065ad2f325149e94f3e
parentfuck (diff)
download42-minishell-f6cc429d6152f330de5d4aac36fea9810f9f47de.tar.gz
42-minishell-f6cc429d6152f330de5d4aac36fea9810f9f47de.tar.bz2
42-minishell-f6cc429d6152f330de5d4aac36fea9810f9f47de.tar.xz
42-minishell-f6cc429d6152f330de5d4aac36fea9810f9f47de.tar.zst
42-minishell-f6cc429d6152f330de5d4aac36fea9810f9f47de.zip
mergethis
-rw-r--r--src/c_ctrls.c1
-rw-r--r--src/c_init.c6
2 files changed, 3 insertions, 4 deletions
diff --git a/src/c_ctrls.c b/src/c_ctrls.c
index 0bea322..af0528e 100644
--- a/src/c_ctrls.c
+++ b/src/c_ctrls.c
@@ -66,7 +66,6 @@ void c_signal_int(int signo)
write(1, "\n", 1);
msh = c_get_msh(0, msh);
msh->sig = 130;
- ioctl(1, TIOCSTI, "\002");
}
void c_signal_ign(int signo)
diff --git a/src/c_init.c b/src/c_init.c
index 1659f3f..c3c6421 100644
--- a/src/c_init.c
+++ b/src/c_init.c
@@ -157,9 +157,9 @@ short
msh->sig = 0;
tcaps.plen = (unsigned int)m_plen(msh->ps[psx - 1]);
*line = NULL;
- if (*line == NULL)
- if (!(*line = ft_calloc(sizeof(char), 1)))
- return (-1);
+ if (!(*line = ft_calloc(sizeof(char), 1)))
+ return (-1);
+ ft_printf("[%p]\n\r", (void*)*line);
if (!(c_get_win_size(&tcaps.ws)))
return (-1);
while (!(ft_strchr(nread, '\n')))