users: Use compile-time macro env!

fox0 · fox0 · commit 152b2653ad46 · 2024-10-20T11:52:07.000+07:00
diff --git a/users/id.rs b/users/id.rs
@@ -12,7 +12,7 @@
 
 use clap::Parser;
 use gettextrs::{bind_textdomain_codeset, setlocale, textdomain, LocaleCategory};
-use plib::PROJECT_NAME;
+use plib::group;
 use std::collections::HashMap;
 use std::io::Error;
 
@@ -122,7 +122,7 @@ fn get_user_info(args: &Args) -> Result<UserInfo, Box<dyn std::error::Error>> {
 }
 
 fn get_group_info(userinfo: &mut UserInfo) -> Result<(), Box<dyn std::error::Error>> {
-    let groups = plib::group::load();
+    let groups = group::load();
 
     for group in &groups {
         // skip groups that the user is not a member of
@@ -193,12 +193,11 @@ fn display_user_info(args: &Args, userinfo: &UserInfo) {
 }
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-    // parse command line arguments
-    let args = Args::parse();
-
     setlocale(LocaleCategory::LcAll, "");
-    textdomain(PROJECT_NAME)?;
-    bind_textdomain_codeset(PROJECT_NAME, "UTF-8")?;
+    textdomain(env!("PROJECT_NAME"))?;
+    bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?;
+
+    let args = Args::parse();
 
     let mut userinfo = get_user_info(&args)?;
     get_group_info(&mut userinfo)?;
diff --git a/users/logger.rs b/users/logger.rs
@@ -8,13 +8,12 @@
 //
 
 use gettextrs::{bind_textdomain_codeset, setlocale, textdomain, LocaleCategory};
-use plib::PROJECT_NAME;
 use syslog::{Facility, Formatter3164};
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     setlocale(LocaleCategory::LcAll, "");
-    textdomain(PROJECT_NAME)?;
-    bind_textdomain_codeset(PROJECT_NAME, "UTF-8")?;
+    textdomain(env!("PROJECT_NAME"))?;
+    bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?;
 
     let mut args: Vec<String> = std::env::args().collect();
     args.remove(0);
diff --git a/users/logname.rs b/users/logname.rs
@@ -7,8 +7,10 @@
 // SPDX-License-Identifier: MIT
 //
 
+use plib::curuser::login_name;
+
 fn main() {
-    let username = plib::curuser::login_name();
+    let username = login_name();
 
     println!("{}", username);
 }
diff --git a/users/mesg.rs b/users/mesg.rs
@@ -13,7 +13,6 @@
 
 use clap::Parser;
 use gettextrs::{bind_textdomain_codeset, gettext, setlocale, textdomain, LocaleCategory};
-use plib::PROJECT_NAME;
 use std::io::{self, Error, ErrorKind, IsTerminal};
 use std::mem;
 
@@ -121,12 +120,11 @@ fn set_mesg(fd: i32, st: libc::stat, setting: &str) -> io::Result<()> {
 }
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-    // parse command line arguments
-    let args = Args::parse();
-
     setlocale(LocaleCategory::LcAll, "");
-    textdomain(PROJECT_NAME)?;
-    bind_textdomain_codeset(PROJECT_NAME, "UTF-8")?;
+    textdomain(env!("PROJECT_NAME"))?;
+    bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?;
+
+    let args = Args::parse();
 
     let (fd, stat) = stat_tty()?;
 
diff --git a/users/pwd.rs b/users/pwd.rs
@@ -12,7 +12,6 @@
 
 use clap::Parser;
 use gettextrs::{bind_textdomain_codeset, setlocale, textdomain, LocaleCategory};
-use plib::PROJECT_NAME;
 use std::ffi::OsStr;
 use std::path::{Component, Path};
 
@@ -53,12 +52,11 @@ fn dirname_valid(name: &OsStr) -> bool {
 }
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-    // parse command line arguments
-    let args = Args::parse();
-
     setlocale(LocaleCategory::LcAll, "");
-    textdomain(PROJECT_NAME)?;
-    bind_textdomain_codeset(PROJECT_NAME, "UTF-8")?;
+    textdomain(env!("PROJECT_NAME"))?;
+    bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?;
+
+    let args = Args::parse();
 
     let mut cwd = std::env::current_dir()?.into_os_string();
     if args.env {
diff --git a/users/talk.rs b/users/talk.rs
@@ -8,7 +8,6 @@
 
 use clap::{error::ErrorKind, Parser};
 use gettextrs::{bind_textdomain_codeset, gettext, setlocale, textdomain, LocaleCategory};
-use plib::PROJECT_NAME;
 use thiserror::Error;
 
 use binrw::{binrw, BinReaderExt, BinWrite, Endian};
@@ -1721,6 +1720,10 @@ fn get_terminal_size() -> (u16, u16) {
 }
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
+    setlocale(LocaleCategory::LcAll, "");
+    textdomain(env!("PROJECT_NAME"))?;
+    bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?;
+
     let args = Args::try_parse().unwrap_or_else(|err| {
         if err.kind() == ErrorKind::DisplayHelp || err.kind() == ErrorKind::DisplayVersion {
             // Print help or version message
@@ -1733,9 +1736,6 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         // Exit with a non-zero status code
         std::process::exit(1);
     });
-    setlocale(LocaleCategory::LcAll, "");
-    textdomain(PROJECT_NAME)?;
-    bind_textdomain_codeset(PROJECT_NAME, "UTF-8")?;
 
     let mut exit_code = 0;
 
diff --git a/users/tty.rs b/users/tty.rs
@@ -7,6 +7,7 @@
 // SPDX-License-Identifier: MIT
 //
 
+use plib::curuser::tty;
 use std::io::{self, IsTerminal};
 
 fn main() {
@@ -16,7 +17,7 @@ fn main() {
         std::process::exit(1);
     }
 
-    let ttyname = plib::curuser::tty();
+    let ttyname = tty();
 
     println!("{}", ttyname);
 }
diff --git a/users/write.rs b/users/write.rs
@@ -10,9 +10,8 @@
 use chrono::Local;
 use clap::Parser;
 use gettextrs::{bind_textdomain_codeset, gettext, setlocale, textdomain, LocaleCategory};
-use plib::{platform, PROJECT_NAME};
-use std::fs;
-use std::fs::OpenOptions;
+use plib::{curuser, platform, utmpx};
+use std::fs::{self, OpenOptions};
 use std::io::{self, BufRead, Write};
 use std::os::unix::fs::MetadataExt;
 use std::os::unix::fs::PermissionsExt;
@@ -38,7 +37,7 @@ struct Args {
 // Select terminal in an implementation-defined manner and return terminal
 // Print an informational message about the chosen terminal
 fn select_terminal(user_name: &str) -> String {
-    let entries = plib::utmpx::load();
+    let entries = utmpx::load();
 
     // Filter the entries to find terminals for the specified user
     let user_entries: Vec<_> = entries
@@ -106,15 +105,6 @@ fn check_write_permission(terminal: &str) -> bool {
     }
 }
 
-// Retrieve the sender's login ID
-fn get_login_id() -> String {
-    plib::curuser::login_name()
-}
-
-fn get_terminal() -> String {
-    plib::curuser::tty()
-}
-
 fn get_current_date() -> String {
     // Retrieve the current date and time in a human-readable format
     let now = Local::now();
@@ -213,12 +203,11 @@ fn process_non_printable(line: &str) -> String {
 }
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-    // parse command line arguments
-    let args = Args::parse();
-
     setlocale(LocaleCategory::LcAll, "");
-    textdomain(PROJECT_NAME)?;
-    bind_textdomain_codeset(PROJECT_NAME, "UTF-8")?;
+    textdomain(env!("PROJECT_NAME"))?;
+    bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?;
+
+    let args = Args::parse();
 
     let user_name = args.username;
     let terminal = match args.terminal {
@@ -237,8 +226,8 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         exit(1);
     }
 
-    let sender_login_id = get_login_id();
-    let sending_terminal = get_terminal();
+    let sender_login_id = curuser::login_name();
+    let sending_terminal = curuser::tty();
     let date = get_current_date();
 
     let message = format!(

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`// SPDX-License-Identifier: MIT`
`8`	`8`	`//`
`9`	`9`
	`10`	`+use plib::curuser::tty;`
`10`	`11`	`use std::io::{self, IsTerminal};`
`11`	`12`
`12`	`13`	`fn main() {`
`@@ -16,7 +17,7 @@ fn main() {`
`16`	`17`	`std::process::exit(1);`
`17`	`18`	`}`
`18`	`19`
`19`		`- let ttyname = plib::curuser::tty();`
	`20`	`+ let ttyname = tty();`
`20`	`21`
`21`	`22`	`println!("{}", ttyname);`
`22`	`23`	`}`