vasilito/RedBear-OS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add descriptions and pick a better function name

Browse Source
This commit is contained in:
auronandace
2026-06-12 11:13:06 +01:00
parent 0dc5247ff6
commit ecb081d8bd
6 changed files with 48 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/header/getopt/mod.rs
+8 -13
View File
@@ -62,7 +62,7 @@ pub unsafe extern "C" fn getopt_long(
let current_arg = unsafe { *argv.offset(optind as isize) };
if unsafe {
current_arg.is_null()
|| *current_arg != ByteLiteral::cast_unchecked(b'-')
|| *current_arg != ByteLiteral::cast_cchar(b'-')
|| *current_arg.offset(1) == 0
} {
-1
@@ -75,9 +75,7 @@ pub unsafe extern "C" fn getopt_long(
// remove the '-'
let current_arg = unsafe { current_arg.offset(1) };
if unsafe { *current_arg == ByteLiteral::cast_unchecked(b'-') }
&& !longopts.is_null()
{
if unsafe { *current_arg == ByteLiteral::cast_cchar(b'-') } && !longopts.is_null() {
let current_arg = unsafe { current_arg.offset(1) };
// is a long option
for i in 0.. {
@@ -89,7 +87,7 @@ pub unsafe extern "C" fn getopt_long(
let mut end = 0;
while {
let c = unsafe { *current_arg.offset(end) };
c != 0 && c != ByteLiteral::cast_unchecked(b'=')
c != 0 && c != ByteLiteral::cast_cchar(b'=')
} {
end += 1;
}
@@ -104,20 +102,18 @@ pub unsafe extern "C" fn getopt_long(
if opt.has_arg == optional_argument {
unsafe {
if *current_arg.offset(end) == ByteLiteral::cast_unchecked(b'=')
{
if *current_arg.offset(end) == ByteLiteral::cast_cchar(b'=') {
optarg = current_arg.offset(end + 1);
}
}
} else if opt.has_arg == required_argument {
unsafe {
if *current_arg.offset(end) == ByteLiteral::cast_unchecked(b'=')
{
if *current_arg.offset(end) == ByteLiteral::cast_cchar(b'=') {
optarg = current_arg.offset(end + 1);
} else if optind < argc {
optarg = *argv.offset(optind as isize);
optind += 1;
} else if *optstring == ByteLiteral::cast_unchecked(b':') {
} else if *optstring == ByteLiteral::cast_cchar(b':') {
return c_int::from(b':');
} else {
stdio::fputs((*argv).cast_const(), &raw mut *stdio::stderr);
@@ -188,7 +184,7 @@ unsafe fn parse_arg(
CURRENT_OPT = ptr::null_mut();
optopt = c_int::from(*current_arg);
let errch = if *optstring == ByteLiteral::cast_unchecked(b':') {
let errch = if *optstring == ByteLiteral::cast_cchar(b':') {
b':'
} else {
if opterr != 0 {
@@ -236,8 +232,7 @@ unsafe fn find_option(ch: c_char, optstring: *const c_char) -> Option<GetoptOpti
while unsafe { *optstring.offset(i) != 0 } {
if unsafe { *optstring.offset(i) == ch } {
let result = if unsafe { *optstring.offset(i + 1) == ByteLiteral::cast_unchecked(b':') }
{
let result = if unsafe { *optstring.offset(i + 1) == ByteLiteral::cast_cchar(b':') } {
GetoptOption::OptArg
} else {
GetoptOption::Flag