From feede2804fec939c962e4eca8b39df028f5a5d67 Mon Sep 17 00:00:00 2001 From: Hugo LAMY Date: Wed, 27 Nov 2019 21:41:19 +0100 Subject: [PATCH] corrrection erreur dans le split --- .gitignore | 1 + srcs/part2/.ft_split.c.swp | Bin 12288 -> 0 bytes srcs/part2/a.out | Bin 8640 -> 8640 bytes srcs/part2/ft_split.c | 36 +++++++++++++++++++----------------- 4 files changed, 20 insertions(+), 17 deletions(-) delete mode 100644 srcs/part2/.ft_split.c.swp diff --git a/.gitignore b/.gitignore index c3119b3..088e750 100644 --- a/.gitignore +++ b/.gitignore @@ -52,6 +52,7 @@ Mkfile.old dkms.conf # OS generated files # +*.swp .DS_Store .DS_Store? ._* diff --git a/srcs/part2/.ft_split.c.swp b/srcs/part2/.ft_split.c.swp deleted file mode 100644 index 817fa9865c33a4d87c2fd646732c3834cc6aa59b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2O^6&t6vrzD6I)IEgop=uJ43QFJ)7y7*^NmiAA~4^m;|CE9yXKE+tagC>rBts z)w9WF5>2PhcoIy467awTSO;zgzuv&uBKQt`1I~dn;9c-K zcm=!!4ubt)H<$utupZn3e!rfvpTJw-1#k+?f(O7BumOyLyTEyevERTsa0a{w-UKg$ z7s0dOBsdNl;4pX)>;gYt$JnRfEO-Mv2O`h_2f==@59|e1uoXC9HTY{a`~>I0BKQG( z4n6}PfcL@M;CXNgJO!QrkAe<}zS9hDCcQYKoFB*jLVg=_RAYLsMmwm4 z?n&k-9F7~D3e*ZC+DK&#Ic9F5AZN?>uzE8hiF0Ct_=KD&?cqYJP*BaIP2LJAC#JQf z8g1A>BfYU56y)VIa+TBpr;k2wsE2B#C*a<|RH49Y@);A!z5{#q$c5!IV`*G4l?$4F zOs<=6`>j?d$O(Qt>@@V$Rpfx9@mKV(!jK!6DMd)x;v*` zl@e`)GFUrGR1DG$*_<;Cj)wHaaa|?!Hr8jVj~nJiw$!Ph6N!Xe>4)?j>oDZP1gXUx zWXItbDQvVIh&Gal{_->(X5rsMLqvTh5Bd;4k;|+XhoZ~`q28tudo7*k49Y^@Mp;N(4(1>;19??y zm08CLFfdNzW)ao*=cg;R=~7Kk5tx!`b>gs1yeoQbs&~*M!4vY^VS@Z1yf8@QMk2q? zyIcf3nx#;_lSmJRb&5I>#a#3Rx;@biqdFHN%nTNlD`3&GSy76Oy_d$_*WV~->{9r< zgC=EMDl}C(LF%Y#yFzx6xe!A2`|_q5Z~HvT&3AZRN#%LNn`n_A=;}kY z&YMM*t^Y1pzip>I729hMJ+1 zJk)GhJo+S%0;GpQS_o#-Uwjg%b3hio+4u6%K`mx7+I4A6R#OsVZcgOklX69uo7tlm zE-#FNjy!yhB+ioLz}hf3X};td>4_@)s?O3Ap%)208=IkGxL+)a^WsdTsNueJ!NuI&fz;P^Nl*1G0U_ibg5#r5XKk3BEsOOS<#V*1j1cO)b zG6oNH>wXf}t5hkKw|eEWSJ{kab!u~UaudxgQ2KiF$imrd7Cn5b3vWm3F=OzaIK05% zCMr)=OQmXg@*fRSwjeEY5QcXz=Lg1QlP02~CK4MJO+Z9JF(L;G8VHD`AlT>+Na05iIfa}@;B*me z1hKKPIJtC!MlBSvII++|P$9~tI}0J*IcwI1opJ??R!kyNNRNl6BcsXBLuq~C zpt#@3Qt}8ktrhvCp1E>@Mg7~IPdsrSwGGF7`I#9!6uwA0C+un zoTHgS#|p^gtk<&)YAkVB`SLt(DagH7@R&*B0Y3d9ApEYe4>GvBAO{Y_?2frwvCta< zx))Uk>u4E=q+hi0d0s6o0J`o#Y M{lg+Q8IE240?Fu+Y5)KL delta 609 zcmX@$e873a1wjRF1_nk31_mw`AOQpl6Cc_OYVkt^c_3m8T9XYK?FB8MqAE~Pi^+{Z z(HN*`BvdqJ@wN`}?%D_Z`%3S>@B_(px_$s^{@{`9`^KZ$<^%(Oiw?xR58b|RI!`qpV(bik z`5Ty82n##Cy<_y0TO)q3}{vcABc4a z$YRLJFG|f-$Sf!>%~eRr2l5n(GfNZ_b5l!n6q57vic^zIQcFsU6cST13o?t7GxO3F zQgbp(^b~?qQxx*@^Aw6Qi%W}v+|uHL)I8Rd%;MtI$!qvkctO!<0<;E%wI|=@*XQ+s z#y}8=-mEBapMPQk%Or(ny#-F~9{^WJbmP04m$6!T +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/11/25 14:00:13 by hulamy #+# #+# */ -/* Updated: 2019/11/27 20:47:35 by hulamy ### ########.fr */ +/* Updated: 2019/11/27 21:35:21 by hulamy ### ########.fr */ /* */ /* ************************************************************************** */ @@ -47,8 +47,8 @@ ** ** char **ft_split(char const *s, char c); ** -** //int main(int ac, char **av) -** int main(void) +** int main(int ac, char **av) +** //int main(void) ** { ** char **str; ** int i; @@ -56,17 +56,17 @@ ** char *s; ** char c; ** -** // if (ac == 3) -** // { +** if (ac == 3) +** { ** i = 0; -** // s = av[1]; -** s = "lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed non risus. Suspendisse"; -** // c = av[2][0]; -** c = ' '; +** s = av[1]; +** // s = "lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed non risus. Suspendisse"; +** c = av[2][0]; +** // c = ' '; ** str = ft_split(s, c); ** while (str[i]) ** printf("%s\n", str[i++]); -** // } +** } ** return (0); ** } */ @@ -76,20 +76,22 @@ static int ft_count_word(char const *s, char c) { int i; - int len; + int words; - i = -1; - len = 0; - while (s[++i]) + i = 0; + words = 0; + while (s[i]) { if (s[i] != c) { - len++; + words++; while (s[i] && s[i] != c) i++; } + else + i++; } - return (len); + return (words); } char **ft_split(char const *s, char c) @@ -102,7 +104,7 @@ char **ft_split(char const *s, char c) i = -1; j = 0; if (!s || !c) - return (0); + return (NULL); if (!(array = (char **)malloc(sizeof(char *) * (ft_count_word(s, c) + 1)))) return (NULL); while (s[++i])