Merge 88d47ac379 into 836e5d19c4

src/uu/pwd/locales/en-US.ftl

@@ -4,6 +4,8 @@ pwd-usage = pwd [OPTION]...
 # Help messages
 pwd-help-logical = use PWD from environment, even if it contains symlinks
 pwd-help-physical = avoid all symlinks
+pwd-help-text = Print help information
+pwd-version-text = Print version information
 
 # Error messages
 pwd-error-failed-to-get-current-directory = failed to get current directory

src/uu/pwd/locales/fr-FR.ftl

@@ -4,6 +4,8 @@ pwd-usage = pwd [OPTION]...
 # Messages d'aide
 pwd-help-logical = utiliser PWD de l'environnement, même s'il contient des liens symboliques
 pwd-help-physical = éviter tous les liens symboliques
+pwd-help-text = Afficher l'aide
+pwd-version-text = Afficher les informations de version
 
 # Messages d'erreur
 pwd-error-failed-to-get-current-directory = échec de l'obtention du répertoire actuel

src/uu/pwd/src/pwd.rs

@@ -145,6 +145,22 @@ pub fn uu_app() -> Command {
         .about(translate!("pwd-about"))
         .override_usage(format_usage(&translate!("pwd-usage")))
         .infer_long_args(true)
+        .disable_help_flag(true)
+        .disable_version_flag(true)
+        .arg(
+            Arg::new("help")
+                .short('h')
+                .long("help")
+                .help(translate!("pwd-help-text"))
+                .action(ArgAction::Help),
+        )
+        .arg(
+            Arg::new("version")
+                .short('V')
+                .long("version")
+                .help(translate!("pwd-version-text"))
+                .action(ArgAction::Version),
+        )
         .arg(
             Arg::new(OPT_LOGICAL)
                 .short('L')

tests/by-util/test_pwd.rs

@@ -15,6 +15,42 @@ fn test_invalid_arg() {
     new_ucmd!().arg("--definitely-invalid").fails_with_code(1);
 }
 
+#[test]
+fn test_help() {
+    new_ucmd!()
+        .arg("--help")
+        .succeeds()
+        .stdout_contains("Display the full filename of the current working directory")
+        .stdout_contains("--help")
+        .stdout_contains("--version");
+}
+
+#[test]
+fn test_version() {
+    new_ucmd!()
+        .arg("--version")
+        .succeeds()
+        .stdout_contains("uutils coreutils");
+}
+
+#[test]
+fn test_short_help() {
+    new_ucmd!()
+        .arg("-h")
+        .succeeds()
+        .stdout_contains("Display the full filename of the current working directory")
+        .stdout_contains("-h");
+}
+
+#[test]
+fn test_short_version() {
+    new_ucmd!()
+        .arg("-V")
+        .succeeds()
+        .stdout_contains("pwd")
+        .stdout_contains("uutils coreutils");
+}
+
 #[test]
 fn test_default() {
     let (at, mut ucmd) = at_and_ucmd!();