openvt: Use xmalloc

Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index 2115b8f..e970da8 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -53,7 +53,7 @@ getunimap_SOURCES       = $(ALL_S) getunimap.c $(GETFD_S) $(KDMA_S)
 kbd_mode_SOURCES        = $(ALL_S) kbd_mode.c $(GETFD_S)
 loadunimap_SOURCES      = $(ALL_S) loadunimap.c $(FIND_S) $(PSF_S) $(UTF8_S) $(XMAL_S) $(GETFD_S) $(KDMA_S)
 mapscrn_SOURCES         = $(ALL_S) mapscrn.c $(FIND_S) $(UTF8_S) $(XMAL_S) $(GETFD_S) $(KDMA_S)
-openvt_SOURCES          = $(ALL_S) openvt.c openvt.h $(GETFD_S)
+openvt_SOURCES          = $(ALL_S) openvt.c openvt.h $(GETFD_S) $(XMAL_S)
 psfxtable_SOURCES       = $(ALL_S) psfxtable.c $(PSF_S) $(XMAL_S) $(UTF8_S) $(GETFD_S)
 resizecons_SOURCES      = $(ALL_S) resizecons.c $(GETFD_S) $(FIND_S) $(XMAL_S)
 screendump_SOURCES      = $(ALL_S) screendump.c $(XMAL_S)

diff --git a/src/openvt.c b/src/openvt.c
index 28442ec..c343dd0 100644 (file)
--- a/src/openvt.c
+++ b/src/openvt.c
@@ -30,8 +30,9 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#include "kbd.h"
+#include "version.h"
 #include "openvt.h"
+#include "xmalloc.h"
 #include "nls.h"
 
 const char *version = "openvt 1.4b - (c) Jon Tombs 1994";
@@ -173,9 +174,9 @@ main(int argc, char *argv[])
                        def_cmd = getenv("SHELL");
                        if (def_cmd == NULL)
                                usage(0);
-                       cmd = malloc(strlen(def_cmd + 2));
+                       cmd = xmalloc(strlen(def_cmd) + 2);
                } else {
-                       cmd = malloc(strlen(argv[optind] + 2));
+                       cmd = xmalloc(strlen(argv[optind]) + 2);
                }
 
                if (login)

diff --git a/src/version.h b/src/version.h
index 2d94efa..fe55d3a 100644 (file)
--- a/src/version.h
+++ b/src/version.h
@@ -1,5 +1,6 @@
 #include "kbd.h"
 #include "../config.h"
+#include <stdio.h>
 #include <string.h>
 #include <stdlib.h>