sys: Use compile-time macro env!

Author: fox0

sys/getconf.rs

@@ -12,12 +12,12 @@
 // - Proper -v specification support.  is it even necessary?
 //
 
+use std::collections::HashMap;
+use std::ffi::CString;
+
 use clap::Parser;
 use gettextrs::{bind_textdomain_codeset, gettext, setlocale, textdomain, LocaleCategory};
 use libc::{pathconf, sysconf};
-use plib::PROJECT_NAME;
-use std::collections::HashMap;
-use std::ffi::CString;
 
 #[derive(Parser)]
 #[command(version, about = gettext("getconf - get configuration values"))]
@@ -324,13 +324,11 @@ fn load_pathconf_mapping() -> HashMap<&'static str, libc::c_int> {
 }
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-    // Parse command line arguments
-    let args = Args::parse();
-
-    // Set locale and text domain for localization
     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();
 
     if let Some(pathname) = args.pathname {
         let pathconf_mappings = load_pathconf_mapping();

sys/ipcrm.rs

@@ -7,15 +7,15 @@
 // SPDX-License-Identifier: MIT
 //
 
+use std::ffi::{c_int, c_ushort};
+use std::io::{self, Error, ErrorKind};
+use std::ptr;
+
 use clap::Parser;
 use gettextrs::{bind_textdomain_codeset, gettext, setlocale, textdomain, LocaleCategory};
 #[cfg(not(target_os = "macos"))]
 use libc::{msgctl, msgget, msqid_ds};
 use libc::{semctl, semget, shmctl, shmget, shmid_ds};
-use plib::PROJECT_NAME;
-use std::ffi::{c_int, c_ushort};
-use std::io::{self, Error, ErrorKind};
-use std::ptr;
 
 #[derive(Parser)]
 #[command(
@@ -197,12 +197,11 @@ fn remove_ipcs(args: &Args) -> 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 mut exit_code = 0;
 

sys/ipcs.rs

@@ -10,7 +10,6 @@
 use chrono::Local;
 use clap::Parser;
 use gettextrs::{bind_textdomain_codeset, gettext, setlocale, textdomain, LocaleCategory};
-use plib::PROJECT_NAME;
 
 /// ipcs - report XSI interprocess communication facilities status
 #[derive(Parser)]
@@ -260,12 +259,10 @@ fn display_ipc_status(args: &Args) {
 }
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-    // Set locale and text domain for localization
     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")?;
 
-    // Parse command line arguments
     let mut args = Args::parse();
 
     // Validate arguments and determine what to display

sys/ps.rs

@@ -13,9 +13,11 @@ mod psmacos;
 #[cfg(target_os = "linux")]
 mod pslinux;
 
-use clap::Parser;
 use std::collections::HashMap;
 
+use clap::Parser;
+use gettextrs::{bind_textdomain_codeset, setlocale, textdomain, LocaleCategory};
+
 #[cfg(target_os = "macos")]
 mod platform {
     pub use crate::psmacos::*;
@@ -98,8 +100,13 @@ fn posix_field_map() -> HashMap<&'static str, &'static str> {
     ])
 }
 
-fn main() {
+fn main() -> Result<(), Box<dyn std::error::Error>> {
+    setlocale(LocaleCategory::LcAll, "");
+    textdomain(env!("PROJECT_NAME"))?;
+    bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?;
+
     let mut args = Args::parse();
+
     if args.all2 {
         args.all = true;
     }
@@ -108,7 +115,7 @@ fn main() {
         Ok(processes) => processes,
         Err(e) => {
             eprintln!("Error: {}", e);
-            return;
+            return Ok(());
         }
     };
 
@@ -170,4 +177,6 @@ fn main() {
         }
         println!();
     }
+
+    Ok(())
 }

sys/uname.rs

@@ -9,7 +9,6 @@
 
 use clap::Parser;
 use gettextrs::{bind_textdomain_codeset, setlocale, textdomain, LocaleCategory};
-use plib::PROJECT_NAME;
 
 /// uname - return system name
 #[derive(Parser)]
@@ -63,7 +62,10 @@ fn print_info(args: &Args, info: uname::Info) {
 }
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-    // parse command line arguments
+    setlocale(LocaleCategory::LcAll, "");
+    textdomain(env!("PROJECT_NAME"))?;
+    bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?;
+
     let mut args = Args::parse();
 
     if args.all {
@@ -76,10 +78,6 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         args.system = true;
     }
 
-    setlocale(LocaleCategory::LcAll, "");
-    textdomain(PROJECT_NAME)?;
-    bind_textdomain_codeset(PROJECT_NAME, "UTF-8")?;
-
     let mut exit_code = 0;
 
     match uname::uname() {

sys/who.rs

@@ -11,10 +11,12 @@
 // - implement -T, -u options
 //
 
+use std::path::PathBuf;
+
 use clap::Parser;
 use gettextrs::{bind_textdomain_codeset, gettext, setlocale, textdomain, LocaleCategory};
-use plib::{platform, PROJECT_NAME};
-use std::path::PathBuf;
+use plib::utmpx::Utmpx;
+use plib::{curuser, platform, utmpx};
 
 /// who - display who is on the system
 #[derive(Parser)]
@@ -86,7 +88,7 @@ fn fmt_timestamp(ts: libc::time_t) -> String {
     dt.format("%b %e %H:%M").to_string()
 }
 
-fn print_fmt_short(entry: &plib::utmpx::Utmpx, line: &str) {
+fn print_fmt_short(entry: &Utmpx, line: &str) {
     println!(
         "{:<16} {:<12} {}",
         entry.user,
@@ -95,7 +97,7 @@ fn print_fmt_short(entry: &plib::utmpx::Utmpx, line: &str) {
     );
 }
 
-fn print_fmt_term(entry: &plib::utmpx::Utmpx, line: &str) {
+fn print_fmt_term(entry: &Utmpx, line: &str) {
     let term_state = '?';
     println!(
         "{:<16} {} {:<12} {}",
@@ -107,15 +109,15 @@ fn print_fmt_term(entry: &plib::utmpx::Utmpx, line: &str) {
 }
 
 fn current_terminal() -> String {
-    let s = plib::curuser::tty();
+    let s = curuser::tty();
     if let Some(st) = s.strip_prefix("/dev/") {
         st.to_owned()
     } else {
         s
     }
 }
 
-fn print_entry(args: &Args, entry: &plib::utmpx::Utmpx) {
+fn print_entry(args: &Args, entry: &Utmpx) {
     // Skip if current_terminal option is set and this entry is not for the current terminal
     if args.current_terminal {
         let current_tty = current_terminal();
@@ -161,15 +163,15 @@ fn show_utmpx_entries(args: &Args) {
         );
     }
 
-    let entries = plib::utmpx::load();
+    let entries = utmpx::load();
     for entry in &entries {
         print_entry(args, entry);
     }
 }
 
 fn show_utmpx_summary() {
     let mut count = 0;
-    let entries = plib::utmpx::load();
+    let entries = utmpx::load();
     for entry in &entries {
         if !entry.user.is_empty() {
             println!("{}", entry.user);
@@ -181,7 +183,10 @@ fn show_utmpx_summary() {
 }
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-    // manual CLI parse for special "who am i" case
+    setlocale(LocaleCategory::LcAll, "");
+    textdomain(env!("PROJECT_NAME"))?;
+    bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?;
+
     let args: Vec<String> = std::env::args().skip(1).collect();
     let am_i = args.len() == 2 && args[0] == "am" && (args[1] == "i" || args[1] == "I");
 
@@ -207,10 +212,6 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         args.userproc = true;
     }
 
-    setlocale(LocaleCategory::LcAll, "");
-    textdomain(PROJECT_NAME)?;
-    bind_textdomain_codeset(PROJECT_NAME, "UTF-8")?;
-
     let mut exit_code = 0;
 
     if args.file.is_some() {