From ea0f9b085a7f68629abef2b114d9a3f6c9a605b6 Mon Sep 17 00:00:00 2001
From: Hugo LAMY <hulamy@e2r12p12.clusters.42paris.fr>
Date: Mon, 7 Feb 2022 19:27:30 +0100
Subject: [PATCH] d01 ex04 erreur saute des find possibles

---
 d01/ex04/Sed.cpp                         |  13 +++++++++----
 d01/ex04/ldksliejf.replace               |   0
 d01/ex04/sed                             | Bin 36992 -> 37016 bytes
 d01/ex04/test_log/test1                  |   1 +
 d01/ex04/test_log/test2                  |   5 +++++
 d01/ex04/test_log/test3                  |   1 +
 d01/ex04/test_log/test4                  |   2 ++
 d01/ex04/unitests/test.sh                |  21 ++++++++++++++++++---
 d01/ex04/unitests/test_log/test1.replace |   2 +-
 d01/ex04/unitests/test_log/test3.replace |   2 +-
 d01/ex04/unitests/test_log/test5         |   1 +
 d01/ex04/unitests/test_log/test5.replace |   1 +
 12 files changed, 40 insertions(+), 9 deletions(-)
 create mode 100644 d01/ex04/ldksliejf.replace
 create mode 100644 d01/ex04/test_log/test1
 create mode 100644 d01/ex04/test_log/test2
 create mode 100644 d01/ex04/test_log/test3
 create mode 100644 d01/ex04/test_log/test4
 create mode 100644 d01/ex04/unitests/test_log/test5
 create mode 100644 d01/ex04/unitests/test_log/test5.replace

diff --git a/d01/ex04/Sed.cpp b/d01/ex04/Sed.cpp
index b4acbed..b65a350 100644
--- a/d01/ex04/Sed.cpp
+++ b/d01/ex04/Sed.cpp
@@ -22,12 +22,17 @@ void	Sed::replace() {
 	{
 		if (str[0] == this->_find[0])
 		{
-			tmp = str[0];
-			file.get(str, len, EOF);
-			if (this->_find.compare(1, len - 1, str) == 0)
+			if (len == 1)
 				new_file << this->_replacement;
 			else
-				new_file << tmp << str;
+			{
+				tmp = str[0];
+				file.get(str, len, EOF);
+				if (this->_find.compare(1, len - 1, str) == 0)
+					new_file << this->_replacement;
+				else
+					new_file << tmp << str;
+			}
 		}
 		else
 			new_file << str;
diff --git a/d01/ex04/ldksliejf.replace b/d01/ex04/ldksliejf.replace
new file mode 100644
index 0000000..e69de29
diff --git a/d01/ex04/sed b/d01/ex04/sed
index 6ef7124fc1faae6163e8f9f0e86b2739eed79790..fabdcbb8584e84a2eaee1cb1c3b4a860a95ba150 100755
GIT binary patch
delta 928
zcmY*YZAg<*6u$Sp-s`4w?@(8|H8*u?>tj(+5lr2yLDPc1v{Wk4VD__Yl_6-PMQbgW
z*T9O#7X9dlMDZr|Bc-TFD$Mo6zUY&n4Jrc5q_4O0t`>EFoO{l5o^#G~&&#_nDhx!0
z&}=+#%<&?lBnu@^Nfyt>POUrbcj%UDZ~*6C+qHA%jf%SCE5AHjd-D0AhCQ2GJLR}A
zCTa{8H}c%R9+5|~Z>8f4yvJ0VS&b3u9=`WYQ80Iz^L2MVD@sD`moQ-7Y&HsOF>g0p
z*qkZAXY>1}Qe45OO!F*JAo{QSgZrQ~Sr9m&y4}-AJW$9h%`*yqeoD2fgnr`4&|S!T
zg2Nx-ic9>wxv=a0UrKUh(pbQH0z;91$mjm2efR-=0>MWr!+$T;F(;*51%MHMFsbI>
zZN8C|mqM=s`ul+hty3or$5lP0Q0?*Gj*m<$iq|PxdsHn*w7SuxSnyTaxGGp)T!@gg
zp~gQU)z|nxOLda}d%Y((-wyElRgNE??suB_0{Q5yMWoL*s;&F3DE$ILH|3aZ5|^|P
zgwl}RjU>I{pirH~h?D5jHIj}Q&~lih1L_r?C|ZGE@`c5*CFOV#szRu0-Z(*>qrzK)
zz7pLNhNEc@F$Bk$4icxC8LF6y-(&>{VOg^GYWW&L%g5)p3wai~)_G|zZjqJ7)mnT?
zUcL2AS{K!^ZB)a2q}5AjGGg*kJsYGnOuP*gGvaVDvQgtA4li7zG?NjFk7}8d=CD?p
z!8A_N5~d;})(L83wbbsVHWxMSC(RlgbrP$WYF(t+OY<19`G7Y_S(s+CCU7Un7LAK8
zo<WMh3sb^~J<Q0a1`5k4onWLXOa(@apn~K!fCynBCJrB{2or}K+cuV-7oo|o0*l-o
z*~6axiAXxXy!|Zh<FU3JJ}#EY{X1M(ef)#AF{<8Y+VvQgaB*)h#t|-c^a=(@cIZXH
zn8{xsc4p+kkD(smngR?9u*jk#BLeQ>uZ}Lo?|FW2C9da<U=#cV*bsjV_7KkxRpMp5
HF;w;oKf6Je

delta 872
zcmYjPZAep57(VBoo#WkDn+>IpO{clOC?^a0p1ElsS1}CAQZTI4RRpCawTe<wgPX0X
zryu=V3V}cJPu&D55+q9dl1XJkRDYB<lRhY;{OI=H)u8j^z3+M6=Xu`uz4u=05b8UG
zmSwoUb@_Y4m=VR!n2}qsQ}5ROy}Ffr+>DbfJ^5SOpS+avPF#ObeOpM$mX5S45n<3Q
zhHV}s_4n;ldMytV@HyVNumC6Wb=D=glb2gp3Wgs%U|m>O26j?&ch9t{N)4atrNI3!
zkVXzps%lj06g{I6<UTnp$$<!z<fc)G(R(p?NRl5(a(4_5Xn0)Tuj$)>WA5#K`X7D_
zaBu@JzvhDYN2^6Q`(0Hzv!!l-1Igd6phVI1-#~5-jA(lKS=@SSd^8Q1g;^=6Bza=*
zgP1gqe&#i{<c+1Ve*KZJKUKBmn>lsLyQeUaU6GEEcXz%#>@CihC%wD8@=UQ5$gBi-
zXW{Z$sbNBl98(5us|fd`c-qni^hq<SdR0KEQ5j16h8JfMgmlQ^L0(hhMImnvBh!L0
zLG&6~BH9e28-eQQ(M8*EJ9lLatzM5^C>NpJm5L6Xze%3x&|96cli^9-4#?k8BjDrI
zick~N;8vE35LUd7pq}p#3_P6a7e;JKf%DD^oTaFxMS9$%6jhAs>d0XqH88TEmWs?t
zE$krGGto(WA!=g8I!x`XfM)op-A$7&kSZ~aW)iE9if&Tnqw^TC)dH`J(h#XEp_mbe
zn~^f8I(&34BWJ_`C=ZhZqMIg@R7gUUFk&xZWPb^TrPJ-hjFg9{z(_Lai5V(of(sKz
zE!c#JL-}xMFkwDn+UL~X*va-&Y}3D6nDOV;H%Ph7!~4u@l&%^#)|MPUK1j9aUB3y#
zvX4&(G2X{Z&jy7s6wjK>!Yc!xy5uyBzz?n+;I3+BSeQY|hReMIKFWVxS&LtDS1<?X
Z@EV9O_$`Qj{uN?1ceUi;bY9c4^bZ7oMiBr2

diff --git a/d01/ex04/test_log/test1 b/d01/ex04/test_log/test1
new file mode 100644
index 0000000..8d1c8b6
--- /dev/null
+++ b/d01/ex04/test_log/test1
@@ -0,0 +1 @@
+ 
diff --git a/d01/ex04/test_log/test2 b/d01/ex04/test_log/test2
new file mode 100644
index 0000000..23b0c96
--- /dev/null
+++ b/d01/ex04/test_log/test2
@@ -0,0 +1,5 @@
+ce fichier
+contient
+plusieurs lignes
+les unes au dessus des autres
+youhouuu ioieux
diff --git a/d01/ex04/test_log/test3 b/d01/ex04/test_log/test3
new file mode 100644
index 0000000..922f88c
--- /dev/null
+++ b/d01/ex04/test_log/test3
@@ -0,0 +1 @@
+....................................................;
diff --git a/d01/ex04/test_log/test4 b/d01/ex04/test_log/test4
new file mode 100644
index 0000000..0880dee
--- /dev/null
+++ b/d01/ex04/test_log/test4
@@ -0,0 +1,2 @@
+...................................................;
+. . . . . . . . . . . . . . . . . . . . . . . . . .;
diff --git a/d01/ex04/unitests/test.sh b/d01/ex04/unitests/test.sh
index 05c1a55..1fb520a 100644
--- a/d01/ex04/unitests/test.sh
+++ b/d01/ex04/unitests/test.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+cd $(dirname $0)
 source ./colors.sh
 
 mkdir -p test_log
@@ -13,9 +14,9 @@ mkdir -p test_log
 		OUTPUT=$( cat $TESTNAME.replace )
 		if [ "$OUTPUT" == "$RESULT" ]
 		then
-			echo -e $B_GREEN"test1 success"$ENDCO
+			echo -e $B_GREEN"$TESTNAME success"$ENDCO
 		else
-			echo -e $B_RED"test1 faillure"$ENDCO
+			echo -e $B_RED"$TESTNAME faillure"$ENDCO
 		fi
 
 		mv $TESTNAME $TESTNAME.replace ./test_log
@@ -65,7 +66,7 @@ EOF
 )
 run_tests
 
-# TEST 3 ########################################
+# TEST 4 ########################################
 TESTNAME="test4"
 FIND=".."
 REPLACEMENT="++"
@@ -81,3 +82,17 @@ EOF
 )
 run_tests
 
+# TEST 5 ########################################
+TESTNAME="test5"
+FIND="mdr"
+REPLACEMENT="|||"
+CONTENT=$(cat << EOF
+test de mmdr foubar
+EOF
+)
+RESULT=$(cat << EOF
+test de m||| foubar
+EOF
+)
+run_tests
+
diff --git a/d01/ex04/unitests/test_log/test1.replace b/d01/ex04/unitests/test_log/test1.replace
index b6fc4c6..ce01362 100644
--- a/d01/ex04/unitests/test_log/test1.replace
+++ b/d01/ex04/unitests/test_log/test1.replace
@@ -1 +1 @@
-hello
\ No newline at end of file
+hello
diff --git a/d01/ex04/unitests/test_log/test3.replace b/d01/ex04/unitests/test_log/test3.replace
index 9b26e9b..d3b95af 100644
--- a/d01/ex04/unitests/test_log/test3.replace
+++ b/d01/ex04/unitests/test_log/test3.replace
@@ -1 +1 @@
-+
\ No newline at end of file
+++++++++++++++++++++++++++++++++++++++++++++++++++++;
diff --git a/d01/ex04/unitests/test_log/test5 b/d01/ex04/unitests/test_log/test5
new file mode 100644
index 0000000..671f5ed
--- /dev/null
+++ b/d01/ex04/unitests/test_log/test5
@@ -0,0 +1 @@
+test de mmdr foubar
diff --git a/d01/ex04/unitests/test_log/test5.replace b/d01/ex04/unitests/test_log/test5.replace
new file mode 100644
index 0000000..671f5ed
--- /dev/null
+++ b/d01/ex04/unitests/test_log/test5.replace
@@ -0,0 +1 @@
+test de mmdr foubar