[ntp:bk-ntp-stable-send] BitKeeper diffs

Harlan Stenn stenn at deacon.udel.edu
Fri Oct 22 07:35:46 UTC 2010


#### ChangeSet ####
2010-10-22 00:33:26+00:00, davehart at shiny.ad.hartbrothers.com 
  [Bug 1669] NTP 4.2.6p2 fails to compile on IBM AIX 5.3.

==== ChangeLog ====
2010-10-22 00:33:24+00:00, davehart at shiny.ad.hartbrothers.com +4 -0
  [Bug 1669] NTP 4.2.6p2 fails to compile on IBM AIX 5.3.

--- 1.655/ChangeLog	2010-10-16 00:24:07 -04:00
+++ 1.655.1.1/ChangeLog	2010-10-21 20:33:24 -04:00
@@ -1,4 +1,8 @@
 ---
+
+* [Bug 1669] NTP 4.2.6p2 fails to compile on IBM AIX 5.3.
+
+---
 (4.2.6p3-RC4) 2010/10/16 Released by Harlan Stenn <stenn at ntp.org>
 
 * [Bug 1584] wrong SNMP type for precision, resolution.

==== ntpd/ntp_util.c ====
2010-10-22 00:33:25+00:00, davehart at shiny.ad.hartbrothers.com +9 -8
  [Bug 1669] NTP 4.2.6p2 fails to compile on IBM AIX 5.3.

--- 1.76/ntpd/ntp_util.c	2010-09-20 18:41:36 -04:00
+++ 1.77/ntpd/ntp_util.c	2010-10-21 20:33:25 -04:00
@@ -356,6 +356,11 @@ stats_config(
 	int	len;
 	char	tbuf[80];
 	char	str1[20], str2[20];
+#ifndef VMS
+	const char temp_ext[] = ".TEMP";
+#else
+	const char temp_ext[] = "-TEMP";
+#endif
 
 	/*
 	 * Expand environment strings under Windows NT, since the
@@ -410,14 +415,10 @@ stats_config(
 		stats_temp_file = erealloc(stats_temp_file, 
 					   len + sizeof(".TEMP"));
 
-		memmove(stats_drift_file, value, (unsigned)(len+1));
-		memmove(stats_temp_file, value, (unsigned)len);
-		memmove(stats_temp_file + len,
-#if !defined(VMS)
-			".TEMP", sizeof(".TEMP"));
-#else
-			"-TEMP", sizeof("-TEMP"));
-#endif /* VMS */
+		memcpy(stats_drift_file, value, (unsigned)(len+1));
+		memcpy(stats_temp_file, value, (unsigned)len);
+		memcpy(stats_temp_file + len, temp_ext,
+		       sizeof(temp_ext));
 
 		/*
 		 * Open drift file and read frequency. If the file is


More information about the bk-ntp-stable-send mailing list