Commit c2d4f050 authored by Stewart Brodie's avatar Stewart Brodie
Browse files

Updated the X utility to reset Sys$ReturnCode.

Detail:
  Failure to reset Sys$ReturnCode to zero means that amu does NOT ignore
    errors from failing commands correctly.
Admin:
  Tested.


Version 5.34. Tagged as 'Internet-5_34'
parent be088ec3
...@@ -12,42 +12,54 @@ ...@@ -12,42 +12,54 @@
; See the License for the specific language governing permissions and ; See the License for the specific language governing permissions and
; limitations under the License. ; limitations under the License.
; ;
AREA |ObjAsm$$Code|,CODE,READONLY
XOS_CLI * &20005 XOS_CLI * &20005
XOS_ReadVarVal * &20023 XOS_ReadVarVal * &20023
XOS_SetVarVal * &20024 XOS_SetVarVal * &20024
ENTRY AREA |X$$Code|, CODE, READONLY, PIC
X
MOV R0, R1 MOV R0,R1
SWI XOS_CLI SWI XOS_CLI
MOVVC PC, R14 MOVVC PC,R14
ADD R11, R0, #4 ADD R11,R0,#4
ADR R0, XError ADR R0,rcsysvar
MOV R1, R12 ADR R1,zero
MVN R2, #0 MOV R2,#1
MOV R3, #0 MOV R3,#0
MOV R4, #0 MOV R4,#0
SWI XOS_ReadVarVal SWI XOS_SetVarVal
TEQ R2, #0 ADR R0,xsysvar
CMNNE R2, #1 MOV R1,R12
MOVNE PC, R14 MVN R2,#0
MOV R0, R11 MOV R3,#0
MOV R1, R0 MOV R4,#0
XLoop SWI XOS_ReadVarVal
LDRB R2, [R0], #1 TEQ R2,#0
TEQ R2, #0 CMNNE R2,#1
BNE XLoop MOVNE PC,R14
SUB R2, R0, R1 MOV R0,R11
ADR R0, XError MOV R1,R0
MOV R3, #0 10
MOV R4, #0 LDRB R2,[R0],#1
SWI XOS_SetVarVal TEQ R2,#0
MOV PC, R14 BNE %BT10
XError SUB R2,R0,R1
= "X$Error", 0 ADR R0,xsysvar
MOV R3,#0
MOV R4,#0
SWI XOS_SetVarVal
MOV PC,R14
xsysvar
DCB "X$Error", 0
rcsysvar
DCB "Sys$ReturnCode", 0
zero
DCB "0", 0
XVersionInfo XVersionInfo
= "X 1.02 (27 Apr 2000)" DCB "X 1.03 (03 Jul 2001)"
ALIGN
END
END
/* (5.33) /* (5.34)
* *
* 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 5.33 #define Module_MajorVersion_CMHG 5.34
#define Module_MinorVersion_CMHG #define Module_MinorVersion_CMHG
#define Module_Date_CMHG 05 Mar 2001 #define Module_Date_CMHG 03 Jul 2001
#define Module_MajorVersion "5.33" #define Module_MajorVersion "5.34"
#define Module_Version 533 #define Module_Version 534
#define Module_MinorVersion "" #define Module_MinorVersion ""
#define Module_Date "05 Mar 2001" #define Module_Date "03 Jul 2001"
#define Module_ApplicationDate2 "05-Mar-01" #define Module_ApplicationDate2 "03-Jul-01"
#define Module_ApplicationDate4 "05-Mar-2001" #define Module_ApplicationDate4 "03-Jul-2001"
#define Module_ComponentName "Internet" #define Module_ComponentName "Internet"
#define Module_ComponentPath "RiscOS/Sources/SystemRes/Internet" #define Module_ComponentPath "RiscOS/Sources/SystemRes/Internet"
#define Module_FullVersion "5.33" #define Module_FullVersion "5.34"
#define Module_HelpVersion "5.33 (05 Mar 2001)" #define Module_HelpVersion "5.34 (03 Jul 2001)"
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