Imported Upstream version 2.0.90

[platform/upstream/kbd.git] / src / totextmode.c

diff --git a/src/totextmode.c b/src/totextmode.c
index 39d8222..b5035c9 100644 (file)
--- a/src/totextmode.c
+++ b/src/totextmode.c
@@ -1,6 +1,8 @@
 /*
  * totextmode.c - aeb - 2000-01-20
  */
+#include "config.h"
+
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
@@ -9,20 +11,15 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <fcntl.h>
-#include "getfd.h"
-#include "nls.h"
-#include "version.h"
-#include "kbd_error.h"
 
-int
-main(int argc, char *argv[]) {
+#include "libcommon.h"
+
+int main(int argc, char *argv[])
+{
        int fd, num;
 
        set_progname(argv[0]);
-
-       setlocale(LC_ALL, "");
-       bindtextdomain(PACKAGE_NAME, LOCALEDIR);
-       textdomain(PACKAGE_NAME);
+       setuplocale();
 
        if (argc == 2 && !strcmp(argv[1], "-V"))
                print_version_and_exit();
@@ -30,9 +27,12 @@ main(int argc, char *argv[]) {
        if (argc != 2) {
                kbd_error(EXIT_FAILURE, 0, _("usage: totextmode\n"));
        }
-       fd = getfd(NULL);
+
+       if ((fd = getfd(NULL)) < 0)
+               kbd_error(EXIT_FAILURE, 0, _("Couldn't get a file descriptor referring to the console"));
+
        num = atoi(argv[1]);
-       if (ioctl(fd,KDSETMODE,KD_TEXT)) {
+       if (ioctl(fd, KDSETMODE, KD_TEXT)) {
                kbd_error(EXIT_FAILURE, errno, "totextmode: KDSETMODE");
        }
        return EXIT_SUCCESS;