From ad621bb698ea6466c1035ffd03a7091193e215e2 Mon Sep 17 00:00:00 2001
From: brodsom <brodsom@users.sourceforge.net>
Date: Thu, 3 Jul 2003 00:22:48 +0000
Subject: [PATCH] Solve a bug. mv can't be used in win32. Replace cmp with a
 native compare on win32

---
 src/jrd/codes.epp | 36 +++++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/jrd/codes.epp b/src/jrd/codes.epp
index a4a134ea8c..b7655caa1d 100644
--- a/src/jrd/codes.epp
+++ b/src/jrd/codes.epp
@@ -749,17 +749,31 @@ const\n\
 static void move_if_not_identical( char* original, char* new_file)
 {
 
-    
-    char origName[1000];
-    if ( genDirectory != NULL) {
-        sprintf(origName,"%s/%s", genDirectory, original);
-    }
-    else {
-        sprintf(origName,"./%s", original);
-    }
-
+	
+	char origName[1000];
 	char buffer[1000];
+#ifdef WIN_NT
+	if ( genDirectory != NULL) {
+		sprintf(origName,"%s\\%s", genDirectory, original);
+	}
+	else {
+		sprintf(origName,".\\%s", original);
+	}
+	/*
+	 * This is a trick to make on systems previous to W2K were apparently 
+	 * fc does not return a errorlevel, but find return it (1 found 0 not found)
+	 * FC: appear only where there are no differences (and the switch /B is not used)
+	 */
+	sprintf(buffer, "fc %s %s | find \"FC:\" > nul", new_file, origName);
+#else
+	if ( genDirectory != NULL) {
+		sprintf(origName,"%s/%s", genDirectory, original);
+	}
+	else {
+		sprintf(origName,"./%s", original);
+	}
 	sprintf(buffer, "cmp -s %s %s", new_file, origName);
+#endif
 
 /* If the new file is identical to the original, then don't update
    the original */
@@ -769,7 +783,11 @@ static void move_if_not_identical( char* original, char* new_file)
 	}
 	else {
 		/* Original file is missing or different */
+#ifdef WIN_NT
+		sprintf(buffer, "move %s %s > nul", new_file, origName);
+#else
 		sprintf(buffer, "mv -f %s %s", new_file, origName);
+#endif
 		if (system(buffer) != 0) {
 			ib_fprintf(ib_stderr, "Error moving %s to %s!\n",
 					   new_file, origName);