Commit 2414d9a8 authored by Robert Sprowson's avatar Robert Sprowson Committed by ROOL
Browse files

Allow for !Scrap in the root of the boot drive

Add an extra lookup step so that !Scrap can live outside of !Boot on the locked drive.

Version 1.26. Tagged as 'FSLock-1_26'
parent cb2f11f1
No preview for this file type
...@@ -9,12 +9,12 @@ ...@@ -9,12 +9,12 @@
GBLS Module_ApplicationDate GBLS Module_ApplicationDate
GBLS Module_HelpVersion GBLS Module_HelpVersion
GBLS Module_ComponentName GBLS Module_ComponentName
Module_MajorVersion SETS "1.25" Module_MajorVersion SETS "1.26"
Module_Version SETA 125 Module_Version SETA 126
Module_MinorVersion SETS "" Module_MinorVersion SETS ""
Module_Date SETS "28 Jun 2019" Module_Date SETS "07 May 2022"
Module_ApplicationDate SETS "28-Jun-19" Module_ApplicationDate SETS "07-May-22"
Module_ComponentName SETS "FSLock" Module_ComponentName SETS "FSLock"
Module_FullVersion SETS "1.25" Module_FullVersion SETS "1.26"
Module_HelpVersion SETS "1.25 (28 Jun 2019)" Module_HelpVersion SETS "1.26 (07 May 2022)"
END END
/* (1.25) /* (1.26)
* *
* This file is automatically maintained by srccommit, do not edit manually. * This file is automatically maintained by srccommit, do not edit manually.
* *
*/ */
#define Module_MajorVersion_CMHG 1.25 #define Module_MajorVersion_CMHG 1.26
#define Module_MinorVersion_CMHG #define Module_MinorVersion_CMHG
#define Module_Date_CMHG 28 Jun 2019 #define Module_Date_CMHG 07 May 2022
#define Module_MajorVersion "1.25" #define Module_MajorVersion "1.26"
#define Module_Version 125 #define Module_Version 126
#define Module_MinorVersion "" #define Module_MinorVersion ""
#define Module_Date "28 Jun 2019" #define Module_Date "07 May 2022"
#define Module_ApplicationDate "28-Jun-19" #define Module_ApplicationDate "07-May-22"
#define Module_ComponentName "FSLock" #define Module_ComponentName "FSLock"
#define Module_FullVersion "1.25" #define Module_FullVersion "1.26"
#define Module_HelpVersion "1.25 (28 Jun 2019)" #define Module_HelpVersion "1.26 (07 May 2022)"
#define Module_LibraryVersionInfo "1:25" #define Module_LibraryVersionInfo "1:26"
...@@ -1167,42 +1167,39 @@ Check_R1_path ROUT ...@@ -1167,42 +1167,39 @@ Check_R1_path ROUT
CLRV CLRV
Pull "R0-R3,PC" Pull "R0-R3,PC"
20 20
CLRV ADD R2, R1, R2 ; r2 -> next char after end of drive name
ADD R1, R1, R2 ; r1 -> next char after end of drive name
Push "R1" ADR R1, special_path1a
BL Check_R2_Against_Token
ADD R0, R11, #:INDEX:Wsp_MsgBlock ADRVC R1, special_path1b
ADR R1, special_path1 BLVC Check_R2_Against_Token
MOV R2, #0 ADRVC R1, special_path2
SWI XMessageTrans_Lookup BLVC Check_R2_Against_Token
Pull "R1", VS
BVS %BT10 BVS %BT10
MOV R0, R2 SETV
MOV R2, R3 Pull "R0-R3,PC" ; Unstack registers, exit with V set
LDR R1, [R13]
BL StrCmp_CaseInsens
Pull "R1", VS
BVS %BT10
Check_R2_Against_Token ROUT
; R1 -> Token of path to match
; R2 -> Proposed path after drive name
; V set if matched
Push "R2,LR"
ADD R0, R11, #:INDEX:Wsp_MsgBlock ADD R0, R11, #:INDEX:Wsp_MsgBlock
ADR R1, special_path2
MOV R2, #0 MOV R2, #0
SWI XMessageTrans_Lookup SWI XMessageTrans_Lookup
Pull "R1", VS Pull "R2,PC", VS ; Treat failed lookup as match
BVS %BT10
MOV R0, R2 ; String MOV R0, R2 ; String
MOV R2, R3 ; Length MOV R2, R3 ; Length
LDR R1, [R13] ; User's LDR R1, [R13] ; User's
BL StrCmp_CaseInsens BL StrCmp_CaseInsens
ADD R13, R13, #4 ; Junk R1 Pull "R2,PC"
BVS %BT10
SETV
Pull "R0-R3,PC" ; Unstack registers, exit with V set
DCB "SPTH" DCB "SPTH"
special_path1 special_path1a
DCB "Path1", 0 DCB "Path1a", 0
special_path1b
DCB "Path1b", 0
ALIGN ALIGN
Rnd1 Rnd1
DCD 0 DCD 0
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment