init: backported Replace_Right_Unicode corrections to Left functions

There were some functional errors discovered in Replace_Right_Unicode functions implementations. Hence, let's backport them back to Replace_Left_Unicode variants. This patch backports Replace_Right_Unicode corrections to Replace_Left_Unicode within string components of HestiaKERNEL inside init/ directory. Co-authored-by: Shuralyov, Jean <[email protected]> Co-authored-by: Galyna, Cory <[email protected]> Co-authored-by: (Holloway) Chew, Kean Ho <[email protected]> Signed-off-by: (Holloway) Chew, Kean Ho <[email protected]>
JeanShuralyov · Nov 24, 2024 · 0e986e6 · 0e986e6
1 parent 1e6bf7b
commit 0e986e6
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 28 deletions.
diff --git a/init/services/HestiaKERNEL/Unicode/Replace_Left_Unicode.ps1 b/init/services/HestiaKERNEL/Unicode/Replace_Left_Unicode.ps1
@@ -8,6 +8,7 @@
 #
 # You MUST ensure any interaction with the content STRICTLY COMPLIES with
 # the permissions and limitations set forth in the license.
+. "${env:LIBS_HESTIA}\HestiaKERNEL\Errors\Error_Codes.ps1"
 . "${env:LIBS_HESTIA}\HestiaKERNEL\Unicode\Is_Unicode.ps1"
 . "${env:LIBS_HESTIA}\HestiaKERNEL\Number\Is_Number.ps1"
 
@@ -32,7 +33,7 @@ function HestiaKERNEL-Replace-Left-Unicode {
                 return $___content_unicode
         }
 
-        if ($___to_unicode.Length -gt 0) {
+        if ("${___to_unicode}" -ne "") {
                 if ($(HestiaKERNEL-Is-Unicode $___to_unicode) -ne ${env:HestiaKERNEL_ERROR_OK}) {
                         return [uint32[]]@()
                 }
@@ -52,21 +53,26 @@ function HestiaKERNEL-Replace-Left-Unicode {
                 $___ignore = -1
         }
 
-        if ($___target_unicode.Length -gt $___content_unicode.Length) {
+        if ($___from_unicode.Length -gt $___content_unicode.Length) {
                 return $___content_unicode
         }
 
 
         # execute
         [System.Collections.Generic.List[uint32]]$___converted = @()
         [System.Collections.Generic.List[uint32]]$___buffer = @()
-        $___from_index = 0
         $___from_length = $___from_unicode.Length - 1
+        $___from_index = 0
         $___is_replacing = 0
         for ($___index = 0; $___index -le $___content_unicode.Length - 1; $___index++) {
                 # get current character
                 $___current = $___content_unicode[$___index]
 
+                if ($___is_replacing -ne 0) {
+                        $___converted.Add($___current)
+                        continue
+                }
+
 
                 # get target character
                 $___from = $___from_unicode[$___from_index]
@@ -107,21 +113,12 @@ function HestiaKERNEL-Replace-Left-Unicode {
                                 if ($___count -le 0) {
                                         $___is_replacing = 1
 
-                                        if ($___buffer.Length -gt 0) {
-                                                foreach ($___char in $___buffer) {
-                                                        $___converted.Add($___char)
-                                                }
-                                                [System.Collections.Generic.List[uint32]]$___buffer = @()
-                                        }
-
                                         continue
                                 }
                         }
                 } else {
-                        if ($___buffer.Length -gt 0) {
-                                foreach ($___char in $___buffer) {
-                                        $___converted.Add($___char)
-                                }
+                        foreach ($___char in $___buffer) {
+                                $___converted.Add($___char)
                         }
 
                         $___converted.Add($___current)
@@ -132,13 +129,6 @@ function HestiaKERNEL-Replace-Left-Unicode {
                 $___from_index = 0
         }
 
-        if ($___buffer.Length -gt 0) {
-                foreach ($___char in $___buffer) {
-                        $___converted.Add($___char)
-                }
-                [System.Collections.Generic.List[uint32]]$___buffer = @()
-        }
-
 
         # report status
         return [uint32[]]$___converted

diff --git a/init/services/HestiaKERNEL/Unicode/Replace_Left_Unicode.sh b/init/services/HestiaKERNEL/Unicode/Replace_Left_Unicode.sh
@@ -113,11 +113,7 @@ HestiaKERNEL_Replace_Left_Unicode() {
                                 ___count=$(($___count - 1))
                                 if [ $___count -le 0 ]; then
                                         ___is_replacing=1
-
-                                        if [ ! "$___buffer" = "" ]; then
-                                                ___converted="${___converted}${___buffer%, }, "
-                                                ___buffer=""
-                                        fi
+                                        ___buffer=""
 
                                         continue
                                 fi
@@ -135,9 +131,8 @@ HestiaKERNEL_Replace_Left_Unicode() {
                 ___from_unicode="$2"
         done
 
-        if [ ! "$___buffer" = "" ]; then
+        if [ ! "$___to_unicode" = "" ] && [ ! "$___buffer" = "" ]; then
                 ___converted="${___converted}${___buffer%, }, "
-                ___buffer=""
         fi
 
 

diff --git a/init/services/HestiaKERNEL/Unicode/Replace_Right_Unicode.sh b/init/services/HestiaKERNEL/Unicode/Replace_Right_Unicode.sh
@@ -112,6 +112,7 @@ HestiaKERNEL_Replace_Right_Unicode() {
                                 ___count=$(($___count - 1))
                                 if [ $___count -le 0 ]; then
                                         ___is_replacing=1
+                                        ___buffer=""
 
                                         continue
                                 fi