From e431e4c5f0506a90f1283e5bddfe47e703f4c9ce Mon Sep 17 00:00:00 2001
From: wangmengc <wangmengc@uniontech.com>
Date: Wed, 16 Aug 2023 09:20:39 +0800
Subject: [PATCH]  add u_src dir

---
 bash-5.1/Cargo.toml  | 8 ++++++++
 bash-5.1/Makefile.in | 4 ++--
 record.txt           | 1 +
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/bash-5.1/Cargo.toml b/bash-5.1/Cargo.toml
index 87ccd3a..68e7298 100644
--- a/bash-5.1/Cargo.toml
+++ b/bash-5.1/Cargo.toml
@@ -2,6 +2,10 @@
 name = "rsbash"
 version = "0.1.0"
 edition = "2018"
+build = "build.rs"
+
+[build-dependencies]
+bindgen = "0.20.0"
 
 [lib]
 name = "rsbash"
@@ -62,10 +66,12 @@ members=[
  "builtins_rust/setattr",
  "builtins_rust/source",
  "builtins_rust/exec_cmd",
+ "u_src",
 ]
 
 [dependencies]
  libc = "*"
+ bindgen = "*"
  rread = {path = "./builtins_rust/read"}
  rhistory = {path = "./builtins_rust/history"}
  rkill = {path = "./builtins_rust/kill"}
@@ -102,3 +108,5 @@ members=[
  rwait = {path = "./builtins_rust/wait"}
  rdeclare = {path = "./builtins_rust/declare"}
  rexec_cmd = {path = "./builtins_rust/exec_cmd"}
+
+ r_main = {path = "./u_src"}
diff --git a/bash-5.1/Makefile.in b/bash-5.1/Makefile.in
index dd1c8a4..d94c718 100644
--- a/bash-5.1/Makefile.in
+++ b/bash-5.1/Makefile.in
@@ -139,7 +139,7 @@ LOCALE_DEFS = -DLOCALEDIR='"$(localedir)"' -DPACKAGE='"$(PACKAGE)"'
 
 LOCAL_LIBS = @LOCAL_LIBS@
 
-LIBS = $(BUILTINS_LIB) $(LIBRARIES) @LIBS@ -lrt -lpthread -L./target/debug  -lralias  -lrbind  -lrbreak  -lrbuiltin -lrcaller -lrcd -lrcolon -lrcommon -lcommand -lrcomplete -lrdeclare -lrecho -lrenable -lreval -lrexec -lrexit -lrfc -lrfg_bg -lrgetopts -lrhash -lrexit -lrhelp -lrhistory -lrjobs -lrkill -lrmapfile  -lrpushd -lrread  -lrlet -lrreturn -lrset -lrsetattr -lrshift -lrshopt  -lrsource -lrsuspend  -lrtest -lrtimes -lrtrap -lrtype -lrulimit -lrumask -lrwait -lrprintf -lrexec_cmd
+LIBS = $(BUILTINS_LIB) $(LIBRARIES) @LIBS@ -lrt -lpthread -L./target/debug  -lralias  -lrbind  -lrbreak  -lrbuiltin -lrcaller -lrcd -lrcolon -lrcommon -lcommand -lrcomplete -lrdeclare -lrecho -lrenable -lreval -lrexec -lrexit -lrfc -lrfg_bg -lrgetopts -lrhash -lrexit -lrhelp -lrhistory -lrjobs -lrkill -lrmapfile  -lrpushd -lrread  -lrlet -lrreturn -lrset -lrsetattr -lrshift -lrshopt  -lrsource -lrsuspend  -lrtest -lrtimes -lrtrap -lrtype -lrulimit -lrumask -lrwait -lrprintf -lrexec_cmd -lr_main
 LIBS_FOR_BUILD = 
 
 STATIC_LD = @STATIC_LD@
@@ -571,7 +571,7 @@ LANGSRC = $(srcdir)/$(LANGSUBDIR)
 
 RUST_DIR = $(top_builddir)/builtins_rust
 #RUST_TARGET_LIB = $(top_builddir)/target/debug/librjobs.a $(top_builddir)/target/debug/librread.a
-RUST_BUILTINS_DIRS = $(RUST_DIR)/alias $(RUST_DIR)/bind $(RUST_DIR)/break_1 $(RUST_DIR)/builtin $(RUST_DIR)/caller $(RUST_DIR)/cd $(RUST_DIR)/colon $(RUST_DIR)/command $(RUST_DIR)/common $(RUST_DIR)/complete $(RUST_DIR)/declare $(RUST_DIR)/echo $(RUST_DIR)/enable $(RUST_DIR)/eval $(RUST_DIR)/exit $(RUST_DIR)/fc $(RUST_DIR)/fg_bg $(RUST_DIR)/getopts $(RUST_DIR)/hash $(RUST_DIR)/help $(RUST_DIR)/history $(RUST_DIR)/jobs $(RUST_DIR)/kill $(RUST_DIR)/mapfile $(RUST_DIR)/printf $(RUST_DIR)/pushd $(RUST_DIR)/read $(RUST_DIR)/rlet $(RUST_DIR)/rreturn  $(RUST_DIR)/set $(RUST_DIR)/setattr $(RUST_DIR)/shift $(RUST_DIR)/shopt $(RUST_DIR)/source $(RUST_DIR)/suspend $(RUST_DIR)/test $(RUST_DIR)/times $(RUST_DIR)/trap $(RUST_DIR)/type $(RUST_DIR)/ulimit $(RUST_DIR)/umask $(RUST_DIR)/wait $(RUST_DIR)/exec  $(RUST_DIR)/exec_cmd
+RUST_BUILTINS_DIRS = $(RUST_DIR)/alias $(RUST_DIR)/bind $(RUST_DIR)/break_1 $(RUST_DIR)/builtin $(RUST_DIR)/caller $(RUST_DIR)/cd $(RUST_DIR)/colon $(RUST_DIR)/command $(RUST_DIR)/common $(RUST_DIR)/complete $(RUST_DIR)/declare $(RUST_DIR)/echo $(RUST_DIR)/enable $(RUST_DIR)/eval $(RUST_DIR)/exit $(RUST_DIR)/fc $(RUST_DIR)/fg_bg $(RUST_DIR)/getopts $(RUST_DIR)/hash $(RUST_DIR)/help $(RUST_DIR)/history $(RUST_DIR)/jobs $(RUST_DIR)/kill $(RUST_DIR)/mapfile $(RUST_DIR)/printf $(RUST_DIR)/pushd $(RUST_DIR)/read $(RUST_DIR)/rlet $(RUST_DIR)/rreturn  $(RUST_DIR)/set $(RUST_DIR)/setattr $(RUST_DIR)/shift $(RUST_DIR)/shopt $(RUST_DIR)/source $(RUST_DIR)/suspend $(RUST_DIR)/test $(RUST_DIR)/times $(RUST_DIR)/trap $(RUST_DIR)/type $(RUST_DIR)/ulimit $(RUST_DIR)/umask $(RUST_DIR)/wait $(RUST_DIR)/exec  $(RUST_DIR)/exec_cmd $(RUST_DIR)/u_src
 
 
 # Keep GNU Make from exporting the entire environment for small machines.
diff --git a/record.txt b/record.txt
index d05e2cd..d14f599 100644
--- a/record.txt
+++ b/record.txt
@@ -120,3 +120,4 @@
 119
 120
 121
+122
-- 
Gitee