From ae8538c8603b9a5a5cd34981e6cba485d560789a Mon Sep 17 00:00:00 2001 From: Tribhuwan Kumar Date: Thu, 16 May 2024 09:16:46 +0530 Subject: [PATCH] update --- trashbhuwan | Bin 36496 -> 36496 bytes trashbhuwan.c | 28 +++++++++++++++++++--------- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/trashbhuwan b/trashbhuwan index 2f14c9b83ee99702051f9faafdb72bb1df6414f5..60add0b194cba2e0a5ae6dc118f08e8f6f83b018 100755 GIT binary patch delta 2064 zcmZ{lYfMx}6vyveSlmUnyF7fLz-0qOn;OO12n{vJ@>)|L5QPYf2(5@xA6tZqX%i*% zHd(i8)*Ou(pF~OYLsP;+YHd&uE3vJ*#@4qr*qXB12ewUP+l1-=-k~h^!H4skGv~~I z=A4RmvpJ@`XyN7g7qK}k##k=g5NW485@-Fr?rC~K!Ia|$ zWpcK6r0(9zpQHT;!)mi4PcbYAZZS#{nX{8D#Tc~oRNUuWwy0@g^rk(QU8SYjDa*Si zNs_~T-QgY>3OwLk?X{@4WK4MthxLf+!y#m*EU;U8Qq53pVW1R`Bi)q1L2%Sg(_JYbWw}8(@nUd(BP+p;ny$z|*DbjRWdW{Yb+A%32l#{9FG`>Cl zKK6)i4sAe8+=m?-QFwk93!{bk@s@8?Wbv&LrgpDCFizJ2Ni&QG9UnHM?tfpb6OJOE~Z!{7qY ziu=q3)4@ex5x5L=fhC|1bb=jVH5dSE!C`PCXbqF3Enqsh4J-n;gRU@XyQE^^!-NOy z0C$4{a344f9s;fSFpq)h;7PCu{19}3-JlQr1ndC&zyLS^4uh9KD}H0Hf$88aun4>l zx(u&N(nAbJGcop;kW)NSV|?%7uZp1c22?j-0z&h%Bat&uxuKHO(RyJu!&@YeL^{_5^!Yc z235oDp=Q`))CTLOKG@AP2wOsImBO;f25Z9-g-xJp*dM65G9es2zea6vKc+s|BQyxB z6020$8)SnmrX1J|s)kL(5(S@W8*GpUE2kUYLCddTq_A#cs}**DY_QFg16xbguuG^J zR;9MpDa=lvV!VnT!n(;&rA55wN**1kW@^qq4ug2c8M-x+(f}DWy*Xs zD$|5=bDp!lC+C_Y!seNxCK&OQo1>_Aql2~jO`EPn$i{O2?S|R1oN1!St(!2rZEHrX uT$)OqJ7=3(3$>RnNv#yzStv(D(umb{*Lmifb~r`O4*yBdck*9*x?y_& delta 1994 zcmY+FeN0nV7{>3prP4AhAP^-gl~vqa;4jX}GB?ZiU!tOHIZ}FqbC&$^bc3QeHJ=NSb4#1a zsVPo>Mh`8XYkTcb2BzwIoOPYi2x@(8$-e6c zmQf=epBq$_3|f`n|8jP^uW*R`XZ3LhMm==YkylNKQ6G|Sn?;0ro&12;;}7BBQ$JeY)A zneHIn7U^T*=F&%G_GK3=8vNG0Z-m)$Lm4eMZ}^X-&1M9gl8NUMfpWZ5vLn`@?tSBm;IC=+U2)+ z_4#g5<)Uv3rd8)7@nqG#>*5{xVt1u^CARNttDHLQd9TEVe1*{fR>;FW6i4+N_u}@6 ziRofOze#`U6OFO>h6b-m^@Xdt{lsDRSH+X#r)xy*?OCvO589qX$?Ytxi0J1R4PPp! zWW)DgL7RLlG08L?c3&xif7CqKCH(B^j`!$|m(ibgi+%AeV--iNnbv1P_$Xrq% zU)_p!;cTgB<0d`Z8GVG*Z7=GceCEM;QGLAVhryywvKM7eSTuUr1(*7d#IJz$;(~>;)s>EieY&0aJ{M zG63d)4?!2mL9ek~QH;OC0EuN_2%K}0^K)R;DbDYKC&2U(in1rdc`o?JdCr%BwLP3y zfQAd4e+K5G+xx*&xWN~}CVZD4fE%dNJ%hDT&^?B2r$g>3tcrTwRj) z)C+ATw%p2^DI2Ph1G=8dpi8L+nnyvXjoP7RtRJ6%mft0|!phE5HuNw#pg}5wZlfCL zS_(p&seOfwy+!|GyqSz1vBSyGwNwb*KyQ1jYEp!1Jy~oOH6yi^PIzqW4)tN&MCLN< zm^aXsL_(}<%*fAde%fq8`mLQ yweiI?wckej>SvmBi^RuXQF5uTzDT`krf0R8NyGm8uGU^Kd)#u3C%i|yrT!1cL3zjk diff --git a/trashbhuwan.c b/trashbhuwan.c index a385f73..6b4f052 100644 --- a/trashbhuwan.c +++ b/trashbhuwan.c @@ -495,17 +495,17 @@ int main(int argc, char *argv[]) { if (username == NULL && trashFilesDir == NULL && trashInfoDir == NULL) { perror("Something went wrong"); - exit(EXIT_FAILURE); + return 1; } // NO ARGUEMENTs if (argc == 1) { - printf("󰋼 No arguments were provided, See the github page https://github.com/tribhuwan-kumar/trashbhuwan for usage.\n"); + printf("No arguments were provided, See the github page https://github.com/tribhuwan-kumar/trashbhuwan for usage.\n"); return 1; } // LIST TRASH - else if (argc > 1 && (strcmp(argv[1], "--list") == 0 || strcmp(argv[1], "-ls") == 0 )) { + else if (argc == 2 && (strcmp(argv[1], "--list") == 0 || strcmp(argv[1], "-ls") == 0 )) { char totalSize[RTSIG_MAX]; const char *size = "SIZE"; const char *deleted_from = "DELETED FROM"; @@ -549,11 +549,14 @@ int main(int argc, char *argv[]) { listTrashedFiles(trashFilesDir, trashInfoDir); printf("%s%-*s%s %s%-*s%s %s%-s%s\n", YELLOW, sizeWidth, totalSize, NC, YELLOW, dirWidth, total_size, NC, YELLOW, dash, NC); } - exit(EXIT_SUCCESS); } // PUT FILEs IN TRASH - else if (argc > 1 && (strcmp(argv[1], "--put") == 0 || strcmp(argv[1], "-p") == 0 )) { + else if (argc >= 2 && (strcmp(argv[1], "--put") == 0 || strcmp(argv[1], "-p") == 0 )) { + if (argc == 2) { + printf("No input files were provided!!\n"); + return 1; + } for (int i = 2; i < argc; i++) { char *fileNames = argv[i]; char *resolvedPath = getAbsolutePath(fileNames); @@ -587,11 +590,14 @@ int main(int argc, char *argv[]) { } } } - return 0; } // INDIVIDUALLY DELETE TRASHED FILE - else if (argc > 1 && (strcmp(argv[1], "--delete") == 0 || strcmp(argv[1], "-dl") == 0 )) { + else if (argc >= 2 && (strcmp(argv[1], "--delete") == 0 || strcmp(argv[1], "-dl") == 0 )) { + if (argc == 2) { + printf("No input files were provided!!\n"); + return 1; + } for (int i = 2; i < argc; i++) { char *fileNames = argv[i]; deleteTrashedFile(fileNames); @@ -599,7 +605,11 @@ int main(int argc, char *argv[]) { } // RESTORE TRASH - else if (argc > 1 && (strcmp(argv[1], "--restore") == 0 || strcmp(argv[1], "-r") == 0 )) { + else if (argc >= 2 && (strcmp(argv[1], "--restore") == 0 || strcmp(argv[1], "-r") == 0 )) { + if (argc == 2) { + printf("No input files were provided!!\n"); + return 1; + } for (int i = 2; i < argc; i++) { char *fileNames = argv[i]; restoreTrashedfile(fileNames); @@ -607,7 +617,7 @@ int main(int argc, char *argv[]) { } // EMPTY TRASH - else if (strcmp(argv[1], "--empty") == 0 || strcmp(argv[1], "-em") == 0) { + else if (argc == 2 && strcmp(argv[1], "--empty") == 0 || strcmp(argv[1], "-em") == 0) { emptyTrash(trashFilesDir, trashInfoDir); }