From: Karel Zak <kzak@redhat.com>
Date: Tue, 16 Aug 2011 10:33:56 +0000 (+0200)
Subject: namei: cleanup usage()
X-Git-Tag: v2.20-rc2~35
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=54f0728944927d919135e1c0af8953206ddcc569;p=thirdparty%2Futil-linux.git

namei: cleanup usage()

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/misc-utils/namei.c b/misc-utils/namei.c
index e192f58c15..752c0c183c 100644
--- a/misc-utils/namei.c
+++ b/misc-utils/namei.c
@@ -400,28 +400,29 @@ print_namei(struct namei *nm, char *path)
 	return 0;
 }
 
-static void
-usage(int rc)
+static void usage(int rc)
 {
 	const char *p = program_invocation_short_name;
+	FILE *out = rc == EXIT_FAILURE ? stderr : stdout;
 
 	if (!*p)
 		p = "namei";
 
-	printf(_("\nUsage: %s [options] pathname [pathname ...]\n"), p);
-	printf(_("\nOptions:\n"));
-
-	printf(_(
-	" -h, --help          displays this help text\n"
-	" -V, --version       output version information and exit\n"
-	" -x, --mountpoints   show mount point directories with a 'D'\n"
-	" -m, --modes         show the mode bits of each file\n"
-	" -o, --owners        show owner and group name of each file\n"
-	" -l, --long          use a long listing format (-m -o -v) \n"
-	" -n, --nosymlinks    don't follow symlinks\n"
-	" -v, --vertical      vertical align of modes and owners\n"));
-
-	printf(_("\nFor more information see namei(1).\n"));
+	fputs(_("\nUsage:\n"), out);
+	fprintf(out,
+	      _(" %s [options] pathname [pathname ...]\n"), p);
+
+	fputs(_("\nOptions:\n"), out);
+	fputs(_(" -h, --help          displays this help text\n"
+		" -V, --version       output version information and exit\n"
+		" -x, --mountpoints   show mount point directories with a 'D'\n"
+		" -m, --modes         show the mode bits of each file\n"
+		" -o, --owners        show owner and group name of each file\n"
+		" -l, --long          use a long listing format (-m -o -v) \n"
+		" -n, --nosymlinks    don't follow symlinks\n"
+		" -v, --vertical      vertical align of modes and owners\n"), out);
+
+	fputs(_("\nFor more information see namei(1).\n"), out);
 	exit(rc);
 }