From 7ed4cd5c8b1e170a71aab448bb42413da7b0855d Mon Sep 17 00:00:00 2001
From: John Kastner <john@correctcomputation.com>
Date: Fri, 16 Oct 2020 11:42:38 -0400
Subject: [PATCH] Manual fix for conversion errors

---
 sysdeputil.c | 8 +++++++-
 sysutil.c    | 6 +++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/sysdeputil.c b/sysdeputil.c
index b068d29..3c5166a 100644
--- a/sysdeputil.c
+++ b/sysdeputil.c
@@ -212,7 +212,7 @@ int capset(cap_user_header_t header, const cap_user_data_t data)
 #endif
 
 #ifdef VSF_SYSDEP_TRY_LINUX_SETPROCTITLE_HACK
-extern char** environ;
+extern char ** environ;
 static unsigned int s_proctitle_space = 0;
 static int s_proctitle_inited = 0;
 static char* s_p_proctitle = 0;
@@ -908,6 +908,12 @@ vsf_sysutil_setproctitle_init(int argc, const char* argv[])
 {
   int i;
   char** p_env = environ;
+  /* Force p_env to stay wild */
+  if (0) {
+    *p_env = (char*) 0xBAD;
+    p_env = (char**) 0xBAD;
+  }
+
   if (s_proctitle_inited)
   {
     bug("vsf_sysutil_setproctitle_init called twice");
diff --git a/sysutil.c b/sysutil.c
index 2f74cf1..e5c0135 100644
--- a/sysutil.c
+++ b/sysutil.c
@@ -1381,7 +1381,7 @@ vsf_sysutil_statbuf_get_date(const struct vsf_sysutil_statbuf* p_statbuf,
   {
     p_date_format = "%b %d  %Y";
   }
-  retval = strftime(datebuf, sizeof(datebuf), p_date_format, p_tm);
+  retval = strftime(datebuf, sizeof(datebuf) - 1, p_date_format, p_tm);
   datebuf[sizeof(datebuf)-1] = '\0';
   if (retval == 0)
   {
@@ -1407,7 +1407,7 @@ vsf_sysutil_statbuf_get_numeric_date(
   {
     p_tm = localtime(&p_stat->st_mtime);
   }
-  retval = strftime(datebuf, sizeof(datebuf), "%Y%m%d%H%M%S", p_tm);
+  retval = strftime(datebuf, sizeof(datebuf) - 1, "%Y%m%d%H%M%S", p_tm);
   if (retval == 0)
   {
     die("strftime");
@@ -2624,7 +2624,7 @@ vsf_sysutil_get_current_date(void)
   int i = 0;
   curr_time = vsf_sysutil_get_time_sec();
   p_tm = localtime(&curr_time);
-  if (strftime(datebuf, sizeof(datebuf), "%a %b!%d %H:%M:%S %Y", p_tm) == 0)
+  if (strftime(datebuf, sizeof(datebuf) - 1, "%a %b!%d %H:%M:%S %Y", p_tm) == 0)
   {
     die("strftime");
   }