!38 [sync] PR-36: 修改echo和type命令报错

From: @openeuler-sync-bot 
Reviewed-by: @ut-wanglujun 
Signed-off-by: @ut-wanglujun

0006-fix-select-error.patch

@@ -0,0 +1,29 @@
+From e7dfff81605834dcc6b879963d820c60aef972b0 Mon Sep 17 00:00:00 2001
+From: wangmengc <wangmengc@uniontech.com>
+Date: Thu, 9 May 2024 10:58:58 +0800
+Subject: [PATCH] fix select error
+
+---
+ builtins_rust/read/src/lib.rs | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/builtins_rust/read/src/lib.rs b/builtins_rust/read/src/lib.rs
+index d08da49..de8bbd8 100644
+--- a/builtins_rust/read/src/lib.rs
++++ b/builtins_rust/read/src/lib.rs
+@@ -770,10 +770,10 @@ pub extern "C" fn r_read_builtin(mut list: *mut WordList) -> i32 {
+             //和-d相关  -n 0可以退出，有显示
+             if saw_escape != 0 {
+                 let t = dequote_string(input_string);
+-                var = bind_variable("REPLY".as_ptr() as *const c_char, t, 0);
++                var = bind_variable( b"REPLY\0" as *const u8 as *const libc::c_char,t, 0);
+                 libc::free(t as *mut c_void);
+             } else {
+-                var = bind_variable("REPLY".as_ptr() as *const c_char, input_string, 0);
++                var = bind_variable( b"REPLY\0" as *const u8 as *const libc::c_char,input_string, 0);
+             }
+             let cond = var.is_null()
+                 || ((*var).attributes & 0x0000002) != 0
+-- 
+2.39.3
+

0007-fix-compile-error-on-riscv64.patch

@@ -0,0 +1,29 @@
+From b93998a221ad9e78540253016eadd634a39c1598 Mon Sep 17 00:00:00 2001
+From: wangyaoyong <yaoyong.oerv@isrc.iscas.ac.cn>
+Date: Thu, 23 May 2024 17:59:49 +0800
+Subject: [PATCH 1/1] fix compile error on riscv64
+
+---
+ Makefile.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 6affd14..0e8ff16 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -598,10 +598,10 @@ $(Program):  .build  $(OBJECTS) $(BUILTINS_DEP) $(LIBDEP) rust_builtins_lib rust
+ 	@echo "	  ***********************************************************"
+ 	@echo
+ 
+-rust_mainland_lib:
++rust_mainland_lib: $(SHLIB_LIBRARY)
+ 	@for it in $(RUST_MAINLAND_DIRS); do  cd $$it ;  cargo build;   cd -; done
+ 
+-rust_builtins_lib:
++rust_builtins_lib: $(SHLIB_LIBRARY)
+ 	@for it in $(RUST_BUILTINS_DIRS); do  cd $$it ;  cargo build;   cd -; done
+ 
+ 
+-- 
+2.25.1
+

0008-fix-echo-a.z.patch

@@ -0,0 +1,36 @@
+From 35f29adb96c082cd94ec0c72c62556b4fde1e05c Mon Sep 17 00:00:00 2001
+From: wangmengc <wangmengc@uniontech.com>
+Date: Fri, 13 Dec 2024 17:15:50 +0800
+Subject: [PATCH] fix echo {a..z}
+
+---
+ r_braces/src/lib.rs | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/r_braces/src/lib.rs b/r_braces/src/lib.rs
+index ee83ac1..d36ff1f 100644
+--- a/r_braces/src/lib.rs
++++ b/r_braces/src/lib.rs
+@@ -378,7 +378,7 @@ pub unsafe extern "C" fn brace_expand(
+     loop  {
+         if *amble.offset(j as isize) as libc::c_int == 0 as libc::c_int  {
+             tack = expand_seqterm (amble, alen);
+-            if tack.is_null() {
++            if !tack.is_null() {
+                 break;
+             }
+             else if !text.offset((i+1) as isize).is_null() {
+@@ -692,7 +692,9 @@ unsafe extern "C" fn expand_seqterm(
+     lhs = substring(text, 0 as libc::c_int, lhs_l);
+     rhs = substring(
+         text,
+-        (lhs_l + std::mem::size_of::<[libc::c_char; 3]> as libc::c_int - 1 as libc::c_int ),
++        (lhs_l as libc::c_ulong)
++                .wrapping_add(::std::mem::size_of::<[libc::c_char; 3]>() as libc::c_ulong)
++               .wrapping_sub(1 as libc::c_int as libc::c_ulong) as libc::c_int,
+         tlen as libc::c_int,
+     );    
+     if *lhs.offset(0 as libc::c_int as isize) as libc::c_int == 0 as libc::c_int
+-- 
+2.39.3
+

0009-fix-type-return-error.patch

@@ -0,0 +1,38 @@
+From 7af7b30f2dc162ff4999a5c0e11132796f62b0be Mon Sep 17 00:00:00 2001
+From: wangmengc <wangmengc@uniontech.com>
+Date: Fri, 13 Dec 2024 17:35:33 +0800
+Subject: [PATCH] fix type return error
+
+---
+ builtins_rust/type/src/lib.rs | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/builtins_rust/type/src/lib.rs b/builtins_rust/type/src/lib.rs
+index 4940fae..c1b470e 100644
+--- a/builtins_rust/type/src/lib.rs
++++ b/builtins_rust/type/src/lib.rs
+@@ -555,17 +555,16 @@ pub unsafe extern "C" fn r_type_builtin(mut list: *mut WordList) -> i32 {
+                 sh_notfound((*(*list).word).word);
+             }
+         }
+-        any_failed = found + any_failed;
+-        let _ = any_failed == 0;
+-        // (any_failed += found) == 0;
++        
++        any_failed += (found == 0 as libc::c_int) as libc::c_int;
+         unsafe {
+             list = (*list).next;
+         }
+     }
+     if any_failed == 0 {
+-        EXECUTION_SUCCESS!();
++        opt = EXECUTION_SUCCESS!();
+     } else {
+-        EXECUTION_FAILURE!();
++        opt = EXECUTION_FAILURE!();
+     }
+     return unsafe { sh_chkwrite(opt) };
+ }
+-- 
+2.39.3
+

utshell.spec

@@ -6,7 +6,7 @@
 Version: %{baseversion}%{patchleveltag}
 Name: utshell
 Summary: The utshell respect Bash
-Release: 0%{?dist}.2
+Release: 3%{?dist}
 License: GPLv3+
 Source0: utshell-%{baseversion}.tar.gz
 
@@ -17,7 +17,10 @@ Patch0002: 0002-fix-kill-l.patch
 Patch0003: 0003-fix-exec-c-exec-l-Redundant-output.patch
 Patch0004: 0004-fix-complete-p-no-display.patch
 Patch0005: 0005-fix-translation-files-correlation.patch
-
+Patch0006: 0006-fix-select-error.patch
+Patch0007: 0007-fix-compile-error-on-riscv64.patch
+Patch0008: 0008-fix-echo-a.z.patch
+Patch0009: 0009-fix-type-return-error.patch
 # Other patches
 # We don't want to add '/etc:/usr/etc' in standard utils path.
 
@@ -134,6 +137,20 @@ end
 %{_includedir}/%{name}
 
 %changelog
+* Fri Dec 13 2024 wangmeng <wangmengc@uniontech.com> - 0.5.0-3
+- feat: add patch 0003-fix-echo-a.z.patch
+- feat: add patch 0004-fix-type-return-error.patch
+- 修复echo {a..z} 执行错误和type命令返回值错误
+
+* Fri Jun 21 2024 wangmeng<wangmengc@uniontech.con> - 0.5.0-1
+- fix:IA4DBK Change the verson number to be consistent with other software packages
+
+* Thu May 23 2024 wangyaoyong <yaoyong.oerv@isrc.iscas.ac.cn> - 0.5.0-0.4
+- fix:I9KZET riscv64 下cargo build编译时出现缺少依赖的问题
+
+* Thu May 9 2024 wangmeng<wangmengc@uniontech.com> - 0.5.0-0.3
+- fix:I9CANW select 关键字没有输出
+
 * Thu Apr 11 2024 wangyaoyong <yaoyong.oerv@isrc.iscas.ac.cn> - 0.5.0-0.2
 - update ExclusiveArch: riscv to riscv64