From 4ea34335e81c93cc7fe28e122e494ae6a605aa7f Mon Sep 17 00:00:00 2001 From: fox0 <15684995+fox0@users.noreply.github.com> Date: Sun, 1 Dec 2024 15:24:07 +0700 Subject: [PATCH] Remove compile-time macro env! --- .cargo/config.toml | 2 -- awk/src/main.rs | 4 ++-- calc/bc.rs | 4 ++-- calc/expr.rs | 4 ++-- datetime/cal.rs | 4 ++-- datetime/date.rs | 4 ++-- datetime/sleep.rs | 4 ++-- datetime/time.rs | 6 +++--- dev/nm.rs | 4 ++-- dev/strings.rs | 4 ++-- dev/strip.rs | 4 ++-- display/echo.rs | 4 ++-- display/printf.rs | 4 ++-- file/cat.rs | 4 ++-- file/cmp.rs | 4 ++-- file/dd.rs | 4 ++-- file/file.rs | 4 ++-- file/find.rs | 4 ++-- file/od.rs | 4 ++-- file/split.rs | 4 ++-- file/tee.rs | 4 ++-- fs/df.rs | 4 ++-- i18n/gencat.rs | 4 ++-- i18n/iconv.rs | 4 ++-- make/src/main.rs | 4 ++-- misc/test.rs | 4 ++-- pathnames/basename.rs | 4 ++-- pathnames/dirname.rs | 4 ++-- pathnames/pathchk.rs | 4 ++-- pathnames/realpath.rs | 4 ++-- process/env.rs | 4 ++-- process/fuser.rs | 4 ++-- process/kill.rs | 4 ++-- process/nice.rs | 4 ++-- process/nohup.rs | 4 ++-- process/renice.rs | 4 ++-- process/timeout.rs | 4 ++-- process/xargs.rs | 4 ++-- sccs/what.rs | 4 ++-- screen/stty.rs | 4 ++-- screen/tabs.rs | 4 ++-- screen/tput.rs | 4 ++-- sys/getconf.rs | 4 ++-- sys/ipcrm.rs | 4 ++-- sys/ipcs.rs | 4 ++-- sys/ps.rs | 4 ++-- sys/uname.rs | 4 ++-- sys/who.rs | 4 ++-- text/asa.rs | 4 ++-- text/comm.rs | 4 ++-- text/csplit.rs | 4 ++-- text/cut.rs | 4 ++-- text/diff.rs | 4 ++-- text/expand.rs | 4 ++-- text/fold.rs | 4 ++-- text/grep.rs | 4 ++-- text/head.rs | 4 ++-- text/join.rs | 4 ++-- text/nl.rs | 4 ++-- text/paste.rs | 4 ++-- text/pr.rs | 4 ++-- text/sort.rs | 4 ++-- text/tail.rs | 4 ++-- text/tr.rs | 4 ++-- text/tsort.rs | 4 ++-- text/unexpand.rs | 4 ++-- text/uniq.rs | 4 ++-- text/wc.rs | 4 ++-- tree/chgrp.rs | 4 ++-- tree/chmod.rs | 4 ++-- tree/chown.rs | 4 ++-- tree/cp.rs | 4 ++-- tree/du.rs | 4 ++-- tree/link.rs | 4 ++-- tree/ln.rs | 4 ++-- tree/ls.rs | 4 ++-- tree/mkdir.rs | 4 ++-- tree/mkfifo.rs | 4 ++-- tree/mv.rs | 4 ++-- tree/readlink.rs | 4 ++-- tree/rm.rs | 4 ++-- tree/rmdir.rs | 4 ++-- tree/touch.rs | 4 ++-- tree/unlink.rs | 4 ++-- users/id.rs | 4 ++-- users/logger.rs | 4 ++-- users/mesg.rs | 4 ++-- users/newgrp.rs | 4 ++-- users/pwd.rs | 4 ++-- users/talk.rs | 4 ++-- users/write.rs | 4 ++-- xform/cksum.rs | 4 ++-- xform/compress.rs | 4 ++-- xform/uncompress.rs | 4 ++-- xform/uudecode.rs | 4 ++-- xform/uuencode.rs | 4 ++-- 96 files changed, 191 insertions(+), 193 deletions(-) delete mode 100644 .cargo/config.toml diff --git a/.cargo/config.toml b/.cargo/config.toml deleted file mode 100644 index dbd057e4c..000000000 --- a/.cargo/config.toml +++ /dev/null @@ -1,2 +0,0 @@ -[env] -PROJECT_NAME = "posixutils-rs" diff --git a/awk/src/main.rs b/awk/src/main.rs index 5118ffdf0..ee785598c 100644 --- a/awk/src/main.rs +++ b/awk/src/main.rs @@ -56,8 +56,8 @@ fn exit_if_error(r: Result) -> T { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/calc/bc.rs b/calc/bc.rs index 46dc73cab..399ff3a01 100644 --- a/calc/bc.rs +++ b/calc/bc.rs @@ -44,8 +44,8 @@ fn print_output_or_error(result: ExecutionResult) { fn main() -> Result<()> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/calc/expr.rs b/calc/expr.rs index 618d7739b..58648a769 100644 --- a/calc/expr.rs +++ b/calc/expr.rs @@ -370,8 +370,8 @@ fn eval_expression(tokens: &[Token]) -> Result { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; // tokenize and evaluate the expression let arg_tokens = tokenize(); diff --git a/datetime/cal.rs b/datetime/cal.rs index 22b992926..cd38adc9e 100644 --- a/datetime/cal.rs +++ b/datetime/cal.rs @@ -94,8 +94,8 @@ fn print_year(year: u32) { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let mut args = Args::parse(); diff --git a/datetime/date.rs b/datetime/date.rs index f7de2181c..5ea597de9 100644 --- a/datetime/date.rs +++ b/datetime/date.rs @@ -146,8 +146,8 @@ fn set_time(utc: bool, timestr: &str) -> Result<(), &'static str> { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/datetime/sleep.rs b/datetime/sleep.rs index a1669fa56..d9324b8dc 100644 --- a/datetime/sleep.rs +++ b/datetime/sleep.rs @@ -23,8 +23,8 @@ struct Args { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/datetime/time.rs b/datetime/time.rs index ce2934646..fb62d4dc5 100644 --- a/datetime/time.rs +++ b/datetime/time.rs @@ -132,9 +132,9 @@ impl Status { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bindtextdomain(env!("PROJECT_NAME"), "locale")?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bindtextdomain("posixutils-rs", "locale")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/dev/nm.rs b/dev/nm.rs index 2cb23893c..02da0b1b1 100644 --- a/dev/nm.rs +++ b/dev/nm.rs @@ -143,8 +143,8 @@ fn show_object_file(args: &Args) -> Result<(), Box> { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/dev/strings.rs b/dev/strings.rs index f46164f92..a17f38830 100644 --- a/dev/strings.rs +++ b/dev/strings.rs @@ -187,8 +187,8 @@ where fn main() -> StringsResult { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/dev/strip.rs b/dev/strip.rs index f3b210c7c..be1ec6c4c 100644 --- a/dev/strip.rs +++ b/dev/strip.rs @@ -143,8 +143,8 @@ fn strip_file(file: &OsStr) { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/display/echo.rs b/display/echo.rs index 384874b2a..2b04e9874 100644 --- a/display/echo.rs +++ b/display/echo.rs @@ -72,8 +72,8 @@ fn translate_str(skip_nl: bool, s: &str) -> String { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let mut args: Vec = std::env::args().collect(); args.remove(0); diff --git a/display/printf.rs b/display/printf.rs index 4ca0d3655..bb9112952 100644 --- a/display/printf.rs +++ b/display/printf.rs @@ -492,10 +492,10 @@ fn main() -> ExitCode { setlocale(LocaleCategory::LcAll, ""); // TODO // unwrap - textdomain(env!("PROJECT_NAME")).unwrap(); + textdomain("posixutils-rs").unwrap(); // TODO // unwrap - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8").unwrap(); + bind_textdomain_codeset("posixutils-rs", "UTF-8").unwrap(); let args = std::env::args_os().collect::>(); diff --git a/file/cat.rs b/file/cat.rs index 105916c97..beba13c15 100644 --- a/file/cat.rs +++ b/file/cat.rs @@ -53,8 +53,8 @@ fn cat_file(pathname: &PathBuf) -> io::Result<()> { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let mut args = Args::parse(); diff --git a/file/cmp.rs b/file/cmp.rs index d16387768..a0afa8218 100644 --- a/file/cmp.rs +++ b/file/cmp.rs @@ -137,8 +137,8 @@ fn cmp_main(args: &Args) -> io::Result { fn main() -> ExitCode { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME")).unwrap(); - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8").unwrap(); + textdomain("posixutils-rs").unwrap(); + bind_textdomain_codeset("posixutils-rs", "UTF-8").unwrap(); let args = Args::parse(); diff --git a/file/dd.rs b/file/dd.rs index fd3bd0b25..f50054c2d 100644 --- a/file/dd.rs +++ b/file/dd.rs @@ -383,8 +383,8 @@ fn parse_cmdline(args: &[String]) -> Result> fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args: Vec = std::env::args().skip(1).collect(); let config = parse_cmdline(&args)?; diff --git a/file/file.rs b/file/file.rs index dae907fde..82bff30de 100644 --- a/file/file.rs +++ b/file/file.rs @@ -191,8 +191,8 @@ fn analyze_file(mut path: String, args: &Args, magic_files: &Vec) { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/file/find.rs b/file/find.rs index 8a829b2ca..5f6eff109 100644 --- a/file/find.rs +++ b/file/find.rs @@ -485,8 +485,8 @@ fn find(args: Vec) -> Result<(), String> { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args: Vec = env::args().collect(); diff --git a/file/od.rs b/file/od.rs index a579ccf14..03452a91c 100644 --- a/file/od.rs +++ b/file/od.rs @@ -1139,8 +1139,8 @@ fn od(args: &Args) -> Result<(), Box> { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let mut args = Args::parse(); diff --git a/file/split.rs b/file/split.rs index 656af498f..c2de348f5 100644 --- a/file/split.rs +++ b/file/split.rs @@ -261,8 +261,8 @@ fn split_by_lines(args: &Args, linesplit: u64) -> io::Result<()> { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let mut args = Args::parse(); diff --git a/file/tee.rs b/file/tee.rs index 4213b31eb..d50d7af93 100644 --- a/file/tee.rs +++ b/file/tee.rs @@ -94,8 +94,8 @@ fn tee_stdin(info: &mut TeeInfo) -> io::Result<()> { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/fs/df.rs b/fs/df.rs index 6b37eb2cb..76e14246f 100644 --- a/fs/df.rs +++ b/fs/df.rs @@ -364,8 +364,8 @@ fn mask_fs_by_file(info: &mut MountList, filename: &str) -> io::Result<()> { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/i18n/gencat.rs b/i18n/gencat.rs index 5021ce90d..a796cf56b 100644 --- a/i18n/gencat.rs +++ b/i18n/gencat.rs @@ -775,8 +775,8 @@ impl MessageCatalog { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/i18n/iconv.rs b/i18n/iconv.rs index 6cab1b239..b1e3c3c10 100644 --- a/i18n/iconv.rs +++ b/i18n/iconv.rs @@ -481,8 +481,8 @@ fn charmap_conversion( fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/make/src/main.rs b/make/src/main.rs index b14e770b2..f4eaa4abe 100644 --- a/make/src/main.rs +++ b/make/src/main.rs @@ -161,8 +161,8 @@ fn read_stdin() -> Result { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let Args { directory, diff --git a/misc/test.rs b/misc/test.rs index 1e91ded83..98654ce34 100644 --- a/misc/test.rs +++ b/misc/test.rs @@ -279,8 +279,8 @@ fn eval_binary(s1: &str, op_str: &str, s2: &str) -> bool { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let mut args: Vec = std::env::args().collect(); diff --git a/pathnames/basename.rs b/pathnames/basename.rs index 4765f6a0c..75a5fb467 100644 --- a/pathnames/basename.rs +++ b/pathnames/basename.rs @@ -53,8 +53,8 @@ fn show_basename(args: &Args) { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/pathnames/dirname.rs b/pathnames/dirname.rs index ce6ec7464..4ef2277c1 100644 --- a/pathnames/dirname.rs +++ b/pathnames/dirname.rs @@ -41,8 +41,8 @@ fn show_dirname(args: &Args) { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/pathnames/pathchk.rs b/pathnames/pathchk.rs index 8a4361e55..0fb6bdb75 100644 --- a/pathnames/pathchk.rs +++ b/pathnames/pathchk.rs @@ -143,8 +143,8 @@ fn check_path(args: &Args, pathname: &str) -> Result<(), &'static str> { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/pathnames/realpath.rs b/pathnames/realpath.rs index 16d1822d6..81e823cad 100644 --- a/pathnames/realpath.rs +++ b/pathnames/realpath.rs @@ -64,8 +64,8 @@ fn normalize>(path: P) -> std::io::Result { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/process/env.rs b/process/env.rs index 2f4f33248..3884ed5b9 100644 --- a/process/env.rs +++ b/process/env.rs @@ -93,8 +93,8 @@ fn exec_util(envs: HashMap, util_args: Vec) -> io::Resul fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/process/fuser.rs b/process/fuser.rs index b1b0f25b5..fffdb7e83 100644 --- a/process/fuser.rs +++ b/process/fuser.rs @@ -1483,8 +1483,8 @@ fn timeout(path: &str, seconds: u32) -> Result { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let Args { mount, user, file, .. diff --git a/process/kill.rs b/process/kill.rs index a8d6ac2e7..ec897894a 100644 --- a/process/kill.rs +++ b/process/kill.rs @@ -85,8 +85,8 @@ fn send_signal(prog_cfg: &Config, sig_no: i32) -> u32 { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let prog_cfg = parse_cmdline()?; diff --git a/process/nice.rs b/process/nice.rs index 323dc97c8..4804bf402 100644 --- a/process/nice.rs +++ b/process/nice.rs @@ -52,8 +52,8 @@ fn exec_util(util: &str, util_args: Vec) -> io::Result<()> { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/process/nohup.rs b/process/nohup.rs index 8e835b84b..bec304c5f 100644 --- a/process/nohup.rs +++ b/process/nohup.rs @@ -51,8 +51,8 @@ fn get_nohup_out_file() -> Result<(File, NohupDir), io::Error> { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; unsafe { // Ignore the SIGHUP signal diff --git a/process/renice.rs b/process/renice.rs index d7b434ef8..91be72790 100644 --- a/process/renice.rs +++ b/process/renice.rs @@ -102,8 +102,8 @@ fn parse_id(which: u32, input: &str) -> Result { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/process/timeout.rs b/process/timeout.rs index cad8a29a9..8faa211af 100644 --- a/process/timeout.rs +++ b/process/timeout.rs @@ -469,8 +469,8 @@ fn timeout(args: Args) -> i32 { /// 127 - The utility specified by utility could not be found. fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::try_parse().unwrap_or_else(|err| match err.kind() { clap::error::ErrorKind::DisplayHelp | clap::error::ErrorKind::DisplayVersion => { diff --git a/process/xargs.rs b/process/xargs.rs index 1c4959e25..7b53e2785 100644 --- a/process/xargs.rs +++ b/process/xargs.rs @@ -348,8 +348,8 @@ fn read_and_spawn(args: &Args) -> io::Result<()> { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/sccs/what.rs b/sccs/what.rs index 51dc2871d..eef5f390a 100644 --- a/sccs/what.rs +++ b/sccs/what.rs @@ -52,8 +52,8 @@ fn process_file(reader: R, single: bool) -> io::Result<()> { fn main() -> io::Result<()> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/screen/stty.rs b/screen/stty.rs index 9ad8ad69c..362f88c8c 100644 --- a/screen/stty.rs +++ b/screen/stty.rs @@ -553,8 +553,8 @@ fn stty_set(ti: Termios, args: &Args) -> io::Result<()> { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/screen/tabs.rs b/screen/tabs.rs index 5f4123af7..86746169e 100644 --- a/screen/tabs.rs +++ b/screen/tabs.rs @@ -211,8 +211,8 @@ fn set_hw_tabs(info: &Database, tabstops: &Vec) -> io::Result<()> { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/screen/tput.rs b/screen/tput.rs index 0e31ed4e2..11160d973 100644 --- a/screen/tput.rs +++ b/screen/tput.rs @@ -73,8 +73,8 @@ fn tput_clear(info: Database) -> terminfo::Result<()> { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/sys/getconf.rs b/sys/getconf.rs index 1251d02b0..09edde7b0 100644 --- a/sys/getconf.rs +++ b/sys/getconf.rs @@ -325,8 +325,8 @@ fn load_pathconf_mapping() -> HashMap<&'static str, libc::c_int> { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/sys/ipcrm.rs b/sys/ipcrm.rs index a402c3e6d..6b8f57847 100644 --- a/sys/ipcrm.rs +++ b/sys/ipcrm.rs @@ -198,8 +198,8 @@ fn remove_ipcs(args: &Args) -> io::Result<()> { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/sys/ipcs.rs b/sys/ipcs.rs index 8bf76de9e..e4fa40445 100644 --- a/sys/ipcs.rs +++ b/sys/ipcs.rs @@ -260,8 +260,8 @@ fn display_ipc_status(args: &Args) { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let mut args = Args::parse(); diff --git a/sys/ps.rs b/sys/ps.rs index a3fd22531..59a212912 100644 --- a/sys/ps.rs +++ b/sys/ps.rs @@ -102,8 +102,8 @@ fn posix_field_map() -> HashMap<&'static str, &'static str> { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let mut args = Args::parse(); diff --git a/sys/uname.rs b/sys/uname.rs index e842d3aa9..35ed6f261 100644 --- a/sys/uname.rs +++ b/sys/uname.rs @@ -63,8 +63,8 @@ fn print_info(args: &Args, info: uname::Info) { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let mut args = Args::parse(); diff --git a/sys/who.rs b/sys/who.rs index 37b22a4c4..ccfd4544d 100644 --- a/sys/who.rs +++ b/sys/who.rs @@ -184,8 +184,8 @@ fn show_utmpx_summary() { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args: Vec = std::env::args().skip(1).collect(); let am_i = args.len() == 2 && args[0] == "am" && (args[1] == "i" || args[1] == "I"); diff --git a/text/asa.rs b/text/asa.rs index bf052aaee..1f76ad7a5 100644 --- a/text/asa.rs +++ b/text/asa.rs @@ -129,8 +129,8 @@ fn asa_file(pathname: &PathBuf) -> io::Result<()> { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let mut args = Args::parse(); diff --git a/text/comm.rs b/text/comm.rs index 4fd457cc4..81a45cc1e 100644 --- a/text/comm.rs +++ b/text/comm.rs @@ -146,8 +146,8 @@ fn args_mask(args: &Args) -> u32 { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/text/csplit.rs b/text/csplit.rs index 03381733c..c4e12b377 100644 --- a/text/csplit.rs +++ b/text/csplit.rs @@ -593,8 +593,8 @@ fn parse_operands(args: &Args) -> io::Result { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/text/cut.rs b/text/cut.rs index 67969691c..a54a95b41 100644 --- a/text/cut.rs +++ b/text/cut.rs @@ -434,8 +434,8 @@ fn read_range(line: &str) -> Result, String> { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/text/diff.rs b/text/diff.rs index 9f9b82e1f..c3fd8d984 100644 --- a/text/diff.rs +++ b/text/diff.rs @@ -141,8 +141,8 @@ fn check_difference(args: Args) -> io::Result { fn main() -> DiffExitStatus { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME")).unwrap(); - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8").unwrap(); + textdomain("posixutils-rs").unwrap(); + bind_textdomain_codeset("posixutils-rs", "UTF-8").unwrap(); let args = Args::parse(); diff --git a/text/expand.rs b/text/expand.rs index c3f74d335..022ff299c 100644 --- a/text/expand.rs +++ b/text/expand.rs @@ -133,8 +133,8 @@ fn expand_file(tablist: &TabList, pathname: &PathBuf) -> io::Result<()> { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let mut args = Args::parse(); diff --git a/text/fold.rs b/text/fold.rs index ba67c5b19..db9f025f4 100644 --- a/text/fold.rs +++ b/text/fold.rs @@ -168,8 +168,8 @@ fn fold_file(args: &Args, pathname: &PathBuf) -> io::Result<()> { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let mut args = Args::parse(); diff --git a/text/grep.rs b/text/grep.rs index 5221bdb89..5ee38227d 100644 --- a/text/grep.rs +++ b/text/grep.rs @@ -488,8 +488,8 @@ impl GrepModel { // >1 - An error occurred. fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let mut args = Args::parse(); diff --git a/text/head.rs b/text/head.rs index afdcf9807..e0bb129ed 100644 --- a/text/head.rs +++ b/text/head.rs @@ -144,8 +144,8 @@ fn head_file( fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let mut args = Args::parse(); diff --git a/text/join.rs b/text/join.rs index dd56e28d6..63e1a9ffc 100644 --- a/text/join.rs +++ b/text/join.rs @@ -185,8 +185,8 @@ fn join(args: Args) -> Result<(), Box> { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/text/nl.rs b/text/nl.rs index 0d7f010ce..bf45b7310 100644 --- a/text/nl.rs +++ b/text/nl.rs @@ -310,8 +310,8 @@ fn nl_main(args: &Args) -> io::Result<()> { fn main() -> ExitCode { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME")).unwrap(); - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8").unwrap(); + textdomain("posixutils-rs").unwrap(); + bind_textdomain_codeset("posixutils-rs", "UTF-8").unwrap(); let mut args = Args::parse(); diff --git a/text/paste.rs b/text/paste.rs index ca441f08b..e63564ef8 100644 --- a/text/paste.rs +++ b/text/paste.rs @@ -420,8 +420,8 @@ fn paste_files( fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/text/pr.rs b/text/pr.rs index 45d77d436..309a4a478 100644 --- a/text/pr.rs +++ b/text/pr.rs @@ -532,8 +532,8 @@ fn pr_merged(paths: &[PathBuf], params: &Parameters) -> io::Result<()> { fn main() -> ExitCode { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME")).unwrap(); - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8").unwrap(); + textdomain("posixutils-rs").unwrap(); + bind_textdomain_codeset("posixutils-rs", "UTF-8").unwrap(); let args = Args::parse_custom(); diff --git a/text/sort.rs b/text/sort.rs index 2d70edf5a..c0012bf0b 100644 --- a/text/sort.rs +++ b/text/sort.rs @@ -1003,8 +1003,8 @@ fn sort(args: &Args) -> Result<(), Box> { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/text/tail.rs b/text/tail.rs index 988039341..c179520fc 100644 --- a/text/tail.rs +++ b/text/tail.rs @@ -473,8 +473,8 @@ fn tail( fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/text/tr.rs b/text/tr.rs index dfb3d3183..276b72d39 100644 --- a/text/tr.rs +++ b/text/tr.rs @@ -289,8 +289,8 @@ fn tr(args: &Args) -> Result<(), Box> { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/text/tsort.rs b/text/tsort.rs index 1ed1ea79f..0836e4264 100644 --- a/text/tsort.rs +++ b/text/tsort.rs @@ -67,8 +67,8 @@ fn pathname_display(path: &Option) -> String { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/text/unexpand.rs b/text/unexpand.rs index 7446a57f3..76a930bae 100644 --- a/text/unexpand.rs +++ b/text/unexpand.rs @@ -166,8 +166,8 @@ fn convert_spaces_to_tabs(line: &str, tabstop: usize) -> String { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/text/uniq.rs b/text/uniq.rs index f91a2ebf3..33d2575a2 100644 --- a/text/uniq.rs +++ b/text/uniq.rs @@ -196,8 +196,8 @@ fn output_result( /// Returns an error if there is an issue with the arguments or the uniq function. fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/text/wc.rs b/text/wc.rs index 39d8b3de7..807b15fdd 100644 --- a/text/wc.rs +++ b/text/wc.rs @@ -170,8 +170,8 @@ fn wc_file( fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let mut args = Args::parse(); diff --git a/tree/chgrp.rs b/tree/chgrp.rs index 75be52c71..77a8806a8 100644 --- a/tree/chgrp.rs +++ b/tree/chgrp.rs @@ -166,8 +166,8 @@ fn main() -> Result<(), Box> { // initialize translations setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let mut exit_code = 0; diff --git a/tree/chmod.rs b/tree/chmod.rs index 80f270801..45f943724 100644 --- a/tree/chmod.rs +++ b/tree/chmod.rs @@ -76,8 +76,8 @@ fn chmod_file(filename: &str, mode: &ChmodMode, recurse: bool) -> Result<(), io: fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/tree/chown.rs b/tree/chown.rs index c2e00499f..cf5e3e2c1 100644 --- a/tree/chown.rs +++ b/tree/chown.rs @@ -132,8 +132,8 @@ fn parse_owner_group(owner_group: &str) -> Result<(u32, Option), &'static s fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/tree/cp.rs b/tree/cp.rs index 93ba28d52..82abc6582 100644 --- a/tree/cp.rs +++ b/tree/cp.rs @@ -103,8 +103,8 @@ fn prompt_user(prompt: &str) -> bool { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/tree/du.rs b/tree/du.rs index a414ef6a0..5fe487b6f 100644 --- a/tree/du.rs +++ b/tree/du.rs @@ -104,8 +104,8 @@ fn du_cli_arg( fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let mut args = Args::parse(); diff --git a/tree/link.rs b/tree/link.rs index 9cfdda5e8..b3ad4da6b 100644 --- a/tree/link.rs +++ b/tree/link.rs @@ -29,8 +29,8 @@ fn do_link(file1: &str, file2: &str) -> io::Result<()> { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/tree/ln.rs b/tree/ln.rs index 7bcbb5611..33e2b6074 100644 --- a/tree/ln.rs +++ b/tree/ln.rs @@ -48,8 +48,8 @@ fn do_link_into(args: &Args, src: &str, target_dir: &str) -> io::Result<()> { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/tree/ls.rs b/tree/ls.rs index 1f53cc392..0bea323b7 100644 --- a/tree/ls.rs +++ b/tree/ls.rs @@ -1320,8 +1320,8 @@ fn process_single_dir( fn main() -> ExitCode { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME")).unwrap(); - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8").unwrap(); + textdomain("posixutils-rs").unwrap(); + bind_textdomain_codeset("posixutils-rs", "UTF-8").unwrap(); let (config, paths) = Config::new(); match ls(paths, &config) { diff --git a/tree/mkdir.rs b/tree/mkdir.rs index 989a45fc1..93ff8c47e 100644 --- a/tree/mkdir.rs +++ b/tree/mkdir.rs @@ -67,8 +67,8 @@ fn do_mkdir(dirname: &str, mode: &ChmodMode, parents: bool) -> io::Result<()> { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/tree/mkfifo.rs b/tree/mkfifo.rs index 8822eb389..d9c49c625 100644 --- a/tree/mkfifo.rs +++ b/tree/mkfifo.rs @@ -41,8 +41,8 @@ fn do_mkfifo(filename: &str, mode: &ChmodMode) -> io::Result<()> { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/tree/mv.rs b/tree/mv.rs index b29639674..dbb4380d0 100644 --- a/tree/mv.rs +++ b/tree/mv.rs @@ -371,8 +371,8 @@ fn move_files(cfg: &MvConfig, sources: &[PathBuf], target: &Path) -> Option<()> fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/tree/readlink.rs b/tree/readlink.rs index 0a63b4de0..18ade5795 100644 --- a/tree/readlink.rs +++ b/tree/readlink.rs @@ -168,8 +168,8 @@ fn do_readlink(args: Args) -> Result { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/tree/rm.rs b/tree/rm.rs index 0f3830ba7..1437ca2f7 100644 --- a/tree/rm.rs +++ b/tree/rm.rs @@ -433,8 +433,8 @@ fn rm_path(cfg: &RmConfig, filepath: &Path) -> io::Result { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/tree/rmdir.rs b/tree/rmdir.rs index 3e218bc6b..d4ba13c55 100644 --- a/tree/rmdir.rs +++ b/tree/rmdir.rs @@ -46,8 +46,8 @@ fn remove_dir(dirname: &str, rm_parents: bool) -> io::Result<()> { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/tree/touch.rs b/tree/touch.rs index db88ab5c8..10270e2ed 100644 --- a/tree/touch.rs +++ b/tree/touch.rs @@ -248,8 +248,8 @@ fn touch_file( fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let mut args = Args::parse(); diff --git a/tree/unlink.rs b/tree/unlink.rs index bb4bdc6ca..ab682b557 100644 --- a/tree/unlink.rs +++ b/tree/unlink.rs @@ -27,8 +27,8 @@ fn do_unlink(pathname: &str) -> io::Result<()> { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/users/id.rs b/users/id.rs index 11ce881f5..da36d4fe2 100644 --- a/users/id.rs +++ b/users/id.rs @@ -194,8 +194,8 @@ fn display_user_info(args: &Args, userinfo: &UserInfo) { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/users/logger.rs b/users/logger.rs index d6ebd3644..7c5cd5425 100644 --- a/users/logger.rs +++ b/users/logger.rs @@ -12,8 +12,8 @@ use syslog::{Facility, Formatter3164}; fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let mut args: Vec = std::env::args().collect(); args.remove(0); diff --git a/users/mesg.rs b/users/mesg.rs index b326a75c8..aca96b812 100644 --- a/users/mesg.rs +++ b/users/mesg.rs @@ -121,8 +121,8 @@ fn set_mesg(fd: i32, st: libc::stat, setting: &str) -> io::Result<()> { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/users/newgrp.rs b/users/newgrp.rs index 71b34206c..a9623f0d0 100644 --- a/users/newgrp.rs +++ b/users/newgrp.rs @@ -794,8 +794,8 @@ fn set_login_environment(user: &str) -> Result<(), io::Error> { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let mut exit_code = 0; diff --git a/users/pwd.rs b/users/pwd.rs index 13551a3f8..48fb74a4a 100644 --- a/users/pwd.rs +++ b/users/pwd.rs @@ -53,8 +53,8 @@ fn dirname_valid(name: &OsStr) -> bool { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/users/talk.rs b/users/talk.rs index da65da23d..3521970d2 100644 --- a/users/talk.rs +++ b/users/talk.rs @@ -1721,8 +1721,8 @@ fn get_terminal_size() -> (u16, u16) { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::try_parse().unwrap_or_else(|err| { if err.kind() == ErrorKind::DisplayHelp || err.kind() == ErrorKind::DisplayVersion { diff --git a/users/write.rs b/users/write.rs index 841fb8b2a..934cc362c 100644 --- a/users/write.rs +++ b/users/write.rs @@ -204,8 +204,8 @@ fn process_non_printable(line: &str) -> String { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/xform/cksum.rs b/xform/cksum.rs index ce6daa1e6..f63306bdf 100644 --- a/xform/cksum.rs +++ b/xform/cksum.rs @@ -69,8 +69,8 @@ fn cksum_file(filename: &PathBuf) -> io::Result<()> { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let mut args = Args::parse(); diff --git a/xform/compress.rs b/xform/compress.rs index 9fb499e5f..fd307e1e2 100644 --- a/xform/compress.rs +++ b/xform/compress.rs @@ -116,8 +116,8 @@ fn compress_file(args: &Args, pathname: &PathBuf) -> io::Result { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let mut args = Args::parse(); diff --git a/xform/uncompress.rs b/xform/uncompress.rs index 9d28b5696..f438071c1 100644 --- a/xform/uncompress.rs +++ b/xform/uncompress.rs @@ -61,8 +61,8 @@ fn prog_is_zcat() -> bool { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let mut args = Args::parse(); diff --git a/xform/uudecode.rs b/xform/uudecode.rs index b3832ca83..566d9bce0 100644 --- a/xform/uudecode.rs +++ b/xform/uudecode.rs @@ -176,8 +176,8 @@ fn pathname_display(path: &Option) -> String { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse(); diff --git a/xform/uuencode.rs b/xform/uuencode.rs index 3b28df935..b0a5e3984 100644 --- a/xform/uuencode.rs +++ b/xform/uuencode.rs @@ -177,8 +177,8 @@ fn pathname_display(path: &Option) -> String { fn main() -> Result<(), Box> { setlocale(LocaleCategory::LcAll, ""); - textdomain(env!("PROJECT_NAME"))?; - bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?; + textdomain("posixutils-rs")?; + bind_textdomain_codeset("posixutils-rs", "UTF-8")?; let args = Args::parse();