Skip to content

GitLab

Commit 6c284d47 authored by Jeffrey Lee's avatar Jeffrey Lee
Browse files

Escape some dollars 

Detail:
  s/CtrlUtils, s/DirStore, s/FSCtrl2, s/FSPath, s/FileSwBody, s/SysVars - Escape some dollars contained in strings to avoid warnings from objasm
Admin:
  Resulting binary unchanged


Version 2.83. Retagged as 'FileSwitch-2_83'
parent ccea391b
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 53 deletions
s/CtrlUtils
View file @ 6c284d47
......@@ -401,7 +401,7 @@ CatExBody_WindBlock
DCD -1
[ CatExLong
CatExMaxWidthStr = "FileSwitch$NameWidth",0
CatExMaxWidthStr = "FileSwitch$$NameWidth",0
ALIGN
]
......
s/DirStore
View file @ 6c284d47
......@@ -61,13 +61,13 @@ FSW_Sysvar_Suffixes
FSW_Sysvar_Prefix DCB "FileSwitch$"
DCB 0
FSW_CSD_Suffix DCB "$CSD"
FSW_CSD_Suffix DCB "$$CSD"
DCB 0
FSW_PSD_Suffix DCB "$PSD"
FSW_PSD_Suffix DCB "$$PSD"
DCB 0
FSW_URD_Suffix DCB "$URD"
FSW_URD_Suffix DCB "$$URD"
DCB 0
FSW_Lib_Suffix DCB "$Lib"
FSW_Lib_Suffix DCB "$$Lib"
DCB 0
ALIGN
......
s/FSCtrl2
View file @ 6c284d47
......@@ -984,7 +984,7 @@ ftslocalframesize * localframesize + fts_size
WildFileType
DCB "File$Type_"
DCB "File$$Type_"
FileTypePrefixOff * .-WildFileType
DCB "*" ; Shared zero with ...
fsw_Null ; Can't be local, unfortunately
......@@ -1187,7 +1187,7 @@ DecodeFileType Entry "r0-r2, r4" ; Result r2 poked into stack
dft_VariablePrefix
DCB "File$Type_" ; Shared zero with ...
DCB "File$$Type_" ; Shared zero with ...
66
DCB 0
ALIGN
......
s/FSPath
View file @ 6c284d47
......@@ -249,7 +249,7 @@ FSPath_FindFSPrefix Entry "r0,r1"
; r4 = length of special field
; fscb^ (Nowt if FS prefix and tempfs not set) (ie not Nowt if r2 <> 0)
;
str_dollarpath_message DCB "$Path_Message", 0
str_dollarpath_message DCB "$$Path_Message", 0
ALIGN
FSPath_ExtractFS Entry "r0,r1,r5,r6"
......@@ -356,8 +356,8 @@ FSPath_ExtractFS Entry "r0,r1,r5,r6"
; <path>$Path string on stack
; FileSwitch$SpecialField set to special field of prefix
;
FileSwitchSpecialFieldVar DCB "FileSwitch$SpecialField", 0
DollarPathSuffix DCB "$Path", 0
FileSwitchSpecialFieldVar DCB "FileSwitch$$SpecialField", 0
DollarPathSuffix DCB "$$Path", 0
ALIGN
FSPath_TestForPathLikePrefix Entry "r0,r1,r2,r4"
......
s/FileSwBody
View file @ 6c284d47
......@@ -941,26 +941,26 @@ FileSwitch_FirstVariableToCreate * .
; ************************** Path variables ***********************************
RunPathVariableNameCR DCB "Run$Path", CR
RunPathVariableNameCR DCB "Run$$Path", CR
RunPathVariableDefault DCB ",%.", CR ; null then library
FilePathVariableNameCR DCB "File$Path", CR
FilePathVariableNameCR DCB "File$$Path", CR
FilePathVariableDefault DCB "", CR ; just null
; ************************** Utility Options **********************************
[ hascopy
CopyOptsVariableNameCR DCB "Copy$Options", CR
CopyOptsVariableNameCR DCB "Copy$$Options", CR
CopyOptsVariableDefault DCB "A C ~D ~F ~L ~N ~P ~Q ~R ~S ~T V", CR
]
[ haswipe
WipeOptsVariableNameCR DCB "Wipe$Options", CR
WipeOptsVariableNameCR DCB "Wipe$$Options", CR
WipeOptsVariableDefault DCB "C ~F ~R V", CR
]
[ hascount
CountOptsVariableNameCR DCB "Count$Options", CR
CountOptsVariableNameCR DCB "Count$$Options", CR
CountOptsVariableDefault DCB "~C R ~V", CR
]
......@@ -974,15 +974,15 @@ CountOptsVariableDefault DCB "~C R ~V", CR
; FE1..FE9 not yet allocated
DCB "Alias$@RunType_FEA", CR ; Desktop
DCB "Alias$$@RunType_FEA", CR ; Desktop
DCB "Desktop -file %*0", CR
DCB "Alias$@RunType_FEB", CR ; Obey
DCB "Alias$$@RunType_FEB", CR ; Obey
DCB "Obey %0 ", CR
; No run action for FEC Template
DCB "Alias$@RunType_FED", CR ; Palette
DCB "Alias$$@RunType_FED", CR ; Palette
DCB "WimpPalette %0 ", CR
; No run action for FEE Note pad
......@@ -998,27 +998,27 @@ CountOptsVariableDefault DCB "~C R ~V", CR
; No run action for FF6 Font
DCB "Alias$@RunType_FF7", CR ; BBC font
DCB "Alias$$@RunType_FF7", CR ; BBC font
DCB "Print %0 ", CR
; No run action for FF8 Absolute (can't be aliased)
DCB "Alias$@RunType_FF9", CR
DCB "Alias$$@RunType_FF9", CR
DCB "ScreenLoad %0 ", CR
DCB "Alias$@RunType_FFA", CR ; Module
DCB "Alias$$@RunType_FFA", CR ; Module
DCB "RMRun %*0", CR
DCB "Alias$@RunType_FFB", CR ; Basic
DCB "Alias$$@RunType_FFB", CR ; Basic
DCB "Basic -quit ""%0"" %*1", CR
; No run action for FFC Transient (can't be aliased)
; FFD Data
DCB "Alias$@RunType_FFE", CR ; Command
DCB "Alias$$@RunType_FFE", CR ; Command
DCB "Exec %0 ", CR
DCB "Alias$@RunType_FFF", CR ; Text
DCB "Alias$$@RunType_FFF", CR ; Text
DCB "Type %0 ", CR
; *********************** Aliases for Load actions ****************************
......@@ -1040,18 +1040,18 @@ CountOptsVariableDefault DCB "~C R ~V", CR
; No load action for FF6 Font
DCB "Alias$@LoadType_FF7", CR ; BBC font
DCB "Alias$$@LoadType_FF7", CR ; BBC font
DCB "Print %0 ", CR
; No load action for FF8 Absolute (can't be aliased)
DCB "Alias$@LoadType_FF9", CR ; Sprite
DCB "Alias$$@LoadType_FF9", CR ; Sprite
DCB "SLoad %0 ", CR
DCB "Alias$@LoadType_FFA", CR ; Module
DCB "Alias$$@LoadType_FFA", CR ; Module
DCB "RMLoad %*0", CR
DCB "Alias$@LoadType_FFB", CR ; Basic
DCB "Alias$$@LoadType_FFB", CR ; Basic
DCB "Basic -load ""%0"" %*1", CR
; No load action for FFC Transient (can't be aliased)
......@@ -1063,32 +1063,32 @@ CountOptsVariableDefault DCB "~C R ~V", CR
; put application suite stuff in here (disc as well as ROM ones)
DCB "File$Type_AFF", CR
DCB "File$$Type_AFF", CR
DCB "DrawFile", CR
DCB "File$Type_BBC", CR
DCB "File$$Type_BBC", CR
DCB "BBC ROM", CR
DCB "File$Type_F95", CR
DCB "File$$Type_F95", CR
DCB "Code", CR
DCB "File$Type_FAE", CR ; AMcC 27-Feb-95: for Toolbox
DCB "File$$Type_FAE", CR ; AMcC 27-Feb-95: for Toolbox
DCB "Resource", CR
; FE0 DeskUtil deprecated
; FE1..FE9 not yet allocated
DCB "File$Type_FEA", CR
DCB "File$$Type_FEA", CR
DCB "Desktop", CR
DCB "File$Type_FEB", CR
DCB "File$$Type_FEB", CR
DCB "Obey", CR
DCB "File$Type_FEC", CR
DCB "File$$Type_FEC", CR
DCB "Template", CR
DCB "File$Type_FED", CR
DCB "File$$Type_FED", CR
DCB "Palette", CR
; FEE Note pad deprecated
......@@ -1096,45 +1096,45 @@ CountOptsVariableDefault DCB "~C R ~V", CR
; FF0..FF1 not yet allocated
DCB "File$Type_FF2", CR
DCB "File$$Type_FF2", CR
DCB "Config", CR
; FF3 LaserJet deprecated
DCB "File$Type_FF4", CR
DCB "File$$Type_FF4", CR
DCB "Printout", CR
DCB "File$Type_FF5", CR
DCB "File$$Type_FF5", CR
DCB "PoScript", CR
DCB "File$Type_FF6", CR
DCB "File$$Type_FF6", CR
DCB "Font", CR
DCB "File$Type_FF7", CR
DCB "File$$Type_FF7", CR
DCB "BBC font", CR
DCB "File$Type_FF8", CR
DCB "File$$Type_FF8", CR
DCB "Absolute", CR
DCB "File$Type_FF9", CR
DCB "File$$Type_FF9", CR
DCB "Sprite", CR
DCB "File$Type_FFA", CR
DCB "File$$Type_FFA", CR
DCB "Module", CR
DCB "File$Type_FFB", CR
DCB "File$$Type_FFB", CR
DCB "BASIC", CR
DCB "File$Type_FFC", CR
DCB "File$$Type_FFC", CR
DCB "Utility", CR
DCB "File$Type_FFD", CR
DCB "File$$Type_FFD", CR
DCB "Data", CR
DCB "File$Type_FFE", CR
DCB "File$$Type_FFE", CR
DCB "Command", CR
DCB "File$Type_FFF", CR
DCB "File$$Type_FFF", CR
DCB "Text", CR
DCB &FF ; End of variable (name,value) list
......
s/SysVars
View file @ 6c284d47
......@@ -31,15 +31,15 @@
;
fsw_dirsprefix DCB "FileSwitch$", 0
fsw_dirspart_separator DCB "$", 0
fsw_dirsspecial_postfix DCB "$Special", 0
fsw_dirspath_postfix DCB "$DiscAndPath", 0
fsw_dirsspecial_postfix DCB "$$Special", 0
fsw_dirspath_postfix DCB "$$DiscAndPath", 0
fsw_dirspart_current DCB "Current", 0
fsw_dirspart_previous DCB "Previous", 0
fsw_dirspart_userroot DCB "UserRoot", 0
fsw_dirspart_library DCB "Library", 0
fsw_currentfs DCB "FileSwitch$CurrentFilingSystem", 0
fsw_tempfs DCB "FileSwitch$TemporaryFilingSystem", 0
fsw_currentfs DCB "FileSwitch$$CurrentFilingSystem", 0
fsw_tempfs DCB "FileSwitch$$TemporaryFilingSystem", 0
Default_RootD_Path DCB "$",CR
Default_LibD_Path DCB "$.Library",CR
......
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