From fb6e3382246bc8a4b2e1f080e3111a7f4a01a788 Mon Sep 17 00:00:00 2001 From: guamss Date: Wed, 28 Jun 2023 15:24:16 +0200 Subject: [PATCH] (fix): warnings in exec.c + bin executable --- src/exec/exec.c | 34 ++++++++++++++++++++-------------- zzsh | Bin 0 -> 16040 bytes 2 files changed, 20 insertions(+), 14 deletions(-) create mode 100755 zzsh diff --git a/src/exec/exec.c b/src/exec/exec.c index 44df817..ade872a 100644 --- a/src/exec/exec.c +++ b/src/exec/exec.c @@ -8,6 +8,7 @@ int execute(cmd** input, char** env) { + int exitcode; for(int i=0; input[i]!=NULL; i++) { // création d'un processus enfant du programme @@ -18,20 +19,17 @@ int execute(cmd** input, char** env) // redirige la sortie standard vers un file descriptor dup2(1, input[i]->fd_out); // on tue l'enfant (l'enfant devient la commande entrée par l'utilisateur) - execve(input[i]->executable, input[i]->args, env); + exitcode = execve(input[i]->executable, input[i]->args, env); } } + return exitcode; } -int builtin_execute(cmd** input, char** env) +int len(char** list) { - for(int i=0; input[i]!=NULL; i++) - { - if (strcmp(input[i]->executable, "cd") == 0) - { - change_directory(input[i]->args); - } - } + int index; + for (index = 0; list[index]!=NULL; index++); + return index; } int change_directory(char** args) @@ -49,16 +47,24 @@ int change_directory(char** args) char cwd[PATH_MAX]; if (getcwd(cwd, sizeof(cwd)) != NULL) { - printf("Current working dir: %s\n", cwd); + printf("cd %s \nCurrent working dir: %s\n", args[1], cwd); } return 0; } -int len(char** list) +int builtin_execute(cmd** input, char** env) { - int index; - for (index = 0; list[index]!=NULL; index++); - return index; + int exitcode; + (void) env; + for(int i=0; input[i]!=NULL; i++) + { + if (strcmp(input[i]->executable, "cd") == 0) + { + exitcode = change_directory(input[i]->args); + + } + } + return exitcode; } int main() diff --git a/zzsh b/zzsh new file mode 100755 index 0000000000000000000000000000000000000000..0d07cbe33784e7a2b068188c26d30521e0655a18 GIT binary patch literal 16040 zcmeHOeQX@n5r20{zO<$P!E z_JV_;n3_Z~mPLwMK!`tF{%8?ZQAAON+CVN1bx2zwqe_)qs`gYhlC3}q#jQ;1=K7nr zZ#H||JD~les;V7pci#MF=6%e2yMB8+`*37?M=%f&OpC-91W8l1HWF5fb)QoOu&~%9 zmg0P)xItV3d9lQ7eb{Eu+B6+3FLZUZPEV{R z8yW}INj5};(ZNJIJ{bEXd?SpOl`(u0m{ta-Hp{N4)q%@y!? z1^gx88V)ao0F>+JN#L5-81hyeGzKr-0H9nwVlZcAg<)i^XzYLy>px)hMiWU9>yIZg zqBos6AmX{fCSeYlv4f@tr!g>TVY@{2 z)4{YZY?lb*SP;?>rn7B}z&o@lY!}J?atB5CUHFwQTzBC$F5EBr5%446N5GGO9|1oC z|N9a6pytNE=_Bt{>0?Vyt`|Z-oVS9-DShPis#CJ_#f?7$TwL=DoNHEvQ6jmYbhCvb zXw6SZrY+U%l$3u&GHs=1^HP3^WZL@79+UD5B-55>c0$U}kxW~i*`rc^hGg2}%nnQW z36g1BGCL^c$4I6v&1{d9zfLl3WoEk|(|8)+?HqmUtNQ34^pQWF@7f({%r~CV$2adm zCyI4H$BuulH&nCgQMh2h4Tvja9tQsb}Q;Ng>7HPk6 zHL+VR=%eTLlYhEXKRLfh4@~NBU9gs;f`?QERmDPY&8qf`{?xzW&1az&xea^tkzt259^Xm)6;%H=H$T8yJhs>rdVY7oJ-745@SWHupZaQ@$9%f@2 z<1FAo3dO>S6{Kjg6*F=Xj@O-%%33MW6pYusT!Pf|8d zp0*u{uaPBmQHR|Eoh z*Fv--nmZUxWVL9fFE?PO@Xm^nSid=tNNKlgYqEGT5Q~Frm$&6I8CYre;|*3K)u-WY zmTeG=ix5502CiFl2OfLnJBc^&q%(x_(D`Dq2mHSGi^U1>(4ULNJa`VX(l0o~W^td5z!qJRFN1Mk8sIKj( zUa_s_iuPAGaGI%qKqregymo_!00U;77oZ zfFA)r0)7Pi2z*2YI6sc_;nZW4%)ui!ya=*MJ}n94aobc?XY-Xx=DfS>Sg-iCigW(m z^&b6SE)>%Q<>`$th;!I_RDpBX3QEtpW^dc(f^+TY6%mo@mM!3{+{BE^x3iyKg^(|W zpr_|TB6?v=MER*iJqloaLUn{*BopQ3SqRRFNR9_;X^Iy~Qtnayc jx!!7 zrTlrN|4_-?Z`I6yopJuSx8WAG4muRyt9Y;C2Nge}_>+o%NAVvjKB+j@zb|Z;wzjq1 zuB}7%@-159hEQXuQEO^w+R)J4bQ@ci=M>My;{BpmOOsFzC%bZZ4e$U~k$3#|{9fhc zpOZh)tvCW$HN3tgh*K+$WujUfQAxh?HvwP~iR0v<{g5>eMq(WXrim4zD_pAl8bnof ziQ;icwXp9Am%xJZw3h{I1YftTrQamV)$?Kn{7eP>Hx=-0=s(5bjLNr_zn#GL-3s;y zX4(E+4V=d1je}Ofegkj~ZFp&mw67M&uC_Juw-yw;fnOC|A$T3KpFudioY!n*u~MXD zJ#2N6KLWf~tQ7s>ix`zwO8aW(JDIggeMH%N=j#b&->z;@CzbtE3O}wUZBF6O1E>Cb z>vvm&TN5@@}-Nx?LE!!i8NSc(b?#W*db4L2dxLPRT2Von?+H6;zEthWt9O*mGOgYbsVX~Xz67%K=Sv_v5x)d74C;fO5U+CWJ^GS_ z`Te;>(n_QZswrntK7Bl!Hu|HfI3?G2?m|UzsB>8}uJZj$Yco@E`0USSRf{tJKL-Ck z)4SK|0YKJC|q*t*YC+Hs?-EqtCbgkp9#%Lr-q)~9|F7KsL&~2y{ci3izArM?iGthzS>?}MV?)Kg{$B?E zSL}tj|GYnB&f{0xrjlZ+ zjsJZ>X|KoryuV|v*=~aS&vwk||2yp+S?2vC^RV*w_Futb90iIg`%kEbnCF!tx9=VQ zQ_6pfvg7?Q^Ybo$+B19ozYUCH!u31f3K9%`K&w^uruJ-#Lf8IAS=jR}{_f#i-p!_-hLQ|HC?^Pl*jvvcEMuEo9{*}Ia zWP5M>v`=&UPiVF!^96QP+}r*yfmh>DmyPpX6@M4$wP%_6@8L^(Y4+#mzv+5_Ahxrm zi!$TqprEzG{=6S|zH_C)foS~`u^-PP?Tg5S{rP*Y{Cct$Vx7&LGy60D5E{2X@9$@n zf4}2t7ub(^5YBFY-nVu&*!J8{u7>>_8P0@p|9ir=rbqdE?Wrv{EmiF+b4SJg-s_M3 z-JI8+}l7~O|y4!A#j|GW$s_Z>xtYMWKjQ#rTGhV-~l)?YnHUE^`^h~l5k C3cO4J literal 0 HcmV?d00001