From 3cce01a41614fd1b86b75c1303496ffbc97098a9 Mon Sep 17 00:00:00 2001
From: "Jordan K. Hubbard" <jkh@FreeBSD.org>
Date: Tue, 17 Dec 1996 00:00:15 +0000
Subject: 1. Engage brain.  2. Write macro.   Previous commit attempted to
 perform 2 before 1.

---
 release/sysinstall/misc.c       | 4 ++--
 release/sysinstall/sysinstall.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'release')

diff --git a/release/sysinstall/misc.c b/release/sysinstall/misc.c
index 6508fc7634fc..ebca91f33576 100644
--- a/release/sysinstall/misc.c
+++ b/release/sysinstall/misc.c
@@ -1,7 +1,7 @@
 /*
  * Miscellaneous support routines..
  *
- * $Id: misc.c,v 1.24 1996/12/11 18:23:18 jkh Exp $
+ * $Id: misc.c,v 1.25 1996/12/12 22:38:41 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -80,7 +80,7 @@ string_concat(char *one, char *two)
 char *
 sstrncpy(char *dst, const char *src, int size)
 {
-    dst[--size] = '\0';
+    dst[size] = '\0';
     return strncpy(dst, src, size);
 }
 
diff --git a/release/sysinstall/sysinstall.h b/release/sysinstall/sysinstall.h
index 3a7c7fd69a62..fd8b2558c741 100644
--- a/release/sysinstall/sysinstall.h
+++ b/release/sysinstall/sysinstall.h
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $Id: sysinstall.h,v 1.93 1996/12/12 08:33:38 jkh Exp $
+ * $Id: sysinstall.h,v 1.94 1996/12/14 23:09:07 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -144,7 +144,7 @@
 #define ATTR_TITLE	button_active_attr
 
 /* Handy strncpy() macro */
-#define SAFE_STRCPY(to, from)	sstrncpy((to), (from), sizeof (to))
+#define SAFE_STRCPY(to, from)	sstrncpy((to), (from), sizeof (to) - 1)
 
 /*** Types ***/
 typedef unsigned int Boolean;
-- 
cgit v1.3