summaryrefslogtreecommitdiffstats
path: root/src/b_echo.c
diff options
context:
space:
mode:
authorJozanLeClerc <bousset.rudy@gmail.com>2020-08-04 15:52:47 +0200
committerJozanLeClerc <bousset.rudy@gmail.com>2020-08-04 15:52:47 +0200
commit5cb3373a2e5a5109a5d3b72ef45978b98f885706 (patch)
tree11a0a6f467da3ddf227d2eaf6824c4509242025e /src/b_echo.c
parentok nice (diff)
parent$? fix (diff)
download42-minishell-5cb3373a2e5a5109a5d3b72ef45978b98f885706.tar.gz
42-minishell-5cb3373a2e5a5109a5d3b72ef45978b98f885706.tar.bz2
42-minishell-5cb3373a2e5a5109a5d3b72ef45978b98f885706.tar.xz
42-minishell-5cb3373a2e5a5109a5d3b72ef45978b98f885706.tar.zst
42-minishell-5cb3373a2e5a5109a5d3b72ef45978b98f885706.zip
Merge branch 'master' into fix-pwd
Diffstat (limited to '')
-rw-r--r--src/b_echo.c (renamed from src/ft_b_echo.c)20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/ft_b_echo.c b/src/b_echo.c
index de5431f..7b998d7 100644
--- a/src/ft_b_echo.c
+++ b/src/b_echo.c
@@ -1,7 +1,7 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
-/* ft_b_echo.c :+: :+: :+: */
+/* b_echo.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: rbousset <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
@@ -15,15 +15,15 @@
#include <stdio.h>
#include <stdlib.h>
-#include "ft_s_struct.h"
-#include "ft_u_utils.h"
+#include "s_struct.h"
+#include "u_utils.h"
/* TODO: echo "quoted text", echo 'quoted text', done*/
/* echo kill\nbackslash\nbut\nnot\nn, echo "quoted\nnew\nlines", done */
/* full buffer */
void
- ft_e_put(char *str,
+ e_put(char *str,
uint8_t op)
{
size_t i;
@@ -39,7 +39,7 @@ void
}
char
- *ft_e_initb(char *ptr[],
+ *e_initb(char *ptr[],
char *str)
{
size_t len;
@@ -58,7 +58,7 @@ char
/***********************************************/
/* void */
-/* ft_e_fill(char *ptr[], char **str) */
+/* e_fill(char *ptr[], char **str) */
/* { */
/* char *bs; */
/* */
@@ -70,7 +70,7 @@ char
/* } */
/* else if ((bs = ft_strrchr(*str, '\\'))) */
/* { */
-/* ft_e_put(*str, 0); */
+/* e_put(*str, 0); */
/* } */
/* else */
/* ft_printf("%s", *str); */
@@ -78,10 +78,10 @@ char
/***********************************************/
uint8_t
- ft_b_echo(char *args[],
+ b_echo(char *args[],
t_msh *msh)
{
- const uint64_t argc = ft_get_argc((const char **)args);
+ const uint64_t argc = u_builtins_get_argc((const char **)args);
char **ptr;
char *str;
int8_t nopt;
@@ -90,7 +90,7 @@ uint8_t
ptr = args;
nopt = 0;
str = NULL;
- str = ft_e_initb(ptr, str);
+ str = e_initb(ptr, str);
if (argc >= 1)
{
if (ft_strncmp(ptr[0], "-n", 2) == 0)