uucore: add systemd_logind cfg alias

Author: xtqqczze

Cargo.lock

@@ -21,6 +21,9 @@ workspace = true
 [lib]
 path = "src/lib/lib.rs"
 
+[build-dependencies]
+cfg_aliases.workspace = true
+
 [dependencies]
 bstr = { workspace = true, optional = true }
 clap = { workspace = true }

src/uucore/Cargo.toml

@@ -3,12 +3,20 @@
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
 
+// spell-checker:ignore logind
+
 use std::env;
 use std::fs::File;
 use std::io::Write;
 use std::path::Path;
 
+use cfg_aliases::cfg_aliases;
+
 pub fn main() -> Result<(), Box<dyn std::error::Error>> {
+    cfg_aliases! {
+        systemd_logind: { all(feature = "feat_systemd_logind", target_os = "linux") },
+    }
+
     let out_dir = env::var("OUT_DIR")?;
 
     let mut embedded_file = File::create(Path::new(&out_dir).join("embedded_locales.rs"))?;

src/uucore/build.rs

@@ -87,7 +87,7 @@ pub mod selinux;
 pub mod signals;
 #[cfg(all(target_os = "linux", feature = "smack"))]
 pub mod smack;
-#[cfg(feature = "feat_systemd_logind")]
+#[cfg(systemd_logind)]
 pub mod systemd_logind;
 #[cfg(all(
     unix,

src/uucore/src/lib/features.rs

@@ -41,7 +41,7 @@ use std::path::Path;
 use std::ptr;
 use std::sync::{Mutex, MutexGuard};
 
-#[cfg(feature = "feat_systemd_logind")]
+#[cfg(systemd_logind)]
 use crate::features::systemd_logind;
 
 pub use self::ut::*;
@@ -313,13 +313,13 @@ impl Utmpx {
     /// Only one instance of [`UtmpxIter`] may be active at a time. This
     /// function will block as long as one is still active. Beware!
     pub fn iter_all_records() -> UtmpxIter {
-        #[cfg(feature = "feat_systemd_logind")]
+        #[cfg(systemd_logind)]
         {
             // Use systemd-logind instead of traditional utmp when feature is enabled
             UtmpxIter::new_systemd()
         }
 
-        #[cfg(not(feature = "feat_systemd_logind"))]
+        #[cfg(not(systemd_logind))]
         {
             let iter = UtmpxIter::new();
             unsafe {
@@ -345,7 +345,7 @@ impl Utmpx {
     ///
     /// The same caveats as for [`Utmpx::iter_all_records`] apply.
     pub fn iter_all_records_from<P: AsRef<Path>>(path: P) -> UtmpxIter {
-        #[cfg(feature = "feat_systemd_logind")]
+        #[cfg(systemd_logind)]
         {
             // Use systemd-logind for default utmp file when feature is enabled
             if path.as_ref() == Path::new(DEFAULT_FILE) {
@@ -389,7 +389,7 @@ pub struct UtmpxIter {
     /// Ensure UtmpxIter is !Send. Technically redundant because MutexGuard
     /// is also !Send.
     phantom: PhantomData<std::rc::Rc<()>>,
-    #[cfg(feature = "feat_systemd_logind")]
+    #[cfg(systemd_logind)]
     systemd_iter: Option<systemd_logind::SystemdUtmpxIter>,
 }
 
@@ -400,12 +400,12 @@ impl UtmpxIter {
         Self {
             guard,
             phantom: PhantomData,
-            #[cfg(feature = "feat_systemd_logind")]
+            #[cfg(systemd_logind)]
             systemd_iter: None,
         }
     }
 
-    #[cfg(feature = "feat_systemd_logind")]
+    #[cfg(systemd_logind)]
     fn new_systemd() -> Self {
         // PoisonErrors can safely be ignored
         let guard = LOCK.lock().unwrap_or_else(|err| err.into_inner());
@@ -428,7 +428,7 @@ impl UtmpxIter {
 /// Wrapper type that can hold either traditional utmpx records or systemd records
 pub enum UtmpxRecord {
     Traditional(Box<Utmpx>),
-    #[cfg(feature = "feat_systemd_logind")]
+    #[cfg(systemd_logind)]
     Systemd(systemd_logind::SystemdUtmpxCompat),
 }
 
@@ -437,7 +437,7 @@ impl UtmpxRecord {
     pub fn record_type(&self) -> i16 {
         match self {
             Self::Traditional(utmpx) => utmpx.record_type(),
-            #[cfg(feature = "feat_systemd_logind")]
+            #[cfg(systemd_logind)]
             Self::Systemd(systemd) => systemd.record_type(),
         }
     }
@@ -446,7 +446,7 @@ impl UtmpxRecord {
     pub fn pid(&self) -> i32 {
         match self {
             Self::Traditional(utmpx) => utmpx.pid(),
-            #[cfg(feature = "feat_systemd_logind")]
+            #[cfg(systemd_logind)]
             Self::Systemd(systemd) => systemd.pid(),
         }
     }
@@ -455,7 +455,7 @@ impl UtmpxRecord {
     pub fn terminal_suffix(&self) -> String {
         match self {
             Self::Traditional(utmpx) => utmpx.terminal_suffix(),
-            #[cfg(feature = "feat_systemd_logind")]
+            #[cfg(systemd_logind)]
             Self::Systemd(systemd) => systemd.terminal_suffix(),
         }
     }
@@ -464,7 +464,7 @@ impl UtmpxRecord {
     pub fn user(&self) -> String {
         match self {
             Self::Traditional(utmpx) => utmpx.user(),
-            #[cfg(feature = "feat_systemd_logind")]
+            #[cfg(systemd_logind)]
             Self::Systemd(systemd) => systemd.user(),
         }
     }
@@ -473,7 +473,7 @@ impl UtmpxRecord {
     pub fn host(&self) -> String {
         match self {
             Self::Traditional(utmpx) => utmpx.host(),
-            #[cfg(feature = "feat_systemd_logind")]
+            #[cfg(systemd_logind)]
             Self::Systemd(systemd) => systemd.host(),
         }
     }
@@ -482,7 +482,7 @@ impl UtmpxRecord {
     pub fn tty_device(&self) -> String {
         match self {
             Self::Traditional(utmpx) => utmpx.tty_device(),
-            #[cfg(feature = "feat_systemd_logind")]
+            #[cfg(systemd_logind)]
             Self::Systemd(systemd) => systemd.tty_device(),
         }
     }
@@ -491,7 +491,7 @@ impl UtmpxRecord {
     pub fn login_time(&self) -> time::OffsetDateTime {
         match self {
             Self::Traditional(utmpx) => utmpx.login_time(),
-            #[cfg(feature = "feat_systemd_logind")]
+            #[cfg(systemd_logind)]
             Self::Systemd(systemd) => systemd.login_time(),
         }
     }
@@ -502,7 +502,7 @@ impl UtmpxRecord {
     pub fn exit_status(&self) -> (i16, i16) {
         match self {
             Self::Traditional(utmpx) => utmpx.exit_status(),
-            #[cfg(feature = "feat_systemd_logind")]
+            #[cfg(systemd_logind)]
             Self::Systemd(systemd) => systemd.exit_status(),
         }
     }
@@ -511,7 +511,7 @@ impl UtmpxRecord {
     pub fn is_user_process(&self) -> bool {
         match self {
             Self::Traditional(utmpx) => utmpx.is_user_process(),
-            #[cfg(feature = "feat_systemd_logind")]
+            #[cfg(systemd_logind)]
             Self::Systemd(systemd) => systemd.is_user_process(),
         }
     }
@@ -520,7 +520,7 @@ impl UtmpxRecord {
     pub fn canon_host(&self) -> IOResult<String> {
         match self {
             Self::Traditional(utmpx) => utmpx.canon_host(),
-            #[cfg(feature = "feat_systemd_logind")]
+            #[cfg(systemd_logind)]
             Self::Systemd(systemd) => systemd.canon_host(),
         }
     }
@@ -529,7 +529,7 @@ impl UtmpxRecord {
 impl Iterator for UtmpxIter {
     type Item = UtmpxRecord;
     fn next(&mut self) -> Option<Self::Item> {
-        #[cfg(feature = "feat_systemd_logind")]
+        #[cfg(systemd_logind)]
         {
             if let Some(ref mut systemd_iter) = self.systemd_iter {
                 // We have a systemd iterator - use it exclusively (never fall back to traditional utmp)

src/uucore/src/lib/features/utmpx.rs

@@ -75,7 +75,7 @@ pub use crate::features::ranges;
 pub use crate::features::ringbuffer;
 #[cfg(feature = "sum")]
 pub use crate::features::sum;
-#[cfg(feature = "feat_systemd_logind")]
+#[cfg(systemd_logind)]
 pub use crate::features::systemd_logind;
 #[cfg(feature = "time")]
 pub use crate::features::time;