Fix merge conflicts

[bsdgames-darwin.git] / hack / hack.unix.c

diff --git a/hack/hack.unix.c b/hack/hack.unix.c
index 8e82fefa3a293d0cfc6e7a258c7315b492f0dcef..811aedc1a685bbcfd4e5161f007eb3029467b581 100644 (file)
--- a/hack/hack.unix.c
+++ b/hack/hack.unix.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: hack.unix.c,v 1.16 2011/08/31 16:24:56 plunky Exp $    */
+/*     $NetBSD: hack.unix.c,v 1.18 2019/02/03 10:48:46 mrg Exp $       */
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,7 +63,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: hack.unix.c,v 1.16 2011/08/31 16:24:56 plunky Exp $");
+__RCSID("$NetBSD: hack.unix.c,v 1.18 2019/02/03 10:48:46 mrg Exp $");
 #endif                         /* not lint */
 
 /* This file collects some Unix dependencies; hack.pager.c contains some more */
@@ -123,7 +123,7 @@ getyear(void)
 char           *
 getdatestr(void)
 {
-       static char     datestr[7];
+       static char     datestr[32];
        struct tm      *lt = getlt();
 
        (void) snprintf(datestr, sizeof(datestr), "%02d%02d%02d",
@@ -506,7 +506,7 @@ readmail(void)
        if (!(mr = getenv("MAILREADER")))
                mr = DEF_MAILREADER;
        if (child(1)) {
-               execl(mr, mr, NULL);
+               execl(mr, mr, (char *)NULL);
                exit(1);
        }
 #else  /* DEF_MAILREADER */