1 diff -urN proftpd-1.3.0a-0rig/ChangeLog proftpd-1.3.0a/ChangeLog
2 --- proftpd-1.3.0a-0rig/ChangeLog 2006-04-16 23:39:01.000000000 +0200
3 +++ proftpd-1.3.0a/ChangeLog 2007-09-24 08:18:14.000000000 +0200
7 + * contrib/mod_load/mod_load.c.in
11 + Replace bzero/bcopy with memset/memcpy
13 2006-04-16 14:36 castaglia
15 * contrib/dist/rpm/proftpd.spec, include/version.h, NEWS:
16 diff -urN proftpd-1.3.0a-0rig/config.h.in proftpd-1.3.0a/config.h.in
17 --- proftpd-1.3.0a-0rig/config.h.in 2005-10-20 01:28:30.000000000 +0200
18 +++ proftpd-1.3.0a/config.h.in 2007-09-24 08:24:38.000000000 +0200
20 #undef STACK_DIRECTION
22 /* Define if you have the ANSI C header files. */
24 +#define STDC_HEADERS 1
26 /* Define if you can safely include both <sys/time.h> and <time.h>. */
27 #undef TIME_WITH_SYS_TIME
31 /* The number of bytes in a short. */
33 +#define SIZEOF_SHORT 2
35 /* The number of bytes in an int. */
39 /* The number of bytes in a long. */
42 /* The number of bytes in a time_t. */
45 -/* Define if you have the bcopy function. */
48 /* Define if you have the crypt function. */
54 /* Define if you have the memcpy function. */
56 +#define HAVE_MEMCPY 1
58 /* Define if you have the mempcpy function. */
60 diff -urN proftpd-1.3.0a-0rig/contrib/mod_load/mod_load.c.in proftpd-1.3.0a/contrib/mod_load/mod_load.c.in
61 --- proftpd-1.3.0a-0rig/contrib/mod_load/mod_load.c.in 2005-01-07 00:39:59.000000000 +0100
62 +++ proftpd-1.3.0a/contrib/mod_load/mod_load.c.in 2007-09-24 08:02:01.000000000 +0200
64 for (i = 0; i < conf.config_maxclass; ++i)
66 struct class_stats stats;
67 - bzero ((char *) &stats, sizeof stats);
68 + memset ((char *) &stats, 0, sizeof stats);
70 desc.sd_type = CPUTYPE_CLASS;
72 diff -urN proftpd-1.3.0a-0rig/include/conf.h proftpd-1.3.0a/include/conf.h
73 --- proftpd-1.3.0a-0rig/include/conf.h 2005-06-30 02:39:16.000000000 +0200
74 +++ proftpd-1.3.0a/include/conf.h 2007-09-24 08:20:26.000000000 +0200
76 # define strrchr rindex
78 char *strchr(),*strrchr();
80 -# define memcpy(d,s,n) bcopy((s),(d),(n))
81 -# define memmove(d,s,n) bcopy((s),(d),(n))
87 off_t lseek(int, off_t, int);
90 -/* See if we have bcopy, if not define them to use the memcpy functions */
93 -# define bcopy(s,d,n) memcpy((d),(s),(n))
94 -# define bzero(d,n) memset((d),0,(n))
97 /* Solaris has __vsnprintf, but no vsnprintf */
98 #if ! defined(HAVE_VSNPRINTF) && defined(HAVE___VSNPRINTF)
100 diff -urN proftpd-1.3.0a-0rig/lib/glibc-glob.c proftpd-1.3.0a/lib/glibc-glob.c
101 --- proftpd-1.3.0a-0rig/lib/glibc-glob.c 2006-03-22 23:10:34.000000000 +0100
102 +++ proftpd-1.3.0a/lib/glibc-glob.c 2007-09-24 08:07:48.000000000 +0200
108 -extern void bzero ();
111 -extern void bcopy ();
114 -# define memcpy(d, s, n) bcopy ((s), (d), (n))
115 # define strrchr rindex
116 /* memset is only used for zero here, but let's be paranoid. */
117 -# define memset(s, better_be_zero, n) \
118 - ((void) ((better_be_zero) == 0 ? (bzero((s), (n)), 0) : (abort(), 0)))
119 #endif /* Not ANSI_STRING. */
121 #if !defined HAVE_STRCOLL && !defined _LIBC
122 diff -urN proftpd-1.3.0a-0rig/lib/libltdl/config-h.in proftpd-1.3.0a/lib/libltdl/config-h.in
123 --- proftpd-1.3.0a-0rig/lib/libltdl/config-h.in 2004-10-29 07:17:55.000000000 +0200
124 +++ proftpd-1.3.0a/lib/libltdl/config-h.in 2007-09-24 08:25:40.000000000 +0200
126 /* Define to 1 if you have the <assert.h> header file. */
129 -/* Define to 1 if you have the `bcopy' function. */
132 /* Define to 1 if you have the `closedir' function. */
138 /* Define to 1 if you have the `memcpy' function. */
140 +#define HAVE_MEMCPY 1
142 /* Define to 1 if you have the `memmove' function. */
145 #undef PACKAGE_VERSION
147 /* Define to 1 if you have the ANSI C header files. */
149 +#define STDC_HEADERS 1
151 /* Define to empty if `const' does not conform to ANSI C. */
153 diff -urN proftpd-1.3.0a-0rig/lib/libltdl/ltdl.c proftpd-1.3.0a/lib/libltdl/ltdl.c
154 --- proftpd-1.3.0a-0rig/lib/libltdl/ltdl.c 2004-10-29 07:17:55.000000000 +0200
155 +++ proftpd-1.3.0a/lib/libltdl/ltdl.c 2007-09-24 08:13:51.000000000 +0200
157 if you need that behaviour. */
161 -# define memcpy(dest, src, size) bcopy (src, dest, size)
163 # define memcpy rpl_memcpy
165 static lt_ptr memcpy LT_PARAMS((lt_ptr dest, const lt_ptr src, size_t size));
170 -# endif /* !HAVE_BCOPY */
171 #endif /* !HAVE_MEMCPY */