From 4b500002f63f7b426906339c9bc4996852b86e0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laure=CE=B7t?= Date: Wed, 21 Apr 2021 14:01:28 +0200 Subject: [PATCH] concatenation marche --- jobs | Bin 33016 -> 32928 bytes jobs.c | 24 +++++++++++++----------- jobs.h | 2 +- minishell | Bin 32992 -> 32928 bytes minishell.c | 3 +-- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/jobs b/jobs index 470a24c19290de02d9c51f8149d25774f77d4887..3eed0f9098bf235cc79798832f0673fcc6f01ece 100755 GIT binary patch delta 7989 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 delta 8130 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 UbaVzUYZ;^6xlYFxWAdK=2BAYrmH+?% diff --git a/jobs.c b/jobs.c index 482678e..742bd62 100644 --- a/jobs.c +++ b/jobs.c @@ -3,24 +3,26 @@ #include #include "jobs.h" -void ajouter(list *l_ptr, int pid, int id, char*** cmd) +void ajouter(list *l_ptr, int pid, int id, char** seq) { - cell *new_cell = malloc(sizeof(*new_cell)); + cell* new_cell = malloc(sizeof(*new_cell)); - char *name_with_extension; - name_with_extension = malloc(sizeof(char)*256); - - char** cursor = *cmd; - strcpy(name_with_extension, *cursor); - cursor++; - strcat(name_with_extension, *cursor); - cursor++; - char* test = *cursor; + char* cmd; + cmd = malloc(sizeof(char)*256); + cmd[0] = '\0'; + + while (*seq) + { + strcat(cmd, *seq); + seq++; + strcat(cmd, " "); + } new_cell->pid = pid; new_cell->id = id; + new_cell->cmd = cmd; if (*l_ptr == NULL) { diff --git a/jobs.h b/jobs.h index 2d1d858..2600795 100644 --- a/jobs.h +++ b/jobs.h @@ -11,7 +11,7 @@ struct cell { typedef cell* list; -void ajouter(cell** list, int pid, int id, char*** cmd); +void ajouter(cell** list, int pid, int id, char** cmd); void supprimer(cell** list, int pid); void afficher(cell** list); void initialiser(list* list); diff --git a/minishell b/minishell index 780d6c30a67b3699ee9f4581fd3648f2a01e405b..3eed0f9098bf235cc79798832f0673fcc6f01ece 100755 GIT binary patch delta 8119 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 delta 8259 zcmbtZ33OCdntu0Hy{h+;N~$VbrIJAQ5VjeO zFD|Te{^Mxt*~@Kz+j+kKp}BmwDc79=VTOMTDX}!ENs?sDqzwLnDU;baGrQO*J_uu@ z7<<#mJMK2~`Q|v@Xh~!z1f@wyWLtzpe}T7K%)H1P#~v2gI&&iXNz6Ld2|C|vN#wIP z=`!<$UL~IcFSiP*F33j-YMB^c!>O zd?II7SL!p!$SJv{l4{CLl2jc?(#lmU<~6QwE3htSkuox;KU9GKK`qU8qAm_YFs`8? zN|H=cvO!y&)SywNvbj@p6?VkvVqKLw44L0y(50SktN9&TKX-fl?RT|{tfiiu`Z9l{G7)RgXP`&)B(`t@x9~moedOSg9-^WA6Gs88#xn5-CrK? zPkY-}W!7iyK9abIf68rjG*LZgOT?DAV%J$D5%Bn`49RJjJ7B|K-tIet)TgIN(u)XI z3PfDv$73h3JRTWW$vSvVTyf+Y6kKQK^2g%Fvnt*h*El%%Q!sc|qJ};u6jQGTgU6^t z1Lc@aL!~^;U!g}&szBNm`~@I-6`xQ{lPg#OuSm&b>3m(vI9Z8nJCd@U zWvoG`q4dp5US?MYBBOJZ=cRANqKcef=Zkw!WKH~V@4;*${}N*&PfzX7zTlOqDeO(Y zFg2Gw$$4sp_cw!3>wbs~`+2ip*$fo3h+`3mFfh3*81$E4h4E=*Trab~1Z#d(Ecgr9 z9r~I+0ZA$?n1WMGW_{m5U3sfOl9~g|r<}*cuO#apoMiWmXUO*A{v^5v`a8~_G8Ww7 z+kDmITivBc@#@!l6tu;DhK)c4-;oyA_Z3XB&Y6DYRm_f}hb07hw-GW4pCsX^F8+F2 zDVxjf=`LCB;<@ShY!IKGo+C$m&70D*y&r#t(6?{xK(`#F=Av5W!{rsW<0$P!7&@L0 zLy@rD+%4N%o-+|~YX_Prtnjm8MD!*3{tTyxUYb*2omFaJLhNg;n<}|=INY68#^p=7 zZ~=SGM~EWXTNaRYzu%TaVjY%1nHJMnd*|FiQdMfl(yy@+)Q-K1wGqs4s%r z=@636DnoLfkhHgS@nGZC)K=1<^H-I^UC>QpUja_-A&XKXq50J+(z_#vR|;d;e5=`^4?V z$=IExw^jJwDVb!C(pCM}V^d^FIy-n*hrJ_W~{jJPz0l*a3JBke*Af0Hy%C{~8RA z0=yM)2Hc1cNUF?gD&YmikFUuta!xkv;%S1GJ)6bDnV(q<5%*yD2x1>&5Fkx+}ET{`2U8VFHB`? zc_+rFxHdSIJ;M89e3DmS{2gz=c%1tNC$qEs3C#b@Ph7pUaXC2~oyvyu^wG7mRQL?s5Od+%M&kv zv?SsNb|F0K?B_#IZx&*EGoeRi0GlOZv^{{~Tl`=50>rpv)%q5uvf27B0jBy0$kzD+ zv-kz3>;o{Fm4>COBw1BDftl4sy2MTbs`6I>tglOwT~b;IF~@HMu(a@^v4!5_MA0;` z@vv-Gn*fz!#3|eCMAL3Tz1S?}cFavivgMf5#dha|8Sy!uU)iiUn#--zBO4p$15G6b zxpk`TITD;B?8~k7@bD)Pw6#R7fmN?0eML7qT!wX+T@W@~6HDTx7&VmwnPNF@NcR;w zAno22mY!k+Q7_@90M;bSenZ-Lr-JmUu=J!vgnWx`{7w=dYpFHFtHQ>qZ}kkv#v2*x zDV2v)irPcUS(d|m|F{INs76+TF6+^&k(I7jqfA%rW2jEIe}o5gx-xYjHNuNF877TQIqrzDAvC)(~LtfU^k#i)%DlEqk{vPfDk zORgSZN#wjGgcgyWsr5y#t%=O&+XIVh8&7DYRtF%r&eqe3Hc(pJG%pm*D)A*N-i6Fk z4C-y{_F3S43&!=PAu;Skh{)?`xZoNA+@$Y(lfLuKs!8AbCVlUlnArO!S?qm9-}@$g z@5?j1Fk^bqy%=WXk5En1L&-F^sI6p}S*R(j`@pzp9;BuMs(y-iuvLVt&WE~rs7B4D zs%HrqCJ=|(30d=Sfh4MvNoRyW($o>e87Yul)%$OR-6XIA)khXa31qnXJ|V>dDN$=k ztVAFlHIB@c3ZzQ?J8{MeWV(8gkg|l~0JGKQWZ>qw(Lm}|dZ#dZMA(h$5)!K*#4D{* zY0sJ`M6N^<>(l_rRmRYcZc^KcGs#YieUD0|GEY{^Kx=ZPr@tb}&j2V^_k)nr9wD**(Gkh~i<@(7-@~m%y#us}lf3u%q`o-!K4<(OHlFkGIazPR2;1X)6F%dUz{Ry!(IMMSREJIGAB@j% zyhMV(SH+>)I^FRow|hLJ?}b^mPopH{R*&N)fyU@)RZIocnT@e^y>)|#>M2OXW)Xc? z)PBCplcm)Y@~f!sM1ImU8gKWkBHi{|@>OpC2ZZ0@c@+ulC0<@JUJfSk`zun4sB73H zvHaBiQo_Lgx(nn9wA?Vg8h9MAF(D|)e9ezhXi_5?|1MAIrf#QRLhW>b0P zgp|wy6i1REFEWhe2@_R6JCiSqCR6B50xh|p-=kIj1PUcaH~+6_?s zf3~jN54KJH5=vk()W&5nYx3@N6HT6hl+e=aXl}H$nEyz654-D#zJcbulZkFoPhjlX z>XRv#|E<;k3&P=6CnVhJUc$n?PDr@d3CUHBRwpFf>V$+_ose*=6B2H9Lc*<1NVwJO z5vbnkUiA7>VE<>YUvG8V9REVAuY$F3tG56NxB3Gx5N>tK3#~p60KNV&K)BZ_o^Y@K zi>U}Cht^R9>q19_D(+Xb0YC8SV2SADb2j&(tbN)N@EGm`C=zDvU zRnfkKh+58{uIx2(Dg>>n2@lMnv%rxFlByy?NJx@6g`A&af2qkDB_PS|J150? zhk&b%j3zIVT1&`H(RBWqCA&i#BR>KQ>MKMpji3!DsXv0EjTH!Pd&C*%BtI%CjF;b_ zsW4h`qtOYvQC;DdkV2X^YO?Hx4PB%9MvYqyjbwzZO%eW7^%n9sHFiG&aj5(Fo0Af} zk5N4HqC`sSw}i|Wh$_W6v{@EP$@w*@)mh1tvyns=MAOYtvZrY^@(xf{8%f+LZu62F zN61XaEJ{~36H*^h4B(&?7t4n*Rq5=|md39W&mHRPge}v9B%xLECnRJc@*2bHHZru< zNaP?zu`ad*E^Javqc&KX3|Z$ck{MzV^F~r0W${4Ld4}d?mc^LI)~;A3X%j89GR{s@ zCK$I_sOrv3q}-rqe30gi7Rt@p!Yx(VlNXSQ9P!8^sr1sMcbd0NO-wVeVjN&wi>AHkP<9HS6%}NTWZWA5F_by+lYyc9+Iq* z^*!*;MJ1^R$jK-~6_sYM#avQH9DuE;bYZwe-APD>aOuHm4Xx<3-Y=6yvi9Hj7Z&xK zXKVGKyz%HEdxB`TMAyo?<&xbMkz~dBhYoxbJh=r<9On1|pjlgZS9M|KaiVD25>OnF zN&}SXHNs)D6D{#6gvX+lI*4he+0_8J5+@=uW;dv6i25jBc5A%%L*hBDC*e;sHHLWN z_86;C%9^Rkpt`$BcC@hbZkjMHiT6!R+3q(~NlMBS647;_m|C}ONID_#B+ACr+O#2g zFyW;Rl1yL&`_oJ0;KiFliT9?oHFhuD@IK(Gb{a6p0nMNJnm6oW#gPL0$x0;{jVrzeadJ z%S=PLpKb$L%?~U0OZtU!zd<48j2FmuVZ0@D*WMS_*4@S@{z5Z8-_Yb+rX}!IQ?Iq% zGi`-QmFfN~^^y4US+U$+liY{iGw4cG;?z47_a#NUsF~KxW~k@+ZN7R$=LI4AJ$G~n)41tF&*;CgZSt%Zmd6X~>)mNa z*t!h~-&Ig!yeU@kgY_=9gP*U*_XqB5pic|S8(i+54@&PE@(=OH!0q`g)@g9x;TOQ| zPSm};paU#}?rT413xoJ(!WO0CJ9zpc7n{jPEV@@K!%C$|iBdN|zo-v>WvE{4VrBfB zMXrk5utVvmuTalmGl^?9=niPuj2;L%;_wtB+oj<-A&L$ckWKdnXvHAso}2Mr;qf6M zbI6eCxohU}#B}$n<<0zf9ag-y7VXZ{OHP!uw(4wf9LQ#0X(Im&U#$4Vlm; z3%$$IlPTrf9qJ!`c}Xg(;1>|nT%o^)M&*90B(_29AaQ4qu@F5f^dFFL!j@E^yAM_L zFzLHrHT)mX*12^?jQ_)1m*!V|X>faf3Zc6b)iw0u(0V=iA56BH}onzRWc! z7Xdi1!aY~A2z0X9^F$j#TJB14ov26X)C^@YmAGsHKe){0Tx?hfe_`R@EX(FO%VONW zGdMjzcsx$py`CrAsGOrmHz?{KSf}<7x}@3iF1vC9OPT#^+U~tz+$M#%A-<_4!T@ZWDBc;2ORK)T20a=?Xy) zKe0YPBJ@p9)%Z{Ahib!d7Sc7GkJvCQ{24IxIdCuEvcZe*p=@J*_~-Y~I+gR%jrm%r zSBAH(-)NOtH{Y^3Ukh!tZhm<482pm{2K1z}LPj?|=oB#j- diff --git a/minishell.c b/minishell.c index e56b04f..636ee0d 100644 --- a/minishell.c +++ b/minishell.c @@ -90,7 +90,6 @@ int main(int argc, char *argv[]) } getcwd(currentcd, 256); - printf("%s >>> ", currentcd); prompting = 1; @@ -159,7 +158,7 @@ int main(int argc, char *argv[]) { // instructions du père if (cmd->backgrounded) { // on sauvegarde le pid, si background - ajouter(&jobs, pidFils, job_id++, cmd->seq); + ajouter(&jobs, pidFils, job_id++, *(cmd->seq)); } else { // on attend le fils, si foreground