From 8159da18297161205fd4deaae3b36ea53962d8b3 Mon Sep 17 00:00:00 2001
From: Stewart Brodie <sbrodie@gitlab.riscosopen.org>
Date: Thu, 10 May 2001 09:26:10 +0000
Subject: [PATCH] Fix for strxfrm()
Detail:
strxfrm was passing the buffers to the Territory module SWI the wrong
way around so Territory_TransformString copied the destination over
the source rather than vice versa!
Admin:
Reported by <mailto:ian.foster@gps.tandb.co.uk>
Fixes Bugzilla bug #4375
Version 5.33. Tagged as 'RISC_OSLib-5_33'
---
VersionASM | 14 +++++++-------
VersionNum | 20 ++++++++++----------
c/string | 4 ++--
3 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/VersionASM b/VersionASM
index 448b6ea..352e3d1 100644
--- a/VersionASM
+++ b/VersionASM
@@ -11,14 +11,14 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
-Module_MajorVersion SETS "5.32"
-Module_Version SETA 532
+Module_MajorVersion SETS "5.33"
+Module_Version SETA 533
Module_MinorVersion SETS ""
-Module_Date SETS "17 Apr 2001"
-Module_ApplicationDate2 SETS "17-Apr-01"
-Module_ApplicationDate4 SETS "17-Apr-2001"
+Module_Date SETS "10 May 2001"
+Module_ApplicationDate2 SETS "10-May-01"
+Module_ApplicationDate4 SETS "10-May-2001"
Module_ComponentName SETS "RISC_OSLib"
Module_ComponentPath SETS "RiscOS/Sources/Lib/RISC_OSLib"
-Module_FullVersion SETS "5.32"
-Module_HelpVersion SETS "5.32 (17 Apr 2001)"
+Module_FullVersion SETS "5.33"
+Module_HelpVersion SETS "5.33 (10 May 2001)"
END
diff --git a/VersionNum b/VersionNum
index 4cf6900..c7dff05 100644
--- a/VersionNum
+++ b/VersionNum
@@ -1,22 +1,22 @@
-/* (5.32)
+/* (5.33)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
-#define Module_MajorVersion_CMHG 5.32
+#define Module_MajorVersion_CMHG 5.33
#define Module_MinorVersion_CMHG
-#define Module_Date_CMHG 17 Apr 2001
+#define Module_Date_CMHG 10 May 2001
-#define Module_MajorVersion "5.32"
-#define Module_Version 532
+#define Module_MajorVersion "5.33"
+#define Module_Version 533
#define Module_MinorVersion ""
-#define Module_Date "17 Apr 2001"
+#define Module_Date "10 May 2001"
-#define Module_ApplicationDate2 "17-Apr-01"
-#define Module_ApplicationDate4 "17-Apr-2001"
+#define Module_ApplicationDate2 "10-May-01"
+#define Module_ApplicationDate4 "10-May-2001"
#define Module_ComponentName "RISC_OSLib"
#define Module_ComponentPath "RiscOS/Sources/Lib/RISC_OSLib"
-#define Module_FullVersion "5.32"
-#define Module_HelpVersion "5.32 (17 Apr 2001)"
+#define Module_FullVersion "5.33"
+#define Module_HelpVersion "5.33 (10 May 2001)"
diff --git a/c/string b/c/string
index 383c1c9..24fd608 100644
--- a/c/string
+++ b/c/string
@@ -333,8 +333,8 @@ size_t strxfrm(char *s1, const char *s2, size_t n)
if (strcoll_territory) {
r.r[0] = strcoll_territory;
- r.r[1] = (int)s2;
- r.r[2] = (int)s1;
+ r.r[1] = (int)s1;
+ r.r[2] = (int)s2;
r.r[3] = n;
if (!_kernel_swi(Territory_TransformString, &r, &r))
return r.r[0];
--
GitLab