From d03c7212c6ec2dbd52496f05318a81760e9246c3 Mon Sep 17 00:00:00 2001 From: Jeff Quast Date: Mon, 24 Jul 2023 00:48:14 -0400 Subject: [PATCH] combined approach works, bring back getopt -a -l tested on OSX and Debian arm64 --- demos/lovebyte_turbo22/planet/planet.bas | Bin 280 -> 227 bytes music/still_alive/title.bas | Bin 1109 -> 937 bytes utils/dos33fs-utils/dos33.c | 16 +++++++++++++--- vaporlock/tfv_credits/bishop.bas | Bin 345 -> 156 bytes vaporlock/tfv_credits/rainbow.bas | Bin 817 -> 551 bytes 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/demos/lovebyte_turbo22/planet/planet.bas b/demos/lovebyte_turbo22/planet/planet.bas index 63da74da37175152d7c8e0fb5de2dd10a45ef26b..d7f6d2f52f9a62233a83f6a9632baa6a6cf9203c 100644 GIT binary patch literal 227 zcmW-bJr06E5QWG1lf8!xB*g3@h&vsjvV>3!7qN$U00URBGaQ11m}MzkTWyRdaUoO8 z%$xV}%@4K=;EH8tco#@)K8|p;f8^dgNQo7k*#gLr5`#mUM*qOMi-nPLcsrTS1}nN4 z+g;h?Fy{#CJvP=sUeU!~fwjQK_HHtH1zgw?T6zU?Cwl=mwu16xL>D0$j=4E$TVpUm sB9((;Yp6q=U}7E#rY2M~B*&Ii`t&2&SMX&UXeOGKEN}WZ#d`<ts- zoW@%ga$B8zv8^$}co#N7P+TZ8v9hm@-sdo5jOAxaS+c2AIESkuPU&*{73e#9QNqJd zUGJrsnXbkBXTpzBglTy$W^))Ga<1bpa(^F#sWsz(fvE*S4~&D=+1HDI>)14#M`Jta la3tY79;&9YRR;7Lr4`2s=BMwI{n diff --git a/music/still_alive/title.bas b/music/still_alive/title.bas index 2a70563d763028b65aebf6bea9e51d2a09dc0d85..1ab5f00ae19b0cc305143365a30ad04d28c2d8a0 100644 GIT binary patch delta 463 zcmY+B&npCB9LArWwX-wtC>ICP@|yKyw;h^U%i6Wk+cvvt2b-lNA-O2IZE;dkE)GOE z;p9h~o6F8oa&REUKj0!~M;Bj4$y49nPoJLN_w9XOl*?fF!XH!uI7CPZ!hMS*qWXxK z$_+bqiCa1xg~8o5qB7Q$I-fFoRPjm=1 z0(Wo77p_HK?ShMCHBO@JYmu?9CJB#yx{RutA-w;#uc{#Y@P%arSdNfOAsGfM5ay-U zcEnkc_9?JQ@3f+0i;~Stwqs`}(mKj)nwm#an~W1SLwF~(#c<1J|1Q_l&HGKB9djl} zMtO{vinb`&<2v5iJoQ8VmUVox1+U*l8RYr^ByAC!0*%@duEdk|ARZI9^lZs!x{~UJ zsjc8zRIIpZSUofenqCumZ57pIU%z3dX-OGYx?=U2nAJ8sZT-__ZQIiwzjf2AZ)per R>L$*#Q~I;LOihCyz!%H_btwP< literal 1109 zcmZ`(>u#Gc6#nn0_+;(Js--C;kPDq6Ip8!jU^8Q~cB>S78r)>CO&-|&JiUZC{I4w-hzJo z3{Uu&q*~5acaIORGb6OFoupc_Slul^a+BpwV8-BVeYbFqc10Ghb-2C$lOC#!0v~?a zm$4ps_>KGGX>br0R9nq&C-zz`Y8Krz}rB8C{~%#)<;RcU(nr zm7K+M-?FLmlmH1{wG#F$6jEJSufF*z`c_uBN>h`2g6tJK%RO)=N~p)fdl{3G`b0}% zrQvM*RTU`yL?d$H0zT3>fIriH36QI*u@E$mk)I%bhR_D$5W$|M>RH`o+dd?C(N<$0vyiTuRuH#D zxC$2Gnj)fz14iG}Di?|EX155Ee!5?TNyiU21o2HiK*E1ReD4mBkxDR9@r^n_Mk=I# Y@3#Jr;+Y>!qfiT%>asGjt|gtzU)?tPng9R* diff --git a/utils/dos33fs-utils/dos33.c b/utils/dos33fs-utils/dos33.c index 3b020cc21..58d2125f5 100644 --- a/utils/dos33fs-utils/dos33.c +++ b/utils/dos33fs-utils/dos33.c @@ -1062,13 +1062,22 @@ int main(int argc, char **argv) { int retval=0; /* Check command line arguments */ - while ((c = getopt (argc, argv,"t:s:dhvxy"))!=-1) { + while ((c = getopt (argc, argv,"a:l:t:s:dhvxy"))!=-1) { switch (c) { case 'd': fprintf(stderr,"DEBUG enabled\n"); debug=1; break; + case 'a': + address=strtol(optarg,&endptr,0); + if (debug) fprintf(stderr,"Address=%d\n",address); + break; + case 'l': + length=strtol(optarg,&endptr,0); + if (debug) fprintf(stderr,"Length=%d\n",length); + break; + #if 0 case 't': track=strtol(optarg,&endptr,0); @@ -1233,8 +1242,9 @@ int main(int argc, char **argv) { goto exit_and_close; } - // check for optional -a and -l argument in command BSAVE [-a addr] [-l len] local_file [apple_file], - // this is done here instead of through getopt(3), because getopt does not handle sub-arguments + // check for optional -a and -l argument in command BSAVE [-a addr] [-l len] local_file [apple_file], + // this is done here only for non-linux systems instead of going through getopt(3), where 'optind' is + // handleled differently while(optind < argc) { if (strcmp (argv[optind], "-a") == 0) { if (optind + 2 > argc) { diff --git a/vaporlock/tfv_credits/bishop.bas b/vaporlock/tfv_credits/bishop.bas index a799d513d9f32e621d395af3f807f2bffc71af2e..224f10a54c93a84e8538f7a9adf5c978553afe21 100644 GIT binary patch literal 156 zcmbQuAj!eSuPr27*aVtF!URl>X?`w^=8Q7 z_{GrV%}~yv!??)IYMP-rLpz5V<1Qt~fB+v?1y4^Uh6x-K7<-7B^L literal 345 zcmX|*&2ED*5QOi3iV>=mwuyoz-(Hn5>i&g`ylIdL4*JuauHQ3=+UT?F;H_6|@TEj!OuKR2PSuUa zd>+hAr&@iP*ZSt3l=@K@sonlBVBVP9m3S0IneHp>lJen^KRHn@!WTs8ArXaRF-0QY zW5TR>6(urkK~V|#Yr=+Sk;U*hUtx-DW)+^{EeK;HvVU|$bVNSIPUNE8+OR1&VVvTa zr+ctq#sh>EGQt9ief%*<-v%73Fv4PkWSHKP`2V$?uqg5vY3dMe4|idnW4Tz7z%FmX I_Ovef1t4ZtssI20 diff --git a/vaporlock/tfv_credits/rainbow.bas b/vaporlock/tfv_credits/rainbow.bas index 15cdb8d3769c93ed25df0a6f1d4778cc10afe69e..200ca30d0a5f60813ac5f53e7cc4a8473e1d5afb 100644 GIT binary patch literal 551 zcmYL_F>4z^5QQJEZdJQ81R+AOVMBIy@AmG-ZX{WW4`Rv4MI_fLjY*l-a$y^UjW3Y2 za>|5&ZQMvjh>8TK2plO=B|jj2en9r_e5l$t^SznbnMX@?uZCt8Yo)lAks%v#J0lkj zG9AW{-ZD=49e?x{*1ZRKqvUWtkVC%4zPE}a3XP0HNwJoNGz;l3q{<~ec^XGrMN$V; zx@~E(N@`bctSqUK+PLaP>(I(r8hrCMaF}GFjpku&`MAr|M0R+K-**?m^=*lIuUu_X48Y940R@Rd=y(7C{hc!|{JF;zenz!wKd$$=og2SHSTZSfju zkb|HCegOtzgfzcg8?VF|!;Ew_jC48eM7+)ORJ9~3dtQnOCW_s5YHngaSJK2^6Svxp z_<#u+J}WZhQ?f&-`RcA?mh4I*BW?O`;D=?HGu#Awwe3@ literal 817 zcmZ8f(Q>0O41D)jX!6v~xl_pogFVB8AzWZeaE7?O2VFR~;7%b1$WUm6?lOc3DDS{WH+gqc8^5PfWC%we zJy4-#SxB-<&ZXYVY%ejDB46()ETzh6xnPzqgHo}CHgaLLRGI~L^}O!vsC= zQJ69fRanDA`6G<(624mK<>*G8V{4jt~ zS)K{Iw79Bo`exFJEbcM@~C-MECx4GH2r9s}ly%Qr5e zY(s)lLhC9i%tjCgbFWCf3{2{IVvd13=;e8$=l9vFggfwb$MJ17&xe!r*`OHdyEa9Fs2dIfWG#P&b*e#vS6tO!5R*PzHD8xH6G)*j(B`AgR~S9t6CkEy+W&TqVPKN~)WpT3m%4?~l;oB#j-