Merge pull request #49 from dmcoles/v5.3.1

V5.3.1

ACP.e

@@ -3284,6 +3284,7 @@ PROC loadState()
 
     Close(fh)
   ENDIF
+  showLastUser(eWin)
 ENDPROC
 
 PROC saveState()

express.e

@@ -29,8 +29,6 @@ node tooltypes
 door tooltypes
  PASS_PARAMETERS=<res>- options 3 and 4
 
-STICKY - trapdoor command line parameter
-
 */
 
 MODULE 'intuition/screens',
@@ -3972,7 +3970,6 @@ PROC runCommand(cmdtype,cmd,params,privcmd)
   DEF commandTypeCode
   DEF cmdfound = FALSE
   DEF tooltype,pri,stacksize
-  DEF default=FALSE
   DEF acsLevel
   DEF passparams=-1
   DEF access=0
@@ -4088,46 +4085,35 @@ PROC runCommand(cmdtype,cmd,params,privcmd)
     RETURN (processCommand(commandfile,TRUE)=RESULT_SUCCESS)
   ENDIF
 
-  IF (commandTypeCode=DOORTYPE_SIM)
-    getNodeFile(tooltype,cmd,commandfile)
-    default:=fileExists(commandfile)
-  ELSEIF commandTypeCode=DOORTYPE_MCI
-    default:=TRUE
-  ELSE
-    default:=FALSE
-  ENDIF
+  getNodeFile(tooltype,cmd,commandfile)
+  readToolType(tooltype,cmd,'LOCATION',commandfile)
 
-  StrCopy(commandfile,'')
-  IF (default) OR (readToolType(tooltype,cmd,'LOCATION',commandfile))
+  IF commandTypeCode=-1 THEN RETURN FALSE
 
-    IF commandTypeCode=-1 THEN RETURN FALSE
+  IF (checkToolTypeExists(tooltype,cmd,'QUICKMODE')) AND (quickFlag) THEN RETURN TRUE
 
-    IF (checkToolTypeExists(tooltype,cmd,'QUICKMODE')) AND (quickFlag) THEN RETURN TRUE
+  cmdfound:=TRUE
 
-    cmdfound:=TRUE
-
-    pri:=0
-    stacksize:=20000
-    IF readToolType(tooltype,cmd,'PRIORITY',passwordstr)
-      IF strCmpi(passwordstr,'same',ALL)
-        pri:=byteSignExtend(cmds.taskPri)
-      ELSE
-        pri:=Val(passwordstr)
-      ENDIF
+  pri:=0
+  stacksize:=20000
+  IF readToolType(tooltype,cmd,'PRIORITY',passwordstr)
+    IF strCmpi(passwordstr,'same',ALL)
+      pri:=byteSignExtend(cmds.taskPri)
+    ELSE
+      pri:=Val(passwordstr)
     ENDIF
+  ENDIF
 
-    IF readToolType(tooltype,cmd,'STACK',passwordstr) THEN stacksize:=Val(passwordstr)
+  IF readToolType(tooltype,cmd,'STACK',passwordstr) THEN stacksize:=Val(passwordstr)
 
-    resident:=checkToolTypeExists(tooltype,cmd,'RESIDENT')
-    IF checkToolTypeExists(tooltype,cmd,'EXPERT_MODE') THEN doorExpertMode:=TRUE
+  resident:=checkToolTypeExists(tooltype,cmd,'RESIDENT')
+  IF checkToolTypeExists(tooltype,cmd,'EXPERT_MODE') THEN doorExpertMode:=TRUE
 
-    doorTrap:=checkToolTypeExists(tooltype,cmd,'TRAPON')
+  doorTrap:=checkToolTypeExists(tooltype,cmd,'TRAPON')
 
-    readToolType(tooltype,cmd,'MIMICVER',mimicVersion)
-    runDoor(commandfile,commandTypeCode,cmd,tooltype,params,resident,doorTrap,privcmd,pri,stacksize)
-    StrCopy(mimicVersion,'')
-
-  ENDIF
+  readToolType(tooltype,cmd,'MIMICVER',mimicVersion)
+  runDoor(commandfile,commandTypeCode,cmd,tooltype,params,resident,doorTrap,privcmd,pri,stacksize)
+  StrCopy(mimicVersion,'')
 ENDPROC cmdfound
 
 PROC runBbsCommand(cmd,params,privcmd=FALSE)
@@ -5002,7 +4988,7 @@ PROC processMciCmd(mcidata,len,pos)
       midStr2(cmd,mcidata,pos,nval)
       slowmo:=Val(cmd)
       IF (slowmo<1) OR (slowmo>5) THEN slowmo:=1
-      pos:=pos+t
+      pos:=pos+nval+t
     ELSEIF StrCmp(cmd,'SMC',ALL)
       slowmo:=0
       pos:=pos+3+t
@@ -6549,7 +6535,6 @@ PROC checkIncomingCall()
       hostent:=GetHostByAddr({s},4,AF_INET)
       IF hostent<>NIL THEN StrCopy(hostName,hostent.h_name,255)
     ENDIF
-
     JUMP go3
   ENDIF
 
@@ -8427,23 +8412,27 @@ PROC runFifoHandler()
 
   ->check to see if fifo handler is running and run it if not
 
+  Forbid()
   m:=MaxCli()
 
   FOR i:=1 TO m
     p:=FindCliProc(i)
-    c:=p.cli
-    IF c
-      c:=Shl(c,2)
-      s:=c.commandname
-      IF s
-        s:=Shl(s,2)
-        StrCopy(tempstr,s+1,s[0])
-        LowerStr(tempstr)
-        IF StrCmp(tempstr,'l:fifo-handler') THEN found:=TRUE
+    IF p
+      c:=p.cli
+      IF c
+        c:=Shl(c,2)
+        s:=c.commandname
+        IF s
+          s:=Shl(s,2)
+          StrCopy(tempstr,s+1,s[0])
+          LowerStr(tempstr)
+          IF StrCmp(tempstr,'l:fifo-handler') THEN found:=TRUE
+        ENDIF
       ENDIF
     ENDIF
 
   ENDFOR
+  Permit()
   IF found=FALSE THEN Execute('Run >NIL: <NIL: l:fifo-handler',0,0)
 ENDPROC
 
@@ -14013,7 +14002,11 @@ PROC updateZDisplay()
       SetAPen(windowZmodem.rport,0)
       RectFill(windowZmodem.rport,11,136,322,143)
     ELSE
-      StringF(tempstr,' Complete: \d%\n',Div(zModemInfo.transPos,Div(zModemInfo.filesize,100)))
+      IF zModemInfo.filesize<100
+        StringF(tempstr,' Complete: \d%\n',Div(Mul(zModemInfo.transPos,100),zModemInfo.filesize))
+      ELSE
+        StringF(tempstr,' Complete: \d%\n',Div(zModemInfo.transPos,Div(zModemInfo.filesize,100)))
+      ENDIF
       zmodemStatPrint(tempstr)
 
       v1:=zModemInfo.transPos
@@ -23270,7 +23263,7 @@ ENDPROC RESULT_SUCCESS
 
 PROC internalCommandVER()
   DEF tempStr[255]:STRING
-  StringF(tempStr,'\b\nAmiExpress \s (\s) Copyright �2018-2020 Darren Coles\b\n',expressVer,expressDate)
+  StringF(tempStr,'\b\nAmiExpress \s (\s) Copyright �2018-2020 Darren Coles\b\n',expressVer,expressDate)
   aePuts(tempStr)
   aePuts('Original Version (C)1992-95 LightSpeed Technologies Inc.\b\n')
   StringF(tempStr,'Registered to \s.\b\n',regKey)
@@ -26451,7 +26444,7 @@ PROC processLogon()
   ENDIF
   aePuts(tempStr)
 
-  StringF(tempStr,'\b\n\b\nRunning AmiExpress \s Copyright �2018-2020 Darren Coles\b\n',expressVer)
+  StringF(tempStr,'\b\n\b\nRunning AmiExpress \s Copyright �2018-2020 Darren Coles\b\n',expressVer)
   aePuts(tempStr)
   aePuts('Original Version (C)1992-95 LightSpeed Technologies Inc.\b\n')
   StringF(tempStr,'Registration \s. You are connected to Node \d at \d baud',regKey,node,onlineBaud)
@@ -26751,9 +26744,9 @@ PROC processAwait()
       send017()
       sendCLS()
 
-      StringF(tempstr,'\b\n           � 1992-1995 AmiExpress by Light Speed Technologies Inc.\b\n')
+      StringF(tempstr,'\b\n           � 1992-1995 AmiExpress by Light Speed Technologies Inc.\b\n')
       aePuts(tempstr)
-      StringF(tempstr,'\b\n                            Version 5 �2018-2020\b\n')
+      StringF(tempstr,'\b\n                            Version 5 �2018-2020\b\n')
       aePuts(tempstr)
 
       StringF(tempstr,'\b\n                        Programming by:  Darren Coles')

makefile

@@ -4,7 +4,7 @@ options=DEBUG IGNORECACHE NILCHECK
 compiler=EC
 expprogramname=AmiExpress
 acpprogramname=ACP
-version=5.3.0-beta
+version=5.3.1
 
 all:					acp express5 jsonimport icon2cfg qwk ftn