summaryrefslogtreecommitdiffstats
path: root/release/sysinstall
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>1996-12-17 00:00:15 +0000
committerjkh <jkh@FreeBSD.org>1996-12-17 00:00:15 +0000
commite31e8400c205000f443a487e9c3ff8902aac54c4 (patch)
tree9171bf0e609c77bc332ee9b25f8bf527e9c46097 /release/sysinstall
parent89d0c85c516287e9c361728235da106e6972a164 (diff)
downloadFreeBSD-src-e31e8400c205000f443a487e9c3ff8902aac54c4.zip
FreeBSD-src-e31e8400c205000f443a487e9c3ff8902aac54c4.tar.gz
1. Engage brain. 2. Write macro. Previous commit attempted to perform
2 before 1.
Diffstat (limited to 'release/sysinstall')
-rw-r--r--release/sysinstall/misc.c4
-rw-r--r--release/sysinstall/sysinstall.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/release/sysinstall/misc.c b/release/sysinstall/misc.c
index 6508fc7..ebca91f 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 3a7c7fd..fd8b255 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;
OpenPOWER on IntegriCloud