From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 95ECCB87A1; Tue, 5 Dec 2023 13:12:47 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 789E31A30D; Tue, 5 Dec 2023 13:12:17 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS; Tue, 5 Dec 2023 13:12:16 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 78B5444C49; Tue, 5 Dec 2023 13:12:16 +0100 (CET) From: Lukas Wagner To: pbs-devel@lists.proxmox.com, pve-devel@lists.proxmox.com Date: Tue, 5 Dec 2023 13:11:40 +0100 Message-Id: <20231205121142.169542-4-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231205121142.169542-1-l.wagner@proxmox.com> References: <20231205121142.169542-1-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.007 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [posix.rs] Subject: [pve-devel] [PATCH proxmox 3/5] time: posix: add bindings for strftime_l X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Dec 2023 12:12:47 -0000 This variant of strftime can be provided with a locale_t, which determines the locale used for time formatting. A struct `Locale` was also introduced as a safe wrapper around locale_t. Signed-off-by: Lukas Wagner --- proxmox-time/src/posix.rs | 99 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) diff --git a/proxmox-time/src/posix.rs b/proxmox-time/src/posix.rs index 5913816..9c8002a 100644 --- a/proxmox-time/src/posix.rs +++ b/proxmox-time/src/posix.rs @@ -140,6 +140,93 @@ pub fn strftime(format: &str, t: &libc::tm) -> Result { Ok(str_slice.to_owned()) } +// The `libc` crate does not yet contain bindings for `strftime_l` +#[link(name = "c")] +extern "C" { + #[link_name = "strftime_l"] + fn libc_strftime_l( + s: *mut libc::c_char, + max: libc::size_t, + format: *const libc::c_char, + time: *const libc::tm, + locale: libc::locale_t, + ) -> libc::size_t; +} + +/// Safe bindings to libc's `strftime_l` +/// +/// The compared to `strftime`, `strftime_l` allows the caller to provide a +/// locale object. +pub fn strftime_l(format: &str, t: &libc::tm, locale: &Locale) -> Result { + let format = CString::new(format).map_err(|err| format_err!("{err}"))?; + let mut buf = vec![0u8; 8192]; + + let res = unsafe { + libc_strftime_l( + buf.as_mut_ptr() as *mut libc::c_char, + buf.len() as libc::size_t, + format.as_ptr(), + t as *const libc::tm, + locale.locale, + ) + }; + if res == !0 { + // -1,, it's unsigned + // man strftime: POSIX.1-2001 does not specify any errno settings for strftime() + bail!("strftime failed"); + } + + // `res` is a `libc::size_t`, which on a different target architecture might not be directly + // assignable to a `usize`. Thus, we actually want a cast here. + #[allow(clippy::unnecessary_cast)] + let len = res as usize; + + if len == 0 { + bail!("strftime: result len is 0 (string too large)"); + }; + + let c_str = CStr::from_bytes_with_nul(&buf[..len + 1]).map_err(|err| format_err!("{err}"))?; + let str_slice: &str = c_str.to_str()?; + Ok(str_slice.to_owned()) +} + +/// A safe wrapper for `libc::locale_t`. +/// +/// The enclosed locale object will be automatically freed by `Drop::drop` +pub struct Locale { + locale: libc::locale_t, +} + +impl Locale { + /// Portable, minimal locale environment + const C: &'static str = "C"; + + /// Create a new locale object. + /// `category_mask` is expected to be a bitmask based on the + /// LC_*_MASK constants from libc. The locale will be set to `locale` + /// for every entry in the bitmask which is set. + pub fn new(category_mask: i32, locale: &str) -> Result { + let format = CString::new(locale).map_err(|err| format_err!("{err}"))?; + + let locale = + unsafe { libc::newlocale(category_mask, format.as_ptr(), std::ptr::null_mut()) }; + + if locale.is_null() { + return Err(std::io::Error::last_os_error().into()); + } + + Ok(Self { locale }) + } +} + +impl Drop for Locale { + fn drop(&mut self) { + unsafe { + libc::freelocale(self.locale); + } + } +} + /// Format epoch as local time pub fn strftime_local(format: &str, epoch: i64) -> Result { let localtime = localtime(epoch)?; @@ -391,3 +478,15 @@ fn test_timezones() { let res = epoch_to_rfc3339_utc(parsed).expect("converting to RFC failed"); assert_eq!(expected_utc, res); } + +#[test] +fn test_strftime_l() { + let epoch = 1609263000; + + let locale = Locale::new(libc::LC_ALL, Locale::C).expect("could not create locale"); + let time = gmtime(epoch).expect("gmtime failed"); + + let formatted = strftime_l("%a, %d %b %Y %T %z", &time, &locale).expect("strftime_l failed"); + + assert_eq!(formatted, "Tue, 29 Dec 2020 17:30:00 +0000"); +} -- 2.39.2