>From 20f46a2e347a53855b70b47297cd1856741d6265 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <address@hidden>
Date: Tue, 9 Sep 2014 10:25:39 +0100
Subject: [PATCH 1/2] maint: fix syntax-check issues in recent commit

Avoid 2 new syntax-check failures introduced in commit v8.23-19-g8defcee

* cfg.mk (sc_some_programs_must_avoid_exit_failure): s/exit/return/.
* src/whoami.c (main): Reinstate translation marker for diagnostic.
---
 cfg.mk       |    2 +-
 src/whoami.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cfg.mk b/cfg.mk
index 26a5966..178ff76 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -436,7 +436,7 @@ sc_prohibit_test_empty:
 sc_some_programs_must_avoid_exit_failure:
 	@grep -nw EXIT_FAILURE						\
 	    $$(git grep -El '[^T]_FAILURE|EXIT_CANCELED' src)		\
-	  | grep -vE '= EXIT_FAILURE|exit \(.* \?' | grep .		\
+	  | grep -vE '= EXIT_FAILURE|return .* \?' | grep .		\
 	    && { echo '$(ME): do not use EXIT_FAILURE in the above'	\
 		  1>&2; exit 1; } || :
 
diff --git a/src/whoami.c b/src/whoami.c
index 545e521..5ec0dc1 100644
--- a/src/whoami.c
+++ b/src/whoami.c
@@ -84,7 +84,7 @@ main (int argc, char **argv)
   uid = geteuid ();
   pw = (uid == NO_UID && errno ? NULL : getpwuid (uid));
   if (!pw)
-    error (EXIT_FAILURE, errno, "cannot find name for user ID %lu",
+    error (EXIT_FAILURE, errno, _("cannot find name for user ID %lu"),
            (unsigned long int) uid);
   puts (pw->pw_name);
   return EXIT_SUCCESS;
-- 
1.7.7.6


>From 8e8c8fe1bccc47ec6a07ac44cf5af88e7cd3f3dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <address@hidden>
Date: Tue, 9 Sep 2014 02:05:45 +0100
Subject: [PATCH 2/2] doc: adjust reference to info nodes in man pages

old form: coreutils '$cmd invocation'
new form: '(coreutils) $cmd invocation'

The old form erroneously referenced the node for the 'coreutils'
multi-call program.  Now that problematic node name was renamed
in commit v8.23-18-g72e470b, but the newer less ambiguous form
also has the advantage of working with the pinfo viewer for example.

* man/local.mk: Adjust man page references to texinfo nodes.
* src/system.h: Adjust --help references to texinfo nodes.
---
 man/local.mk |    2 +-
 src/system.h |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/man/local.mk b/man/local.mk
index f4b213f..f2d1357 100644
--- a/man/local.mk
+++ b/man/local.mk
@@ -102,7 +102,7 @@ man/dynamic-deps.mk: Makefile
 		     --source='$(PACKAGE_STRING)'			\
 		     --include=$(srcdir)/man/$$name.x			\
 		     --output=$$t/$$name.1 $$t/$$argv			\
-		     --info-page='coreutils \(aq'$$name' invocation\(aq' \
+		     --info-page='\(aq(coreutils) '$$name' invocation\(aq' \
 	  && sed \
 	       -e 's|$*\.td/||g' \
 	       -e '/For complete documentation/d' \
diff --git a/src/system.h b/src/system.h
index 162446c..00180cb 100644
--- a/src/system.h
+++ b/src/system.h
@@ -582,7 +582,8 @@ emit_ancillary_info (void)
                 last_component (program_name));
     }
   printf (_("For complete documentation, run: "
-            "info coreutils '%s invocation'\n"), last_component (program_name));
+            "info '(coreutils) %s invocation'\n"),
+          last_component (program_name));
 }
 
 static inline void
-- 
1.7.7.6