From d325f98376786b4d905d82986341696aac22a516 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Sat, 25 Nov 2000 05:35:11 +0000 Subject: [PATCH] Tons of changes from trip to Charlotte over Thanksgiving. See CHANGELOG. --- CHANGELOG | 19 +++++++++++ archive1.pas | 96 ++++++++++++++++++++++++++++++++++++++++++++-------- archive2.pas | 20 ++++++++--- archive3.pas | 13 +++++-- bb.pas | 6 ++-- bbs.pas | 4 +-- common.pas | 27 +++++++++++++-- common1.pas | 11 ++++-- common2.pas | 6 ++-- common3.pas | 2 +- conv17a.pas | 20 ++++++++--- conv17a9.pas | 22 +++++++++--- conv18a.pas | 22 +++++++++--- cuser.pas | 2 +- doors.pas | 6 ++-- execbat.pas | 10 ++++-- execswap.pas | 2 +- file0.pas | 3 +- file1.pas | 6 ++-- file10.pas | 2 +- file11.pas | 2 +- file12.pas | 38 ++++++++++++++++----- file13.pas | 2 +- file14.pas | 2 +- file2.pas | 2 +- file3.pas | 2 +- file4.pas | 11 ++++-- file5.pas | 24 ++++++++++--- file6.pas | 2 +- file7.pas | 2 +- file8.pas | 2 +- file9.pas | 6 ++-- fvtype.pas | 2 +- ifl.pas | 2 +- init.pas | 2 +- initp.pas | 3 +- logon1.pas | 2 +- logon2.pas | 8 ++++- mail0.pas | 2 +- mail1.pas | 2 +- mail2.pas | 2 +- mail3.pas | 2 +- mail4.pas | 2 +- mail5.pas | 2 +- mail6.pas | 2 +- mail9.pas | 2 +- mdek.pas | 2 +- menus.pas | 2 +- menus2.pas | 2 +- menus3.pas | 2 +- menus4.pas | 2 +- miniterm.pas | 36 ++++++++++++++++---- misc1.pas | 2 +- misc2.pas | 10 ++++-- misc3.pas | 2 +- misc4.pas | 2 +- miscx.pas | 8 ++++- mmodem.pas | 2 +- msgpack.pas | 2 +- myio.pas | 2 +- newusers.pas | 2 +- pibo.pas | 2 +- sepmsgs.pas | 51 ++++++++++++++++++++++------ stubs.pas | 2 +- sysop1.pas | 2 +- sysop10.pas | 2 +- sysop11.pas | 2 +- sysop2.pas | 2 +- sysop21.pas | 2 +- sysop2a.pas | 2 +- sysop2b.pas | 6 ++-- sysop2c.pas | 2 +- sysop2d.pas | 2 +- sysop2e.pas | 2 +- sysop2f.pas | 6 ++-- sysop2fa.pas | 2 +- sysop2g.pas | 2 +- sysop2h.pas | 2 +- sysop2i.pas | 2 +- sysop2s.pas | 2 +- sysop2z.pas | 2 +- sysop3.pas | 2 +- sysop4.pas | 2 +- sysop5.pas | 2 +- sysop6.pas | 2 +- sysop7.pas | 2 +- sysop7m.pas | 2 +- sysop8.pas | 17 +++++++--- sysop9.pas | 18 ++++++++-- t2t.pas | 15 ++++++-- ta2z.pas | 7 +++- timejunk.pas | 2 +- tmpcom.pas | 2 +- tmpcommm.pas | 2 +- wfcmenu.pas | 2 +- 95 files changed, 510 insertions(+), 171 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 7dfbd6c..e097acb 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,22 @@ +2000-11-24 Ryan C. Gordon + * Aha! I think I stumbled upon the keypressed() problem. Looks like a + piece of the overlay code was still in there and causing problems. + Will investigate more some other time. Ugh. + * Changed timer() in common.pas to not use int21h services. + * Lots more DOSisms removed. Did a grep for the DOS backslash pathchar. + * Added TODO. + * Hack for Y2K bug in ageuser() (common.pas). + * Changed all implementations of exdrv(). So much code duplication... + * Lots of the system seems to be working, now, at first glance. + +2000-11-23 Ryan C. Gordon + + * Oh my god. Almost every damn source file has {$D-} in it, which + turns off debugging symbols. Removed, and now I can run bbs under + GDB. Thank heavens. I wonder if {$D-} means something different under + Turbo Pascal 6.0...in fact, there's a lot of these sort of things in + the source that should probably be controlled via the Makefile instead. + 2000-11-18 Ryan C. Gordon * Stubbed DOSism in file2.pas. diff --git a/archive1.pas b/archive1.pas index dcb94e8..43887fe 100644 --- a/archive1.pas +++ b/archive1.pas @@ -1,4 +1,4 @@ -{$A+,B+,D-,E+,F+,I+,L-,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L-,N-,O+,R-,S+,V-} unit archive1; interface @@ -40,7 +40,9 @@ var odir,odir2:astr; att:word; begin s:=fexpand(s); - while copy(s,length(s),1)='\' do s:=copy(s,1,length(s)-1); + {rcg11242000 DOSism} + {while copy(s,length(s),1)='\' do s:=copy(s,1,length(s)-1);} + while copy(s,length(s),1)='/' do s:=copy(s,1,length(s)-1); getdir(0,odir); getdir(exdrv(s),odir2); chdir(s); findfirst('*.*',AnyFile-Directory,dirinfo); @@ -62,12 +64,20 @@ end; procedure arcdecomp(var ok:boolean; atype:integer; fn,fspec:astr); begin - purgedir(systat.temppath+'1\'); + {rcg11242000 DOSism.} + {purgedir(systat.temppath+'1\');} + purgedir(systat.temppath+'1/'); shel1; + {rcg11242000 DOSism.} + { execbatch(ok,TRUE,'tgtemp1.bat','tgtest1.$$$',systat.temppath+'1\', arcmci(systat.filearcinfo[atype].unarcline,fn,fspec), systat.filearcinfo[atype].succlevel); + } + execbatch(ok,TRUE,'tgtemp1.bat','tgtest1.$$$',systat.temppath+'1/', + arcmci(systat.filearcinfo[atype].unarcline,fn,fspec), + systat.filearcinfo[atype].succlevel); shel2; if (not ok) then @@ -81,15 +91,23 @@ procedure arccomp(var ok:boolean; atype:integer; fn,fspec:astr); *} begin shel1; + {rcg11242000 DOSism.} + { execbatch(ok,TRUE,'tgtemp1.bat','tgtest1.$$$',systat.temppath+'1\', arcmci(systat.filearcinfo[atype].arcline,fn,fspec), systat.filearcinfo[atype].succlevel); + } + execbatch(ok,TRUE,'tgtemp1.bat','tgtest1.$$$',systat.temppath+'1/', + arcmci(systat.filearcinfo[atype].arcline,fn,fspec), + systat.filearcinfo[atype].succlevel); shel2; if (not ok) then sysoplog('Archive "'+fn+'": Errors during compression'); - purgedir(systat.temppath+'1\'); + {rcg11242000 DOSism.} + {purgedir(systat.temppath+'1\');} + purgedir(systat.temppath+'1/'); end; procedure arccomment(var ok:boolean; atype,cnum:integer; fn:astr); @@ -104,9 +122,16 @@ begin shel1; b:=systat.swapshell; systat.swapshell:=FALSE; + + {rcg11242000 DOSism.} + { execbatch(ok,FALSE,'tgtemp1.bat','tgtest1.$$$',systat.temppath+'1\', arcmci(systat.filearcinfo[atype].cmtline,fn,'')+' <'+tfn, systat.filearcinfo[atype].succlevel); + } + execbatch(ok,FALSE,'tgtemp1.bat','tgtest1.$$$',systat.temppath+'1/', + arcmci(systat.filearcinfo[atype].cmtline,fn,'')+' <'+tfn, + systat.filearcinfo[atype].succlevel); systat.swapshell:=b; shel2; @@ -118,9 +143,15 @@ procedure arcintegritytest(var ok:boolean; atype:integer; fn:astr); begin if (systat.filearcinfo[atype].testline<>'') then begin shel1; + {rcg11242000 DOSism.} + { execbatch(ok,TRUE,'tgtemp1.bat','tgtest1.$$$',systat.temppath+'1\', arcmci(systat.filearcinfo[atype].testline,fn,''), systat.filearcinfo[atype].succlevel); + } + execbatch(ok,TRUE,'tgtemp1.bat','tgtest1.$$$',systat.temppath+'1/', + arcmci(systat.filearcinfo[atype].testline,fn,''), + systat.filearcinfo[atype].succlevel); shel2; end; end; @@ -203,7 +234,9 @@ begin nl; prompt('Already in TEMP: '); numfiles:=0; tsiz:=0; - findfirst(systat.temppath+'3\*.*',anyfile-dos.directory,dirinfo); + {rcg11242000 DOSism.} + {findfirst(systat.temppath+'3\*.*',anyfile-dos.directory,dirinfo);} + findfirst(systat.temppath+'3/*.*',anyfile-dos.directory,dirinfo); found:=(doserror=0); while (found) do begin inc(tsiz,dirinfo.size); @@ -325,9 +358,15 @@ begin ok:=TRUE; s:=sqoutsp(s); shel1; + {rcg11242000 DOSism} + { execbatch(ok,TRUE,'tgtemp1.bat','tgtest1.$$$',systat.temppath+'3\', arcmci(systat.filearcinfo[atype].unarcline,fn,s), systat.filearcinfo[atype].succlevel); + } + execbatch(ok,TRUE,'tgtemp1.bat','tgtest1.$$$',systat.temppath+'3/', + arcmci(systat.filearcinfo[atype].unarcline,fn,s), + systat.filearcinfo[atype].succlevel); shel2; if (not ok) then begin @@ -342,7 +381,9 @@ begin until (done) or (hangup); end; if (tocopy) then begin - s:=systat.temppath+'3\'+ns+es; (*sqoutsp(f.filename);*) + {rcg11242000 DOSism.} + {s:=systat.temppath+'3\'+ns+es; (*sqoutsp(f.filename);*)} + s:=systat.temppath+'3/'+ns+es; (*sqoutsp(f.filename);*) sprompt(#3#5+'Progress: '); copyfile(ok,nospace,TRUE,fn,s); if (ok) then @@ -405,7 +446,9 @@ begin 'A':begin nl; prt('Archive name: '); input(fn,12); if (hangup) then exit; - fn:=systat.temppath+'3\'+fn; + {rcg11242000 DOSism.} + {fn:=systat.temppath+'3\'+fn;} + fn:=systat.temppath+'3/'+fn; loaduboard(fileboard); if (pos('.',fn)=0) and (memuboard.arctype<>0) then fn:=fn+'.'+systat.filearcinfo[memuboard.arctype].ext; @@ -424,9 +467,15 @@ begin nl; ok:=TRUE; shel1; + {rcg11242000 DOSism.} + { execbatch(ok,TRUE,'tgtemp1.bat','tgtest1.$$$',systat.temppath+'3\', arcmci(systat.filearcinfo[atype].arcline,fn,s), systat.filearcinfo[atype].succlevel); + } + execbatch(ok,TRUE,'tgtemp1.bat','tgtest1.$$$',systat.temppath+'3/', + arcmci(systat.filearcinfo[atype].arcline,fn,s), + systat.filearcinfo[atype].succlevel); shel2; if (not ok) then begin sysoplog('Archive "'+fn+'": Errors during user compression'); @@ -442,7 +491,9 @@ begin if (hangup) then exit; if (not okname(s)) then print('Illegal filename.') else begin - s:=systat.temppath+'3\'+s; + {rcg11242000 DOSism.} + {s:=systat.temppath+'3\'+s;} + s:=systat.temppath+'3/'+s; assign(fi,s); {$I-} reset(fi); {$I+} if (ioresult=0) then begin @@ -468,8 +519,13 @@ begin fiscan(pl); { loads in memuboard } su:=memuboard; with memuboard do begin + {rcg11242000 DOSisms.} + { dlpath:=systat.temppath+'3\'; ulpath:=systat.temppath+'3\'; + } + dlpath:=systat.temppath+'3/'; + ulpath:=systat.temppath+'3/'; name:='Temporary directory'; fbstat:=[]; end; @@ -492,7 +548,9 @@ begin end; 'L':begin nl; - dir(systat.temppath+'3\','*.*',TRUE); + {rcg11242000 DOSism.} + {dir(systat.temppath+'3\','*.*',TRUE);} + dir(systat.temppath+'3/','*.*',TRUE); nl; end; 'R':begin @@ -500,7 +558,9 @@ begin if (hangup) then exit; if (isul(s)) then print('Illegal filename.') else begin - s:=systat.temppath+'3\'+s; + {rcg11242000 DOSism.} + {s:=systat.temppath+'3\'+s;} + s:=systat.temppath+'3/'+s; ffile(s); if (not found) then print('File not found.') @@ -509,7 +569,9 @@ begin if not ((dirinfo.attr and VolumeID=VolumeID) or (dirinfo.attr and Directory=Directory)) then begin s:=dirinfo.name; - assign(fi,systat.temppath+'3\'+s); + {rcg11242000 DOSism.} + {assign(fi,systat.temppath+'3\'+s);} + assign(fi,systat.temppath+'3/'+s); {$I-} erase(fi); {$I+} if (ioresult<>0) then begin sysoplog('Error removing from temp. dir: "'+s+'"'); @@ -527,7 +589,9 @@ begin if (hangup) then exit; if (not okname(s)) then print('Illegal filename.') else begin - s1:=systat.temppath+'3\'+s; + {rcg11242000 DOSism.} + {s1:=systat.temppath+'3\'+s;} + s1:=systat.temppath+'3/'+s; if (not exist(s1)) then print('File not found.') else begin @@ -541,9 +605,13 @@ begin nl; prt('File mask: '); input(fn,12); if (hangup) then exit; abort:=FALSE; next:=FALSE; - ffile(systat.temppath+'3\'+fn); + {rcg11242000 DOSism.} + {ffile(systat.temppath+'3\'+fn);} + ffile(systat.temppath+'3/'+fn); repeat - lfi(systat.temppath+'3\'+dirinfo.name,abort,next); + {rcg11242000 DOSism.} + {lfi(systat.temppath+'3\'+dirinfo.name,abort,next);} + lfi(systat.temppath+'3/'+dirinfo.name,abort,next); nfile; until (not found) or (abort) or (hangup); end; diff --git a/archive2.pas b/archive2.pas index 9937d8f..7ce837d 100644 --- a/archive2.pas +++ b/archive2.pas @@ -1,4 +1,4 @@ -{$A+,B+,D-,E+,F+,I+,L-,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L-,N-,O+,R-,S+,V-} unit archive2; interface @@ -79,7 +79,9 @@ var fl:array[1..maxfiles] of astr; end else begin oldnumfl:=numfl; fsplit(fn,dstr,nstr,estr); s:=dstr; - while (copy(s,length(s),1)='\') do s:=copy(s,1,length(s)-1); + {rcg11242000 DOSism.} + {while (copy(s,length(s),1)='\') do s:=copy(s,1,length(s)-1);} + while (copy(s,length(s),1)='/') do s:=copy(s,1,length(s)-1); {$I-} chdir(s); {$I+} if ioresult<>0 then print('Path not found.') else begin @@ -199,7 +201,9 @@ var fl:array[1..maxfiles] of astr; else begin ok:=TRUE; s:=copy(fn,1,pos('.',fn))+systat.filearcinfo[toa].ext; - conva(ok,atype,bb,systat.temppath+'1\',sqoutsp(fn),sqoutsp(s)); + {rcg11242000 DOSism} + {conva(ok,atype,bb,systat.temppath+'1\',sqoutsp(fn),sqoutsp(s));} + conva(ok,atype,bb,systat.temppath+'1/',sqoutsp(fn),sqoutsp(s)); if (ok) then begin assign(fi,sqoutsp(fn)); {$I-} reset(fi); {$I+} @@ -331,9 +335,15 @@ begin ok:=TRUE; star('Adding '+cstr(j)+' files to archive...'); shel1; + {rcg11242000 DOSism} + { execbatch(ok,TRUE,'tgtemp1.bat','tgtemp1.$$$', systat.temppath+'1\',s1, systat.filearcinfo[atype].succlevel); + } + execbatch(ok,TRUE,'tgtemp1.bat','tgtemp1.$$$', + systat.temppath+'1/',s1, + systat.filearcinfo[atype].succlevel); shel2; if (not ok) then begin star('Errors in adding files'); @@ -492,7 +502,9 @@ begin star('Converting "'+fn+'"'); ok:=TRUE; s:=copy(fn,1,pos('.',s))+systat.filearcinfo[bb].ext; - conva(ok,atype,bb,systat.temppath+'1\',fn,s); + {rcg11242000 DOSism.} + {conva(ok,atype,bb,systat.temppath+'1\',fn,s);} + conva(ok,atype,bb,systat.temppath+'1/',fn,s); if (ok) then begin assign(fi,sqoutsp(fn)); {$I-} reset(fi); {$I+} diff --git a/archive3.pas b/archive3.pas index ea3e810..b6e2372 100644 --- a/archive3.pas +++ b/archive3.pas @@ -1,4 +1,4 @@ -{$A+,B+,D-,E+,F+,I+,L-,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L-,N-,O+,R-,S+,V-} unit archive3; interface @@ -53,7 +53,12 @@ begin close(fi); end; shel1; - execbatch(ok,TRUE,'tgtemp1.bat','tgtest1.$$$',systat.temppath+'1\', + {rcg11242000 DOSism} + { + execbatch(ok,TRUE,'tgtemp1.bat','tgtest1.$$$',systat.temppath+'1\', + rezipcmd+' '+sqoutsp(fn),-1); + } + execbatch(ok,TRUE,'tgtemp1.bat','tgtest1.$$$',systat.temppath+'1/', rezipcmd+' '+sqoutsp(fn),-1); shel2; assign(fi,sqoutsp(fn)); @@ -67,7 +72,9 @@ begin end else begin ok:=TRUE; s:=fn; - conva(ok,atype,atype,systat.temppath+'1\',sqoutsp(fn),sqoutsp(s)); + {rcg11242000 DOSism} + {conva(ok,atype,atype,systat.temppath+'1\',sqoutsp(fn),sqoutsp(s));} + conva(ok,atype,atype,systat.temppath+'1/',sqoutsp(fn),sqoutsp(s)); if (ok) then begin fsplit(fn,ps,ns,es); fn:=ps+ns+'.#$%'; assign(fi,sqoutsp(fn)); diff --git a/bb.pas b/bb.pas index d82ce83..2cac022 100644 --- a/bb.pas +++ b/bb.pas @@ -1,4 +1,4 @@ -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} {$M 32150,0,0} { Declared here suffices for all Units as well! } program BatchBackup; @@ -17,7 +17,9 @@ type end; const - lastspec='c:\lastbak.txt'; + {rcg11242000 uh...DOSism. uh...} + {lastspec='c:\lastbak.txt';} + lastspec='./lastbak.txt'; cline='tape SBK @D:\/S-\TRAP*.MSG/S-\BBS.OVR/S-\BBS.EXE/S/A/C/C+/-O/R@T/LBAK@D@N'; lodrv:char='C'; hidrv:char='E'; diff --git a/bbs.pas b/bbs.pas index 96cdbfa..2c09191 100644 --- a/bbs.pas +++ b/bbs.pas @@ -11,7 +11,7 @@ * written by Eric Oman, and Martin Pollard. * * * *****************************************************************************} -{$A+,B+,D-,E+,F+,I+,L-,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L-,N-,O+,R-,S+,V-} {$M 60000,0,45000} { Memory Allocation Sizes } Program BBS; @@ -225,7 +225,6 @@ Begin ovrinitems; if (ovrresult=ovrok) then overlayinems:=TRUE; end; ovrsetbuf(ovrmaxsize); ovrsetretry(ovrmaxsize div 2); - } initexecswap2:=initexecswap; execwithswap2:=execwithswap; @@ -233,6 +232,7 @@ Begin findvertypeout(ovrpath,vercs,vertype,vertypes,serialnumber,licenseinfo,sitedatetime); ver:=ver+' '+vertype; + } init; diff --git a/common.pas b/common.pas index cec41ee..4bfc449 100644 --- a/common.pas +++ b/common.pas @@ -1,4 +1,4 @@ -{$A+,B+,D-,E+,F+,I+,L-,N-,O-,R-,S+,V-} +{$A+,B+,E+,F+,I+,L-,N-,O-,R-,S+,V-} unit common; interface @@ -745,13 +745,22 @@ begin end; function timer:real; + {rcg11242000 not needed.} +{ var r:registers; h,m,s,t:real; +} +var h,m,s,t:word; begin +{ r.ax:=44*256; msdos(dos.registers(r)); h:=(r.cx div 256); m:=(r.cx mod 256); s:=(r.dx div 256); t:=(r.dx mod 256); timer:=h*3600+m*60+s+t/100; +} + {rcg11242000 linux/freepascal implementation.} + GetTime(h,m,s,t); + timer:=h*3600+m*60+s+t/100; end; function fbaseac(b:byte):boolean; @@ -937,7 +946,11 @@ begin pr(''); if (not ulfo) then close(ulf); end; - 'r':sendfilep(start_dir+'\err.log'); + + {rcg11242000 DOSism} + {'r':sendfilep(start_dir+'\err.log');} + 'r':sendfilep(start_dir+'/err.log'); + 't':begin pr(''); assign(tf,systat.gfilepath+'gfiles.dat'); @@ -1032,7 +1045,7 @@ begin end; function sysop1:boolean; -{rcg11172000 ?!} +{rcg11172000 $0000:$0417 contains value of scroll lock key.} { var a:byte absolute $0000:$0417; begin @@ -1155,6 +1168,10 @@ function ageuser(bday:string):integer; var i:integer; begin i:=value(copy(date,7,2))-value(copy(bday,7,2)); + + {rcg11242000 Y2K hack.} + i := i + 100; + if (daynum(copy(bday,1,6)+copy(date,7,2))>daynum(date)) then dec(i); ageuser:=i; end; @@ -1383,8 +1400,12 @@ end; function exdrv(s:string):byte; begin + {rcg11242000 point at root drive always. Ugh.} + { s:=fexpand(s); exdrv:=ord(s[1])-64; + } + exdrv:=3; end; function mlnnomci(s:string; l:integer):string; diff --git a/common1.pas b/common1.pas index f4851be..3c4b5ce 100644 --- a/common1.pas +++ b/common1.pas @@ -1,4 +1,4 @@ -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit common1; interface @@ -572,12 +572,19 @@ begin end else if ((xx='/HELP') or (xx='/?')) then begin nl; - sprint('^5/TYPE d:\path\filename.ext^3: Type a file'); + {rcg11242000 DOSism.} + {sprint('^5/TYPE d:\path\filename.ext^3: Type a file');} + sprint('^5/TYPE /path/filename.ext^3: Type a file'); sprint('^5/BYE^3: Hang up'); sprint('^5/CLS^3: Clear the screen'); sprint('^5/PAGE^3: Page the SysOp and User'); + {rcg11242000 DOSism} + { if (thisuser.sl=255) then sprint('^5/SHELL^3: Shell to DOS with user (255 SL ^5ONLY^3)'); + } + if (thisuser.sl=255) then + sprint('^5/SHELL^3: Shell to operating system with user (255 SL ^5ONLY^3)'); sprint('^5/Q^3: Exit chat mode'); nl; end diff --git a/common2.pas b/common2.pas index 006cbbd..a5b19e8 100644 --- a/common2.pas +++ b/common2.pas @@ -1,4 +1,4 @@ -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit common2; interface @@ -328,7 +328,9 @@ end; procedure savesystat; var systatf:file of systatrec; begin - assign(systatf,start_dir+'\status.dat'); + {rcg11242000 DOSism.} + {assign(systatf,start_dir+'\status.dat');} + assign(systatf,start_dir+'/status.dat'); rewrite(systatf); write(systatf,systat); close(systatf); end; diff --git a/common3.pas b/common3.pas index 80814cb..60fed51 100644 --- a/common3.pas +++ b/common3.pas @@ -1,4 +1,4 @@ -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit common3; interface diff --git a/conv17a.pas b/conv17a.pas index 850648a..bcac61a 100644 --- a/conv17a.pas +++ b/conv17a.pas @@ -231,8 +231,12 @@ end; function exdrv(s:astr):byte; begin + {rcg11242000 point at root drive always. Ugh.} + { s:=fexpand(s); exdrv:=ord(s[1])-64; + } + exdrv:=3; end; procedure movefile(srcname,destpath:string); @@ -587,7 +591,9 @@ var i,j,k:integer; i,j:integer; begin for i:=1 to 3 do begin - while copy(newpath[i],length(newpath[i]),1)='\' do + {rcg11242000 DOSism.} + {while copy(newpath[i],length(newpath[i]),1)='\' do} + while copy(newpath[i],length(newpath[i]),1)='/' do newpath[i]:=copy(newpath[i],1,length(newpath[i])-1); case i of 1:s:='AFILES'; 2:s:='TRAP'; 3:s:='TEMP'; end; star(s+' path ("'+fexpand(newpath[i])+'")'); @@ -599,14 +605,20 @@ var i,j,k:integer; end; if (i=3) then for j:=1 to 3 do begin - {$I-} mkdir(fexpand(newpath[i]+'\'+cstr(j))); {$I+} + {rcg11242000 DOSism.} + (*{$I-} mkdir(fexpand(newpath[i]+'\'+cstr(j))); {$I+}*) + {$I-} mkdir(fexpand(newpath[i]+'/'+cstr(j))); {$I+} if (ioresult<>0) then begin writeln; - star('Error creating directory "'+fexpand(newpath[i]+'\'+cstr(j))+'"'); + {rcg11242000 DOSism.} + {star('Error creating directory "'+fexpand(newpath[i]+'\'+cstr(j))+'"');} + star('Error creating directory "'+fexpand(newpath[i]+'/'+cstr(j))+'"'); halt(1); end; end; - newpath[i]:=newpath[i]+'\'; + {rcg11242000 DOSism.} + {newpath[i]:=newpath[i]+'\';} + newpath[i]:=newpath[i]+'/'; end; end; diff --git a/conv17a9.pas b/conv17a9.pas index 34053f8..03ebf19 100644 --- a/conv17a9.pas +++ b/conv17a9.pas @@ -1,4 +1,4 @@ -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} {$M 50000,0,1024} { Declared here suffices for all Units as well! } uses @@ -256,8 +256,12 @@ end; function exdrv(s:astr):byte; begin + {rcg11242000 point at root drive always. Ugh.} + { s:=fexpand(s); exdrv:=ord(s[1])-64; + } + exdrv:=3; end; procedure movefile(srcname,destpath:string); @@ -613,7 +617,9 @@ var i,j,k:integer; i,j:integer; begin for i:=1 to 3 do begin - while copy(newpath[i],length(newpath[i]),1)='\' do + {rcg11242000 DOSism.} + {while copy(newpath[i],length(newpath[i]),1)='\' do} + while copy(newpath[i],length(newpath[i]),1)='/' do newpath[i]:=copy(newpath[i],1,length(newpath[i])-1); case i of 1:s:='AFILES'; 2:s:='TRAP'; 3:s:='TEMP'; end; star(s+' path ("'+fexpand(newpath[i])+'")'); @@ -625,14 +631,20 @@ var i,j,k:integer; end; if (i=3) then for j:=1 to 3 do begin - {$I-} mkdir(fexpand(newpath[i]+'\'+cstr(j))); {$I+} + {rcg11242000 dosism.} + (*{$I-} mkdir(fexpand(newpath[i]+'\'+cstr(j))); {$I+}*) + {$I-} mkdir(fexpand(newpath[i]+'/'+cstr(j))); {$I+} if (ioresult<>0) then begin writeln; - star('Error creating directory "'+fexpand(newpath[i]+'\'+cstr(j))+'"'); + {rcg11242000 dosism.} + {star('Error creating directory "'+fexpand(newpath[i]+'\'+cstr(j))+'"');} + star('Error creating directory "'+fexpand(newpath[i]+'/'+cstr(j))+'"'); halt(1); end; end; - newpath[i]:=newpath[i]+'\'; + {rcg11242000 dosism.} + {newpath[i]:=newpath[i]+'\';} + newpath[i]:=newpath[i]+'/'; end; end; diff --git a/conv18a.pas b/conv18a.pas index 7b69e38..1881f2b 100644 --- a/conv18a.pas +++ b/conv18a.pas @@ -1,4 +1,4 @@ -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} {$M 50000,0,1024} uses crt,dos, @@ -241,8 +241,12 @@ end; function exdrv(s:astr):byte; begin + {rcg11242000 point at root drive always. Ugh.} + { s:=fexpand(s); exdrv:=ord(s[1])-64; + } + exdrv:=3; end; procedure movefile(srcname,destpath:string); @@ -714,7 +718,9 @@ var i,j,k:integer; i,j:integer; begin for i:=1 to 3 do begin - while copy(newpath[i],length(newpath[i]),1)='\' do + {rcg11242000 Dosism.} + {while copy(newpath[i],length(newpath[i]),1)='\' do} + while copy(newpath[i],length(newpath[i]),1)='/' do newpath[i]:=copy(newpath[i],1,length(newpath[i])-1); case i of 1:s:='AFILES'; 2:s:='TRAP'; 3:s:='TEMP'; end; star(s+' path ("'+fexpand(newpath[i])+'")'); @@ -726,14 +732,20 @@ var i,j,k:integer; end; if (i=3) then for j:=1 to 3 do begin - {$I-} mkdir(fexpand(newpath[i]+'\'+cstr(j))); {$I+} + {rcg11242000 DOSism.} + (*{$I-} mkdir(fexpand(newpath[i]+'\'+cstr(j))); {$I+}*) + {$I-} mkdir(fexpand(newpath[i]+'/'+cstr(j))); {$I+} if (ioresult<>0) then begin writeln; - star('Error creating directory "'+fexpand(newpath[i]+'\'+cstr(j))+'"'); + {rcg11242000 DOSism.} + {star('Error creating directory "'+fexpand(newpath[i]+'\'+cstr(j))+'"');} + star('Error creating directory "'+fexpand(newpath[i]+'/'+cstr(j))+'"'); halt(1); end; end; - newpath[i]:=newpath[i]+'\'; + {rcg11242000 DOSism.} + {newpath[i]:=newpath[i]+'\';} + newpath[i]:=newpath[i]+'/'; end; end; diff --git a/cuser.pas b/cuser.pas index e3987ea..7303629 100644 --- a/cuser.pas +++ b/cuser.pas @@ -1,4 +1,4 @@ -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit cuser; interface diff --git a/doors.pas b/doors.pas index a22a045..3d67068 100644 --- a/doors.pas +++ b/doors.pas @@ -5,7 +5,7 @@ (*> Online door procedures. <*) (*> <*) (*****************************************************************************) -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit doors; interface @@ -60,7 +60,9 @@ begin 'I':begin loaduboard(fileboard); sda:=systat.gfilepath; - if (copy(sda,length(sda),1)<>'\') then sda:=sda+'\'; + {rcg11242000 DOSism.} + {if (copy(sda,length(sda),1)<>'\') then sda:=sda+'\';} + if (copy(sda,length(sda),1)<>'/') then sda:=sda+'/'; sda:=sda+memuboard.filename+'.DIR'; end; 'L':begin diff --git a/execbat.pas b/execbat.pas index 0438ade..3569131 100644 --- a/execbat.pas +++ b/execbat.pas @@ -1,4 +1,4 @@ -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit execbat; interface @@ -47,7 +47,9 @@ begin getdir(0,odir); dir:=fexpand(dir); - while copy(dir,length(dir),1)='\' do dir:=copy(dir,1,length(dir)-1); + {rcg11242000 DOSism.} + {while copy(dir,length(dir),1)='\' do dir:=copy(dir,1,length(dir)-1);} + while copy(dir,length(dir),1)='/' do dir:=copy(dir,1,length(dir)-1); assign(bfp,bfn); rewrite(bfp); writeln(bfp,'echo off'); @@ -90,7 +92,9 @@ begin getdir(0,odir); dir:=fexpand(dir); - while copy(dir,length(dir),1)='\' do dir:=copy(dir,1,length(dir)-1); + {rcg11242000 DOSism.} + {while copy(dir,length(dir),1)='\' do dir:=copy(dir,1,length(dir)-1);} + while copy(dir,length(dir),1)='/' do dir:=copy(dir,1,length(dir)-1); assign(bfp,bfn); rewrite(bfp); writeln(bfp,'echo off'); diff --git a/execswap.pas b/execswap.pas index ea1b8c9..2de7a15 100644 --- a/execswap.pas +++ b/execswap.pas @@ -13,7 +13,7 @@ Version 1.3 - 5/02/89 flush swap file before execing } -{$A+,B-,D-,E+,F+,I-,L-,N-,O-,R-,S-,V-} +{$A+,B-,E+,F+,I-,L-,N-,O-,R-,S-,V-} unit ExecSwap; {-Memory-efficient DOS EXEC call} diff --git a/file0.pas b/file0.pas index 9af48be..ef06687 100644 --- a/file0.pas +++ b/file0.pas @@ -1,4 +1,4 @@ -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit file0; interface @@ -107,6 +107,7 @@ var savedir:astr; okd:boolean; begin okd:=TRUE; +{ !!! Check this! } s:=bslash(FALSE,fexpand(s)); if ((length(s)=2) and (copy(s,2,1)=':')) then begin diff --git a/file1.pas b/file1.pas index 4dbb2a2..dfac84b 100644 --- a/file1.pas +++ b/file1.pas @@ -1,4 +1,4 @@ -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit file1; interface @@ -1011,7 +1011,9 @@ procedure do_unlisted_download; var s:astr; begin nl; - print('Enter file name to download (d:path\filename.ext)'); + {rcg11242000 DOSism.} + {print('Enter file name to download (d:path\filename.ext)');} + print('Enter file name to download (path/filename.ext)'); prt(':'); mpl(78); input(s,78); unlisted_download(s); end; diff --git a/file10.pas b/file10.pas index 1141841..c22143e 100644 --- a/file10.pas +++ b/file10.pas @@ -1,4 +1,4 @@ -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit file10; interface diff --git a/file11.pas b/file11.pas index a6f85ff..6514b5d 100644 --- a/file11.pas +++ b/file11.pas @@ -1,4 +1,4 @@ -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit file11; interface diff --git a/file12.pas b/file12.pas index 1466760..8a53b86 100644 --- a/file12.pas +++ b/file12.pas @@ -1,4 +1,4 @@ -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit file12; interface @@ -199,8 +199,13 @@ begin getdatetime(xferstart); if (useron) then shel(caps(thisuser.name)+' is batch uploading!') else shel('Receiving file(s)...'); + {rcg11242000 DOSism.} + { execbatch(dok,FALSE,'tgtemp1.bat','tgtest1.$$$',systat.temppath+'2\', bproline1(protocol.ulcmd),-1); + } + execbatch(dok,FALSE,'tgtemp1.bat','tgtest1.$$$',systat.temppath+'2/', + bproline1(protocol.ulcmd),-1); shel2; getdatetime(xferend); timediff(tooktime,xferstart,xferend); @@ -222,7 +227,9 @@ begin tconvtime:=0.0; takeawayulrefundgot:=0.0; totb:=0; totfils:=0; totb1:=0; totfils1:=0; totpts:=0; - findfirst(systat.temppath+'2\*.*',anyfile-directory,dirinfo); + {rcg11242000 DOSism.} + {findfirst(systat.temppath+'2\*.*',anyfile-directory,dirinfo);} + findfirst(systat.temppath+'2/*.*',anyfile-directory,dirinfo); while (doserror=0) do begin inc(totfils1); inc(totb1,dirinfo.size); @@ -279,7 +286,9 @@ begin print('Uploads detected:'); nl; - dir(systat.temppath+'2\','*.*',TRUE); + {rcg11242000 DOSism.} + {dir(systat.temppath+'2\','*.*',TRUE);} + dir(systat.temppath+'2/','*.*',TRUE); nl; star('# files uploaded: '+cstr(totfils1)+' files.'); star('File size uploaded: '+cstrl(totb1)+' bytes.'); @@ -296,7 +305,9 @@ begin {* files already in the upload batch queue done during the second pass *} for passn:=1 to 2 do begin - findfirst(systat.temppath+'2\*.*',anyfile-directory,dirinfo); + {rcg11242000 DOSism.} + {findfirst(systat.temppath+'2\*.*',anyfile-directory,dirinfo);} + findfirst(systat.temppath+'2/*.*',anyfile-directory,dirinfo); while (doserror=0) do begin fn:=sqoutsp(dirinfo.name); nl; @@ -358,7 +369,12 @@ begin close(ulff); fiscan(pl); - arcstuff(ok,convt,blks,convtime,TRUE,systat.temppath+'2\', + {rcg11242000 DOSism.} + { + arcstuff(ok,convt,blks,convtime,TRUE,systat.temppath+'2\', + fn,f.description); + } + arcstuff(ok,convt,blks,convtime,TRUE,systat.temppath+'2/', fn,f.description); tconvtime:=tconvtime+convtime; f.blocks:=blks; doffstuff(f,fn,gotpts); @@ -368,7 +384,9 @@ begin if (ok) then begin star('Moving file to '+#3#5+memuboard.name); sprompt(#3#5+'Progress: '); - movefile(fok,nospace,TRUE,systat.temppath+'2\'+fn,memuboard.dlpath+fn); + {rcg11242000 DOSism.} + {movefile(fok,nospace,TRUE,systat.temppath+'2\'+fn,memuboard.dlpath+fn);} + movefile(fok,nospace,TRUE,systat.temppath+'2/'+fn,memuboard.dlpath+fn); if (fok) then begin nl; newff(f,v); @@ -391,7 +409,9 @@ begin dyny:=TRUE; if pynq('Save file for a later resume? ') then begin sprompt(#3#5+'Progress: '); - movefile(fok,nospace,TRUE,systat.temppath+'2\'+fn,memuboard.dlpath+fn); + {rcg11242000 DOSism} + {movefile(fok,nospace,TRUE,systat.temppath+'2\'+fn,memuboard.dlpath+fn);} + movefile(fok,nospace,TRUE,systat.temppath+'2/'+fn,memuboard.dlpath+fn); if (fok) then begin nl; doffstuff(f,fn,gotpts); @@ -406,7 +426,9 @@ begin end; if (not (resumelater in f.filestat)) then begin s:='file deleted'; - assign(fi,systat.temppath+'2\'+fn); erase(fi); + {rcg11242000 DOSism.} + {assign(fi,systat.temppath+'2\'+fn); erase(fi);} + assign(fi,systat.temppath+'2/'+fn); erase(fi); end; sysoplog(#3#3+'Errors batch uploading "'+sqoutsp(fn)+'" - '+s); end; diff --git a/file13.pas b/file13.pas index 4d4a42c..de599ec 100644 --- a/file13.pas +++ b/file13.pas @@ -1,4 +1,4 @@ -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit file13; diff --git a/file14.pas b/file14.pas index efb5649..bc637b4 100644 --- a/file14.pas +++ b/file14.pas @@ -1,4 +1,4 @@ -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit file14; interface diff --git a/file2.pas b/file2.pas index 9d32d8a..d360706 100644 --- a/file2.pas +++ b/file2.pas @@ -1,4 +1,4 @@ -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit file2; interface diff --git a/file3.pas b/file3.pas index 028833f..e49ab83 100644 --- a/file3.pas +++ b/file3.pas @@ -1,4 +1,4 @@ -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit file3; interface diff --git a/file4.pas b/file4.pas index 7378954..bfface3 100644 --- a/file4.pas +++ b/file4.pas @@ -42,7 +42,7 @@ * 3. Corrected errors in and updated documentation. *) -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit file4; interface @@ -473,8 +473,15 @@ begin reset(fp,1); {* back to start of file *} p:=0; {* drop drive and pathname *} - for i:=1 to length(infile) do + + {rcg11242000 DOSism.} + { + for i:=1 to length(infile) do if infile[i] in [':','\'] then p:=i; + } + for i:=1 to length(infile) do + if infile[i] in [':','/'] then p:=i; + filename:=copy(infile,p+1,length(infile)-p); accum_csize:=0; accum_usize:=0; {* set accumulators to 0 *} diff --git a/file5.pas b/file5.pas index ac7f7ec..5960e52 100644 --- a/file5.pas +++ b/file5.pas @@ -1,4 +1,4 @@ -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit file5; interface @@ -74,7 +74,9 @@ var curdir,s,s1:astr; abort:=FALSE; next:=FALSE; nocmd:=FALSE; for i:=1 to 9 do xword[i]:=allcaps(xword[i]); s:=xword[1]; - if ((pos('\',xword[2])<>0) or (pos('..',xword[2])<>0)) and + {rcg11242000 DOSism.} + {if ((pos('\',xword[2])<>0) or (pos('..',xword[2])<>0)) and} + if ((pos('/',xword[2])<>0) or (pos('..',xword[2])<>0)) and (restr) then exit; if (s='DIR/W') then s:='DIR *.* /W'; @@ -138,8 +140,11 @@ var curdir,s,s1:astr; if (s2='') then s2:='*.*'; if (not iswildcard(xword[2])) then begin ffile(xword[2]); - if ((found) and (dirinfo.attr=directory)) or - ((length(s1)=3) and (s1[3]='\')) then begin {* root directory *} + {rcg11242000 DOSism.} + (*if ((found) and (dirinfo.attr=directory)) or + ((length(s1)=3) and (s1[3]='\')) then begin {* root directory *}*) + if (((found) and (dirinfo.attr=directory)) or + (s1[1]='/')) then begin {* root directory *} s1:=bslash(TRUE,xword[2]); s2:='*.*'; end; @@ -173,6 +178,8 @@ var curdir,s,s1:astr; xword[3]:=fexpand(xword[3]); ffile(xword[3]); b:=((found) and (dirinfo.attr and directory=directory)); + +{rcg11242000 !!! Look at this. } if ((not b) and (copy(xword[3],2,2)=':\') and (length(xword[3])=3)) then b:=TRUE; @@ -226,6 +233,8 @@ var curdir,s,s1:astr; xword[3]:=fexpand(xword[3]); ffile(xword[3]); b:=((found) and (dirinfo.attr and directory=directory)); + +{rcg11242000 !!! Look at this. } if ((not b) and (copy(xword[3],2,2)=':\') and (length(xword[3])=3)) then b:=TRUE; @@ -390,7 +399,12 @@ var curdir,s,s1:astr; if (j=0) then invarc else begin ok:=TRUE; - conva(ok,i,j,systat.temppath+'1\',sqoutsp(fexpand(xword[2])), + {rcg11242000 DOSism.} + { + conva(ok,i,j,systat.temppath+'1\',sqoutsp(fexpand(xword[2])), + sqoutsp(fexpand(s3))); + } + conva(ok,i,j,systat.temppath+'1/',sqoutsp(fexpand(xword[2])), sqoutsp(fexpand(s3))); if (ok) then begin assign(fi,sqoutsp(fexpand(xword[2]))); diff --git a/file6.pas b/file6.pas index 5b42551..147f82e 100644 --- a/file6.pas +++ b/file6.pas @@ -1,4 +1,4 @@ -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit file6; interface diff --git a/file7.pas b/file7.pas index 9e348ed..77eb378 100644 --- a/file7.pas +++ b/file7.pas @@ -1,4 +1,4 @@ -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit file7; interface diff --git a/file8.pas b/file8.pas index b4a898f..c12a396 100644 --- a/file8.pas +++ b/file8.pas @@ -1,4 +1,4 @@ -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit file8; interface diff --git a/file9.pas b/file9.pas index 95da685..6078744 100644 --- a/file9.pas +++ b/file9.pas @@ -1,4 +1,4 @@ -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit file9; interface @@ -64,7 +64,9 @@ var abort,next,nofiles:boolean; dfs:longint; numfiles:integer; begin - if (copy(cd,length(cd),1)<>'\') then cd:=cd+'\'; + {rcg11242000 DOSism.} + {if (copy(cd,length(cd),1)<>'\') then cd:=cd+'\';} + if (copy(cd,length(cd),1)<>'/') then cd:=cd+'/'; abort:=FALSE; cd:=cd+x; if (fso) then begin diff --git a/fvtype.pas b/fvtype.pas index 58de8ca..2ed4ea4 100644 --- a/fvtype.pas +++ b/fvtype.pas @@ -1,4 +1,4 @@ -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit fvtype; interface diff --git a/ifl.pas b/ifl.pas index 51dcc2d..02c755c 100644 --- a/ifl.pas +++ b/ifl.pas @@ -41,7 +41,7 @@ uses to allow redirection of I/O *} -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} {$I ifl.inc} const diff --git a/init.pas b/init.pas index e6f5c0c..4a07bf5 100644 --- a/init.pas +++ b/init.pas @@ -9,7 +9,7 @@ (*****************************************************************************) program init; -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} {$M 50000,0,1024} { Declared here suffices for all Units as well! } uses diff --git a/initp.pas b/initp.pas index 736144b..b6d4815 100644 --- a/initp.pas +++ b/initp.pas @@ -1,4 +1,4 @@ -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit initp; interface @@ -167,6 +167,7 @@ var filv:text; procedure showmem; var i,p:longint; begin +exit; textbackground(1); textcolor(15); gotoxy(20,13); p:=40-(((40*memavail) div MaxHeapSpace)+1); for i:=1 to 40 do diff --git a/logon1.pas b/logon1.pas index 16d344a..61686ec 100644 --- a/logon1.pas +++ b/logon1.pas @@ -5,7 +5,7 @@ (*> Logon functions -- Part 1. <*) (*> <*) (*****************************************************************************) -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit logon1; interface diff --git a/logon2.pas b/logon2.pas index 0a088cb..43d4892 100644 --- a/logon2.pas +++ b/logon2.pas @@ -6,7 +6,7 @@ (*> <*) (*> <*) (*****************************************************************************) -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit logon2; interface @@ -391,9 +391,15 @@ begin if ((useron) and (usernum>0)) then begin + {rcg11242000 dosisms.} + { purgedir(systat.temppath+'1\'); purgedir(systat.temppath+'2\'); purgedir(systat.temppath+'3\'); + } + purgedir(systat.temppath+'1/'); + purgedir(systat.temppath+'2/'); + purgedir(systat.temppath+'3/'); slogging:=TRUE; diff --git a/mail0.pas b/mail0.pas index 0202b2f..f0ea327 100644 --- a/mail0.pas +++ b/mail0.pas @@ -1,4 +1,4 @@ -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit mail0; interface diff --git a/mail1.pas b/mail1.pas index ebf0179..06dea13 100644 --- a/mail1.pas +++ b/mail1.pas @@ -1,4 +1,4 @@ -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit mail1; interface diff --git a/mail2.pas b/mail2.pas index 18fb5f3..c7aa858 100644 --- a/mail2.pas +++ b/mail2.pas @@ -1,4 +1,4 @@ -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit mail2; interface diff --git a/mail3.pas b/mail3.pas index 901cd8f..1a67d37 100644 --- a/mail3.pas +++ b/mail3.pas @@ -1,4 +1,4 @@ -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit mail3; interface diff --git a/mail4.pas b/mail4.pas index 95bae34..4435b14 100644 --- a/mail4.pas +++ b/mail4.pas @@ -1,4 +1,4 @@ -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit mail4; interface diff --git a/mail5.pas b/mail5.pas index f294385..2586c89 100644 --- a/mail5.pas +++ b/mail5.pas @@ -1,4 +1,4 @@ -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit mail5; interface diff --git a/mail6.pas b/mail6.pas index 5761616..bcc34c8 100644 --- a/mail6.pas +++ b/mail6.pas @@ -1,4 +1,4 @@ -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit mail6; interface diff --git a/mail9.pas b/mail9.pas index 21608d6..fa97d70 100644 --- a/mail9.pas +++ b/mail9.pas @@ -1,4 +1,4 @@ -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit mail9; interface diff --git a/mdek.pas b/mdek.pas index c4bfeb5..38bb392 100644 --- a/mdek.pas +++ b/mdek.pas @@ -1,4 +1,4 @@ -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit mdek; interface diff --git a/menus.pas b/menus.pas index f082aba..938fb1f 100644 --- a/menus.pas +++ b/menus.pas @@ -8,7 +8,7 @@ * 08/20/91 - 1.00 - E?O - Original Version * * * *****************************************************************************} -{$A+,B+,D-,E+,F+,I+,L+,N-,O-,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O-,R-,S+,V-} Unit Menus; Interface diff --git a/menus2.pas b/menus2.pas index 60521cf..cff5269 100644 --- a/menus2.pas +++ b/menus2.pas @@ -5,7 +5,7 @@ (*> Other menu functions - generic, list, etc. <*) (*> <*) (*****************************************************************************) -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit menus2; interface diff --git a/menus3.pas b/menus3.pas index 4ae77e7..798b68f 100644 --- a/menus3.pas +++ b/menus3.pas @@ -5,7 +5,7 @@ (*> Menu command execution routines. <*) (*> <*) (*****************************************************************************) -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit menus3; interface diff --git a/menus4.pas b/menus4.pas index 6dfe563..4fc7791 100644 --- a/menus4.pas +++ b/menus4.pas @@ -6,7 +6,7 @@ (*> <*) (*> <*) (*****************************************************************************) -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit menus4; interface diff --git a/miniterm.pas b/miniterm.pas index a4591a8..981b16c 100644 --- a/miniterm.pas +++ b/miniterm.pas @@ -5,7 +5,7 @@ (*> and Todd Bolitho - All Rights Reserved. <*) (*> <*) (*****************************************************************************) -{$A+,B+,D-,E+,F+,I+,L+,N-,O-,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O-,R-,S+,V-} {$M $4000,0,0} program miniterm; @@ -340,11 +340,15 @@ var c,bl,bl2:char; s:astr; begin b:=0; - for a:=1 to length(fn) do if fn[a]='\' then b:=a; + {rcg11242000 dosism.} + {for a:=1 to length(fn) do if fn[a]='\' then b:=a;} + for a:=1 to length(fn) do if fn[a]='/' then b:=a; if b<>0 then filepath:=copy(fn,1,b) else begin getdir(0,s); - filepath:=s+'\'; + {rcg11242000 dosism.} + {filepath:=s+'\';} + filepath:=s+'/'; end; end; @@ -1047,9 +1051,16 @@ var c,bl,bl2:char; if (waitbaud=9600) then maxs:=4; end; + {rcg11242000 dosisms.} + { loading(start_dir+'\miniterm.fon'); if not exist(start_dir+'\miniterm.fon') then begin assign(fil,start_dir+'\miniterm.fon'); + } + + loading(start_dir+'/miniterm.fon'); + if not exist(start_dir+'/miniterm.fon') then begin + assign(fil,start_dir+'/miniterm.fon'); rewrite(fil); with ns[1] do begin name:='Grosse Pointe Centrale'; @@ -1060,7 +1071,9 @@ var c,bl,bl2:char; close(fil); end; - assign(fil,start_dir+'\miniterm.fon'); + {rcg11242000 DOSism.} + {assign(fil,start_dir+'\miniterm.fon');} + assign(fil,start_dir+'/miniterm.fon'); reset(fil); hientrynum:=0; repeat @@ -1072,17 +1085,28 @@ var c,bl,bl2:char; pages:=((hientrynum-1) div 10)+1; pagnum:=1; + {rcg11242000 DOSisms.} + { loading(start_dir+'\miniterm.cfg'); if not exist(start_dir+'\miniterm.cfg') then begin assign(cfgfil,start_dir+'\miniterm.cfg'); + } + + loading(start_dir+'/miniterm.cfg'); + if not exist(start_dir+'/miniterm.cfg') then begin + assign(cfgfil,start_dir+'/miniterm.cfg'); rewrite(cfgfil); with mini do begin - dpath:=start_dir+'\'; + {rcg11242000 dosism.} + {dpath:=start_dir+'\';} + dpath:=start_dir+'/'; end; write(cfgfil,mini); close(cfgfil); end; - assign(cfgfil,start_dir+'\miniterm.cfg'); + {rcg11242000 DOSism.} + {assign(cfgfil,start_dir+'\miniterm.cfg');} + assign(cfgfil,start_dir+'/miniterm.cfg'); reset(cfgfil); read(cfgfil,mini); close(cfgfil); removewindow(wind); diff --git a/misc1.pas b/misc1.pas index bd4b824..7e98145 100644 --- a/misc1.pas +++ b/misc1.pas @@ -6,7 +6,7 @@ (*> <*) (*> <*) (*****************************************************************************) -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit misc1; interface diff --git a/misc2.pas b/misc2.pas index 47b7ed4..d9015b3 100644 --- a/misc2.pas +++ b/misc2.pas @@ -6,7 +6,7 @@ (*> <*) (*> <*) (*****************************************************************************) -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit misc2; interface @@ -462,7 +462,9 @@ var gfil:file of tfilerec; nl; prompt('Already in TEMP: '); numfiles:=0; tsiz:=0; - findfirst(systat.temppath+'3\*.*',anyfile-dos.directory,dirinfo); + {rcg11242000 DOSism.} + {findfirst(systat.temppath+'3\*.*',anyfile-dos.directory,dirinfo);} + findfirst(systat.temppath+'3/*.*',anyfile-dos.directory,dirinfo); found:=(doserror=0); while (found) do begin inc(tsiz,dirinfo.size); @@ -495,7 +497,9 @@ var gfil:file of tfilerec; if (gftit[i].gfile) then begin seek(gfil,gftit[i].arn); read(gfil,b); s:=systat.tfilepath+b.filen; - s2:=systat.temppath+'3\'+b.filen; + {rcg11242000 DOSism.} + {s2:=systat.temppath+'3\'+b.filen;} + s2:=systat.temppath+'3/'+b.filen; sprompt(#3#5+'Progress: '); copyfile(ok,nospace,TRUE,s,s2); if (ok) then diff --git a/misc3.pas b/misc3.pas index 35039c6..10516fb 100644 --- a/misc3.pas +++ b/misc3.pas @@ -6,7 +6,7 @@ (*> <*) (*> <*) (*****************************************************************************) -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit misc3; interface diff --git a/misc4.pas b/misc4.pas index b030dca..c9b1192 100644 --- a/misc4.pas +++ b/misc4.pas @@ -3,7 +3,7 @@ (*> MISC4 .PAS - InfoForm questionairre system. <*) (*> <*) (*****************************************************************************) -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit misc4; interface diff --git a/miscx.pas b/miscx.pas index 13767a7..f840469 100644 --- a/miscx.pas +++ b/miscx.pas @@ -1,4 +1,4 @@ -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit miscx; interface @@ -182,9 +182,15 @@ begin realsl:=thisuser.sl; realdsl:=thisuser.dsl; commandline('Purging files in TEMP directories 1, 2, and 3 ...'); + {rcg11242000 DOSisms.} + { purgedir(systat.temppath+'1\'); purgedir(systat.temppath+'2\'); purgedir(systat.temppath+'3\'); + } + purgedir(systat.temppath+'1/'); + purgedir(systat.temppath+'2/'); + purgedir(systat.temppath+'3/'); if (systat.lastdate<>date) then begin prompt('Please wait ....'); diff --git a/mmodem.pas b/mmodem.pas index 9646657..2a19588 100644 --- a/mmodem.pas +++ b/mmodem.pas @@ -1,4 +1,4 @@ -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit mmodem; interface diff --git a/msgpack.pas b/msgpack.pas index a807873..a2740bc 100644 --- a/msgpack.pas +++ b/msgpack.pas @@ -1,4 +1,4 @@ -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit msgpack; interface diff --git a/myio.pas b/myio.pas index 778f5eb..e6568e5 100644 --- a/myio.pas +++ b/myio.pas @@ -1,4 +1,4 @@ -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit myio; interface diff --git a/newusers.pas b/newusers.pas index 196a39f..38a713e 100644 --- a/newusers.pas +++ b/newusers.pas @@ -6,7 +6,7 @@ (*> <*) (*> <*) (*****************************************************************************) -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit newusers; interface diff --git a/pibo.pas b/pibo.pas index 54f7cc1..e4e61eb 100644 --- a/pibo.pas +++ b/pibo.pas @@ -1,4 +1,4 @@ -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit pibo; interface diff --git a/sepmsgs.pas b/sepmsgs.pas index 206db60..26a9b06 100644 --- a/sepmsgs.pas +++ b/sepmsgs.pas @@ -1,6 +1,6 @@ uses crt,dos; -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} {$M 50000,0,90000} { Declared here suffices for all Units as well! } {$I rec16e1.pas} @@ -55,8 +55,12 @@ end; function exdrv(s:astr):byte; begin + {rcg11242000 point at root drive always. Ugh.} + { s:=fexpand(s); exdrv:=ord(s[1])-64; + } + exdrv:=3; end; procedure movefile(srcname,destpath:string); @@ -123,7 +127,9 @@ var j,k:integer; f:file; lastm,thism:messages; {* keep track of mass-mail duplicates *} begin - while copy(npath,length(npath),1)='\' do + {rcg11242000 DOSism.} + {while copy(npath,length(npath),1)='\' do} + while copy(npath,length(npath),1)='/' do npath:=copy(npath,1,length(npath)-1); getdir(0,odir); {$I-} chdir(npath); {$I+} @@ -150,8 +156,13 @@ begin thism:=mr.msg; gotoxy(wherex,wherey-1); clreol; inc(k); - star('Message file #'+cstr(k)+' of '+ + {rcg11242000 DOSism.} + { + star('Message file #'+cstr(k)+' of '+ cstr(filesize(mailfile))+': '+npath+'\'+s); + } + star('Message file #'+cstr(k)+' of '+ + cstr(filesize(mailfile))+': '+npath+'/'+s); if ((thism.ltr<>lastm.ltr) or (thism.number<>lastm.number) or (thism.ext<>lastm.ext)) then begin @@ -159,7 +170,9 @@ begin {$I-} reset(f); {$I+} if ioresult=0 then begin close(f); - movefile(s1,npath+'\'); + {rcg11242000 DOSism.} + {movefile(s1,npath+'\');} + movefile(s1,npath+'/'); lastm:=thism; end else star('File does not exist: '+s1); lastm:=thism; @@ -177,7 +190,9 @@ var j,k:integer; f:file; mary:array[0..200] of messagerec; begin - while copy(npath,length(npath),1)='\' do + {rcg11242000 DOSism.} + {while copy(npath,length(npath),1)='\' do} + while copy(npath,length(npath),1)='/' do npath:=copy(npath,1,length(npath)-1); with brd do begin getdir(0,odir); @@ -211,9 +226,15 @@ begin close(f); gotoxy(wherex,wherey-1); clreol; inc(k); - star('Message file #'+cstr(k)+' of '+ + {rcg11242000 DOSisms.} + { + star('Message file #'+cstr(k)+' of '+ cstr(mary[0].message.number)+': '+npath+'\'+s); movefile(s1,npath+'\'); + } + star('Message file #'+cstr(k)+' of '+ + cstr(mary[0].message.number)+': '+npath+'/'+s); + movefile(s1,npath+'/'); end else star('File does not exist: '+s1); end; end else star('Unable to open file: '+systat.gfilepath+brd.filename+'.BRD'); @@ -233,14 +254,14 @@ begin star('This program can do all the work of seperating all the messages'); star('in each base into their own directories.'); writeln; - star('Message directories will be created off of your current Telegard MSGS\'); + star('Message directories will be created off of your current Telegard MSGS/'); star('directory according to the *.BRD FILENAMEs of each message base.'); writeln; star('Example:'); - star('"'+systat.pmsgpath+'EMAIL\" for private mail'); - star('"'+systat.pmsgpath+'GENERAL\" for message base #1'); + star('"'+systat.pmsgpath+'EMAIL/" for private mail'); + star('"'+systat.pmsgpath+'GENERAL/" for message base #1'); star(' (if msg base #1 filename is "GENERAL")'); - star('"'+systat.pmsgpath+'MISC\" for message base #2'); + star('"'+systat.pmsgpath+'MISC/" for message base #2'); star(' (if msg base #2 filename is "MISC")'); star('And so on.'); writeln; @@ -257,15 +278,23 @@ begin reset(bf); for i:=0 to filesize(bf)-1 do begin seek(bf,i); read(bf,brd); - brd.msgpath:=brd.msgpath+brd.filename+'\'; + {rcg11242000 DOSism.} + {brd.msgpath:=brd.msgpath+brd.filename+'\';} + brd.msgpath:=brd.msgpath+brd.filename+'/'; seek(bf,i); write(bf,brd); star('Moving messages in '+brd.filename+'.BRD ('+brd.name+') to "'+brd.msgpath+'"'); movemsgbase(brd,brd.msgpath,i+1); end; close(bf); chdir(sp); + {rcg11242000 DOSisms.} + { ttl('Moving private mail into "'+systat.pmsgpath+'EMAIL\"'); moveprivmail(systat.pmsgpath+'EMAIL\'); systat.pmsgpath:=systat.pmsgpath+'EMAIL\'; + } + ttl('Moving private mail into "'+systat.pmsgpath+'EMAIL/"'); + moveprivmail(systat.pmsgpath+'EMAIL/'); + systat.pmsgpath:=systat.pmsgpath+'EMAIL/'; rewrite(systatf); write(systatf,systat); close(systatf); end. diff --git a/stubs.pas b/stubs.pas index c19ad15..241bb6f 100644 --- a/stubs.pas +++ b/stubs.pas @@ -1,6 +1,6 @@ {rcg11172000 stub functions.} -{$A+,B+,D-,E+,F+,I+,L-,N-,O-,R-,S+,V-} +{$A+,B+,E+,F+,I+,L-,N-,O-,R-,S+,V-} unit stubs; interface diff --git a/sysop1.pas b/sysop1.pas index b80bd8a..b64e38d 100644 --- a/sysop1.pas +++ b/sysop1.pas @@ -5,7 +5,7 @@ (*> SysOp functions: Protocol editor. <*) (*> <*) (*****************************************************************************) -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit sysop1; interface diff --git a/sysop10.pas b/sysop10.pas index d8c004c..7a93b5d 100644 --- a/sysop10.pas +++ b/sysop10.pas @@ -5,7 +5,7 @@ (*> SysOp functions: Voting question editor, voting results output. <*) (*> <*) (*****************************************************************************) -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit sysop10; interface diff --git a/sysop11.pas b/sysop11.pas index abe4bb4..92533df 100644 --- a/sysop11.pas +++ b/sysop11.pas @@ -5,7 +5,7 @@ (*> SysOp functions: Voting question editor, voting results output. <*) (*> <*) (*****************************************************************************) -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit sysop11; interface diff --git a/sysop2.pas b/sysop2.pas index 05ffd7d..8bef172 100644 --- a/sysop2.pas +++ b/sysop2.pas @@ -6,7 +6,7 @@ (*> <*) (*> <*) (*****************************************************************************) -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit sysop2; interface diff --git a/sysop21.pas b/sysop21.pas index e2886f9..7cca869 100644 --- a/sysop21.pas +++ b/sysop21.pas @@ -6,7 +6,7 @@ (*> <*) (*> <*) (*****************************************************************************) -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit sysop21; interface diff --git a/sysop2a.pas b/sysop2a.pas index 7531231..88e6985 100644 --- a/sysop2a.pas +++ b/sysop2a.pas @@ -8,7 +8,7 @@ (*> (Modem Configuration) <*) (*> <*) (*****************************************************************************) -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit sysop2a; interface diff --git a/sysop2b.pas b/sysop2b.pas index 98df98d..e9bb173 100644 --- a/sysop2b.pas +++ b/sysop2b.pas @@ -6,7 +6,7 @@ (*> <*) (*> <*) (*****************************************************************************) -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit sysop2b; interface @@ -190,7 +190,9 @@ begin prt(' path:'); nl; mpl(79); input(s,79); if (s<>'') then begin - if (copy(s,length(s),1)<>'\') then s:=s+'\'; + {rcg11242000 DOSism.} + {if (copy(s,length(s),1)<>'\') then s:=s+'\';} + if (copy(s,length(s),1)<>'\') then s:=s+'/'; if (wantit) then case c of '1':gfilepath:=s; '2':afilepath:=s; diff --git a/sysop2c.pas b/sysop2c.pas index 6b26639..a674f83 100644 --- a/sysop2c.pas +++ b/sysop2c.pas @@ -6,7 +6,7 @@ (*> <*) (*> <*) (*****************************************************************************) -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit sysop2c; interface diff --git a/sysop2d.pas b/sysop2d.pas index a767f2a..4f7e592 100644 --- a/sysop2d.pas +++ b/sysop2d.pas @@ -6,7 +6,7 @@ (*> <*) (*> <*) (*****************************************************************************) -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit sysop2d; interface diff --git a/sysop2e.pas b/sysop2e.pas index 133c04f..b370e67 100644 --- a/sysop2e.pas +++ b/sysop2e.pas @@ -5,7 +5,7 @@ (*> SysOp functions: System Configuration Editor -- "E" command. <*) (*> <*) (*****************************************************************************) -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit sysop2e; interface diff --git a/sysop2f.pas b/sysop2f.pas index f7e7bd9..7268f7d 100644 --- a/sysop2f.pas +++ b/sysop2f.pas @@ -5,7 +5,7 @@ (*> SysOp functions: System Configuration Editor -- "F" command. <*) (*> <*) (*****************************************************************************) -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit sysop2f; interface @@ -48,7 +48,9 @@ begin printacr(s,abort,next); printacr('H. Auto-validate ALL files ULed? :'+syn(validateallfiles),abort,next); printacr('I. Remote DOS re-direction device :'+systat.remdevice,abort,next); - printacr('J. Max k-bytes allowed in TEMP\3\ :'+cstr(systat.maxintemp),abort,next); + {rcg11242000 DOSism.} + {printacr('J. Max k-bytes allowed in TEMP\3\ :'+cstr(systat.maxintemp),abort,next);} + printacr('J. Max k-bytes allowed in TEMP/3/ :'+cstr(systat.maxintemp),abort,next); printacr('K. Min k-bytes to save for resume :'+cstr(systat.minresume),abort,next); nl; prt('Enter selection (A-K) [Q]uit : '); onek(c,'QABCDEFGHIJK'^M); diff --git a/sysop2fa.pas b/sysop2fa.pas index 5c24d2d..2479eb6 100644 --- a/sysop2fa.pas +++ b/sysop2fa.pas @@ -6,7 +6,7 @@ (*> <*) (*> <*) (*****************************************************************************) -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit sysop2fa; interface diff --git a/sysop2g.pas b/sysop2g.pas index a5fcfa1..c16c5b7 100644 --- a/sysop2g.pas +++ b/sysop2g.pas @@ -6,7 +6,7 @@ (*> <*) (*> <*) (*****************************************************************************) -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit sysop2g; interface diff --git a/sysop2h.pas b/sysop2h.pas index 9052a6f..31e8d65 100644 --- a/sysop2h.pas +++ b/sysop2h.pas @@ -6,7 +6,7 @@ (*> <*) (*> <*) (*****************************************************************************) -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit sysop2h; interface diff --git a/sysop2i.pas b/sysop2i.pas index d804b0f..953c3ea 100644 --- a/sysop2i.pas +++ b/sysop2i.pas @@ -6,7 +6,7 @@ (*> <*) (*> <*) (*****************************************************************************) -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit sysop2i; interface diff --git a/sysop2s.pas b/sysop2s.pas index 94374d2..0a1a593 100644 --- a/sysop2s.pas +++ b/sysop2s.pas @@ -6,7 +6,7 @@ (*> <*) (*> <*) (*****************************************************************************) -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit sysop2s; interface diff --git a/sysop2z.pas b/sysop2z.pas index 66d72fb..02050c2 100644 --- a/sysop2z.pas +++ b/sysop2z.pas @@ -6,7 +6,7 @@ (*> <*) (*> <*) (*****************************************************************************) -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit sysop2z; interface diff --git a/sysop3.pas b/sysop3.pas index b78261e..5b3097a 100644 --- a/sysop3.pas +++ b/sysop3.pas @@ -5,7 +5,7 @@ (*> SysOp functions: User Editor. <*) (*> <*) (*****************************************************************************) -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit sysop3; interface diff --git a/sysop4.pas b/sysop4.pas index 02efac3..5a02919 100644 --- a/sysop4.pas +++ b/sysop4.pas @@ -6,7 +6,7 @@ (*> <*) (*> <*) (*****************************************************************************) -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit sysop4; interface diff --git a/sysop5.pas b/sysop5.pas index 40667b4..6820d35 100644 --- a/sysop5.pas +++ b/sysop5.pas @@ -6,7 +6,7 @@ (*> Vote printer. <*) (*> <*) (*****************************************************************************) -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit sysop5; interface diff --git a/sysop6.pas b/sysop6.pas index 6bc8f32..2913509 100644 --- a/sysop6.pas +++ b/sysop6.pas @@ -5,7 +5,7 @@ (*> SysOp functions: Event editor <*) (*> <*) (*****************************************************************************) -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit sysop6; interface diff --git a/sysop7.pas b/sysop7.pas index 07a7d62..3b5a108 100644 --- a/sysop7.pas +++ b/sysop7.pas @@ -5,7 +5,7 @@ (*> SysOp functions: Menu editor <*) (*> <*) (*****************************************************************************) -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit sysop7; interface diff --git a/sysop7m.pas b/sysop7m.pas index 0693882..376f3c5 100644 --- a/sysop7m.pas +++ b/sysop7m.pas @@ -5,7 +5,7 @@ (*> SysOp functions: Menu editor -- "M" command (modify commands) <*) (*> <*) (*****************************************************************************) -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit sysop7m; interface diff --git a/sysop8.pas b/sysop8.pas index 17af418..fd8c498 100644 --- a/sysop8.pas +++ b/sysop8.pas @@ -5,7 +5,7 @@ (*> SysOp functions: Message base editor <*) (*> <*) (*****************************************************************************) -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit sysop8; interface @@ -420,15 +420,24 @@ var f1:file; end; nl; prompt('Current message path: '); if (msgpath<>'') then print(msgpath) else print('*NONE*'); - nl; print('Press to use default path "'+systat.msgpath+filename+'\"'); + {rcg11242000 DOSism.} + {nl; print('Press to use default path "'+systat.msgpath+filename+'\"');} + nl; print('Press to use default path "'+systat.msgpath+filename+'/"'); nl; print('Enter new message path:'); prt(':'); mpl(40); input(s,40); s:=sqoutsp(s); if (s<>'') then begin - while (copy(s,length(s)-1,2)='\\') do s:=copy(s,1,length(s)-1); + {rcg11242000 DOSisms.} + { + while (copy(s,length(s)-1,2)='\\') do s:=copy(s,1,length(s)-1); if (copy(s,length(s),1)<>'\') then s:=s+'\'; + } + while (copy(s,length(s)-1,2)='//') do s:=copy(s,1,length(s)-1); + if (copy(s,length(s),1)<>'/') then s:=s+'/'; msgpath:=s; end; - if ((s='') and (msgpath='')) then msgpath:=systat.msgpath+filename+'\'; + {rcg11242000 DOSism.} + {if ((s='') and (msgpath='')) then msgpath:=systat.msgpath+filename+'\';} + if ((s='') and (msgpath='')) then msgpath:=systat.msgpath+filename+'/'; if (not existdir(msgpath)) then begin nl; print('"'+msgpath+'" does not exist.'); if (pynq('Create message directory now? ')) then begin diff --git a/sysop9.pas b/sysop9.pas index de22207..4a09287 100644 --- a/sysop9.pas +++ b/sysop9.pas @@ -5,7 +5,7 @@ (*> SysOp functions: File base editor <*) (*> <*) (*****************************************************************************) -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit sysop9; interface @@ -129,7 +129,9 @@ var i1,ii,culb,i2:integer; getdir(0,s); name:='<< Not Used >>'; filename:='NEWDIR'; - dlpath:=s[1]+':DLOADS\'; + {rcg11242000 DOSism.} + {dlpath:=s[1]+':DLOADS\';} + dlpath:=s[1]+':DLOADS/'; ulpath:=dlpath; maxfiles:=2000; password:=''; @@ -287,8 +289,13 @@ var i1,ii,culb,i2:integer; print('Enter new download path:'); prt(':'); mpl(40); input(s,40); s:=sqoutsp(s); if (s<>'') then begin + {rcg11242000 DOSisms.} + { while (copy(s,length(s)-1,2)='\\') do s:=copy(s,1,length(s)-1); if (copy(s,length(s),1)<>'\') then s:=s+'\'; + } + while (copy(s,length(s)-1,2)='//') do s:=copy(s,1,length(s)-1); + if (copy(s,length(s),1)<>'/') then s:=s+'/'; if (s<>dlpath) then changed:=TRUE; dlpath:=s; if (not existdir(s)) then begin @@ -308,8 +315,13 @@ var i1,ii,culb,i2:integer; prt(':'); mpl(40); input(s,40); s:=sqoutsp(s); if ((s='D') or (s='d')) then s:=dlpath; if (s<>'') then begin - while (copy(s,length(s)-1,2)='\\') do s:=copy(s,1,length(s)-1); + {rcg11242000 DOSism.} + { + while (copy(s,length(s)-1,2)='\\') do s:=copy(s,1,length(s)-1); if (copy(s,length(s),1)<>'\') then s:=s+'\'; + } + while (copy(s,length(s)-1,2)='//') do s:=copy(s,1,length(s)-1); + if (copy(s,length(s),1)<>'/') then s:=s+'/'; if (s<>ulpath) then changed:=TRUE; ulpath:=s; if (not existdir(s)) then begin diff --git a/t2t.pas b/t2t.pas index 05c11e3..20b5c00 100644 --- a/t2t.pas +++ b/t2t.pas @@ -1,4 +1,4 @@ -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} {$M 50000,0,1000} { Declared here suffices for all Units as well! } uses @@ -86,8 +86,13 @@ end; procedure alignpathname(var s:astr); begin + {rcg11242000 DOSisms.} + { if copy(s,length(s),1)<>'\' then s:=s+'\'; while (copy(s,length(s)-1,2)='\\') and (length(s)>2) do + } + if copy(s,length(s),1)<>'/' then s:=s+'/'; + while (copy(s,length(s)-1,2)='//') and (length(s)>2) do s:=copy(s,1,length(s)-1); end; @@ -182,8 +187,12 @@ end; function exdrv(s:astr):byte; begin + {rcg11242000 point at root drive always. Ugh.} + { s:=fexpand(s); exdrv:=ord(s[1])-64; + } + exdrv:=3; end; procedure movefile(srcname,destpath:string); @@ -1187,7 +1196,9 @@ begin writeln('Now you need to enter your Telegard MSGS directory, where you'); writeln('will later be putting all of your message files in.'); writeln; - writeln('This is probably "'+tgpath+'MSGS\" ...'); + {rcg11242000 DOSism.} + {writeln('This is probably "'+tgpath+'MSGS\" ...');} + writeln('This is probably "'+tgpath+'MSGS/" ...'); writeln; textcolor(9); write('Telegard MSGS Path: '); infield(tmsgpath,40); if (tmsgpath='') then ee('ABORTED'); diff --git a/ta2z.pas b/ta2z.pas index c2717bc..ee79c0c 100644 --- a/ta2z.pas +++ b/ta2z.pas @@ -1,4 +1,4 @@ -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} {$M 32150,0,0} { Declared here suffices for all Units as well! } uses @@ -140,8 +140,13 @@ end; procedure alignpathname(var s:astr); begin + {rcg11242000 DOSisms.} + { if copy(s,length(s),1)<>'\' then s:=s+'\'; while (copy(s,length(s)-1,2)='\\') and (length(s)>2) do + } + if copy(s,length(s),1)<>'/' then s:=s+'/'; + while (copy(s,length(s)-1,2)='//') and (length(s)>2) do s:=copy(s,1,length(s)-1); end; diff --git a/timejunk.pas b/timejunk.pas index eabe2de..ba12e30 100644 --- a/timejunk.pas +++ b/timejunk.pas @@ -1,4 +1,4 @@ -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit timejunk; interface diff --git a/tmpcom.pas b/tmpcom.pas index 58495b3..f365f15 100644 --- a/tmpcom.pas +++ b/tmpcom.pas @@ -1,4 +1,4 @@ -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} UNIT tmpcom; {Version 3.0} diff --git a/tmpcommm.pas b/tmpcommm.pas index 7198c01..9eca697 100644 --- a/tmpcommm.pas +++ b/tmpcommm.pas @@ -1,4 +1,4 @@ -{$A+,B+,D-,E+,F+,I+,L+,N-,O-,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O-,R-,S+,V-} unit tmpcom; interface diff --git a/wfcmenu.pas b/wfcmenu.pas index e620387..c3dcf6e 100644 --- a/wfcmenu.pas +++ b/wfcmenu.pas @@ -6,7 +6,7 @@ (*> various status reports, and log on locally. <*) (*> <*) (*****************************************************************************) -{$A+,B+,D-,E+,F+,I+,L+,N-,O+,R-,S+,V-} +{$A+,B+,E+,F+,I+,L+,N-,O+,R-,S+,V-} unit wfcmenu; interface