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

Merge branch 'time-utime-cleanup' into 'master'

Browse Source 
time and utime header cleanup

See merge request redox-os/relibc!850
This commit is contained in:
Jeremy Soller
2025-12-31 09:38:55 -07:00
parent 2a39863003 911c36ecd3
commit 0f0880d750
7 changed files with 44 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/header/time/constants.rs
+1 -1
View File
@@ -1,4 +1,4 @@
use crate::platform::types::*;
use crate::platform::types::{c_char, c_int, c_long, clockid_t};
#[cfg(target_os = "linux")]
#[path = "linux.rs"]
src/header/time/linux.rs
+1 -1
View File
@@ -1,4 +1,4 @@
use crate::platform::types::*;
use crate::platform::types::c_int;
pub const CLOCK_REALTIME: c_int = 0;
pub const CLOCK_MONOTONIC: c_int = 1;
src/header/time/mod.rs
+7 -1
View File
@@ -15,7 +15,13 @@ use crate::{
},
io::Read,
out::Out,
platform::{self, Pal, Sys, types::*},
platform::{
self, Pal, Sys,
types::{
c_char, c_double, c_int, c_long, c_ulong, clock_t, clockid_t, pid_t, pthread_t, size_t,
time_t, timer_t,
},
},
sync::{Mutex, MutexGuard},
};
use __libc_only_for_layout_checks::EINVAL;
src/header/time/redox.rs
+1 -1
View File
@@ -1,4 +1,4 @@
use crate::platform::types::*;
use crate::platform::types::c_int;
pub const CLOCK_REALTIME: c_int = 1;
pub const CLOCK_MONOTONIC: c_int = 4;
src/header/time/strftime.rs
+10 -3
View File
@@ -1,11 +1,16 @@
// strftime implementation for Redox, following the POSIX standard.
// Following https://pubs.opengroup.org/onlinepubs/7908799/xsh/strftime.html
// `strftime` implementation.
//
// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strftime.html>.
use alloc::string::String;
use super::{get_offset, tm};
use crate::{
c_str::CStr,
platform::{self, WriteByte, types::*},
platform::{
self, WriteByte,
types::{c_char, c_int, size_t},
},
};
// We use the langinfo constants
@@ -36,6 +41,8 @@ unsafe fn langinfo_to_str(item: nl_item) -> &'static str {
}
}
/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strftime.html>.
///
/// Formats time data according to the given `format` string.
///
/// Use `langinfo` for locale-based day/month names,
src/header/time/strptime.rs
+20 -57
View File
@@ -1,4 +1,6 @@
// https://pubs.opengroup.org/onlinepubs/7908799/xsh/strptime.html
// `strptime` implementation.
//
// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strptime.html>.
use crate::{
header::{string::strlen, time::tm},
@@ -127,9 +129,7 @@ pub unsafe extern "C" fn strptime(
// Handle known specifiers
match final_spec {
///////////////////////////
// Whitespace: %n or %t //
///////////////////////////
// Whitespace: %n or %t
'n' | 't' => {
// Skip over any whitespace in the input
while index_in_input < input_str.len()
@@ -139,9 +139,7 @@ pub unsafe extern "C" fn strptime(
}
}
///////////////////////////
// Literal % => "%%" //
///////////////////////////
// Literal % => "%%"
'%' => {
if index_in_input >= input_str.len()
|| input_str.as_bytes()[index_in_input] as char != '%'
@@ -151,9 +149,7 @@ pub unsafe extern "C" fn strptime(
index_in_input += 1;
}
///////////////////////////
// Day of Month: %d / %e //
///////////////////////////
// Day of Month: %d / %e
'd' | 'e' => {
// parse a 2-digit day (with or without leading zero)
let (val, len) = match parse_int(&input_str[index_in_input..], 2, false) {
@@ -170,9 +166,7 @@ pub unsafe extern "C" fn strptime(
index_in_input += len;
}
///////////////////////////
// Month: %m //
///////////////////////////
// Month: %m
'm' => {
// parse a 2-digit month
let (val, len) = match parse_int(&input_str[index_in_input..], 2, false) {
@@ -189,9 +183,7 @@ pub unsafe extern "C" fn strptime(
index_in_input += len;
}
//////////////////////////////
// Year without century: %y //
//////////////////////////////
// Year without century: %y
'y' => {
// parse a 2-digit year
let (val, len) = match parse_int(&input_str[index_in_input..], 2, false) {
@@ -207,9 +199,7 @@ pub unsafe extern "C" fn strptime(
index_in_input += len;
}
///////////////////////////
// Year with century: %Y //
///////////////////////////
// Year with century: %Y
'Y' => {
// parse up to 4-digit (or more) year
// We allow more than 4 digits if needed
@@ -223,9 +213,7 @@ pub unsafe extern "C" fn strptime(
index_in_input += len;
}
///////////////////////////
// Hour (00..23): %H //
///////////////////////////
// Hour (00..23): %H
'H' => {
let (val, len) = match parse_int(&input_str[index_in_input..], 2, false) {
Some(v) => v,
@@ -240,9 +228,7 @@ pub unsafe extern "C" fn strptime(
index_in_input += len;
}
///////////////////////////
// Hour (01..12): %I //
///////////////////////////
// Hour (01..12): %I
'I' => {
let (val, len) = match parse_int(&input_str[index_in_input..], 2, false) {
Some(v) => v,
@@ -258,9 +244,7 @@ pub unsafe extern "C" fn strptime(
index_in_input += len;
}
///////////////////////////
// Minute (00..59): %M //
///////////////////////////
// Minute (00..59): %M
'M' => {
let (val, len) = match parse_int(&input_str[index_in_input..], 2, false) {
Some(v) => v,
@@ -275,9 +259,7 @@ pub unsafe extern "C" fn strptime(
index_in_input += len;
}
///////////////////////////
// Seconds (00..60): %S //
///////////////////////////
// Seconds (00..60): %S
'S' => {
let (val, len) = match parse_int(&input_str[index_in_input..], 2, false) {
Some(v) => v,
@@ -292,9 +274,7 @@ pub unsafe extern "C" fn strptime(
index_in_input += len;
}
///////////////////////////
// AM/PM: %p //
///////////////////////////
// AM/PM: %p
'p' => {
// Parse either "AM" or "PM" (no case-sensitive)
// We'll read up to 2 or 3 letters from input ("AM", "PM")
@@ -321,9 +301,7 @@ pub unsafe extern "C" fn strptime(
index_in_input += parsed_len;
}
///////////////////////////
// Weekday Name: %a/%A //
///////////////////////////
// Weekday Name: %a/%A
'a' => {
// Abbreviated day name (Sun..Sat)
let leftover = &input_str[index_in_input..];
@@ -353,9 +331,7 @@ pub unsafe extern "C" fn strptime(
index_in_input += parsed_len;
}
///////////////////////////
// Month Name: %b/%B/%h //
///////////////////////////
// Month Name: %b/%B/%h
'b' | 'h' => {
// Abbreviated month name
let leftover = &input_str[index_in_input..];
@@ -385,9 +361,7 @@ pub unsafe extern "C" fn strptime(
index_in_input += parsed_len;
}
///////////////////////////
// Day of year: %j //
///////////////////////////
// Day of year: %j
'j' => {
// parse 3-digit day of year [001..366]
let (val, len) = match parse_int(&input_str[index_in_input..], 3, false) {
@@ -404,9 +378,7 @@ pub unsafe extern "C" fn strptime(
index_in_input += len;
}
//////////////////////////////////
// Date shortcuts: %D, %F, etc. //
//////////////////////////////////
// Date shortcuts: %D, %F, etc.
'D' => {
// Equivalent to "%m/%d/%y"
// We can do a mini strptime recursion or manually parse
@@ -440,27 +412,20 @@ pub unsafe extern "C" fn strptime(
index_in_input += used;
}
//////////////////////////////////////////////////////////
// TODO : not implemented: %x, %X, %c, %r, %R, etc. //
//////////////////////////////////////////////////////////
// TODO : not implemented: %x, %X, %c, %r, %R, etc.
// Hint : if you want to implement these, do similarly to %D / %F (or parse manually)
'x' | 'X' | 'c' | 'r' | 'R' => {
// Return NULL if we don’t want to accept them :
return ptr::null_mut();
}
///////////////////////////
// Timezone: %Z or %z //
///////////////////////////
// Timezone: %Z or %z
'Z' | 'z' => {
// Full/abbrev time zone name or numeric offset
// Implementation omitted. Real support is quite complicated.
return ptr::null_mut();
}
//////////
// else //
//////////
_ => {
// We do not recognize this specifier
return ptr::null_mut();
@@ -474,9 +439,7 @@ pub unsafe extern "C" fn strptime(
ret_ptr as *mut c_char
}
// -----------------------
// Helper / Parsing Logic
// -----------------------
/// Parse an integer from the beginning of `input_str`.
///
src/header/utime/mod.rs
+4 -1
View File
@@ -12,7 +12,10 @@ use crate::{
c_str::CStr,
error::ResultExt,
header::time::timespec,
platform::{Pal, Sys, types::*},
platform::{
Pal, Sys,
types::{c_char, c_int, time_t},
},
};
/// See <https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/utime.h.html>.