From 6d7341e6abc98a4f8f495aa77d8980d4eb774e48 Mon Sep 17 00:00:00 2001 From: Adam Joly Date: Sun, 5 Nov 2023 15:12:25 +0100 Subject: [PATCH] correct putstr_fd --- Makefile | 4 +++- ft_isprint.c | 18 ++++++++++++++++++ ft_memchr.c | 18 ++++++++++++++++++ ft_memmove.c | 2 +- ft_putstr_fd.c | 4 +++- ft_strchr.c | 5 +++-- ft_strncmp.c | 23 +++++++++++++++++++++++ libft.h | 5 ++++- libft.so | Bin 15560 -> 15704 bytes 9 files changed, 73 insertions(+), 6 deletions(-) create mode 100644 ft_isprint.c create mode 100644 ft_memchr.c create mode 100644 ft_strncmp.c diff --git a/Makefile b/Makefile index cc92334..e40e196 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ # By: adjoly +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2023/11/01 11:03:22 by adjoly #+# #+# # -# Updated: 2023/11/05 10:48:31 by adjoly ### ########.fr # +# Updated: 2023/11/05 14:57:25 by adjoly ### ########.fr # # # # **************************************************************************** # @@ -20,6 +20,7 @@ SRCS = ft_atoi.c \ ft_isalpha.c \ ft_isascii.c \ ft_isdigit.c \ + ft_isprint.c \ ft_putchar_fd.c \ ft_putnbr_fd.c \ ft_putstr_fd.c \ @@ -34,6 +35,7 @@ SRCS = ft_atoi.c \ ft_strlcat.c \ ft_strjoin.c \ ft_strncmp.c \ + ft_strchr.c \ OBJS = $(SRCS:.c=.o) diff --git a/ft_isprint.c b/ft_isprint.c new file mode 100644 index 0000000..e21f334 --- /dev/null +++ b/ft_isprint.c @@ -0,0 +1,18 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_isprint.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: adjoly +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2023/11/05 14:47:49 by adjoly #+# #+# */ +/* Updated: 2023/11/05 14:51:51 by adjoly ### ########.fr */ +/* */ +/* ************************************************************************** */ + +int ft_isprint(int c) +{ + if (c >= 32 && c <= 126) + return (1); + return (0); +} diff --git a/ft_memchr.c b/ft_memchr.c new file mode 100644 index 0000000..abccd56 --- /dev/null +++ b/ft_memchr.c @@ -0,0 +1,18 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_memchr.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: adjoly +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2023/11/05 14:52:53 by adjoly #+# #+# */ +/* Updated: 2023/11/05 14:54:57 by adjoly ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "libft.h" + +void *ft_memchr(const void *s, int c, size_t n) +{ + +} diff --git a/ft_memmove.c b/ft_memmove.c index bc2ebdf..a5dba16 100644 --- a/ft_memmove.c +++ b/ft_memmove.c @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/11/03 15:04:04 by adjoly #+# #+# */ -/* Updated: 2023/11/03 15:57:15 by adjoly ### ########.fr */ +/* Updated: 2023/11/05 14:52:24 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/ft_putstr_fd.c b/ft_putstr_fd.c index 1f63bff..2b23b47 100644 --- a/ft_putstr_fd.c +++ b/ft_putstr_fd.c @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/10/31 11:45:55 by adjoly #+# #+# */ -/* Updated: 2023/11/01 17:14:02 by adjoly ### ########.fr */ +/* Updated: 2023/11/05 15:06:13 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ @@ -17,6 +17,8 @@ void ft_putstr_fd(char *s, int fd) int i; i = 0; + if (s == NULL) + return ; while (s[i]) { write(fd, &s[i], 1); diff --git a/ft_strchr.c b/ft_strchr.c index 6cf9679..5af9f0f 100644 --- a/ft_strchr.c +++ b/ft_strchr.c @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/11/01 15:45:18 by adjoly #+# #+# */ -/* Updated: 2023/11/04 15:32:14 by adjoly ### ########.fr */ +/* Updated: 2023/11/05 14:59:50 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,9 +15,10 @@ char *ft_strchr(const char *s, int c) int i; int j; char *str_result; -// initialize str_result + i = 0; j = 0; + str_result = 0; while (s[i] != c || s[i]) i++; if (s[i] == c) diff --git a/ft_strncmp.c b/ft_strncmp.c new file mode 100644 index 0000000..656bd37 --- /dev/null +++ b/ft_strncmp.c @@ -0,0 +1,23 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_strncmp.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: adjoly +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2023/11/05 10:40:45 by adjoly #+# #+# */ +/* Updated: 2023/11/05 11:02:33 by adjoly ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "libft.h" + +int ft_strncmp(const char *s1, const char *s2, size_t n) +{ + size_t i; + + i = 0; + while (s1[i] && s2[i] && i < n && s1[i] != s2[i]) + i++; + return (s1[i] - s2[i]); +} diff --git a/libft.h b/libft.h index 999a2f9..d345c6d 100644 --- a/libft.h +++ b/libft.h @@ -6,13 +6,14 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/11/01 10:06:03 by adjoly #+# #+# */ -/* Updated: 2023/11/05 10:48:55 by adjoly ### ########.fr */ +/* Updated: 2023/11/05 14:57:55 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef LIBFT_H # define LIBFT_H +#include # include # include # include @@ -40,5 +41,7 @@ int ft_toupper(int c); size_t ft_strlcat(char *dst, const char *src, size_t size); char *ft_strjoin(char const *s1, char const *s2); int ft_strncmp(const char *s1, const char *s2, size_t n); +int ft_isprint(int c); +void *memchr(const void *s, int c, size_t n); #endif \ No newline at end of file diff --git a/libft.so b/libft.so index fad24009a865beb6a5ffea076230b7df53f3a4fa..c082c23ca2bdf0fffee8d58f635258c2e3a08566 100755 GIT binary patch delta 2558 zcmZ8ieN0nV6o0oZ<&{+0LPz!sfb>`2{-75D4HX zB@R4ub5oaLh?$EqDs!2eA!TE>ZvIhS7BM3WBz3mLIdFbdC3`!!?>;rX$-TdGf9H44 zyYIg9?(yy#-`$@rTUR`=s8H1t&4pXffWs2ATP;p@s|SvnRbII`^A23Qsu~k*ZVb+m zkJf(O+~PSjJ^NMA6n8pGZP;}y_ev!d=&;jOGVC;Pck)3_wx+vssw-BTbF@xPeNotH zQ(~tY9(xRS4hCiMsak4b(_?=IdjfX;c_nus)1U#bET1p_ZsAE!^4Q<|<+-FD^5h0` zfR0cn=hG+Y3T)LPaJLcTFnE88NKC_4xv`{!v0u_>U^^xPcN&qZYYie%Ktz01;^Crv z<;zq}Rk?I$*nSs*b0Jb*E3Iby4~*|m6p4JsUtqis)+<(49A>jx_6D6y)y()@wpRz^ z?TpvPi^MV*RTy8n!B}6i$etI0+r;>Grar;=3C8C#{U?mS%y?}QSfkb}9ox5TbG!$8 zqXvy{HE-D7yshEwZCsOMV}p77W^*A|RlR0a2tOu zJ5)3+lzruf3t<#U1%EJcOOcIO;Tpu8*hXPq8bODLd$k@zgx!$;tc&(vZ7PSZ`Z zF1UgYAk!}*hhVAR5Unw`Bf~+hJ~5&Bksvs26E53Cr<>RtLiW)cT%c`ukA5GK`5r)Q z!U0kOLkY*oet5x6qAH%?{(Blp0RG?6uV z_bI_|;>3#rpIzSSwRd_*;Lp2YN?x2WN`0=@apW;tOTg}0>kXWM`s6>VG{$mnt=)Ou z?rfcLw%qjC0(9>lo1cQ+V;c{n%QjJR=b1|7$92?c5PGF9M$g4c)>^dK2}<0t&|d*%C0e486}^#7UrM-XWGG|dPC zP0|yyf{=x&Gl94ovFx@WG$QsPb|GFu970t8D+ptV)rfw?4-gf287;Yk>k$tlu12iJ zV{Sy8K zOwt3_Oh#Gg7CbaPOWGkl-AMYO0!JUzjp}H;EK||dh5lMd&q#?HLTeH#&>9PK^=SFgYKIQA6!;3| zFo;$bTKJTV6qw7%27g9kR2MRCNYBI=VXFeIv9P{A(~w4=;>Xz}9>g@-+~Zwb$6X9} zWPTq5?Pi|Lfzxcvc%NPB^iHSEghxVK_+CehBk+s)MO}#b>9tSWB;;6LB5v4aF_PZl z&n%x3@)`{08px*bxFbAvhsS~Nc!ZAN&PycUhUY)RY~D_2w<=N<+^ir5eKKnB94HT$ zi5{A)dXfSiRzp%2()cAgh3ScuT19Xgy*22i_ju%8`8rHl4Q)-#dx};%Yzsu-S{NUB z`?oRP7bgmrF?}!NBP-U&jE}5AUx+;HT&BxA&NSsLW)+M14dWy0+6dkGn#;@^S+^z_ z|F}l7Xn!$2vLej@$v3n;l2%1jH6^A@xH?8u6dmJz5&Bd~A5q_OBz;6B%NO}oTrDeQ z*=)P3*aB^mNTlHgX{(WVsZfeEw+=@08>PyYR&ZYRxU#|30*_KGa`1WKyG(PYh$o;d z-bl`aqu8R85?sP{aJ<+OC;bKzV%kp^n{~Y`?IpBAPKib3W~>|PONvyJY&HplIFo*q z5KNVPD2q|UJInWwF$gZV#Cc8P8%W5>VNvOS^Sla?ra6%UODzVdF4L=u3q-aK9A!mV Jvj)o+{trf$Xukje delta 2134 zcmZuyeN0i_vC{eTja0T`n1 zb{xNU@Jvc~$ouT(%Z8cJ$)kgpU!G?LCUmw+Kxd6L8E+F|^Zt!9-6_Vr=HQ%g~uEM^8mJqw62iQUc>bk=ix5`ZLg}^66txtFq7oINJ2S zyRZhW8vH7oYY#@tiGgfkE749UAS2_6MInl*f*u6M8(~hhzV;Z;rg_gFl_Ju~`Cytt z6m$MG=PRuWQN;N#INu3v>h*bko)O-)i&r&qKEh6lRtF1e+an>2*p50gWReUkK&utf9*(sKgP1Tzp*!WDLSSZRz5r_bO zZ5|A3b$8F=IwS9~JEIBTlt7|9-v%>U2Q`Bx!ATRLIAIet1|}Snx-&+z3hGib=oQ$R z>Zbj0DzzkQ?~)|VRp3f*)%+0t@}%JV8_}Lo@9vx78n~UBBa|;ej@beA=2bb7za`0A z73m7no~p>)m?TM_t`Xz5^Nr#%Tetl1Mj!NtI)dz3-)~l5`1iM?{jw5l=-W$&8mTgjj^={!^0b5Dy~mLL5gtjF|M7Bn_~6 z#2*kZA4f$%Yi;o5IFqtx%Jcpd%y;spoM%A8J=-YPvBBLJLM8$($df5sVt3 zAEQ4ovcm*MYTRliL@~<22%qA}gd|5U)H$r0Ze;qP#eqFAvV-4Y2~0XZHGnVSDd-e+ zbQXF<+saC&IA~0Cm|2+`p|QKj>=uD<#D`5M`8*d!;)6VA4Q+-tr;V-)9Cdy`>67qb zzJ)f)W2-!N%cD;od)WxV0xLZ$=jR|=@G4AGHS`vmsQ~?jmh?nC7?V1+o#DT>0%mZw z2xr+hAOCG{0MlAa$5uXjnyD??Dg{VA=i^nWk@FXsilVJmfV6P_j$(5DHO|Lt<9>yQ zPu7|We7vTT_uRzS9^-tx-hM3ae2~w^>*;yU$1CEuocG1;e2Vk&I{SO9f1LJRQTPth z87IsOe8C;b<;T$CJ^DYWlmG