From 269dcce5e7c2b50f35a9158486e1d18e1d019174 Mon Sep 17 00:00:00 2001 From: bePrivate Date: Tue, 31 Oct 2023 13:12:25 +0100 Subject: [PATCH] feature made short cmdline arguments work --- .gitignore | 2 +- main | Bin 21864 -> 21864 bytes src/main.c | 29 ++++++++++++++++++++++++----- 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 88d050b..09a756f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -main \ No newline at end of file +./main \ No newline at end of file diff --git a/main b/main index 386fb9775f83a7a2e7be3b52f3edc2b3f404c95a..b69e71b8e6c29aa8ead03359c1d2986bf01b1c37 100755 GIT binary patch delta 1863 zcmbVNe@t6d6n^)W2c@CoR}0aUw$P$;;YS5atJ~rjK6u*_=15dnVlw7LF*7QZEhZ{3 z3R!*BNbV$#VZ=mZoVskhEn$&FkVyrd!GDMmbZo*bpo58vWs+Uby|46%{^v`$-?``e z&bjB@cU}pfM&Z-wtR5M<(mD2YrQ2h?p0ae!Ykeev28-QD|6 z#ZUF_eY|zH;Il0A=hI53ZfO%=m!iCy_FdwR2n`E~YZT^N1&)(saYm9;WN}S;TM8z9 zNeSjdUr9121tz6HDD1sONc&K-e-PoXEf({i8K6;_geW5;+yl(0#!UX9#_U&P`ZVT) zD03fUOfPGUFUmylxFyT9S0l=zM2HdD8j%(yy75U%R{F9zR@l`Qdc3b5U$)$B9M$~i zS8#Tg-PTY9%AoNrMtloB4$#KKrywdMMi4zF_fais56jkMQdO&P=l~D;`Eeb+klYMS zY1p6~h$#b1>AYl$RXFxLt+2@?3nLd02bLiuTmXw5?(ETo$78}{F`;i=Sme=!6-=1i zJ_x1BLMam`x1WJsNGPNM)Gw~#QmYNE;aaQpscSA;PAL4`O+w~BR%tp1rhm-Age2>u z6v4*~YZMzxGW@$f=@M7|0q53>)J4YHgTz|0e z=nD;pq=2v$@`Z#4VLe>m=o=MET=ZQO-As$!8)6C8yZlR`N!GiZhuwd>>@8HgbT0qj zE+3*9g6>9EMRZo`Alrs6o8z=1O+cz$rm+H>Hgu$xcpF1&}jf@Xz*F_9gq4sbK%2oEmBs*(lVkGQr7YO+GAHkN7> ztoc-yRGsB*pqItS*vLw<_4Z>@U`}TnQG`v64^gFnZ}O z=>8OPim?Ik(xk!`HN+(gPOxYlxezzV;>?J}8PBjLU&<}WJj*$0x z&cW4RC*%@1ihm(w7VsosoQ~rz{zixsP`rW5-CIx?zvRwDZ{mRaUUVFvb7$T~E2kB& zKNc`L;jb27b=!~+qY@iBhO=Sy<5F1La4oD);#OEs;P+si!owvFl!52KwqwC#LzOre z)?zHe`VM{?)(YJ2vE>A3p__O}E^bQc;LD8hy3F{b1U*O3d=ZKcF5pp*m0w*@u6uS1 z*t^}!`yEQd_9Jn8oEI;YmZLu9{+-Q;di%>JdEOq6UoXFhpUc7hE@ q#pC-541Ncsg~#u}d{sGm7w@VnOw|7MwN`l&tKF)kS{bhTkpCMO2G1`5 delta 1439 zcmYjRZ%kWN6o2=Xw?d_~gLXJm+K$3j7G%KaI)fz2Xjhg@2dL4QC7WR}7{JL2`eCLz zU|D(8xLurlzzoS2-84pdo8iL}S(Mdn35qc!3xZ^HQml$>HE9IB{_blnd&xV$^UmMj zIrrv8FOlda@_8oFtr!LMSuxUFQbzNeHqzlHt@1pvlZ}H_NnaXiP+T@W{A0zLnP$zs zTh0@2=%z}}ZIBwKm43}~jyR!L-prlKdL+)%!kz?&rFoI-YlQ1-w4tEDY{?e{UvSzN z3`a}4d5V5w-ElKcXAA6kBkPtA)KLH9v|`Jq$BaH% zdT}Spg!G+i$RzrVaVF6o#DzU^&ZHZJWY1c)=Ql%t;$OyOPl8Ta^S76*S1nSjcAAp8 zKY-{MCJ~lI$p6FV%xS(0_c`BAlPt}CNd#!Ru=E`?-Ypegd1gI)L=89eUgd6SNKG;H zeul5G)b~Kzkj+LC^s3Ejs;T6?!qJI)j4geVu9}yTnJk~@d0Ay>+G5>YxG&C$Q zfdwYi1)Bb0%omc{d20|{PHv(UY^u2_WPU~k{fOE!c^(1Oh#o}a6fs$9nF$ zky`3Hv=eGhYLM9#ep2xpU*9)a|9;jNyqi3mEjSxl%1q@~$`VPA;grqGmx%x#1Ld5D z{x<&#xxA?9N#Bawyr^^wE*x69EKNY;Jc^NbP|Y)ssCoLm5Af&o&#ln;!eVi1m1-SD zwUsa4bTHMZ_#gj@wpwm$FoCt$LMW4p}n6!Y_*~|e|=_5{8oz(c^?pBZ}#ST)bsFt7TC$9tGX)Dw zM=?fxkxsg;;-RSWhkKty$Hh##yJoi-u`3-lT^Zt?n;VVy9xGm%LBw8+T-_|5V>@bY~rKB|{D< J*BU<({{xm1AOrva diff --git a/src/main.c b/src/main.c index 48d52e6..3025cd4 100644 --- a/src/main.c +++ b/src/main.c @@ -279,11 +279,9 @@ int argparse(int argc, char *argv[]) { /* look for invalid arguments */ - for (int j = 1; j < argc; j++) { - if (strcmp(argv[j], "--wordlist") != 0 && strcmp(argv[j-1], "--wordlist") != 0 && strcmp(argv[j], "--verbose") != 0 && strcmp(argv[j], "--help") != 0) { - fprintf(stderr, "Invalid argument %s\n", argv[j]); - flag_error = 1; - } + if (strcmp(argv[i], argv[0]) != 0 && strcmp(argv[i], "--wordlist") != 0 && strcmp(argv[i-1], "--wordlist") != 0 && strcmp(argv[i], "--verbose") != 0 && strcmp(argv[i], "--help") != 0 && strcmp(argv[i], "-h") != 0 && strcmp(argv[i], "-w") != 0 && strcmp(argv[i-1], "-w") != 0 && strcmp(argv[i], "-v") != 0) { + fprintf(stderr, "Invalid argument %s\n", argv[i]); + flag_error = 1; } /* @@ -294,6 +292,11 @@ int argparse(int argc, char *argv[]) { print_help_and_usage(); return 2; } + // -------------------------------------------------------------- + if (strcmp(argv[i], "-h") == 0) { + print_help_and_usage(); + return 2; + } /* getting the debug flag for debug printing @@ -301,6 +304,10 @@ int argparse(int argc, char *argv[]) { if (strcmp(argv[i], "--verbose") == 0 && flag_verbose == 0) { flag_verbose = 1; } + // -------------------------------------------------------------- + if (strcmp(argv[i], "-v") == 0 && flag_verbose == 0) { + flag_verbose = 1; + } /* getting the path to the wordlist @@ -316,6 +323,18 @@ int argparse(int argc, char *argv[]) { } else if (strcmp(argv[i], "--wordlist") != 0 && flag_worldlist == 0) { strcpy(wordlist_path, "lib/wordlist"); } + // -------------------------------------------------------------- + if (strcmp(argv[i], "--wordlist") == 0 && flag_worldlist == 0) { + flag_worldlist = 1; + if (argv[i+1] != NULL) { // if there is an argument present after that, read it as the wordlist path + strcpy(wordlist_path, argv[i+1]); + } else { + fprintf(stderr, "Missing argument after %s\nUsage: %s \n", argv[i], argv[i]); + flag_error = 1; + } + } else if (strcmp(argv[i], "--wordlist") != 0 && flag_worldlist == 0) { + strcpy(wordlist_path, "lib/wordlist"); + } } if (file_exists(wordlist_path) == 0) {