From 7c7c8bc53ba9bb7a5a5bf17cf66280134833aa81 Mon Sep 17 00:00:00 2001
From: Sami Kerola <kerolasa@iki.fi>
Date: Sat, 17 Mar 2012 18:38:53 +0100
Subject: [PATCH] raw: align with howto-usage-function.txt

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 disk-utils/raw.c | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/disk-utils/raw.c b/disk-utils/raw.c
index c2e029045..028fd7a7a 100644
--- a/disk-utils/raw.c
+++ b/disk-utils/raw.c
@@ -21,6 +21,8 @@
 #include <sys/sysmacros.h>
 #include <linux/raw.h>
 #include <linux/major.h>
+
+#include "c.h"
 #include "nls.h"
 
 
@@ -44,15 +46,20 @@ static int query(int minor_raw, const char *raw_name, int quiet);
 static int bind(int minor_raw, int block_major, int block_minor);
 
 
-static void usage(int err)
+static void __attribute__ ((__noreturn__)) usage(int err)
 {
-	fprintf(stderr,
-		_("Usage:\n"
-		  "  %1$s %2$srawN <major> <minor>\n"
-		  "  %1$s %2$srawN /dev/<blockdevice>\n"
-		  "  %1$s -q %2$srawN\n"
-		  "  %1$s -qa\n"),
-		progname, RAWDEVDIR);
+	FILE *out = err == EXIT_SUCCESS ? stdout : stderr;
+
+	fputs(USAGE_HEADER, out);
+	fprintf(out,
+		_(" %1$s %2$srawN <major> <minor>\n"
+		  " %1$s %2$srawN /dev/<blockdevice>\n"
+		  " %1$s -q %2$srawN\n"
+		  " %1$s -qa\n"), program_invocation_short_name, RAWDEVDIR);
+	fputs(USAGE_OPTIONS, out);
+	fputs(USAGE_HELP, out);
+	fputs(USAGE_VERSION, out);
+	fprintf(out, USAGE_MAN_TAIL("raw(8)"));
 	exit(err);
 }