From 0e8d43306577711b9792ac2eac41092434d0d46c Mon Sep 17 00:00:00 2001 From: Jakub Adamski Date: Fri, 18 Jan 2019 19:43:13 +0100 Subject: [PATCH] ps update --- Microshell/microshell | Bin 18160 -> 18160 bytes Microshell/microshell.c | 12 ++++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Microshell/microshell b/Microshell/microshell index 6f23f8469d2855df71c8248f26f36b874a4df40b..42429d026ad3236fca36299fd1a07c473d697278 100755 GIT binary patch delta 1634 zcmZWqeN0tl96s;41l;(#mkSrT;QfS@DW7@;b%;kq4iiNR6sHz!=%!_36G|6>jBs7? z7W5k`)?CvyVACRRPD2|sGHNx#tq}UyFtgn|Dv7{Aq|zO;Yf(a^W9GkmfS zD|3D6d(=O~py4>t8FV2;hKwdxL5P+&>4Q1W{oS-Ajbw=p*^^>jw?=H>#QN@vV32&N zRvXKY2T`jwkzJqxtvR7F2m(PCR6*c|z+VdoAVIgE9ilefFZ|sAdLt~8U8cS; z18X5q*mkzXwKhDEu~f>@+gJ=eug~N?YPzV;W|wG8pUG+|HRA0Yo>%G|@kfxJ2|1?< zJp$d4ZF(R{T}t>NykYmIyn6^N(UILR*1g)#g}io^ah&Hgg+;!?qNy>my~c`yhegNd z;5YfrL0+-}y_DpemwuhEt(N7#L|~ z6f!sYqS8xr*AO2^W0I8X_)Ki5Zbu_(#06Np?Xw~(%hy@yuL#Q$AGNJr|B3Y z`-Nmg<6pg>QZm#dfi)*D40q=5xedW#e7}qD@vmqM*D_7 zdDFRXc(<@e*eg7{x2I9qDeTB~+!l(2!aQf(xgaxFBsvphd`580WF) zx@ZVn(=>%Oo}z3fmO*Q5OW8+MYBR;#rayNnK__LUe--=KhY zM<;2|XsEO_Yk<~fU6+zIFT)LLBe5;IR)3)7cKE1}%21=z?>*=8m1n!>cb@k=zvuZq z&-0%5PAY6tVXZ^qnHhq9WxjpwlBK|57;{M7>__Wa@zCYinbVag{cW}{hi@Hk&hG8- zwTlmhuqNMEp)ZA**Tx8ftVH#hIjsM{S7x?|_WWo;P`|sUY2$@*OVPC4=#Pkj%NcC(leMG;4_lszXq_?aa z*thhJHHr1msPzd}?OSV$Wb8>Qj(4($sXBgx7`~J~iZ5b=G!?&rous^F$BS*EUS~u& zlJxz>HPyx=5#u)9*0f7{`fGT?>di2$?tz!=EgF&=UmFt4O;};yu-Q#)HC`R=7W^_vf@4%18>Fw%Q_x+}uZv@RM>P~fU zzQ`AqT_aniZPIq>neBbMSDNije1i#Q`$j>kke)8_elKm2%1ag3>rrXK7Fo&R_>|Me&AKT!PK3$5GbZ)CFV%jLMXuT>Ux%JTE`2-u_FY=H7x*C zf7LVrlb8l}!4@Gu0rojy0Wbm$t^~ded=XfTP1FuN1-t;f1q=XP*hF5EwelX(hmLF}(^W^VI6X#U`trn)2~ET2K6j`?fJMN-OgWOMwjyWV2Mumz4kxM}3jGyr9q+a;`OxJO@5Odm@iyY1eSqGIk?Jf_r zNsutdE^0KHJfa>U6U$xDUrvfMn{A{XXEA%$$1)Cw(TNq6II-`nIFEyyK3TPlwc>6w zS%d<*4r>5+n=d-=7-JdKy?Q?@Ajg_q*5E5!<6&TU-A7ovFERgd2I6y`Vll=}pL+7~ zy^VS**tAb7Fh}6%EGx_nZ?Z!LE|3a6me!y(i(PaTKJ))E;hQ|+0}g{R;49hGDgFmf Cr^T57 diff --git a/Microshell/microshell.c b/Microshell/microshell.c index 8c22488..d04e3f1 100644 --- a/Microshell/microshell.c +++ b/Microshell/microshell.c @@ -218,13 +218,17 @@ void myps (char **argv){ strcat(direc, "./"); strcat(direc, name); strcat(direc, "/status"); /*tworzenie sciezki*/ - if (fork() == 0) - execlp("sed", "sed", "-n", "1p", direc, NULL); + + if (fork() == 0){ + printf("Pid: %s ", name); + exit(0); + } else wait(NULL); - if (fork() == 0) - execlp("sed", "sed", "-n", "6p", direc, NULL); + if (fork() == 0){ + execlp("sed", "sed", "-n", "1p", direc, NULL); + } else wait(NULL); }