Move conversion functions in libcc2rs

Author: lucic71

libcc2rs/Cargo.toml

@@ -7,3 +7,4 @@ edition = "2024"
 libcc2rs-macros = { path = "../libcc2rs-macros", version = "0.1.0" }
 libc = "0.2"
 nix = { version = "0.30", features = ["socket", "net", "fs", "poll", "time", "user", "dir", "term", "event", "hostname"] }
+jiff = "0.2"

libcc2rs/src/libc_shims/time.rs

@@ -20,6 +20,36 @@ pub struct Tm {
     pub tm_zone: Value<Ptr<u8>>,
 }
 
+impl Tm {
+    pub fn from_zoned(dt: &jiff::Zoned) -> Self {
+        let tm = Tm::default();
+        *tm.tm_sec.borrow_mut() = dt.second() as i32;
+        *tm.tm_min.borrow_mut() = dt.minute() as i32;
+        *tm.tm_hour.borrow_mut() = dt.hour() as i32;
+        *tm.tm_mday.borrow_mut() = dt.day() as i32;
+        *tm.tm_mon.borrow_mut() = dt.month() as i32 - 1;
+        *tm.tm_year.borrow_mut() = dt.year() as i32 - 1900;
+        *tm.tm_wday.borrow_mut() = dt.weekday().to_sunday_zero_offset() as i32;
+        *tm.tm_yday.borrow_mut() = dt.day_of_year() as i32 - 1;
+        *tm.tm_isdst.borrow_mut() = 0;
+        *tm.tm_gmtoff.borrow_mut() = dt.offset().seconds() as i64;
+        *tm.tm_zone.borrow_mut() = Ptr::from_string_literal(b"GMT");
+        tm
+    }
+
+    pub fn to_civil(&self) -> Result<jiff::civil::DateTime, jiff::Error> {
+        jiff::civil::DateTime::new(
+            (*self.tm_year.borrow() + 1900) as i16,
+            (*self.tm_mon.borrow() + 1) as i8,
+            *self.tm_mday.borrow() as i8,
+            *self.tm_hour.borrow() as i8,
+            *self.tm_min.borrow() as i8,
+            *self.tm_sec.borrow() as i8,
+            0,
+        )
+    }
+}
+
 impl Clone for Tm {
     fn clone(&self) -> Self {
         Self {

rules/time/tgt_refcount.rs

@@ -49,23 +49,11 @@ fn f2(a0: ::libc::clockid_t, a1: Ptr<Timespec>) -> i32 {
 }
 
 fn f4(a0: Ptr<::libc::time_t>, a1: Ptr<Tm>) -> Ptr<Tm> {
-    let __res = a1;
+    let __res = a1.clone();
     match jiff::Timestamp::from_second(a0.read()) {
         Ok(__ts) => {
             let __dt = __ts.to_zoned(jiff::tz::TimeZone::UTC);
-            __res.with_mut(|__tm| {
-                *__tm.tm_sec.borrow_mut() = __dt.second() as i32;
-                *__tm.tm_min.borrow_mut() = __dt.minute() as i32;
-                *__tm.tm_hour.borrow_mut() = __dt.hour() as i32;
-                *__tm.tm_mday.borrow_mut() = __dt.day() as i32;
-                *__tm.tm_mon.borrow_mut() = __dt.month() as i32 - 1;
-                *__tm.tm_year.borrow_mut() = __dt.year() as i32 - 1900;
-                *__tm.tm_wday.borrow_mut() = __dt.weekday().to_sunday_zero_offset() as i32;
-                *__tm.tm_yday.borrow_mut() = __dt.day_of_year() as i32 - 1;
-                *__tm.tm_isdst.borrow_mut() = 0;
-                *__tm.tm_gmtoff.borrow_mut() = 0;
-                *__tm.tm_zone.borrow_mut() = Ptr::from_string_literal(b"GMT");
-            });
+            __res.with_mut(|__tm| *__tm = Tm::from_zoned(&__dt));
             __res
         }
         Err(_) => {
@@ -76,17 +64,7 @@ fn f4(a0: Ptr<::libc::time_t>, a1: Ptr<Tm>) -> Ptr<Tm> {
 }
 
 fn f6(a0: Ptr<u8>, a1: usize, a2: Ptr<u8>, a3: Ptr<Tm>) -> usize {
-    let __dt = a3.with(|__tm| {
-        jiff::civil::DateTime::new(
-            (*__tm.tm_year.borrow() + 1900) as i16,
-            (*__tm.tm_mon.borrow() + 1) as i8,
-            *__tm.tm_mday.borrow() as i8,
-            *__tm.tm_hour.borrow() as i8,
-            *__tm.tm_min.borrow() as i8,
-            *__tm.tm_sec.borrow() as i8,
-            0,
-        )
-    });
+    let __dt = a3.with(|__tm| __tm.to_civil());
     let __text = match __dt {
         Ok(__d) => {
             jiff::fmt::strtime::format(a2.to_rust_string().as_str(), __d).unwrap_or_default()