From 536b80cb569d8ac1819220e1f1eba5d2d7920ca9 Mon Sep 17 00:00:00 2001
From: "cantab.net!aia21" <cantab.net!aia21>
Date: Wed, 25 Feb 2004 17:14:40 +0000
Subject: [PATCH] Fix bug in stoucs().  Thanks to Andras Erdei.

(Logical change 1.281)
---
 ntfsprogs/mkntfs.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ntfsprogs/mkntfs.c b/ntfsprogs/mkntfs.c
index 2e05ef24..94463a62 100644
--- a/ntfsprogs/mkntfs.c
+++ b/ntfsprogs/mkntfs.c
@@ -567,8 +567,10 @@ int stoucs(uchar_t *dest, const char *src, int maxlen)
 	char c;
 	int i;
 
-	/* Need two bytes for null terminator. */
-	maxlen -= 2;
+	/* Convert maxlen from bytes to unicode characters. */
+	maxlen /= sizeof(uchar_t);
+	/* Need space for null terminator. */
+	maxlen--;
 	for (i = 0; i < maxlen; i++) {
 		c = src[i];
 		if (!c)