From 0b608c0b94bbe9ddc2eaf4d1d45972e2922030c7 Mon Sep 17 00:00:00 2001 From: Jack Halford Date: Wed, 15 Mar 2017 18:15:09 +0100 Subject: [PATCH] ft_prompt uses ft_printf not printf --- 42sh/src/glob/esc_print.c | 8 ++++---- 42sh/src/job-control/job_wait.c | 2 +- 42sh/src/line-editing/ft_prompt.c | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/42sh/src/glob/esc_print.c b/42sh/src/glob/esc_print.c index 504e95bd..a91afb64 100644 --- a/42sh/src/glob/esc_print.c +++ b/42sh/src/glob/esc_print.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/02/17 15:38:14 by jhalford #+# #+# */ -/* Updated: 2017/02/24 22:05:04 by ariard ### ########.fr */ +/* Updated: 2017/03/15 18:12:49 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ @@ -20,10 +20,10 @@ void esc_print(char *str, unsigned char *esc) while (*cur) { if (is_char_esc(esc, str, cur)) - printf("\\%c", *cur); + ft_printf("\\%c", *cur); else - printf("%c", *cur); + ft_printf("%c", *cur); ++cur; } - printf("\n"); + ft_printf("\n"); } diff --git a/42sh/src/job-control/job_wait.c b/42sh/src/job-control/job_wait.c index bc1d9f02..0cb2625a 100644 --- a/42sh/src/job-control/job_wait.c +++ b/42sh/src/job-control/job_wait.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/15 11:49:05 by jhalford #+# #+# */ -/* Updated: 2017/03/15 18:11:50 by jhalford ### ########.fr */ +/* Updated: 2017/03/15 18:12:30 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/line-editing/ft_prompt.c b/42sh/src/line-editing/ft_prompt.c index 908479b4..8a6614fa 100644 --- a/42sh/src/line-editing/ft_prompt.c +++ b/42sh/src/line-editing/ft_prompt.c @@ -6,7 +6,7 @@ /* By: gwojda +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/13 13:51:33 by gwojda #+# #+# */ -/* Updated: 2017/03/15 13:55:22 by gwojda ### ########.fr */ +/* Updated: 2017/03/15 18:14:57 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ @@ -27,10 +27,10 @@ static int promt_git_status(int fd) free(tmp); ft_printf("\x1b[38;5;47mgit:(\x1b[38;5;203m%s\x1b[38;5;47m)", line); if (!get_next_line(fd, &tmp)) - printf("\x1b[38;5;83m %C ", L'✓'); + ft_printf("\x1b[38;5;83m ✓ "); else { - printf("\x1b[38;5;1m %C ", L'✗'); + ft_printf("\x1b[38;5;1m ✗ "); free(tmp); } while (get_next_line(fd, &tmp)) @@ -101,9 +101,9 @@ void ft_prompt(void) do_job_notification(); if (ft_getenv(data_singleton()->env, "?") && ft_atoi(ft_getenv(data_singleton()->env, "?"))) - printf("\x1b[38;5;1m%C ", L'➜'); + ft_printf("\x1b[38;5;1m➜ "); else - printf("\x1b[38;5;10m%C ", L'➜'); + ft_printf("\x1b[38;5;10m➜ "); fflush(NULL); ft_putstr("\x1b[38;5;361m"); ret += ft_currend_dir();