diff --git a/bash-5.1/.gitignore b/bash-5.1/.gitignore index 4c50e886289360acfe95a7b1afe68c804517b55b..6c7dbc5f085f84f2a270711cca252e16ba3e0ce4 100644 --- a/bash-5.1/.gitignore +++ b/bash-5.1/.gitignore @@ -1,5 +1,4 @@ *.swp tags -Cargo.lock target/ .vscode diff --git a/bash-5.1/Cargo.toml b/bash-5.1/Cargo.toml index 6e02f0acf5c454e5a1d90427c12f050cc4c8b5b2..ec2f4f94e8ca1e1b1b2b3eda3ff3596abb48b863 100644 --- a/bash-5.1/Cargo.toml +++ b/bash-5.1/Cargo.toml @@ -2,17 +2,11 @@ name = "rsbash" version = "0.1.0" edition = "2021" -[lib] -name = "rsbash" -crate-type = ["cdylib"] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [workspace] -members = ["builtins_rust/read", "builtins/command1", "builtins/command2", "builtins_rust/common"] +members = ["builtins/command1", "builtins/command2"] [dependencies] -libc = "0.2" command1 = {path = "./builtins/command1"} command2 = {path = "./builtins/command2"} -read = {path = "./builtins_rust/read"} -common = {path = "./builtins_rust/common"} diff --git a/bash-5.1/configure b/bash-5.1/configure index 0d917697efd3adc03a884f7dcce0942c0899228d..0f1d3ed178f6339ad64abc93514065c467771d81 100755 --- a/bash-5.1/configure +++ b/bash-5.1/configure @@ -4231,7 +4231,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$want_auto_cflags"; then AUTO_CFLAGS="-g ${GCC+-O2}" AUTO_LDFLAGS="-g ${GCC+-O2}" - STYLE_CFLAGS="${GCC+-Wno-parentheses} ${GCC+-Wno-format-security} ${GCC+-fPIC}" + STYLE_CFLAGS="${GCC+-Wno-parentheses} ${GCC+-Wno-format-security}" else AUTO_CFLAGS= AUTO_LDFLAGS= STYLE_CFLAGS= fi @@ -20255,7 +20255,6 @@ fi $as_echo "using $bash_cv_termcap_lib" >&6; } if test $bash_cv_termcap_lib = gnutermcap && test -z "$prefer_curses"; then LDFLAGS="$LDFLAGS -L./lib/termcap" - TERMCAP_LIB="./lib/termcap/libtermcap.a" TERMCAP_DEP="./lib/termcap/libtermcap.a" elif test $bash_cv_termcap_lib = libtermcap && test -z "$prefer_curses"; then diff --git a/bash-5.1/execute_cmd.c b/bash-5.1/execute_cmd.c index 9d66af0b4ee4f01b484fbcebdc4ddfdc75e156e7..c86c1a079e4f8f588e2dee545c7bb90279466550 100644 --- a/bash-5.1/execute_cmd.c +++ b/bash-5.1/execute_cmd.c @@ -110,8 +110,6 @@ extern int errno; # include /* mbschr */ #endif -# include "./rsbuiltins.h" - extern int command_string_index; extern char *the_printed_command; extern time_t shell_start_time; @@ -4737,7 +4735,6 @@ execute_builtin (builtin, words, flags, subshell) error_trap = 0; should_keep = 0; - //r_execute_cmd(); /* The eval builtin calls parse_and_execute, which does not know about the setting of flags, and always calls the execution functions with flags that will exit the shell on an error if -e is set. If the @@ -4841,7 +4838,6 @@ execute_builtin (builtin, words, flags, subshell) executing_builtin++; executing_command_builtin |= builtin == command_builtin; result = ((*builtin) (words->next)); - // r_execute_cmd2(words->next); /* This shouldn't happen, but in case `return' comes back instead of longjmp'ing, we need to unwind. */ @@ -5312,6 +5308,7 @@ execute_builtin_or_function (words, builtin, var, redirects, int ofifo, nfifo, osize; void *ofifo_list; #endif + #if defined (PROCESS_SUBSTITUTION) begin_unwind_frame ("saved_fifos"); /* If we return, we longjmp and don't get a chance to restore the old diff --git a/record.txt b/record.txt index b83bdb1469471e08189e3040905b8dcbb99bdc53..97b3d1a5707f8a11fa5fa8bc6c3bd7b3965601fd 100644 --- a/record.txt +++ b/record.txt @@ -12,3 +12,4 @@ 12 13 14 +15