From 20e40b3da376bbec0596ea960cd203c1f4e2d56c Mon Sep 17 00:00:00 2001
From: Michiel Broek <mbse@mbse.eu>
Date: Wed, 10 Dec 2003 19:49:20 +0000
Subject: [PATCH] Fixed msg renumber bug and Makefile bug

---
 ChangeLog    |  5 +++++
 Makefile     | 16 ++++++++--------
 lib/jammsg.c |  5 +++--
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 36a2d14b..bbb3c973 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,11 @@ v0.39.4		08-Dec-2003
 		delete /opt/mbse/etc/language.data and run mbsetup to create
 		a new language.data including the french setup.
 
+	libmsgbase:
+		Changed the fix in JAM to prevent the copy overwrite. This may
+		also fixed the message renumbering bug introduced with previous
+		version.
+
 	mbsetup:
 		Added default record for french language.
 
diff --git a/Makefile b/Makefile
index 2107acfd..6d2f7716 100644
--- a/Makefile
+++ b/Makefile
@@ -123,14 +123,14 @@ install:
 			${CHOWN} -R ${OWNER}:${GROUP} ${PREFIX}/german; \
 		fi
 		@chmod 0775 ${PREFIX}/german/txtfiles
-                @if [ ! -d ${PREFIX}/french ] ; then \
-                        mkdir ${PREFIX}/french; \
-                        mkdir ${PREFIX}/french/txtfiles ; \
-                        mkdir ${PREFIX}/french/menus ; \
-                        mkdir ${PREFIX}/french/macro ; \
-                        ${CHOWN} -R ${OWNER}:${GROUP} ${PREFIX}/french; \
-                fi
-                @chmod 0775 ${PREFIX}/french/txtfiles
+		@if [ ! -d ${PREFIX}/french ] ; then \
+			mkdir ${PREFIX}/french; \
+			mkdir ${PREFIX}/french/txtfiles ; \
+			mkdir ${PREFIX}/french/menus ; \
+			mkdir ${PREFIX}/french/macro ; \
+			${CHOWN} -R ${OWNER}:${GROUP} ${PREFIX}/french; \
+		fi
+		@chmod 0775 ${PREFIX}/french/txtfiles
 		@if [ ! -d ${PREFIX}/ftp ] ; then \
 			mkdir ${PREFIX}/ftp ; \
 			mkdir ${PREFIX}/ftp/pub ; \
diff --git a/lib/jammsg.c b/lib/jammsg.c
index a194e79e..0e86b8f7 100644
--- a/lib/jammsg.c
+++ b/lib/jammsg.c
@@ -566,7 +566,7 @@ int JAM_Open(char *Msgbase)
 			fdJlr = open(File, O_RDWR|O_CREAT, S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP);
 			RetVal = TRUE;
 
-			memmove(BaseName, Msgbase, strlen(Msgbase));
+			strcpy(BaseName, Msgbase);
 		} else {
 			close(fdHdr);
 			fdHdr = -1;
@@ -749,7 +749,8 @@ void JAM_Pack(void)
 	unlink(New);
 	rename(File, New);
 
-	JAM_Open(BaseName);
+	sprintf(File, "%s", BaseName);
+	JAM_Open(File);
     }
 
     if (fdnHdr != -1)