1 files changed, 6 insertions, 11 deletions
diff --git a/utility.c b/utility.c
index 3d5620ec5..27613b177 100644
--- a/utility.c
+++ b/utility.c
@@ -79,8 +79,7 @@ const char mtab_file[] = "/dev/mtab";
 extern void usage(const char *usage)
 {
-        fprintf(stderr, "%s\n\n", full_version);
+        fprintf(stderr, "%s\n\nUsage: %s\n", full_version, usage);
-        fprintf(stderr, "Usage: %s\n", usage);
        exit(EXIT_FAILURE);
 }
@@ -89,7 +88,6 @@ static void verror_msg(const char *s, va_list p)
        fflush(stdout);
        fprintf(stderr, "%s: ", applet_name);
        vfprintf(stderr, s, p);
-        fflush(stderr);
 }
 extern void error_msg(const char *s, ...)
@@ -113,14 +111,11 @@ extern void error_msg_and_die(const char *s, ...)
 static void vperror_msg(const char *s, va_list p)
 {
-        fflush(stdout);
+        int err=errno;
-        fprintf(stderr, "%s: ", applet_name);
+        if(s == 0) s = "";
-        if (s && *s) {
+        verror_msg(s, p);
-                vfprintf(stderr, s, p);
+        if (*s) s = ": ";
-                fputs(": ", stderr);
+        fprintf(stderr, "%s%s\n", s, strerror(err));
-        }
-        fprintf(stderr, "%s\n", strerror(errno));
-        fflush(stderr);
 }
 extern void perror_msg(const char *s, ...)