xform: Use compile-time macro env!

Author: fox0

xform/cksum.rs

@@ -19,7 +19,8 @@ mod crc32;
 
 use clap::Parser;
 use gettextrs::{bind_textdomain_codeset, setlocale, textdomain, LocaleCategory};
-use plib::PROJECT_NAME;
+use plib::io::input_stream;
+use plib::BUFSZ;
 use std::io::{self, Read};
 use std::path::PathBuf;
 
@@ -32,9 +33,9 @@ struct Args {
 }
 
 fn cksum_file(filename: &PathBuf) -> io::Result<()> {
-    let mut file = plib::io::input_stream(filename, false)?;
+    let mut file = input_stream(filename, false)?;
 
-    let mut buffer = [0; plib::BUFSZ];
+    let mut buffer = [0; BUFSZ];
     let mut n_bytes: usize = 0;
     let mut crc: u32 = 0;
 
@@ -67,12 +68,11 @@ fn cksum_file(filename: &PathBuf) -> io::Result<()> {
 }
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-    // parse command line arguments
-    let mut 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 mut args = Args::parse();
 
     // if no file args, read from stdin
     if args.files.is_empty() {

xform/compress.rs

@@ -9,8 +9,8 @@
 
 use clap::Parser;
 use gettextrs::{bind_textdomain_codeset, gettext, setlocale, textdomain, LocaleCategory};
+use plib::io::input_stream;
 use plib::lzw::UnixLZWWriter;
-use plib::PROJECT_NAME;
 use std::fs::{self, File};
 use std::io::{self, Write};
 use std::path::{Path, PathBuf};
@@ -49,7 +49,7 @@ fn prompt_user(prompt: &str) -> bool {
 }
 
 fn compress_file(args: &Args, pathname: &PathBuf) -> io::Result<i32> {
-    let mut file = plib::io::input_stream(pathname, false)?;
+    let mut file = input_stream(pathname, false)?;
 
     let mut encoder = UnixLZWWriter::new(args.bits);
 
@@ -115,11 +115,11 @@ fn compress_file(args: &Args, pathname: &PathBuf) -> io::Result<i32> {
 }
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let mut 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 mut args = Args::parse();
 
     if args.files.is_empty() {
         args.files.push(PathBuf::new());

xform/tests/cksum/mod.rs

@@ -7,7 +7,7 @@
 // SPDX-License-Identifier: MIT
 //
 
-use plib::{run_test, TestPlan};
+use plib::testing::{run_test, TestPlan};
 
 fn cksum_test(test_data: &str, expected_output: &str) {
     run_test(TestPlan {

xform/tests/compress/mod.rs

@@ -7,7 +7,7 @@
 // SPDX-License-Identifier: MIT
 //
 
-use plib::{run_test, TestPlan};
+use plib::testing::{run_test, TestPlan};
 use std::{
     fs::{remove_file, File},
     io::Read,

xform/tests/uue/mod.rs

@@ -7,7 +7,7 @@
 // SPDX-License-Identifier: MIT
 //
 
-use plib::{run_test, TestPlan};
+use plib::testing::{run_test, TestPlan};
 use std::{
     fs::{File, Permissions},
     io::Read,

xform/uncompress.rs

@@ -13,8 +13,8 @@
 
 use clap::Parser;
 use gettextrs::{bind_textdomain_codeset, setlocale, textdomain, LocaleCategory};
+use plib::io::input_stream;
 use plib::lzw::UnixLZWReader;
-use plib::PROJECT_NAME;
 use std::io::{self, Write};
 use std::path::PathBuf;
 
@@ -39,7 +39,7 @@ struct Args {
 }
 
 fn uncompress_file(pathname: &PathBuf) -> io::Result<()> {
-    let file = plib::io::input_stream(pathname, false)?;
+    let file = input_stream(pathname, false)?;
     let mut decoder = UnixLZWReader::new(file);
 
     loop {
@@ -60,12 +60,11 @@ fn prog_is_zcat() -> bool {
 }
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-    // parse command line arguments
-    let mut 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 mut args = Args::parse();
 
     // if no file args, read from stdin
     if args.files.is_empty() {

xform/uudecode.rs

@@ -10,7 +10,6 @@
 use base64::prelude::*;
 use clap::Parser;
 use gettextrs::{bind_textdomain_codeset, setlocale, textdomain, LocaleCategory};
-use plib::PROJECT_NAME;
 use std::fs::{remove_file, File};
 use std::io::{self, Error, Read, Write};
 use std::os::unix::fs::PermissionsExt;
@@ -176,12 +175,11 @@ fn pathname_display(path: &Option<PathBuf>) -> 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 mut exit_code = 0;
 

xform/uuencode.rs

@@ -10,7 +10,6 @@
 use base64::prelude::*;
 use clap::Parser;
 use gettextrs::{bind_textdomain_codeset, setlocale, textdomain, LocaleCategory};
-use plib::PROJECT_NAME;
 use std::fs::{File, Permissions};
 use std::io::{self, Read, Write};
 use std::os::unix::fs::PermissionsExt;
@@ -177,11 +176,11 @@ fn pathname_display(path: &Option<PathBuf>) -> String {
 }
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-    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;