Make the ways of using output stream consistent in usage()

[thirdparty/util-linux.git] / sys-utils / pivot_root.c

diff --git a/sys-utils/pivot_root.c b/sys-utils/pivot_root.c
index db8e02f0c900c09942f42f93fb583657161af791..6462a5b95f2925bec15716fb75b9a80dd77ba439 100644 (file)
--- a/sys-utils/pivot_root.c
+++ b/sys-utils/pivot_root.c
@@ -23,19 +23,24 @@
 
 #include "c.h"
 #include "nls.h"
+#include "closestream.h"
 
 #define pivot_root(new_root,put_old) syscall(SYS_pivot_root,new_root,put_old)
 
-static void __attribute__ ((__noreturn__)) usage(FILE * out)
+static void __attribute__((__noreturn__)) usage(void)
 {
-       fprintf(out, USAGE_HEADER);
+       FILE *out = stdout;
+       fputs(USAGE_HEADER, out);
        fprintf(out, _(" %s [options] new_root put_old\n"),
                program_invocation_short_name);
-       fprintf(out, USAGE_SEPARATOR);
-       fprintf(out, USAGE_HELP);
-       fprintf(out, USAGE_VERSION);
+
+       fputs(USAGE_SEPARATOR, out);
+       fputs(_("Change the root filesystem.\n"), out);
+
+       fputs(USAGE_OPTIONS, out);
+       fprintf(out, USAGE_HELP_OPTIONS(16));
        fprintf(out, USAGE_MAN_TAIL("pivot_root(8)"));
-       exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
+       exit(EXIT_SUCCESS);
 }
 
 int main(int argc, char **argv)
@@ -50,21 +55,22 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
+       close_stdout_atexit();
 
        while ((ch = getopt_long(argc, argv, "Vh", longopts, NULL)) != -1)
                switch (ch) {
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                case 'h':
-                       usage(stdout);
+                       usage();
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
 
-       if (argc != 3)
-               usage(stderr);
-
+       if (argc != 3) {
+               warnx(_("bad usage"));
+               errtryhelp(EXIT_FAILURE);
+       }
        if (pivot_root(argv[1], argv[2]) < 0)
                err(EXIT_FAILURE, _("failed to change root from `%s' to `%s'"),
                    argv[1], argv[2]);