new helpers epoch_i64 and epoch_f64

These helpers use rust std SystemTime. Removed the libc time() binding.

diff --git a/proxmox/src/tools/email.rs b/proxmox/src/tools/email.rs
index 97884f61703d28cd5df8140bbe93f162348de925..031baa20ecc2496fadf68c85bdee1434ff7acd58 100644 (file)
--- a/proxmox/src/tools/email.rs
+++ b/proxmox/src/tools/email.rs
@@ -1,6 +1,6 @@
 //! Email related utilities.
 
-use crate::tools::time::time;
+use crate::tools::time::epoch_i64;
 use anyhow::{bail, Error};
 use std::io::Write;
 use std::process::{Command, Stdio};
@@ -36,7 +36,7 @@ pub fn sendmail(
     let recipients = mailto.join(",");
     let author = author.unwrap_or("Proxmox Backup Server");
 
-    let now = crate::tools::time::time()?;
+    let now = epoch_i64();
 
     let mut sendmail_process = match Command::new("/usr/sbin/sendmail")
         .arg("-B")
@@ -57,7 +57,7 @@ pub fn sendmail(
     }
 
     let mut body = String::new();
-    let boundary = format!("----_=_NextPart_001_{}", time()?);
+    let boundary = format!("----_=_NextPart_001_{}", now);
     if is_multipart {
         body.push_str("Content-Type: multipart/alternative;\n");
         body.push_str(&format!("\tboundary=\"{}\"\n", boundary));

diff --git a/proxmox/src/tools/time.rs b/proxmox/src/tools/time.rs
index ef6141f5e5245715447ae56b13a3453b40983d9c..f5898d91afd7dcfd0876c0828d3dfc7ffe34b847 100644 (file)
--- a/proxmox/src/tools/time.rs
+++ b/proxmox/src/tools/time.rs
@@ -74,13 +74,39 @@ pub fn gmtime(epoch: i64) -> Result<libc::tm, Error> {
     Ok(result)
 }
 
-/// Safe bindings to libc time
-pub fn time() -> Result<i64, Error> {
-    let now = unsafe { libc::time(std::ptr::null_mut()) };
-    if now < 0 {
-        bail!("libc::time failed with {}", now);
+/// Returns Unix Epoch (now)
+///
+/// Note: This panics if the SystemTime::now() returns values not
+/// repesentable as i64 (should never happen).
+pub fn epoch_i64() -> i64 {
+    use std::convert::TryFrom;
+    use std::time::{SystemTime, UNIX_EPOCH};
+
+    let now = SystemTime::now();
+
+    if now > UNIX_EPOCH {
+        i64::try_from(now.duration_since(UNIX_EPOCH).unwrap().as_secs())
+            .expect("epoch_i64: now is too large")
+    } else {
+        -i64::try_from(UNIX_EPOCH.duration_since(now).unwrap().as_secs())
+            .expect("epoch_i64: now is too small")
+     }
+}
+
+/// Returns Unix Epoch (now) as f64 with subseconds resolution
+///
+/// Note: This can be inacurrate for values greater the 2^53. But this
+/// should never happen.
+pub fn epoch_f64() -> f64 {
+    use std::time::{SystemTime, UNIX_EPOCH};
+
+    let now = SystemTime::now();
+
+    if now > UNIX_EPOCH {
+        now.duration_since(UNIX_EPOCH).unwrap().as_secs_f64()
+    } else {
+        -UNIX_EPOCH.duration_since(now).unwrap().as_secs_f64()
     }
-    Ok(now)
 }
 
 //  rust libc bindings do not include strftime