diff --git a/bash-5.1/builtins_rust/alias/src/lib.rs b/bash-5.1/builtins_rust/alias/src/lib.rs index c9e53be3218392630a90ef8e390b91eb4a9f50dc..2ff7814fd087b2d7b1f739af084f4f7004fe173f 100644 --- a/bash-5.1/builtins_rust/alias/src/lib.rs +++ b/bash-5.1/builtins_rust/alias/src/lib.rs @@ -212,17 +212,20 @@ unsafe extern "C" fn print_alias( alias: *mut AliasT, flags: libc::c_int) { let value: *mut libc::c_char; value = sh_single_quote((*alias).value); if flags & 0x1 as libc::c_int != 0 { - printf( - b"alias %s\0" as *const u8 as *const libc::c_char, + print!("alias "); + //printf( + // b"alias %s\0" as *const u8 as *const libc::c_char, if !((*alias).name).is_null() && *((*alias).name).offset(0 as libc::c_int as isize) as libc::c_int == '-' as i32 { - b"-- \0" as *const u8 as *const libc::c_char + // b"-- \0" as *const u8 as *const libc::c_char + print!("-- "); } else { - b"\0" as *const u8 as *const libc::c_char - }, - ); + // b"\0" as *const u8 as *const libc::c_char + print!(" "); + } + //); } println!("{}={}", CStr::from_ptr((*alias).name).to_string_lossy().into_owned(), CStr::from_ptr(value).to_string_lossy().into_owned()); diff --git a/bash-5.1/builtins_rust/jobs/src/lib.rs b/bash-5.1/builtins_rust/jobs/src/lib.rs index d16b8941c3ef2b050e444c3c72a4e74f859217a3..e072ee5f68111be1ec8e08bc8b36a9efedafe529 100644 --- a/bash-5.1/builtins_rust/jobs/src/lib.rs +++ b/bash-5.1/builtins_rust/jobs/src/lib.rs @@ -330,11 +330,7 @@ macro_rules! CMD_INHIBIT_EXPANSION {/* Do not expand the command words. */ #[macro_export] macro_rules! get_job_by_jid { ($ind:expr) => { - //(*((jobs as usize + ($ind*8) as usize ) as *mut*mut JOB) as *mut JOB) - //println!("====jobs.offset={:?}", (*jobs.offset($ind as isize))); - //(*((*jobs.offset($ind)) as *mut *mut JOB) as *mut JOB) (*((jobs as usize + ($ind*8) as usize ) as *mut*mut JOB) as *mut JOB) - } } @@ -538,6 +534,7 @@ pub extern "C" fn r_disown_builtin (list:* mut WordList)->libc::c_int { return EX_USAGE; } } + opt = internal_getopt (list, c_str_ahr.as_ptr() as * mut c_char); } retval = EXECUTION_SUCCESS!(); diff --git a/record.txt b/record.txt index 9bffdca499d961732d290be19b1f5c87aaa739fd..6349a61e9638dbd6fa0d88b8d6939cc1a13f51e3 100644 --- a/record.txt +++ b/record.txt @@ -82,3 +82,4 @@ 81 82 83 +84