From b24b9d501bfc84702f635669d703a7a7aa0156fc Mon Sep 17 00:00:00 2001
From: Idan Attias <idana@wix.com>
Date: Thu, 6 May 2021 10:52:35 +0300
Subject: [PATCH] logname: replace getopts with clap

---
 Cargo.lock                    |  1 +
 src/uu/logname/Cargo.toml     |  1 +
 src/uu/logname/src/logname.rs | 16 ++++++++--------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a0169b412..24c008040 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2068,6 +2068,7 @@ dependencies = [
 name = "uu_logname"
 version = "0.0.6"
 dependencies = [
+ "clap",
  "libc",
  "uucore",
  "uucore_procs",
diff --git a/src/uu/logname/Cargo.toml b/src/uu/logname/Cargo.toml
index 416f817d7..4aa4d68f4 100644
--- a/src/uu/logname/Cargo.toml
+++ b/src/uu/logname/Cargo.toml
@@ -16,6 +16,7 @@ path = "src/logname.rs"
 
 [dependencies]
 libc = "0.2.42"
+clap = "2.33"
 uucore = { version=">=0.0.8", package="uucore", path="../../uucore" }
 uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" }
 
diff --git a/src/uu/logname/src/logname.rs b/src/uu/logname/src/logname.rs
index 8c6a946f5..9f9319e65 100644
--- a/src/uu/logname/src/logname.rs
+++ b/src/uu/logname/src/logname.rs
@@ -13,7 +13,8 @@
 extern crate uucore;
 
 use std::ffi::CStr;
-use uucore::InvalidEncodingHandling;
+
+use clap::App;
 
 extern "C" {
     // POSIX requires using getlogin (or equivalent code)
@@ -31,15 +32,14 @@ fn get_userlogin() -> Option<String> {
     }
 }
 
-static SYNTAX: &str = "";
 static SUMMARY: &str = "Print user's login name";
-static LONG_HELP: &str = "";
+static VERSION: &str = env!("CARGO_PKG_VERSION");
 
-pub fn uumain(args: impl uucore::Args) -> i32 {
-    app!(SYNTAX, SUMMARY, LONG_HELP).parse(
-        args.collect_str(InvalidEncodingHandling::ConvertLossy)
-            .accept_any(),
-    );
+pub fn uumain(_: impl uucore::Args) -> i32 {
+    let _ = App::new(executable!())
+        .version(VERSION)
+        .about(SUMMARY)
+        .get_matches();
 
     match get_userlogin() {
         Some(userlogin) => println!("{}", userlogin),