Use xread_char to save a few bytes, fix indenting of comments

[oweals/busybox.git] / console-tools / loadfont.c

diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c
index ec3e50560777e298233e535200fd5ff54f2d9a00..d6650019554dd59cfb99d0d7a146cafdec38c2aa 100644 (file)
--- a/console-tools/loadfont.c
+++ b/console-tools/loadfont.c
@@ -7,7 +7,6 @@
  * Loads the console font, and possibly the corresponding screen map(s).
  * (Adapted for busybox by Matej Vela.)
  */
-#include "busybox.h"
 #include <stdio.h>
 #include <string.h>
 #include <fcntl.h>
@@ -20,6 +19,7 @@
 #include <sys/ioctl.h>
 #include <sys/kd.h>
 #include <endian.h>
+#include "busybox.h"
 
 static const int PSF_MAGIC1 = 0x36;
 static const int PSF_MAGIC2 = 0x04;
@@ -44,11 +44,11 @@ extern int loadfont_main(int argc, char **argv)
        int fd;
 
        if (argc != 1)
-               usage(loadfont_usage);
+               show_usage();
 
-       fd = open("/dev/tty0", O_RDWR);
+       fd = open(CURRENT_VC, O_RDWR);
        if (fd < 0)
-               perror_msg_and_die("Error opening /dev/tty0");
+               perror_msg_and_die("Error opening " CURRENT_VC);
        loadnewfont(fd);
 
        return EXIT_SUCCESS;